August 2021 - crux-commits

ports/contrib (3.6): python3-tox: 3.24.0 -> 3.24.1
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit f4cef85b74af4ce9bbb865364367e7f8d06f6011 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Aug 6 13:37:56 2021 +0200 python3-tox: 3.24.0 -> 3.24.1 diff --git a/python3-tox/.footprint b/python3-tox/.footprint index c56a2d003..4223cc272 100644 --- a/python3-tox/.footprint +++ b/python3-tox/.footprint @@ -5,13 +5,13 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/tox-3.24.0-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.0-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.0-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.0-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.0-py3.9.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.0-py3.9.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.0-py3.9.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.9/site-packages/tox-3.24.1-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.1-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.1-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.1-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.1-py3.9.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.1-py3.9.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/tox-3.24.1-py3.9.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.9/site-packages/tox/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/tox/__init__.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/tox/__main__.py diff --git a/python3-tox/.signature b/python3-tox/.signature index fd1dd87c8..990eb022b 100644 --- a/python3-tox/.signature +++ b/python3-tox/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38SN3fZAUOXpsaQOjZlbUo5VURH9IZtWofKS2/xbsf/dpgrqYy35/YGwWNMxyqENg7cgHAsOsCrLfjxTe+0r7Qs= -SHA256 (Pkgfile) = 5fdbfc03ba95610cbdadd33ff85f9a1d9c1228fddb2bc3e4e5c8e2c9c6d1a2d3 -SHA256 (.footprint) = 822cafd65f47d66b0a8ad91ef6d72858e82552f8f95e0816c7f8a4273b51dddd -SHA256 (tox-3.24.0.tar.gz) = 67636634df6569e450c4bc18fdfd8b84d7903b3902d5c65416eb6735f3d4afb8 +RWSagIOpLGJF3xDeqmbtmQQQ1rbSmoCpOxh54CuxBGCjOzPAqmHKp5/gzkbD6IkX/tIdbBa6WCDmREA733PDbM6qXgsKmfEjAQg= +SHA256 (Pkgfile) = 8078f176aeef222dfbcacc028ff1aabde0e0ee8cf1d900c0c59342bf02729132 +SHA256 (.footprint) = 07862e109f8c168b956c141d3d14ec9302d6aea574e3b68fc56e9594fddd434d +SHA256 (tox-3.24.1.tar.gz) = 9850daeb96d21b4abf049bc5f197426123039e383ebfed201764e9355fc5a880 diff --git a/python3-tox/Pkgfile b/python3-tox/Pkgfile index 9fafb6cfe..4344e84e4 100644 --- a/python3-tox/Pkgfile +++ b/python3-tox/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-packaging python3-pluggy python3-py python3-toml python3-virtualenv name=python3-tox -version=3.24.0 +version=3.24.1 release=1 source=(https://pypi.io/packages/source/t/tox/tox-$version.tar.gz)

1 0

ports/contrib (3.6): python3-virtualenv: 20.6.0 -> 20.7.0
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit 31ab958469b7b342a1c820ba3aa8bef24060d966 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Aug 6 13:37:44 2021 +0200 python3-virtualenv: 20.6.0 -> 20.7.0 diff --git a/python3-virtualenv/.footprint b/python3-virtualenv/.footprint index 0fcff79cb..b7ee01466 100644 --- a/python3-virtualenv/.footprint +++ b/python3-virtualenv/.footprint @@ -4,14 +4,14 @@ drwxr-xr-x root/root usr/bin/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/top_level.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.6.0-py3.9.egg-info/zip-safe +drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv-20.7.0-py3.9.egg-info/zip-safe drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/__init__.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/__main__.py @@ -62,11 +62,6 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/activation/pytho -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/activation/python/__pycache__/activate_this.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/activation/python/activate_this.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/activation/via_template.py -drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/activation/xonsh/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/activation/xonsh/__init__.py -drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/activation/xonsh/__pycache__/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/activation/xonsh/__pycache__/__init__.cpython-39.pyc --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/activation/xonsh/activate.xsh drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/app_data/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/app_data/__init__.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/app_data/__pycache__/ @@ -248,10 +243,10 @@ drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embe drwxr-xr-x root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/__pycache__/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/__pycache__/__init__.cpython-39.pyc -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/pip-20.3.4-py2.py3-none-any.whl --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/pip-21.1.3-py3-none-any.whl +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/pip-21.2.2-py3-none-any.whl -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/setuptools-44.1.1-py2.py3-none-any.whl -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/setuptools-50.3.2-py3-none-any.whl --rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/setuptools-57.1.0-py3-none-any.whl +-rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/setuptools-57.4.0-py3-none-any.whl -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/embed/wheel-0.36.2-py2.py3-none-any.whl -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/periodic_update.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/virtualenv/seed/wheels/util.py diff --git a/python3-virtualenv/.signature b/python3-virtualenv/.signature index ec1e78764..fa5caa32b 100644 --- a/python3-virtualenv/.signature +++ b/python3-virtualenv/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35s0+9A03J/R0/mFOGKWCOamFdiDe5svggXp96Kogo2oeoDFT9DE7F9RgrxsqIUdrVMmJhPE3wC45/07YBqvpAk= -SHA256 (Pkgfile) = 2f513d92c00dd75f7ed4a7b32142f11965a72db14800f524f14c383b2fd01033 -SHA256 (.footprint) = 6bfd771d3593c003628597594406ad792e60270896727d9b79137bde437baba5 -SHA256 (virtualenv-20.6.0.tar.gz) = 51df5d8a2fad5d1b13e088ff38a433475768ff61f202356bb9812c454c20ae45 +RWSagIOpLGJF3xU/An++8DnqS6bL6gnSIUKo5qVpXqwLvu+4aXa66ti8qqjll1unyEfmYorLJFGUfXWw/lkxjk71jtgUopCItgU= +SHA256 (Pkgfile) = 444804b8a5d4b9f88832bcac0ae168214ad5e4ca835ca91dfab049f68bef1703 +SHA256 (.footprint) = 27a92ab48a5f028e95cb4727508ea4593127c0aede3bcf96b89d0a25f6f452fd +SHA256 (virtualenv-20.7.0.tar.gz) = 97066a978431ec096d163e72771df5357c5c898ffdd587048f45e0aecc228094 diff --git a/python3-virtualenv/Pkgfile b/python3-virtualenv/Pkgfile index 6ca8681c8..3670652a7 100644 --- a/python3-virtualenv/Pkgfile +++ b/python3-virtualenv/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-appdirs python3-backports_entry-points-selectable python3-distlib python3-filelock python3-pip python3-platformdirs python3-six name=python3-virtualenv -version=20.6.0 +version=20.7.0 release=1 source=(https://pypi.org/packages/source/v/virtualenv/virtualenv-$version.t…

1 0

ports/contrib (3.6): qownnotes: 21.7.2 -> 21.8.1
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit 9c49f7214e6c980b3a19c71251a4987b1db2bef4 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Aug 6 13:37:32 2021 +0200 qownnotes: 21.7.2 -> 21.8.1 diff --git a/qownnotes/.signature b/qownnotes/.signature index 20cd0e4d4..0efeb8c3c 100644 --- a/qownnotes/.signature +++ b/qownnotes/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF349aMmLpXHhADXF8EXFEQI+7+P9dJB8g3wAFxIhoEdmC7w6usbYRZ8JTI30Zog89+5Adhcho+xepx6yNqg/69Aw= -SHA256 (Pkgfile) = 8d12ab3c707101825ffb49b71f1b79139fc92f640182752f8a6de31b0da4e3bd +RWSagIOpLGJF3+GKEy6RjIVaTOm/S/sNuLhXCF3I1QxzECe8QNTjuolD82H7CIth4KBbGXh4LtN4gPMM6MgI1zn/GQ/1Xq13zwk= +SHA256 (Pkgfile) = 933784da6a5c563cec3db0335230d6f9c954696c6796afaaaadbb4ba94749b37 SHA256 (.footprint) = d3916e94908249d530356c1e79cef586cdeacf7bd488278a3f0c61ab5be2aab3 -SHA256 (qownnotes-21.7.2.tar.xz) = e9dfde5013de2ebc1d2da62ce93544721ca47de11392540b310b43b06c48daef +SHA256 (qownnotes-21.8.1.tar.xz) = 70a4f146a7fc6f749ee56f539b70220de680737d3cafa7f9b4ee0271890f26ab diff --git a/qownnotes/Pkgfile b/qownnotes/Pkgfile index 7967bbf68..9db04707d 100644 --- a/qownnotes/Pkgfile +++ b/qownnotes/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt5 name=qownnotes -version=21.7.2 +version=21.8.1 release=1 source=(https://download.tuxfamily.org/$name/src/$name-$version.tar.xz)

1 0

ports/opt (3.6): imlib2: update to 1.7.2, new maintainer
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit e4406ef523032fef5e2a03ec0323ed5fd50bf409 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 6 12:39:15 2021 +0200 imlib2: update to 1.7.2, new maintainer diff --git a/imlib2/.footprint b/imlib2/.footprint index 0389b58e7..083843aa1 100644 --- a/imlib2/.footprint +++ b/imlib2/.footprint @@ -44,15 +44,17 @@ drwxr-xr-x root/root usr/lib/imlib2/loaders/ -rwxr-xr-x root/root usr/lib/imlib2/loaders/tga.so -rwxr-xr-x root/root usr/lib/imlib2/loaders/tiff.la -rwxr-xr-x root/root usr/lib/imlib2/loaders/tiff.so +-rwxr-xr-x root/root usr/lib/imlib2/loaders/xbm.la +-rwxr-xr-x root/root usr/lib/imlib2/loaders/xbm.so -rwxr-xr-x root/root usr/lib/imlib2/loaders/xpm.la -rwxr-xr-x root/root usr/lib/imlib2/loaders/xpm.so -rwxr-xr-x root/root usr/lib/imlib2/loaders/zlib.la -rwxr-xr-x root/root usr/lib/imlib2/loaders/zlib.so -rw-r--r-- root/root usr/lib/libImlib2.a -rwxr-xr-x root/root usr/lib/libImlib2.la -lrwxrwxrwx root/root usr/lib/libImlib2.so -> libImlib2.so.1.7.1 -lrwxrwxrwx root/root usr/lib/libImlib2.so.1 -> libImlib2.so.1.7.1 --rwxr-xr-x root/root usr/lib/libImlib2.so.1.7.1 +lrwxrwxrwx root/root usr/lib/libImlib2.so -> libImlib2.so.1.7.2 +lrwxrwxrwx root/root usr/lib/libImlib2.so.1 -> libImlib2.so.1.7.2 +-rwxr-xr-x root/root usr/lib/libImlib2.so.1.7.2 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/imlib2.pc drwxr-xr-x root/root usr/share/ diff --git a/imlib2/.signature b/imlib2/.signature index 41fea117b..68767ffe0 100644 --- a/imlib2/.signature +++ b/imlib2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Smgr0vls+vgoCnUlEZtBPMQQEAOgxG+/LWTR9qEc1ZJrmromdFdueddBoOoF2PJ9/FHYsqGqFL5ijuA29q1HAI= -SHA256 (Pkgfile) = d388534690f91e4fc0310af068934e77d8b3212261828da297a3911ed85de746 -SHA256 (.footprint) = 1f0d656e13cd205119cb516b82d0298dc56a46b94ff7bc07eec1d19cc27c3ea3 -SHA256 (imlib2-1.7.1.tar.bz2) = 033a6a639dcbc8e03f65ff05e57068e7346d50ee2f2fff304bb9095a1b2bc407 +RWSE3ohX2g5d/Yp+s8JVuVE5STtcNWIpMCvyqoz46c04y7A/NQS+uWgZQHbE3K9sqzPwE1yJ4axkm6lSvb2WjhUZaGfak3Hyfg0= +SHA256 (Pkgfile) = 8187aaa3cda4717e98f3a537175d3484b2ccfc7f08c61381da902bd07139a10f +SHA256 (.footprint) = e2dccc5f3adbe87b2c30ad9a3203042a30507db629493c12373c5e29713d8f28 +SHA256 (imlib2-1.7.2.tar.bz2) = 525d4e318927471bde4520786dc2550b59ab88533848db2d75c60f5b4e5821a1 diff --git a/imlib2/Pkgfile b/imlib2/Pkgfile index e0410fa4b..e5a3959ff 100644 --- a/imlib2/Pkgfile +++ b/imlib2/Pkgfile @@ -1,19 +1,17 @@ # Description: A fast image manipulation library # URL: https://sourceforge.net/projects/enlightenment/ -# Maintainer: unmaintained +# Maintainer: Juergen Daubert, jue at crux dot nu # Depends on: freetype libtiff xorg-libsm xorg-libxext # Optional: libid3tag giflib name=imlib2 -version=1.7.1 +version=1.7.2 release=1 source=(https://download.sourceforge.net/enlightenment/$name-$version.tar.b… build() { - cd $name-$version - - ./configure --prefix=/usr - - make - make DESTDIR=$PKG install + cd $name-$version + ./configure --prefix=/usr + make + make DESTDIR=$PKG install }

1 0

ports/opt (3.6): nss: update to 3.69
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit 6396ef05545659b197249977087078b30d4e35b2 Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 6 12:03:19 2021 +0200 nss: update to 3.69 diff --git a/nss/.signature b/nss/.signature index 5d4b5f972..03303b9d7 100644 --- a/nss/.signature +++ b/nss/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/T8YC4qkFM173F1n8Rr34arEg6BTat4k6kS1tCHd4YR965eIBP6EKR3ycOur0p92jen8VYub9HddnJ4omuAOWwU= -SHA256 (Pkgfile) = adf2c3e1817e82bab80f17b99171b61eb8536c5dd0a78c87c1e8632f158215b7 +RWSE3ohX2g5d/e5Pkm11YkAFhBP4xDVuFCNRzPGrkOlmv2hHUurkKdYYvD5p1lcFcN3fqzZezEKWiiXDIPul+N0zW2bU4HjfnwM= +SHA256 (Pkgfile) = f67669176912c468022cbe166487ec6e61229fcf9dab2b5e1a8357a053d0fe61 SHA256 (.footprint) = 71cb7f73938ae7291c039c9abec1f93a454919e4133f2f206fe762a9475dda86 -SHA256 (nss-3.68.tar.gz) = c402b32cac83034ec1c3d826ef4306cd14a066d7d9a6f4c30d82b3bc043c725b +SHA256 (nss-3.69.tar.gz) = c880205a365e0dd488ff29fdea82716ff9fcde9da6f3b703d636f8fc08008799 SHA256 (nss-3.54-standalone-2.patch) = 607a29650c767f9451eaec1e35a48a3c8c9ce6a7099234417eb521a44653a371 SHA256 (nss-config.in) = 08dbc1202186308e86125b5c5e7e2d0e1bd1bd5ed65eab011b9af210f656aff5 SHA256 (nss.pc.in) = 135fbde6866e422b7a436e18d5b8e0defbb67dde6b8e1dc9e84de14b5c645626 diff --git a/nss/Pkgfile b/nss/Pkgfile index db46f35fb..8a20d0dcb 100644 --- a/nss/Pkgfile +++ b/nss/Pkgfile @@ -4,7 +4,7 @@ # Depends on: nspr sqlite3 name=nss -version=3.68 +version=3.69 release=1 source=(https://ftp.mozilla.org/pub/security/nss/releases/NSS_${version//./… \ nss-3.54-standalone-2.patch \

1 0

ports/opt (3.6): libev: new maintainer
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit 3da0d9caa511242502b2321365ded5e7941a3785 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Aug 5 19:45:52 2021 +0200 libev: new maintainer diff --git a/libev/.signature b/libev/.signature index 58419a440..373d76639 100644 --- a/libev/.signature +++ b/libev/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/a9R3th3/i4Q2SsYRHrBSrZl7R8rNaG6Ladtw4gnl7gM4L1hf1bgPPDf6oQnfM2If8oFlmIG/qeKJyzW23pZQwE= -SHA256 (Pkgfile) = a5dffc561601dfb7b678dc3af768688b3e9ecfcc6a2b969100da8d971883342c +RWSE3ohX2g5d/fmsPsYYo0Pj86bFp1JezFTK97LZilVAyJzpBtYPuVv59uQTKsFVmWcOrBkOuG+NNe3jR6brhrDdLGSlgPf//gU= +SHA256 (Pkgfile) = 9c6f7d1d49c797ef9ffcd83e95b9a3f8620295e7a702c6bc374b1a436a16140c SHA256 (.footprint) = 0c9486da7c733e0918756b6ce6677b7c358c1d24a2bc27899fff9be7bbe53944 SHA256 (libev-4.33.tar.gz) = 507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea diff --git a/libev/Pkgfile b/libev/Pkgfile index e2b701e24..aef2b7c40 100644 --- a/libev/Pkgfile +++ b/libev/Pkgfile @@ -1,16 +1,16 @@ # Description: high-performance event loop/event model with lots of features # URL: http://software.schmorp.de/pkg/libev.html -# Maintainer: unmaintained +# Maintainer: Juergen Daubert, jue at crux dor nu name=libev version=4.33 release=1 source=(http://dist.schmorp.de/$name/$name-$version.tar.gz) -build () { - cd $name-$version - ./configure --prefix=/usr - make - make prefix=$PKG/usr install - rm $PKG/usr/include/event.h +build() { + cd $name-$version + ./configure --prefix=/usr + make + make prefix=$PKG/usr install + rm $PKG/usr/include/event.h }

1 0

ports/core (3.6): glibc: sync with upstream 2.32 branch
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit f39015d66fd28baff6977d11052ce44da837c41a Author: Juergen Daubert <jue(a)jue.li> Date: Fri Aug 6 12:41:15 2021 +0200 glibc: sync with upstream 2.32 branch diff --git a/glibc/.signature b/glibc/.signature index 911bd5a7..0f951399 100644 --- a/glibc/.signature +++ b/glibc/.signature @@ -1,10 +1,10 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqq7YiPshFBB5CPmGMmusADxcu6YZ79M4YqtmTxJqKBj3x8t5Bzjnxpu+NGW0hE7kZXmz2juUl2TYUX461uiVMwQ= -SHA256 (Pkgfile) = 4ee4d7d539a2df3f2f04b500574a80a0efe84f692793d6cea079652984610909 +RWRJc1FUaeVeqjLke5N/nYqmPS8FTuYrMIMM+JcrMXi+8bYduM69nInINCD/9aHGE46XRhhs9VXDk9OSXGGgYh+0qi53F07DdwE= +SHA256 (Pkgfile) = 9197d70016bdb5b75c53822a5949a397eda0feb038f59e7b2cfe3feef43eff1e SHA256 (.footprint) = aa29daaba0d990bb954964b7605cf132588bcb5ee9cf56d219f2ed26e60eba7b SHA256 (glibc-2.32.tar.xz) = 1627ea54f5a1a8467032563393e0901077626dc66f37f10ee6363bb722222836 SHA256 (linux-5.4.72.tar.xz) = 0e24645bd56fe5b55a7a662895f5562c103d71b54d097281f0c9c71ff22c1172 -SHA256 (glibc-2.32-3.patch) = 6d84a6054984e89c4b139dfa1a29561ee2f146bafa479f1c465700220a6aee73 +SHA256 (glibc-2.32-4.patch) = 3c93822f91229e21fb718390fd41a0dd279032e80c878d2657d268e77f851202 SHA256 (hosts) = 5c02b256c105f1d4a12fb738d71c1bab9eb126533074d7a0c8a14b92670c9431 SHA256 (resolv.conf) = 72ccb58768a72a771ec37142bc361a18478a07ec9de6e925a20760794389bf51 SHA256 (nsswitch.conf) = 859b8984e5e90aff3cce8f9779996ae4033b280d2122840e9411e2f44a1c2e61 diff --git a/glibc/Pkgfile b/glibc/Pkgfile index 7dd332e0..2cbaf942 100644 --- a/glibc/Pkgfile +++ b/glibc/Pkgfile @@ -4,10 +4,10 @@ name=glibc version=2.32 -release=3 +release=4 source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \ https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.72.tar.xz \ - glibc-$version-3.patch \ + glibc-$version-4.patch \ hosts resolv.conf nsswitch.conf host.conf ld.so.conf) build() { @@ -18,7 +18,7 @@ build() { make INSTALL_HDR_PATH=$PKG/usr headers_install chown root:root $PKG/usr - patch -p1 -d $SRC/$name-${version:0:4} -i $SRC/$name-$version-3.patch + patch -p1 -d $SRC/$name-${version:0:4} -i $SRC/$name-$version-4.patch mkdir $SRC/build cd $SRC/build diff --git a/glibc/glibc-2.32-3.patch b/glibc/glibc-2.32-4.patch similarity index 83% rename from glibc/glibc-2.32-3.patch rename to glibc/glibc-2.32-4.patch index 8195ec34..ea46dfbd 100644 --- a/glibc/glibc-2.32-3.patch +++ b/glibc/glibc-2.32-4.patch @@ -1,5 +1,5 @@ diff --git a/NEWS b/NEWS -index 485b8ddffa..f278041512 100644 +index 485b8ddffa..2afe250ccf 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,25 @@ See the end for copying conditions. @@ -28,13 +28,17 @@ index 485b8ddffa..f278041512 100644 Version 2.32 Major new features: -@@ -185,6 +204,10 @@ Security related changes: +@@ -185,6 +204,14 @@ Security related changes: Dytrych of the Cisco Security Assessment and Penetration Team (See TALOS-2020-1019). + CVE-2020-27618: An infinite loop has been fixed in the iconv program when + invoked with input containing redundant shift sequences in the IBM1364, + IBM1371, IBM1388, IBM1390, or IBM1399 character sets. ++ ++ CVE-2021-33574: The mq_notify function has a potential use-after-free ++ issue when using a notification type of SIGEV_THREAD and a thread ++ attribute with a non-default affinity mask. + The following bugs are resolved with this release: @@ -194,7 +198,7 @@ index 4ab7e182b7..0000000000 - -#include <string.h> diff --git a/elf/Makefile b/elf/Makefile -index 0b78721848..355e70037b 100644 +index 0b78721848..3ba7f4ecfc 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1381,6 +1381,8 @@ CFLAGS-ifuncmain7pie.c += $(pie-ccflag) @@ -206,6 +210,15 @@ index 0b78721848..355e70037b 100644 $(objpfx)ifuncmain1pie: $(objpfx)ifuncmod1.so $(objpfx)ifuncmain1staticpie: $(objpfx)ifuncdep1pic.o $(objpfx)ifuncmain1vispie: $(objpfx)ifuncmod1.so +@@ -1630,8 +1632,6 @@ $(objpfx)tst-nodelete-dlclose.out: $(objpfx)tst-nodelete-dlclose-dso.so \ + + tst-env-setuid-ENV = MALLOC_CHECK_=2 MALLOC_MMAP_THRESHOLD_=4096 \ + LD_HWCAP_MASK=0x1 +-tst-env-setuid-tunables-ENV = \ +- GLIBC_TUNABLES=glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096 + + $(objpfx)tst-debug1: $(libdl) + $(objpfx)tst-debug1.out: $(objpfx)tst-debug1mod1.so diff --git a/elf/dl-load.c b/elf/dl-load.c index e39980fb19..71867e7c1a 100644 --- a/elf/dl-load.c @@ -278,6 +291,97 @@ index e39980fb19..71867e7c1a 100644 /* We are done mapping in the file. We no longer need the descriptor. */ if (__glibc_unlikely (__close_nocancel (fd) != 0)) { +diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c +index 26e6e26612..15b29bcb90 100644 +--- a/elf/dl-tunables.c ++++ b/elf/dl-tunables.c +@@ -177,6 +177,7 @@ parse_tunables (char *tunestr, char *valstring) + return; + + char *p = tunestr; ++ size_t off = 0; + + while (true) + { +@@ -190,7 +191,11 @@ parse_tunables (char *tunestr, char *valstring) + /* If we reach the end of the string before getting a valid name-value + pair, bail out. */ + if (p[len] == '\0') +- return; ++ { ++ if (__libc_enable_secure) ++ tunestr[off] = '\0'; ++ return; ++ } + + /* We did not find a valid name-value pair before encountering the + colon. */ +@@ -216,35 +221,28 @@ parse_tunables (char *tunestr, char *valstring) + + if (tunable_is_name (cur->name, name)) + { +- /* If we are in a secure context (AT_SECURE) then ignore the tunable +- unless it is explicitly marked as secure. Tunable values take +- precedence over their envvar aliases. */ ++ /* If we are in a secure context (AT_SECURE) then ignore the ++ tunable unless it is explicitly marked as secure. Tunable ++ values take precedence over their envvar aliases. We write ++ the tunables that are not SXID_ERASE back to TUNESTR, thus ++ dropping all SXID_ERASE tunables and any invalid or ++ unrecognized tunables. */ + if (__libc_enable_secure) + { +- if (cur->security_level == TUNABLE_SECLEVEL_SXID_ERASE) ++ if (cur->security_level != TUNABLE_SECLEVEL_SXID_ERASE) + { +- if (p[len] == '\0') +- { +- /* Last tunable in the valstring. Null-terminate and +- return. */ +- *name = '\0'; +- return; +- } +- else +- { +- /* Remove the current tunable from the string. We do +- this by overwriting the string starting from NAME +- (which is where the current tunable begins) with +- the remainder of the string. We then have P point +- to NAME so that we continue in the correct +- position in the valstring. */ +- char *q = &p[len + 1]; +- p = name; +- while (*q != '\0') +- *name++ = *q++; +- name[0] = '\0'; +- len = 0; +- } ++ if (off > 0) ++ tunestr[off++] = ':'; ++ ++ const char *n = cur->name; ++ ++ while (*n != '\0') ++ tunestr[off++] = *n++; ++ ++ tunestr[off++] = '='; ++ ++ for (size_t j = 0; j < len; j++) ++ tunestr[off++] = value[j]; + } + + if (cur->security_level != TUNABLE_SECLEVEL_NONE) +@@ -257,9 +255,7 @@ parse_tunables (char *tunestr, char *valstring) + } + } + +- if (p[len] == '\0') +- return; +- else ++ if (p[len] != '\0') + p += len + 1; + } + } diff --git a/elf/ifuncmain6pie.c b/elf/ifuncmain6pie.c index 04faeb86ef..4a01906836 100644 --- a/elf/ifuncmain6pie.c @@ -369,6 +473,391 @@ index 5b882163fa..14a42ed00a 100644 break; } +diff --git a/elf/tst-env-setuid-tunables.c b/elf/tst-env-setuid-tunables.c +index 971d5892b1..ca0c8c245c 100644 +--- a/elf/tst-env-setuid-tunables.c ++++ b/elf/tst-env-setuid-tunables.c +@@ -25,35 +25,76 @@ + #include "config.h" + #undef _LIBC + +-#define test_parent test_parent_tunables +-#define test_child test_child_tunables +- +-static int test_child_tunables (void); +-static int test_parent_tunables (void); +- +-#include "tst-env-setuid.c" +- +-#define CHILD_VALSTRING_VALUE "glibc.malloc.mmap_threshold=4096" +-#define PARENT_VALSTRING_VALUE \ +- "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096" ++#include <errno.h> ++#include <fcntl.h> ++#include <stdlib.h> ++#include <stdint.h> ++#include <stdio.h> ++#include <string.h> ++#include <sys/stat.h> ++#include <sys/wait.h> ++#include <unistd.h> ++#include <intprops.h> ++#include <array_length.h> ++ ++#include <support/check.h> ++#include <support/support.h> ++#include <support/test-driver.h> ++#include <support/capture_subprocess.h> ++ ++const char *teststrings[] = ++{ ++ "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.check=2:glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096:glibc.malloc.check=2", ++ "glibc.malloc.perturb=0x800", ++ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.perturb=0x800:not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096", ++ "glibc.not_valid.check=2:glibc.malloc.mmap_threshold=4096", ++ "not_valid.malloc.check=2:glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096:glibc.malloc.check=2", ++ "glibc.malloc.check=4:glibc.malloc.garbage=2:glibc.maoc.mmap_threshold=4096", ++ ":glibc.malloc.garbage=2:glibc.malloc.check=1", ++ "glibc.malloc.check=1:glibc.malloc.check=2", ++ "not_valid.malloc.check=2", ++ "glibc.not_valid.check=2", ++}; ++ ++const char *resultstrings[] = ++{ ++ "glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.perturb=0x800", ++ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.perturb=0x800:glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.mmap_threshold=4096", ++ "glibc.malloc.mmap_threshold=4096", ++ "", ++ "", ++ "", ++ "", ++ "", ++ "", ++}; + + static int +-test_child_tunables (void) ++test_child (int off) + { + const char *val = getenv ("GLIBC_TUNABLES"); + + #if HAVE_TUNABLES +- if (val != NULL && strcmp (val, CHILD_VALSTRING_VALUE) == 0) ++ if (val != NULL && strcmp (val, resultstrings[off]) == 0) + return 0; + + if (val != NULL) +- printf ("Unexpected GLIBC_TUNABLES VALUE %s\n", val); ++ printf ("[%d] Unexpected GLIBC_TUNABLES VALUE %s\n", off, val); + + return 1; + #else + if (val != NULL) + { +- printf ("GLIBC_TUNABLES not cleared\n"); ++ printf ("[%d] GLIBC_TUNABLES not cleared\n", off); + return 1; + } + return 0; +@@ -61,15 +102,48 @@ test_child_tunables (void) + } + + static int +-test_parent_tunables (void) ++do_test (int argc, char **argv) + { +- const char *val = getenv ("GLIBC_TUNABLES"); ++ /* Setgid child process. */ ++ if (argc == 2) ++ { ++ if (getgid () == getegid ()) ++ /* This can happen if the file system is mounted nosuid. */ ++ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n", ++ (intmax_t) getgid ()); + +- if (val != NULL && strcmp (val, PARENT_VALSTRING_VALUE) == 0) +- return 0; ++ int ret = test_child (atoi (argv[1])); + +- if (val != NULL) +- printf ("Unexpected GLIBC_TUNABLES VALUE %s\n", val); ++ if (ret != 0) ++ exit (1); + +- return 1; ++ exit (EXIT_SUCCESS); ++ } ++ else ++ { ++ int ret = 0; ++ ++ /* Spawn tests. */ ++ for (int i = 0; i < array_length (teststrings); i++) ++ { ++ char buf[INT_BUFSIZE_BOUND (int)]; ++ ++ printf ("Spawned test for %s (%d)\n", teststrings[i], i); ++ snprintf (buf, sizeof (buf), "%d\n", i); ++ if (setenv ("GLIBC_TUNABLES", teststrings[i], 1) != 0) ++ exit (1); ++ ++ int status = support_capture_subprogram_self_sgid (buf); ++ ++ /* Bail out early if unsupported. */ ++ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) ++ return EXIT_UNSUPPORTED; ++ ++ ret |= status; ++ } ++ return ret; ++ } + } ++ ++#define TEST_FUNCTION_ARGV do_test ++#include <support/test-driver.c> +diff --git a/elf/tst-env-setuid.c b/elf/tst-env-setuid.c +index 41dc79e83a..2dbccdb69e 100644 +--- a/elf/tst-env-setuid.c ++++ b/elf/tst-env-setuid.c +@@ -29,173 +29,12 @@ + #include <sys/wait.h> + #include <unistd.h> + ++#include <support/check.h> + #include <support/support.h> + #include <support/test-driver.h> ++#include <support/capture_subprocess.h> + + static char SETGID_CHILD[] = "setgid-child"; +-#define CHILD_STATUS 42 +- +-/* Return a GID which is not our current GID, but is present in the +- supplementary group list. */ +-static gid_t +-choose_gid (void) +-{ +- const int count = 64; +- gid_t groups[count]; +- int ret = getgroups (count, groups); +- if (ret < 0) +- { +- printf ("getgroups: %m\n"); +- exit (1); +- } +- gid_t current = getgid (); +- for (int i = 0; i < ret; ++i) +- { +- if (groups[i] != current) +- return groups[i]; +- } +- return 0; +-} +- +-/* Spawn and execute a program and verify that it returns the CHILD_STATUS. */ +-static pid_t +-do_execve (char **args) +-{ +- pid_t kid = vfork (); +- +- if (kid < 0) +- { +- printf ("vfork: %m\n"); +- return -1; +- } +- +- if (kid == 0) +- { +- /* Child process. */ +- execve (args[0], args, environ); +- _exit (-errno); +- } +- +- if (kid < 0) +- return 1; +- +- int status; +- +- if (waitpid (kid, &status, 0) < 0) +- { +- printf ("waitpid: %m\n"); +- return 1; +- } +- +- if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) +- return EXIT_UNSUPPORTED; +- +- if (!WIFEXITED (status) || WEXITSTATUS (status) != CHILD_STATUS) +- { +- printf ("Unexpected exit status %d from child process\n", +- WEXITSTATUS (status)); +- return 1; +- } +- return 0; +-} +- +-/* Copies the executable into a restricted directory, so that we can +- safely make it SGID with the TARGET group ID. Then runs the +- executable. */ +-static int +-run_executable_sgid (gid_t target) +-{ +- char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd", +- test_dir, (intmax_t) getpid ()); +- char *execname = xasprintf ("%s/bin", dirname); +- int infd = -1; +- int outfd = -1; +- int ret = 0; +- if (mkdir (dirname, 0700) < 0) +- { +- printf ("mkdir: %m\n"); +- goto err; +- } +- infd = open ("/proc/self/exe", O_RDONLY); +- if (infd < 0) +- { +- printf ("open (/proc/self/exe): %m\n"); +- goto err; +- } +- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700); +- if (outfd < 0) +- { +- printf ("open (%s): %m\n", execname); +- goto err; +- } +- char buf[4096]; +- for (;;) +- { +- ssize_t rdcount = read (infd, buf, sizeof (buf)); +- if (rdcount < 0) +- { +- printf ("read: %m\n"); +- goto err; +- } +- if (rdcount == 0) +- break; +- char *p = buf; +- char *end = buf + rdcount; +- while (p != end) +- { +- ssize_t wrcount = write (outfd, buf, end - p); +- if (wrcount == 0) +- errno = ENOSPC; +- if (wrcount <= 0) +- { +- printf ("write: %m\n"); +- goto err; +- } +- p += wrcount; +- } +- } +- if (fchown (outfd, getuid (), target) < 0) +- { +- printf ("fchown (%s): %m\n", execname); +- goto err; +- } +- if (fchmod (outfd, 02750) < 0) +- { +- printf ("fchmod (%s): %m\n", execname); +- goto err; +- } +- if (close (outfd) < 0) +- { +- printf ("close (outfd): %m\n"); +- goto err; +- } +- if (close (infd) < 0) +- { +- printf ("close (infd): %m\n"); +- goto err; +- } +- +- char *args[] = {execname, SETGID_CHILD, NULL}; +- +- ret = do_execve (args); +- +-err: +- if (outfd >= 0) +- close (outfd); +- if (infd >= 0) +- close (infd); +- if (execname) +- { +- unlink (execname); +- free (execname); +- } +- if (dirname) +- { +- rmdir (dirname); +- free (dirname); +- } +- return ret; +-} + + #ifndef test_child + static int +@@ -256,40 +95,32 @@ do_test (int argc, char **argv) + if (argc == 2 && strcmp (argv[1], SETGID_CHILD) == 0) + { + if (getgid () == getegid ()) +- { +- /* This can happen if the file system is mounted nosuid. */ +- fprintf (stderr, "SGID failed: GID and EGID match (%jd)\n", +- (intmax_t) getgid ()); +- exit (EXIT_UNSUPPORTED); +- } ++ /* This can happen if the file system is mounted nosuid. */ ++ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n", ++ (intmax_t) getgid ()); + + int ret = test_child (); + + if (ret != 0) + exit (1); + +- exit (CHILD_STATUS); ++ exit (EXIT_SUCCESS); + } + else + { + if (test_parent () != 0) + exit (1); + +- /* Try running a setgid program. */ +- gid_t target = choose_gid (); +- if (target == 0) +- { +- fprintf (stderr, +- "Could not find a suitable GID for user %jd, skipping test\n", +- (intmax_t) getuid ()); +- exit (0); +- } ++ int status = support_capture_subprogram_self_sgid (SETGID_CHILD); + +- return run_executable_sgid (target); +- } ++ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) ++ return EXIT_UNSUPPORTED; ++ ++ if (!WIFEXITED (status)) ++ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status); + +- /* Something went wrong and our argv was corrupted. */ +- _exit (1); ++ return 0; ++ } + } + + #define TEST_FUNCTION_ARGV do_test diff --git a/iconv/Versions b/iconv/Versions index 8a5f4cf780..d51af52fa3 100644 --- a/iconv/Versions @@ -1111,6 +1600,31 @@ index 88c69d1e9c..381aa721ef 100644 } else if (status == NSS_STATUS_RETURN || status == NSS_STATUS_NOTFOUND +diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c +index ed1b22308e..cb3f989cba 100644 +--- a/posix/wordexp-test.c ++++ b/posix/wordexp-test.c +@@ -183,6 +183,7 @@ struct test_case_struct + { 0, NULL, "$var", 0, 0, { NULL, }, IFS }, + { 0, NULL, "\"\\n\"", 0, 1, { "\\n", }, IFS }, + { 0, NULL, "", 0, 0, { NULL, }, IFS }, ++ { 0, NULL, "${1234567890123456789012}", 0, 0, { NULL, }, IFS }, + + /* Flags not already covered (testit() has special handling for these) */ + { 0, NULL, "one two", WRDE_DOOFFS, 2, { "one", "two", }, IFS }, +diff --git a/posix/wordexp.c b/posix/wordexp.c +index e082d94895..56289503a1 100644 +--- a/posix/wordexp.c ++++ b/posix/wordexp.c +@@ -1399,7 +1399,7 @@ envsubst: + /* Is it a numeric parameter? */ + else if (isdigit (env[0])) + { +- int n = atoi (env); ++ unsigned long n = strtoul (env, NULL, 10); + + if (n >= __libc_argc) + /* Substitute NULL. */ diff --git a/resolv/Makefile b/resolv/Makefile index b61c0c3e0c..dbd8f8bf4f 100644 --- a/resolv/Makefile @@ -2389,6 +2903,236 @@ index 95b46dcbeb..3a323547f9 100644 ((char *)charbuf.scratch.data)[fc] = 1; } else +diff --git a/stdlib/tst-secure-getenv.c b/stdlib/tst-secure-getenv.c +index 3cfe9a05c3..d4b1139c5e 100644 +--- a/stdlib/tst-secure-getenv.c ++++ b/stdlib/tst-secure-getenv.c +@@ -30,167 +30,12 @@ + #include <sys/wait.h> + #include <unistd.h> + ++#include <support/check.h> + #include <support/support.h> ++#include <support/capture_subprocess.h> + #include <support/test-driver.h> + + static char MAGIC_ARGUMENT[] = "run-actual-test"; +-#define MAGIC_STATUS 19 +- +-/* Return a GID which is not our current GID, but is present in the +- supplementary group list. */ +-static gid_t +-choose_gid (void) +-{ +- int count = getgroups (0, NULL); +- if (count < 0) +- { +- printf ("getgroups: %m\n"); +- exit (1); +- } +- gid_t *groups; +- groups = xcalloc (count, sizeof (*groups)); +- int ret = getgroups (count, groups); +- if (ret < 0) +- { +- printf ("getgroups: %m\n"); +- exit (1); +- } +- gid_t current = getgid (); +- gid_t not_current = 0; +- for (int i = 0; i < ret; ++i) +- { +- if (groups[i] != current) +- { +- not_current = groups[i]; +- break; +- } +- } +- free (groups); +- return not_current; +-} +- +- +-/* Copies the executable into a restricted directory, so that we can +- safely make it SGID with the TARGET group ID. Then runs the +- executable. */ +-static int +-run_executable_sgid (gid_t target) +-{ +- char *dirname = xasprintf ("%s/secure-getenv.%jd", +- test_dir, (intmax_t) getpid ()); +- char *execname = xasprintf ("%s/bin", dirname); +- int infd = -1; +- int outfd = -1; +- int ret = -1; +- if (mkdir (dirname, 0700) < 0) +- { +- printf ("mkdir: %m\n"); +- goto err; +- } +- infd = open ("/proc/self/exe", O_RDONLY); +- if (infd < 0) +- { +- printf ("open (/proc/self/exe): %m\n"); +- goto err; +- } +- outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700); +- if (outfd < 0) +- { +- printf ("open (%s): %m\n", execname); +- goto err; +- } +- char buf[4096]; +- for (;;) +- { +- ssize_t rdcount = read (infd, buf, sizeof (buf)); +- if (rdcount < 0) +- { +- printf ("read: %m\n"); +- goto err; +- } +- if (rdcount == 0) +- break; +- char *p = buf; +- char *end = buf + rdcount; +- while (p != end) +- { +- ssize_t wrcount = write (outfd, buf, end - p); +- if (wrcount == 0) +- errno = ENOSPC; +- if (wrcount <= 0) +- { +- printf ("write: %m\n"); +- goto err; +- } +- p += wrcount; +- } +- } +- if (fchown (outfd, getuid (), target) < 0) +- { +- printf ("fchown (%s): %m\n", execname); +- goto err; +- } +- if (fchmod (outfd, 02750) < 0) +- { +- printf ("fchmod (%s): %m\n", execname); +- goto err; +- } +- if (close (outfd) < 0) +- { +- printf ("close (outfd): %m\n"); +- goto err; +- } +- if (close (infd) < 0) +- { +- printf ("close (infd): %m\n"); +- goto err; +- } +- +- int kid = fork (); +- if (kid < 0) +- { +- printf ("fork: %m\n"); +- goto err; +- } +- if (kid == 0) +- { +- /* Child process. */ +- char *args[] = { execname, MAGIC_ARGUMENT, NULL }; +- execve (execname, args, environ); +- printf ("execve (%s): %m\n", execname); +- _exit (1); +- } +- int status; +- if (waitpid (kid, &status, 0) < 0) +- { +- printf ("waitpid: %m\n"); +- goto err; +- } +- if (!WIFEXITED (status) || WEXITSTATUS (status) != MAGIC_STATUS) +- { +- printf ("Unexpected exit status %d from child process\n", +- status); +- goto err; +- } +- ret = 0; +- +-err: +- if (outfd >= 0) +- close (outfd); +- if (infd >= 0) +- close (infd); +- if (execname) +- { +- unlink (execname); +- free (execname); +- } +- if (dirname) +- { +- rmdir (dirname); +- free (dirname); +- } +- return ret; +-} + + static int + do_test (void) +@@ -212,15 +57,15 @@ do_test (void) + exit (1); + } + +- gid_t target = choose_gid (); +- if (target == 0) +- { +- fprintf (stderr, +- "Could not find a suitable GID for user %jd, skipping test\n", +- (intmax_t) getuid ()); +- exit (0); +- } +- return run_executable_sgid (target); ++ int status = support_capture_subprogram_self_sgid (MAGIC_ARGUMENT); ++ ++ if (WEXITSTATUS (status) == EXIT_UNSUPPORTED) ++ return EXIT_UNSUPPORTED; ++ ++ if (!WIFEXITED (status)) ++ FAIL_EXIT1 ("Unexpected exit status %d from child process\n", status); ++ ++ return 0; + } + + static void +@@ -229,23 +74,15 @@ alternative_main (int argc, char **argv) + if (argc == 2 && strcmp (argv[1], MAGIC_ARGUMENT) == 0) + { + if (getgid () == getegid ()) +- { +- /* This can happen if the file system is mounted nosuid. */ +- fprintf (stderr, "SGID failed: GID and EGID match (%jd)\n", +- (intmax_t) getgid ()); +- exit (MAGIC_STATUS); +- } ++ /* This can happen if the file system is mounted nosuid. */ ++ FAIL_UNSUPPORTED ("SGID failed: GID and EGID match (%jd)\n", ++ (intmax_t) getgid ()); + if (getenv ("PATH") == NULL) +- { +- printf ("PATH variable not present\n"); +- exit (3); +- } ++ FAIL_EXIT (3, "PATH variable not present\n"); + if (secure_getenv ("PATH") != NULL) +- { +- printf ("PATH variable not filtered out\n"); +- exit (4); +- } +- exit (MAGIC_STATUS); ++ FAIL_EXIT (4, "PATH variable not filtered out\n"); ++ ++ exit (EXIT_SUCCESS); + } + } + diff --git a/string/bits/string_fortified.h b/string/bits/string_fortified.h index 309d0f39b2..c8d3051af8 100644 --- a/string/bits/string_fortified.h @@ -2435,6 +3179,23 @@ index 93faafddf9..4154863511 100644 resolv_test \ set_fortify_handler \ support-xfstat \ +diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h +index 9808750f80..421f657678 100644 +--- a/support/capture_subprocess.h ++++ b/support/capture_subprocess.h +@@ -41,6 +41,12 @@ struct support_capture_subprocess support_capture_subprocess + struct support_capture_subprocess support_capture_subprogram + (const char *file, char *const argv[]); + ++/* Copy the running program into a setgid binary and run it with CHILD_ID ++ argument. If execution is successful, return the exit status of the child ++ program, otherwise return a non-zero failure exit code. */ ++int support_capture_subprogram_self_sgid ++ (char *child_id); ++ + /* Deallocate the subprocess data captured by + support_capture_subprocess. */ + void support_capture_subprocess_free (struct support_capture_subprocess *); diff --git a/support/resolv_response_context_duplicate.c b/support/resolv_response_context_duplicate.c new file mode 100644 index 0000000000..f9c5c3462a @@ -2731,6 +3492,240 @@ index 67819469a0..31a5c1c3e7 100644 __END_DECLS #endif /* SUPPORT_RESOLV_TEST_H */ +diff --git a/support/subprocess.h b/support/subprocess.h +index 8b442fd5c0..34ffd02e8e 100644 +--- a/support/subprocess.h ++++ b/support/subprocess.h +@@ -38,6 +38,11 @@ struct support_subprocess support_subprocess + struct support_subprocess support_subprogram + (const char *file, char *const argv[]); + ++/* Invoke program FILE with ARGV arguments by using posix_spawn and wait for it ++ to complete. Return program exit status. */ ++int support_subprogram_wait ++ (const char *file, char *const argv[]); ++ + /* Wait for the subprocess indicated by PROC::PID. Return the status + indicate by waitpid call. */ + int support_process_wait (struct support_subprocess *proc); +diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c +index eeed676e3d..28a37df67f 100644 +--- a/support/support_capture_subprocess.c ++++ b/support/support_capture_subprocess.c +@@ -20,11 +20,14 @@ + #include <support/capture_subprocess.h> + + #include <errno.h> ++#include <fcntl.h> + #include <stdlib.h> + #include <support/check.h> + #include <support/xunistd.h> + #include <support/xsocket.h> + #include <support/xspawn.h> ++#include <support/support.h> ++#include <support/test-driver.h> + + static void + transfer (const char *what, struct pollfd *pfd, struct xmemstream *stream) +@@ -36,7 +39,7 @@ transfer (const char *what, struct pollfd *pfd, struct xmemstream *stream) + if (ret < 0) + { + support_record_failure (); +- printf ("error: reading from subprocess %s: %m", what); ++ printf ("error: reading from subprocess %s: %m\n", what); + pfd->events = 0; + pfd->revents = 0; + } +@@ -102,6 +105,129 @@ support_capture_subprogram (const char *file, char *const argv[]) + return result; + } + ++/* Copies the executable into a restricted directory, so that we can ++ safely make it SGID with the TARGET group ID. Then runs the ++ executable. */ ++static int ++copy_and_spawn_sgid (char *child_id, gid_t gid) ++{ ++ char *dirname = xasprintf ("%s/tst-tunables-setuid.%jd", ++ test_dir, (intmax_t) getpid ()); ++ char *execname = xasprintf ("%s/bin", dirname); ++ int infd = -1; ++ int outfd = -1; ++ int ret = 1, status = 1; ++ ++ TEST_VERIFY (mkdir (dirname, 0700) == 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ ++ infd = open ("/proc/self/exe", O_RDONLY); ++ if (infd < 0) ++ FAIL_UNSUPPORTED ("unsupported: Cannot read binary from procfs\n"); ++ ++ outfd = open (execname, O_WRONLY | O_CREAT | O_EXCL, 0700); ++ TEST_VERIFY (outfd >= 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ ++ char buf[4096]; ++ for (;;) ++ { ++ ssize_t rdcount = read (infd, buf, sizeof (buf)); ++ TEST_VERIFY (rdcount >= 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ if (rdcount == 0) ++ break; ++ char *p = buf; ++ char *end = buf + rdcount; ++ while (p != end) ++ { ++ ssize_t wrcount = write (outfd, buf, end - p); ++ if (wrcount == 0) ++ errno = ENOSPC; ++ TEST_VERIFY (wrcount > 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ p += wrcount; ++ } ++ } ++ TEST_VERIFY (fchown (outfd, getuid (), gid) == 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ TEST_VERIFY (fchmod (outfd, 02750) == 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ TEST_VERIFY (close (outfd) == 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ TEST_VERIFY (close (infd) == 0); ++ if (support_record_failure_is_failed ()) ++ goto err; ++ ++ /* We have the binary, now spawn the subprocess. Avoid using ++ support_subprogram because we only want the program exit status, not the ++ contents. */ ++ ret = 0; ++ ++ char * const args[] = {execname, child_id, NULL}; ++ ++ status = support_subprogram_wait (args[0], args); ++ ++err: ++ if (outfd >= 0) ++ close (outfd); ++ if (infd >= 0) ++ close (infd); ++ if (execname != NULL) ++ { ++ unlink (execname); ++ free (execname); ++ } ++ if (dirname != NULL) ++ { ++ rmdir (dirname); ++ free (dirname); ++ } ++ ++ if (ret != 0) ++ FAIL_EXIT1("Failed to make sgid executable for test\n"); ++ ++ return status; ++} ++ ++int ++support_capture_subprogram_self_sgid (char *child_id) ++{ ++ gid_t target = 0; ++ const int count = 64; ++ gid_t groups[count]; ++ ++ /* Get a GID which is not our current GID, but is present in the ++ supplementary group list. */ ++ int ret = getgroups (count, groups); ++ if (ret < 0) ++ FAIL_UNSUPPORTED("Could not get group list for user %jd\n", ++ (intmax_t) getuid ()); ++ ++ gid_t current = getgid (); ++ for (int i = 0; i < ret; ++i) ++ { ++ if (groups[i] != current) ++ { ++ target = groups[i]; ++ break; ++ } ++ } ++ ++ if (target == 0) ++ FAIL_UNSUPPORTED("Could not find a suitable GID for user %jd\n", ++ (intmax_t) getuid ()); ++ ++ return copy_and_spawn_sgid (child_id, target); ++} ++ + void + support_capture_subprocess_free (struct support_capture_subprocess *p) + { +diff --git a/support/support_subprocess.c b/support/support_subprocess.c +index 36e3a77af2..4a25828111 100644 +--- a/support/support_subprocess.c ++++ b/support/support_subprocess.c +@@ -27,7 +27,7 @@ + #include <support/subprocess.h> + + static struct support_subprocess +-support_suprocess_init (void) ++support_subprocess_init (void) + { + struct support_subprocess result; + +@@ -48,7 +48,7 @@ support_suprocess_init (void) + struct support_subprocess + support_subprocess (void (*callback) (void *), void *closure) + { +- struct support_subprocess result = support_suprocess_init (); ++ struct support_subprocess result = support_subprocess_init (); + + result.pid = xfork (); + if (result.pid == 0) +@@ -71,7 +71,7 @@ support_subprocess (void (*callback) (void *), void *closure) + struct support_subprocess + support_subprogram (const char *file, char *const argv[]) + { +- struct support_subprocess result = support_suprocess_init (); ++ struct support_subprocess result = support_subprocess_init (); + + posix_spawn_file_actions_t fa; + /* posix_spawn_file_actions_init does not fail. */ +@@ -84,7 +84,7 @@ support_subprogram (const char *file, char *const argv[]) + xposix_spawn_file_actions_addclose (&fa, result.stdout_pipe[1]); + xposix_spawn_file_actions_addclose (&fa, result.stderr_pipe[1]); + +- result.pid = xposix_spawn (file, &fa, NULL, argv, NULL); ++ result.pid = xposix_spawn (file, &fa, NULL, argv, environ); + + xclose (result.stdout_pipe[1]); + xclose (result.stderr_pipe[1]); +@@ -92,6 +92,19 @@ support_subprogram (const char *file, char *const argv[]) + return result; + } + ++int ++support_subprogram_wait (const char *file, char *const argv[]) ++{ ++ posix_spawn_file_actions_t fa; ++ ++ posix_spawn_file_actions_init (&fa); ++ struct support_subprocess res = support_subprocess_init (); ++ ++ res.pid = xposix_spawn (file, &fa, NULL, argv, environ); ++ ++ return support_process_wait (&res); ++} ++ + int + support_process_wait (struct support_subprocess *proc) + { diff --git a/sysdeps/aarch64/dl-bti.c b/sysdeps/aarch64/dl-bti.c index 196e462520..cf7624aaa2 100644 --- a/sysdeps/aarch64/dl-bti.c @@ -4017,6 +5012,85 @@ index 8a53a1088f..362a2b713c 100644 return true; #endif return false; +diff --git a/sysdeps/s390/configure b/sysdeps/s390/configure +index fa46e9e351..e7f576338d 100644 +--- a/sysdeps/s390/configure ++++ b/sysdeps/s390/configure +@@ -123,7 +123,9 @@ void testinsn (char *buf) + __asm__ (".machine \"arch13\" \n\t" + ".machinemode \"zarch_nohighgprs\" \n\t" + "lghi %%r0,16 \n\t" +- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0"); ++ "mvcrl 0(%0),32(%0) \n\t" ++ "vstrs %%v20,%%v20,%%v20,%%v20,0,2" ++ : : "a" (buf) : "memory", "r0"); + } + EOF + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c +@@ -271,7 +273,9 @@ else + void testinsn (char *buf) + { + __asm__ ("lghi %%r0,16 \n\t" +- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0"); ++ "mvcrl 0(%0),32(%0) \n\t" ++ "vstrs %%v20,%%v20,%%v20,%%v20,0,2" ++ : : "a" (buf) : "memory", "r0"); + } + EOF + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS --shared conftest.c +diff --git a/sysdeps/s390/configure.ac b/sysdeps/s390/configure.ac +index 3ed5a8ef87..5c3479e8cf 100644 +--- a/sysdeps/s390/configure.ac ++++ b/sysdeps/s390/configure.ac +@@ -88,7 +88,9 @@ void testinsn (char *buf) + __asm__ (".machine \"arch13\" \n\t" + ".machinemode \"zarch_nohighgprs\" \n\t" + "lghi %%r0,16 \n\t" +- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0"); ++ "mvcrl 0(%0),32(%0) \n\t" ++ "vstrs %%v20,%%v20,%%v20,%%v20,0,2" ++ : : "a" (buf) : "memory", "r0"); + } + EOF + dnl test, if assembler supports S390 arch13 instructions +@@ -195,7 +197,9 @@ cat > conftest.c <<\EOF + void testinsn (char *buf) + { + __asm__ ("lghi %%r0,16 \n\t" +- "mvcrl 0(%0),32(%0)" : : "a" (buf) : "memory", "r0"); ++ "mvcrl 0(%0),32(%0) \n\t" ++ "vstrs %%v20,%%v20,%%v20,%%v20,0,2" ++ : : "a" (buf) : "memory", "r0"); + } + EOF + dnl test, if assembler supports S390 arch13 zarch instructions as default +diff --git a/sysdeps/s390/memmove.c b/sysdeps/s390/memmove.c +index 5fc85e129f..ee59b5de14 100644 +--- a/sysdeps/s390/memmove.c ++++ b/sysdeps/s390/memmove.c +@@ -43,7 +43,7 @@ extern __typeof (__redirect_memmove) MEMMOVE_ARCH13 attribute_hidden; + s390_libc_ifunc_expr (__redirect_memmove, memmove, + ({ + s390_libc_ifunc_expr_stfle_init (); +- (HAVE_MEMMOVE_ARCH13 ++ (HAVE_MEMMOVE_ARCH13 && (hwcap & HWCAP_S390_VXRS_EXT2) + && S390_IS_ARCH13_MIE3 (stfle_bits)) + ? MEMMOVE_ARCH13 + : (HAVE_MEMMOVE_Z13 && (hwcap & HWCAP_S390_VX)) +diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c +index e6195c6e26..17c0cc3952 100644 +--- a/sysdeps/s390/multiarch/ifunc-impl-list.c ++++ b/sysdeps/s390/multiarch/ifunc-impl-list.c +@@ -171,7 +171,8 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, + IFUNC_IMPL (i, name, memmove, + # if HAVE_MEMMOVE_ARCH13 + IFUNC_IMPL_ADD (array, i, memmove, +- S390_IS_ARCH13_MIE3 (stfle_bits), ++ ((dl_hwcap & HWCAP_S390_VXRS_EXT2) ++ && S390_IS_ARCH13_MIE3 (stfle_bits)), + MEMMOVE_ARCH13) + # endif + # if HAVE_MEMMOVE_Z13 diff --git a/sysdeps/sh/be/sh4/fpu/Implies b/sysdeps/sh/be/sh4/fpu/Implies new file mode 100644 index 0000000000..71b28ee1a4 @@ -4059,6 +5133,55 @@ index fc688450ee..00a4d0c8e7 100644 #define IS_EMAG(midr) (MIDR_IMPLEMENTOR(midr) == 'P' \ && MIDR_PARTNUM(midr) == 0x000) +diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c +index 61bbb03b64..b5a903c3a2 100644 +--- a/sysdeps/unix/sysv/linux/mq_notify.c ++++ b/sysdeps/unix/sysv/linux/mq_notify.c +@@ -133,8 +133,11 @@ helper_thread (void *arg) + (void) __pthread_barrier_wait (&notify_barrier); + } + else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED) +- /* The only state we keep is the copy of the thread attributes. */ +- free (data.attr); ++ { ++ /* The only state we keep is the copy of the thread attributes. */ ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + } + return NULL; + } +@@ -255,8 +258,14 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification) + if (data.attr == NULL) + return -1; + +- memcpy (data.attr, notification->sigev_notify_attributes, +- sizeof (pthread_attr_t)); ++ int ret = __pthread_attr_copy (data.attr, ++ notification->sigev_notify_attributes); ++ if (ret != 0) ++ { ++ free (data.attr); ++ __set_errno (ret); ++ return -1; ++ } + } + + /* Construct the new request. */ +@@ -269,8 +278,11 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification) + int retval = INLINE_SYSCALL (mq_notify, 2, mqdes, &se); + + /* If it failed, free the allocated memory. */ +- if (__glibc_unlikely (retval != 0)) +- free (data.attr); ++ if (retval != 0 && data.attr != NULL) ++ { ++ pthread_attr_destroy (data.attr); ++ free (data.attr); ++ } + + return retval; + } diff --git a/sysdeps/unix/sysv/linux/msgctl.c b/sysdeps/unix/sysv/linux/msgctl.c index 0776472d5e..a1f24ab242 100644 --- a/sysdeps/unix/sysv/linux/msgctl.c @@ -4912,6 +6035,88 @@ index 0000000000..42c795d2a8 +++ b/sysdeps/x86/tst-setjmp-cet.c @@ -0,0 +1 @@ +#include <setjmp/tst-setjmp.c> +diff --git a/sysdeps/x86_64/configure b/sysdeps/x86_64/configure +old mode 100644 +new mode 100755 +index 84f82c2406..fc1840e23f +--- a/sysdeps/x86_64/configure ++++ b/sysdeps/x86_64/configure +@@ -107,39 +107,6 @@ if test x"$build_mathvec" = xnotset; then + build_mathvec=yes + fi + +-if test "$static_pie" = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker static PIE support" >&5 +-$as_echo_n "checking for linker static PIE support... " >&6; } +-if ${libc_cv_ld_static_pie+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat > conftest.s <<\EOF +- .text +- .global _start +- .weak foo +-_start: +- leaq foo(%rip), %rax +-EOF +- libc_cv_pie_option="-Wl,-pie" +- if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostartfiles -nostdlib $no_ssp $libc_cv_pie_option -o conftest conftest.s 1>&5' +- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; }; then +- libc_cv_ld_static_pie=yes +- else +- libc_cv_ld_static_pie=no +- fi +-rm -f conftest* +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_ld_static_pie" >&5 +-$as_echo "$libc_cv_ld_static_pie" >&6; } +- if test "$libc_cv_ld_static_pie" != yes; then +- as_fn_error $? "linker support for static PIE needed" "$LINENO" 5 +- fi +-fi +- + $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h + + +diff --git a/sysdeps/x86_64/configure.ac b/sysdeps/x86_64/configure.ac +index cdaba0c075..611a7d9ba3 100644 +--- a/sysdeps/x86_64/configure.ac ++++ b/sysdeps/x86_64/configure.ac +@@ -53,31 +53,6 @@ if test x"$build_mathvec" = xnotset; then + build_mathvec=yes + fi + +-dnl Check if linker supports static PIE with the fix for +-dnl +-dnl https://sourceware.org/bugzilla/show_bug.cgi?id=21782 +-dnl +-if test "$static_pie" = yes; then +- AC_CACHE_CHECK(for linker static PIE support, libc_cv_ld_static_pie, [dnl +-cat > conftest.s <<\EOF +- .text +- .global _start +- .weak foo +-_start: +- leaq foo(%rip), %rax +-EOF +- libc_cv_pie_option="-Wl,-pie" +- if AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -nostartfiles -nostdlib $no_ssp $libc_cv_pie_option -o conftest conftest.s 1>&AS_MESSAGE_LOG_FD); then +- libc_cv_ld_static_pie=yes +- else +- libc_cv_ld_static_pie=no +- fi +-rm -f conftest*]) +- if test "$libc_cv_ld_static_pie" != yes; then +- AC_MSG_ERROR([linker support for static PIE needed]) +- fi +-fi +- + dnl It is always possible to access static and hidden symbols in an + dnl position independent way. + AC_DEFINE(PI_STATIC_AND_HIDDEN) diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index ca73d8fef9..363a749cb2 100644 --- a/sysdeps/x86_64/dl-machine.h

1 0

ports/core (3.6): bzip2: add pkgconfig file
by crux＠crux.nu 06 Aug '21

06 Aug '21

commit 47d0bb7874a9496f1866441eda7f898856964720 Author: Juergen Daubert <jue(a)jue.li> Date: Thu Aug 5 19:39:08 2021 +0200 bzip2: add pkgconfig file diff --git a/bzip2/.footprint b/bzip2/.footprint index 4cd199c2..56f301f9 100644 --- a/bzip2/.footprint +++ b/bzip2/.footprint @@ -18,6 +18,8 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libbz2.so -> libbz2.so.1.0.8 lrwxrwxrwx root/root usr/lib/libbz2.so.1.0 -> libbz2.so.1.0.8 -rwxr-xr-x root/root usr/lib/libbz2.so.1.0.8 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/bzip2.pc drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ diff --git a/bzip2/.signature b/bzip2/.signature index 2fd4160f..bc5f4b7d 100644 --- a/bzip2/.signature +++ b/bzip2/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqoPkHuNb91U53Uj38BArO1VOBPs1cH5viF3yds0L5v6EapLMo0c8F+5m4c3X7JKS39i012u1opeg+BZzblUzhAI= -SHA256 (Pkgfile) = 44c4b62f391736923b6433f2a96b4c1cee218dc7d4dfc812eef38c243f9ae9f3 -SHA256 (.footprint) = e5910c495a4558c4ff528c84fbc9e08e964210c1b2cba5aedb3830b1c07bc748 +RWRJc1FUaeVeqkzfJmg9z5eTgdzqmi1wdcIcbOXOitesEXVUz9vxARy1pxKXjQcu+TEuVslKz8Y6tg/3jfpvCzApL/W1aknduww= +SHA256 (Pkgfile) = 9804f42feb61a129ed4b822ae13af1f0b8d297c46d118d3938393f5e08620d26 +SHA256 (.footprint) = 950dc248b8578bc6b786259d250d13c8a736bb2f48997ea9684dddfed94f8361 SHA256 (bzip2-1.0.8.tar.gz) = ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269 +SHA256 (bzip2.pc.in) = eca9d8cd6376df1fb5442667c603032023fb21d8d183684550da0b96ade39654 diff --git a/bzip2/Pkgfile b/bzip2/Pkgfile index e2fea59d..1a6ac958 100644 --- a/bzip2/Pkgfile +++ b/bzip2/Pkgfile @@ -4,13 +4,14 @@ name=bzip2 version=1.0.8 -release=2 -source=(https://sourceware.org/pub/bzip2/$name-$version.tar.gz) +release=3 +source=(https://sourceware.org/pub/bzip2/$name-$version.tar.gz + bzip2.pc.in) build() { cd $name-$version - install -d $PKG/usr/{bin,lib,include,share/man/man1} + install -d $PKG/usr/{bin,lib/pkgconfig,include,share/man/man1} sed "/^CFLAGS/s/-O2/$CFLAGS/" -i Makefile Makefile-libbz2_so make -f Makefile-libbz2_so @@ -33,4 +34,6 @@ build() { install -m 0644 libbz2.a $PKG/usr/lib install -m 0644 bzlib.h $PKG/usr/include install -m 0644 *.1 $PKG/usr/share/man/man1 + + sed "s/@VERSION@/$version/" $SRC/bzip2.pc.in > $PKG/usr/lib/pkgconfig/bzip2.pc } diff --git a/bzip2/bzip2.pc.in b/bzip2/bzip2.pc.in new file mode 100644 index 00000000..a4dd6825 --- /dev/null +++ b/bzip2/bzip2.pc.in @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=/usr +bindir=${exec_prefix}/bin +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: bzip2 +Description: A file compression library +Version: @VERSION@ +Libs: -L${libdir} -lbz2 +Cflags: -I${includedir}

1 0

ports/contrib (3.6): kexec: do not create a static binary, go dynamic instead
by crux＠crux.nu 05 Aug '21

05 Aug '21

commit 7cd1d745383db17b469cfeb0b2008e3d0117c69a Author: Steffen Nurpmeso <steffen(a)sdaoden.eu> Date: Thu Aug 5 01:45:45 2021 +0200 kexec: do not create a static binary, go dynamic instead diff --git a/kexec/.footprint b/kexec/.footprint index 426884cb5..0729c4646 100644 --- a/kexec/.footprint +++ b/kexec/.footprint @@ -1,6 +1,6 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/sbin/ --rwxr-xr-x root/root usr/sbin/kexec.static +-rwxr-xr-x root/root usr/sbin/kexec drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man8/ diff --git a/kexec/.signature b/kexec/.signature index 08aa4fde7..d72b998eb 100644 --- a/kexec/.signature +++ b/kexec/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF38sbhH8BXPuSxnuRR08Uh5rLxl6Ht58EhCM2AhjiMvjtQEtCYrLCoFgf4aspwk2LnBCFhcDSEpz7gnBEsFZ8Xw0= -SHA256 (Pkgfile) = c15596e6995a434c9fd3feb86a9d644f9d3ca0a6e5cf1de7f5d96b0191d2ee58 -SHA256 (.footprint) = b63f987e520d430ebe3fc026363382f6b37976e082f38327afe66f665612e891 +RWSagIOpLGJF36EmoEC0QwoLfYY8aHRUdMBujfctSFusaYVWhCytm3KmW0mzr0fK+6zEtXVS8383lBSFc20DowtAwc5TES9piQ8= +SHA256 (Pkgfile) = b5f16c4b30cb59c349f58beb035935b6f6a1ff8eddb72c70682c6a9ef0f4cb98 +SHA256 (.footprint) = 750b5d6fc78dd4f4c32345f7218c108ab836a2e6b7ff3e2e1d4024a87e98e754 SHA256 (kexec-tools-2.0.22.tar.gz) = af618de7848142f204b57811f703de3ae7aa3f5bc5d52226db35800fa8fc4dff diff --git a/kexec/Pkgfile b/kexec/Pkgfile index b3500a7bc..5546994c0 100644 --- a/kexec/Pkgfile +++ b/kexec/Pkgfile @@ -5,7 +5,7 @@ name=kexec version=2.0.22 -release=1 +release=2 source=(https://git.kernel.org/pub/scm/utils/kernel/${name}/\ ${name}-tools.git/snapshot/${name}-tools-${version}.tar.gz ) @@ -14,11 +14,12 @@ build() { cd ${name}-tools-${version} ./bootstrap - LDFLAGS="-static ${LDFLAGS}" ./configure --prefix=/usr --without-lzma + #LDFLAGS="-static ${LDFLAGS}" + ./configure --prefix=/usr --without-lzma make make DESTDIR="${PKG}" install - mv "${PKG}"/usr/sbin/kexec "${PKG}"/usr/sbin/kexec.static + #mv "${PKG}"/usr/sbin/kexec "${PKG}"/usr/sbin/kexec.static rm -rf \ "${PKG}"/usr/lib \ "${PKG}"/usr/sbin/vmcore-dmesg \

1 0

ports/xorg (3.6): xrestop: update to 0.5
by crux＠crux.nu 05 Aug '21

05 Aug '21

commit 7595c75f2b4d1411913aed475e2a29109dd4a10d Author: Juergen Daubert <jue(a)jue.li> Date: Tue Aug 3 19:01:24 2021 +0200 xrestop: update to 0.5 diff --git a/xrestop/.signature b/xrestop/.signature index 262c2a5b..d5821413 100644 --- a/xrestop/.signature +++ b/xrestop/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndKbypAEWw3RVxgF9UvwFtm6racHhk9OKL0i7zmeDzBL08gobo9atffzBTUqMJ/1FOpwSD7om0qC/0adz24mgQQU= -SHA256 (Pkgfile) = f61e3628faf8a11a41884d7b7f093831bfcf38732fbe7d6a1d58c4dfd0d691fa +RWTSGWF5Q7TndA2ecZ+QQi5v5K72nDaA+mjEdjAd9n84m8FJ+soZkvIcOgVabp/tesDYbPfYrGfRlnJiKw7LuqNkk4THliksAAE= +SHA256 (Pkgfile) = 687385f31f721cd1efc10e0fb69412bcbcb4b579b0dc021c510a13b253f05232 SHA256 (.footprint) = 334a2417c3d74e161623bff5e05729edc75ec7b7ebfce760bfbfc923911b4448 -SHA256 (xrestop-0.4.tar.gz) = 67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257 +SHA256 (xrestop-0.5.tar.bz2) = 89d0a5d99d1f4b290a79c5ba0d6142d8591262f167165d1bc468abaa9c18d51b diff --git a/xrestop/Pkgfile b/xrestop/Pkgfile index 63d16cf3..c38c5466 100644 --- a/xrestop/Pkgfile +++ b/xrestop/Pkgfile @@ -4,15 +4,13 @@ # Depends on: xorg-libxres name=xrestop -version=0.4 -release=2 -source=(http://downloads.yoctoproject.org/releases/$name/$name-$version.tar.gz) +version=0.5 +release=1 +source=(https://xorg.freedesktop.org/archive/individual/app/$name-$version.tar.bz2) build() { cd xrestop-$version - - ./configure --prefix=/usr --mandir=/usr/share/man - + ./configure --prefix=/usr make make DESTDIR=$PKG install }

1 0