August 2021 - crux-commits

ports/opt (3.6): poppler: update to 21.08.0
by crux＠crux.nu 02 Aug '21

02 Aug '21

commit 06f3f77e292ee607a11765c8f72dfbf3cc2378f0 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 2 16:09:58 2021 +0200 poppler: update to 21.08.0 diff --git a/poppler/.footprint b/poppler/.footprint index c5ed8eb6f..564b1974a 100644 --- a/poppler/.footprint +++ b/poppler/.footprint @@ -156,9 +156,9 @@ drwxr-xr-x root/root usr/lib/ lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so -> libpoppler-cpp.so.0 lrwxrwxrwx root/root usr/lib/libpoppler-cpp.so.0 -> libpoppler-cpp.so.0.9.0 -rwxr-xr-x root/root usr/lib/libpoppler-cpp.so.0.9.0 -lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.111 -lrwxrwxrwx root/root usr/lib/libpoppler.so.111 -> libpoppler.so.111.0.0 --rwxr-xr-x root/root usr/lib/libpoppler.so.111.0.0 +lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.112 +lrwxrwxrwx root/root usr/lib/libpoppler.so.112 -> libpoppler.so.112.0.0 +-rwxr-xr-x root/root usr/lib/libpoppler.so.112.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/poppler-cpp.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler.pc diff --git a/poppler/.signature b/poppler/.signature index 2c9252aac..72b938618 100644 --- a/poppler/.signature +++ b/poppler/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/dM9xYPLUDlQK6QRg2iFMX5g2wz0HP6wJ+kYFxA3XvbczpAbPcg+Bn5iW60fX3e50Z21nyaAz3eTHsYtJnfeSgM= -SHA256 (Pkgfile) = 61928eea7e123567be80ecf374bcd7ac1fc6b80848d7f73874998172a3fa3437 -SHA256 (.footprint) = e638a2bedc9c6d2eb246705af3e29d6225b81226367e2074e924273808b17b1f -SHA256 (poppler-21.07.0.tar.xz) = e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4 +RWSE3ohX2g5d/f/7uIqeCCeQjoF5ytSOH4XDsABoskqf+mCZmGmocxBmRNZF79nszC2PYPtMtRVUZS2lTeOzgbLoUhYquF1ZpQw= +SHA256 (Pkgfile) = 00ee76027f5ab8082231be3d6864a0e6a31f30a26b7cae2d9bd47c3ed1577d23 +SHA256 (.footprint) = f70b532946cccd23cac18000e450ce6462be6332c8ada2073f8082595e3acb60 +SHA256 (poppler-21.08.0.tar.xz) = e9cf5dc5964bce4bb0264d1c4f8122706c910588b421cfc30abc97d6b23e602d diff --git a/poppler/Pkgfile b/poppler/Pkgfile index 27d14dfdc..7d05fcc36 100644 --- a/poppler/Pkgfile +++ b/poppler/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cmake cairo lcms2 name=poppler -version=21.07.0 +version=21.08.0 release=1 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz)

1 0

ports/core (3.6): libcap: update to 2.52
by crux＠crux.nu 02 Aug '21

02 Aug '21

commit be4f2ed3247556b07ebdfa259f1fa10273a5b837 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 2 15:59:24 2021 +0200 libcap: update to 2.52 diff --git a/libcap/.footprint b/libcap/.footprint index f1e10bb1..9e232934 100644 --- a/libcap/.footprint +++ b/libcap/.footprint @@ -1,6 +1,6 @@ drwxr-xr-x root/root lib/ -lrwxrwxrwx root/root lib/libcap.so.2 -> libcap.so.2.51 --rw-r--r-- root/root lib/libcap.so.2.51 +lrwxrwxrwx root/root lib/libcap.so.2 -> libcap.so.2.52 +-rw-r--r-- root/root lib/libcap.so.2.52 drwxr-xr-x root/root lib/security/ -rwxr-xr-x root/root lib/security/pam_cap.so drwxr-xr-x root/root sbin/ @@ -15,11 +15,11 @@ drwxr-xr-x root/root usr/include/sys/ -rw-r--r-- root/root usr/include/sys/psx_syscall.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libcap.a -lrwxrwxrwx root/root usr/lib/libcap.so -> ../../lib/libcap.so.2.51 +lrwxrwxrwx root/root usr/lib/libcap.so -> ../../lib/libcap.so.2.52 -rw-r--r-- root/root usr/lib/libpsx.a lrwxrwxrwx root/root usr/lib/libpsx.so -> libpsx.so.2 -lrwxrwxrwx root/root usr/lib/libpsx.so.2 -> libpsx.so.2.51 --rw-r--r-- root/root usr/lib/libpsx.so.2.51 +lrwxrwxrwx root/root usr/lib/libpsx.so.2 -> libpsx.so.2.52 +-rw-r--r-- root/root usr/lib/libpsx.so.2.52 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libcap.pc -rw-r--r-- root/root usr/lib/pkgconfig/libpsx.pc diff --git a/libcap/.signature b/libcap/.signature index 228ee771..24f42d0f 100644 --- a/libcap/.signature +++ b/libcap/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqkTdbwUveTmro2z069wv1f0IdgZLHc/EbvszP5BeB3Z5bvxv3Zysstkxarqr+MqE+II03OcODTKZtOFq5bx/LQk= -SHA256 (Pkgfile) = d334f2704366840e3e839038611b9377b8df11cd5b79eaf9b59af7480f45b663 -SHA256 (.footprint) = b5a0c251a2ea30ec019dadbbaaacd9265c30ed991c9cb521f41832ff9c5e74ea -SHA256 (libcap-2.51.tar.xz) = 6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9 +RWRJc1FUaeVeqsf5Yf2LewKqLHYVthQ8D29yEcKfx8dX1S/t/GaY67/c/n6dhQNW9wP5118oHVrXdDEWwlhpuuZzj8Kq/7xEgwo= +SHA256 (Pkgfile) = 88a494291baf986a56a6d5d3494d99d32be5e125b822488342d113122b47e54e +SHA256 (.footprint) = dde804bc4ca13071065b6eb363973c282ce7e69a9c337f9d8771085a0a0f6a42 +SHA256 (libcap-2.52.tar.xz) = a2faacd55ae5959db1b0c695f91f256ac4c5e6b10acaeaeaf508ea1ee887fa97 diff --git a/libcap/Pkgfile b/libcap/Pkgfile index 43bb7d26..1cc24211 100644 --- a/libcap/Pkgfile +++ b/libcap/Pkgfile @@ -4,7 +4,7 @@ # Depends on: attr linux-pam name=libcap -version=2.51 +version=2.52 release=1 source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/…

1 0

ports/xorg (3.6): xorg-cf-files: update to 1.0.7
by crux＠crux.nu 02 Aug '21

02 Aug '21

commit 4ea0199ca947c2bf5bb9dc801b6e2f5adbe36f0b Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 2 16:07:47 2021 +0200 xorg-cf-files: update to 1.0.7 diff --git a/xorg-cf-files/.signature b/xorg-cf-files/.signature index 72aba19d..d4b32436 100644 --- a/xorg-cf-files/.signature +++ b/xorg-cf-files/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndAF1siiDzPAj9/kxypCRauzj2/zVq3vRlbptTQwIoCMNSM9OXzqNkhahqquO8n8440edtQVCKy2s2HbFkjRq/AE= -SHA256 (Pkgfile) = be7a6df41fd26a91c567838a3ef0b7f7f4a951d40fa2e856f7b37b0349f125e5 +RWTSGWF5Q7TndOmX6spbumYvjjhIZsNPN1dTZTbiqQRPwlkIRRWfal5RcjL4RfegHBj5Pr8vdhHRtouJbqvfBPMo/QHX2uLUGwA= +SHA256 (Pkgfile) = 086b19330e140e80c9856c7b4479b2a9088a510c3b9298069f9f4b2c393c3132 SHA256 (.footprint) = 6c52a8c79fc9ce96da543de8a61bf44274dec24e754bc0a60491e24e1389aeb5 -SHA256 (xorg-cf-files-1.0.6.tar.bz2) = 4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d +SHA256 (xorg-cf-files-1.0.7.tar.bz2) = 74a771d5bb2189020399998dfa2329c3e038aa2e14dd3d4056144ed9a5976308 diff --git a/xorg-cf-files/Pkgfile b/xorg-cf-files/Pkgfile index 75dd7bb7..c5f0eed8 100644 --- a/xorg-cf-files/Pkgfile +++ b/xorg-cf-files/Pkgfile @@ -4,7 +4,7 @@ # Depends on: xorg-util-macros name=xorg-cf-files -version=1.0.6 +version=1.0.7 release=1 source=(https://www.x.org/releases/individual/util/$name-$version.tar.bz2)

1 0

ports/xorg (3.6): xorg-libxft: update to 2.3.4
by crux＠crux.nu 02 Aug '21

02 Aug '21

commit b9ce45919213867cceab3a34be16c70e626fba30 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 2 16:07:23 2021 +0200 xorg-libxft: update to 2.3.4 diff --git a/xorg-libxft/.footprint b/xorg-libxft/.footprint index b53af51a..92be991b 100644 --- a/xorg-libxft/.footprint +++ b/xorg-libxft/.footprint @@ -7,9 +7,9 @@ drwxr-xr-x root/root usr/include/X11/Xft/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libXft.a -rwxr-xr-x root/root usr/lib/libXft.la -lrwxrwxrwx root/root usr/lib/libXft.so -> libXft.so.2.3.3 -lrwxrwxrwx root/root usr/lib/libXft.so.2 -> libXft.so.2.3.3 --rwxr-xr-x root/root usr/lib/libXft.so.2.3.3 +lrwxrwxrwx root/root usr/lib/libXft.so -> libXft.so.2.3.4 +lrwxrwxrwx root/root usr/lib/libXft.so.2 -> libXft.so.2.3.4 +-rwxr-xr-x root/root usr/lib/libXft.so.2.3.4 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/xft.pc drwxr-xr-x root/root usr/share/ diff --git a/xorg-libxft/.signature b/xorg-libxft/.signature index 6c3a85a2..08873c62 100644 --- a/xorg-libxft/.signature +++ b/xorg-libxft/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndGSntT0eco+dXWSN9sE4laL8XxjLDu/vRphr7Zfr2DThCBDuJKVWbys+WpAftF8llz3cJ0RYy6UdB4lZHN/UUAs= -SHA256 (Pkgfile) = 8db95292ecde61c747e7522ec42aa9cb088deff734c55da882655f4f9bbb1907 -SHA256 (.footprint) = 9d97be9da7b5b6fab05b79931154a354c15073ac8e7c1fdd4b10fd813b2221b7 -SHA256 (libXft-2.3.3.tar.bz2) = 225c68e616dd29dbb27809e45e9eadf18e4d74c50be43020ef20015274529216 +RWTSGWF5Q7TndJGn9kCYTXX5qh7PGMaZHMQPvuixTlahRV3sUs+mI44kVDdLcWK/V8PnqXk4qGxssskUCpORmiclEE0P2IQo5Qg= +SHA256 (Pkgfile) = 519e12c818c37f403dd8ab8a2284777010d509a885645a4a700b134a55067575 +SHA256 (.footprint) = b8031a6d32c6700b5ed3f2038ece5074e620e06a7ce64907476b7f739f5bb452 +SHA256 (libXft-2.3.4.tar.bz2) = 57dedaab20914002146bdae0cb0c769ba3f75214c4c91bd2613d6ef79fc9abdd diff --git a/xorg-libxft/Pkgfile b/xorg-libxft/Pkgfile index a671a537..3d334c55 100644 --- a/xorg-libxft/Pkgfile +++ b/xorg-libxft/Pkgfile @@ -4,7 +4,7 @@ # Depends on: harfbuzz util-linux name=xorg-libxft -version=2.3.3 +version=2.3.4 release=1 source=(https://www.x.org/releases/individual/lib/libXft-$version.tar.bz2)

1 0

ports/xorg (3.6): xorg-libxfont2: update to 2.0.5
by crux＠crux.nu 02 Aug '21

02 Aug '21

commit 70619fbc7cf48c607e53efc621aa221803bbb11f Author: Juergen Daubert <jue(a)jue.li> Date: Mon Aug 2 16:07:02 2021 +0200 xorg-libxfont2: update to 2.0.5 diff --git a/xorg-libxfont2/.signature b/xorg-libxfont2/.signature index ebab3273..577101a1 100644 --- a/xorg-libxfont2/.signature +++ b/xorg-libxfont2/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndCIe3Ywors6oAdE87kpThK41GU6VSXGVDlP+4yiqPOcNK9WQDUyZI0Scx7GolC0koJtvEsFF5wWIRAt661CYwwI= -SHA256 (Pkgfile) = 24f933f4126775eb4351f2ee665272059bd8e072cec0728ea13f8e29c07dd2a9 +RWTSGWF5Q7TndBvt0QbUtsjwsCTa/O2GUEmYjg505u/g6pSrVHeJ4P+uQdwpKcg1cpxWa7NA0n4Td5+VxzW5eeFSe8i619EloQ0= +SHA256 (Pkgfile) = ae9bf05077b62359cea19c4af0b750bdfb68f1dd9d8d3a50f5f076928897e582 SHA256 (.footprint) = dc140cda3b16fb7a5b446a303695090542a6625ecd69cc23fe2bf16ff2b6153a -SHA256 (libXfont2-2.0.4.tar.bz2) = 6d151b3368e5035efede4b6264c0fdc6662c1c99dbc2de425e3480cababc69e6 +SHA256 (libXfont2-2.0.5.tar.bz2) = aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e diff --git a/xorg-libxfont2/Pkgfile b/xorg-libxfont2/Pkgfile index e2a68ed5..655c90ee 100644 --- a/xorg-libxfont2/Pkgfile +++ b/xorg-libxfont2/Pkgfile @@ -4,7 +4,7 @@ # Depends on: bzip2 freetype xorg-libfontenc xorg-xtrans name=xorg-libxfont2 -version=2.0.4 +version=2.0.5 release=1 source=(https://www.x.org/releases/individual/lib/libXfont2-$version.tar.bz…

1 0

ports/contrib (3.6): pam_xdg: 20210801: bring back (optional) session support
by crux＠crux.nu 02 Aug '21

02 Aug '21

commit 63f8a96b40bbb8b3f19abe5de6ae32e1bb5b3dc0 Author: Steffen Nurpmeso <steffen(a)sdaoden.eu> Date: Mon Aug 2 16:01:45 2021 +0200 pam_xdg: 20210801: bring back (optional) session support diff --git a/pam_xdg/.signature b/pam_xdg/.signature index 417c693bd..1c9432822 100644 --- a/pam_xdg/.signature +++ b/pam_xdg/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3z9vXj+fCpENPa65XMag5E6REcBr0Kj7oKCdaZuUaD45UgkBxtRvncVQRDW3rQ8But8+nu14Ag1LHZ7s0OHJXg4= -SHA256 (Pkgfile) = 2c85163d75631d082443136b26d215babc716a9bf2521c616f58f4f1706ae4b4 +RWSagIOpLGJF35ByKJGqZDYTDYgapw8YNFcmoQfuIz4G84szVxTjO1rS11BBqoORBYTNjhd+T3T+UY/nvIWL0h6PK6YhrCZ7rwA= +SHA256 (Pkgfile) = c8ca4da1cb69de37a134d64ca3acbe68d49a5ca2f07c03f86919d9287acd39bb SHA256 (.footprint) = 56d789b652e6167f5fb93e1e6d48243e13f598c6d9a72705a8e54a003574ba31 -SHA256 (pam_xdg.c) = 8569b0cbab468de159143bf58f9207dd9c3db204f44b7153ee410d0733526cea -SHA256 (pam_xdg.8) = 999548e64134d26d0ffeec2931f15a905e4029e6b404e86825d02978d2393d7a +SHA256 (pam_xdg.c) = 3ed98ccd23cee452086722be11c605420b5b96d2a5bb6734270121f1eb18463c +SHA256 (pam_xdg.8) = 946a65f7559e5e9c343fecf565fc3ddee8227e29e2dbb1729eaa96ee6eff75f1 SHA256 (makefile) = 2466f499c3e84fd821176371fa9ff78143bf94b9ec09fd9e654b35613e4ead7d diff --git a/pam_xdg/Pkgfile b/pam_xdg/Pkgfile index 26f7c28e4..16f37b908 100644 --- a/pam_xdg/Pkgfile +++ b/pam_xdg/Pkgfile @@ -1,9 +1,9 @@ -# Description: PAM module to manage XDG Base Directories +# Description: PAM module to manage XDG Base Directories (sessions) # URL: https://www.sdaoden.eu/code.html#s-toolbox # Maintainer: Steffen Nurpmeso, steffen at sdaoden dot eu name=pam_xdg -version=20210731 +version=20210801 release=1 source=($name.c $name.8 makefile) diff --git a/pam_xdg/README b/pam_xdg/README index ec7ab9421..ddd289664 100644 --- a/pam_xdg/README +++ b/pam_xdg/README @@ -8,9 +8,11 @@ For it to work it must be included in /etc/pam.d -- to make it a vivid part of session handling the file /etc/pam.d/common-session seems best. Include the following early: - session optional pam_xdg.so [notroot] [runtime] + session optional pam_xdg.so [notroot] [runtime] [track_sessions] Use notroot argument to only handle XDG for non-root users. Use runtime argument to only handle of XDG_RUNTIME_DIR. +Use track_sessions to remove XDG_RUNTIME_DIR once the last user +session ends (take care of CAVEATS of manual, maybe). [1] https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html diff --git a/pam_xdg/pam_xdg.8 b/pam_xdg/pam_xdg.8 index c4d0eba66..b4aca060f 100644 --- a/pam_xdg/pam_xdg.8 +++ b/pam_xdg/pam_xdg.8 @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. . -.Dd July 29, 2021 +.Dd August 1, 2021 .Dt PAM_XDG 8 .Os . @@ -30,7 +30,7 @@ .Nm .Op Ar runtime .Op Ar notroot -.\".Op Ar track_user_sessions Op Ar per_user_lock +.Op Ar track_sessions Op Ar per_user_lock . . .Sh DESCRIPTION @@ -56,13 +56,13 @@ If .Ar notroot was given the module will bypass itself for root account logins and perform no actions for root. -.\"Lastly -.\".Ar track_user_sessions -.\"will enable session tracking: once the last session ends, the user's -.\".Ev XDG_RUNTIME_DIR -.\"will be recursively removed; on high-load servers setting -.\".Ar per_user_lock -.\"then will reduce lock file lock contention. +Lastly +.Ar track_sessions +will enable session tracking: once the last session ends, the user's +.Ev XDG_RUNTIME_DIR +will be recursively removed; on high-load servers then setting +.Ar per_user_lock +will reduce lock file lock contention. . .Pp In order to make use of this module, place the following in the @@ -81,7 +81,7 @@ and may be desirable, adjusting paths as necessary: . .Bd -literal -offset indent -session optional pam_xdg.so notroot \"track_user_sessions +session optional pam_xdg.so notroot track_sessions .Ed . . @@ -101,13 +101,12 @@ session optional pam_xdg.so notroot \"track_user_sessions On Unix systems any .Dq daemonized program or script is reparented to the program running with PID 1, -therefore leaving the PAM user session without PAM recognizing this. +most likely leaving the PAM user session without PAM recognizing this. Yet careless such code may hold or expect availability of resources of the session it just left, truly performing cleanup when sessions end seems thus unwise. -.\"However, many PAM modules do support cleanup upon closing the last -.\"session of a user, and therefore -.\".Nm -.\"supports this optionally, too. +Since so many PAM modules do support session tracking and cleanup +.Nm +readded optional support for this. . .\" s-ts-mode diff --git a/pam_xdg/pam_xdg.c b/pam_xdg/pam_xdg.c index 54fd7178c..b08d2243f 100644 --- a/pam_xdg/pam_xdg.c +++ b/pam_xdg/pam_xdg.c @@ -1,8 +1,9 @@ /*@ pam_xdg - manage XDG Base Directories (runtime dir life time, environment). *@ See pam_xdg.8 for more. *@ - According to XDG Base Directory Specification, v0.7. - *@ - Supports libpam (Linux) and *BSD OpenPAM. + *@ - Supports libpam (Linux) and OpenPAM. *@ - Requires C preprocessor with __VA_ARGS__ support! + *@ - Uses "rm -rf" to drop per-user directories. XXX Unroll this? nftw? * * Copyright (c) 2021 Steffen Nurpmeso <steffen(a)sdaoden.eu>. * SPDX-License-Identifier: ISC @@ -34,6 +35,13 @@ #define a_RUNTIME_DIR_BASE "user" #define a_RUNTIME_DIR_BASE_MODE 0755 /* 0711? */ +/* Note: we manage these relative to the per-user directory! + * a_LOCK_FILE is only used without "per_user_lock" */ +#define a_LOCK_FILE "../." a_XDG ".lck" +#define a_LOCK_TRIES 10 + +#define a_DAT_FILE "." a_XDG ".dat" + /* >8 -- 8< */ /* @@ -44,11 +52,13 @@ #include <sys/stat.h> #include <sys/types.h> +#include <sys/wait.h> #include <errno.h> #include <fcntl.h> #include <limits.h> #include <pwd.h> +#include <stdint.h> /* xxx not, actually!?! */ #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -96,7 +106,7 @@ # define a_LOG_NOTICE LOG_NOTICE #endif -/* Because of complicated file locking, use one function with two exec paths */ +/* Just put it all in one big fun, use two exec paths */ static int a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv); @@ -107,10 +117,9 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ /* Options */ a_RUNTIME = 1u<<0, a_NOTROOT = 1u<<1, -#if 0 a_SESSIONS = 1u<<16, a_USER_LOCK = 1u<<17, -#endif + /* Flags */ a_MPV = 1u<<29, /* Multi-Purpose-Vehicle */ a_SKIP_XDG = 1u<<30 /* We shall not act */ @@ -128,20 +137,22 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ }; static int f_saved; - char uidbuf[sizeof ".18446744073709551615"], - wbuf[((sizeof("XDG_RUNTIME_DIR=") + sizeof(a_RUNTIME_DIR_OUTER) + - sizeof(a_RUNTIME_DIR_BASE) + sizeof(".18446744073709551615")) | + char uidbuf[sizeof "../.18446744073709551615"], + xbuf[((sizeof("XDG_RUNTIME_DIR=") + sizeof(a_RUNTIME_DIR_OUTER) + + sizeof(a_RUNTIME_DIR_BASE) + + sizeof("../.18446744073709551615")) | (sizeof("XDG_CONFIG_DIRS=") + PATH_MAX) ) +1]; struct a_dirtree dt_user; struct a_dirtree const *dtp; struct passwd *pwp; char const *emsg; - int cwdfd, f, res, uidbuflen; + int cwdfd, cntrlfd, datfd, f, res, uidbuflen; char const *user; user = "<unset>"; cwdfd = AT_FDCWD; + datfd = cntrlfd = -1; /* Command line */ if(isopen){ @@ -158,12 +169,10 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ } else if(!strcmp(argv[0], "notroot")) f |= a_NOTROOT; -#if 0 - else if(!strcmp(argv[0], "track_user_sessions")) + else if(!strcmp(argv[0], "track_sessions")) f |= a_SESSIONS; else if(!strcmp(argv[0], "per_user_lock")) f |= a_USER_LOCK; -#endif else if(!(flags & PAM_SILENT)){ emsg = "command line"; errno = EINVAL; @@ -171,17 +180,14 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ } } -#if 0 if((f & a_USER_LOCK) && !(f & a_SESSIONS)) a_LOG(pamh, a_LOG_NOTICE, - a_XDG ": \"per_user_lock\" requires \"track_user_sessions\""); -#endif + a_XDG ": \"per_user_lock\" requires \"track_sessions\""); }else{ f = f_saved; if(f & a_SKIP_XDG) goto jok; - goto jok; /* No longer used, session counting does not work */ } /* We need the user we go for */ @@ -192,6 +198,7 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ goto jepam; } + /* No PAM failure, no PAM_USER_UNKNOWN here: we are no authentificator! */ if((pwp = getpwnam(user)) == NULL){ emsg = "host does not know about user"; errno = EINVAL; @@ -204,13 +211,13 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ } /* Our lockfile and per-user directory name */ - uidbuflen = snprintf(uidbuf, sizeof(uidbuf), ".%lu", - (unsigned long)pwp->pw_uid); + uidbuflen = snprintf(uidbuf, sizeof(uidbuf), "../.%lu", /* xxx error?? */ + (unsigned long)pwp->pw_uid) - 3; - dt_user.name = &uidbuf[1]; - dt_user.mode = 0700; + dt_user.name = &uidbuf[4]; + dt_user.mode = 0700; /* XDG implied */ - /* Handle tree. On *BSD outermost may not exist! */ + /* Handle tree, go to user runtime. On *BSD outermost may not exist! */ for(/*f &= ~a_MPV,*/ dtp = a_dirtree;;){ int e; gid_t oegid; @@ -231,8 +238,8 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ } if(!isopen) - /* Someone removed the entire directory tree while sessions were open! - * Silently out!?! */ + /* XXX Entire directory tree disappeared while sessions were open! + * XXX Silently out!?! */ goto jok; /* We try creating the directories once as necessary */ @@ -263,19 +270,124 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ "(a mount point of) volatile storage!"); /* Just chown it! */ else if(dtp == &dt_user && - fchownat(cwdfd, &uidbuf[1], pwp->pw_uid, pwp->pw_gid, + fchownat(cwdfd, &uidbuf[4], pwp->pw_uid, pwp->pw_gid, AT_SYMLINK_NOFOLLOW) == -1){ emsg = "cannot chown(2) per user XDG_RUNTIME_DIR"; goto jerr; } } + /* In session mode we have to manage the counter file */ + if(f & a_SESSIONS){ + unsigned long long int sessions; + + /* Landed in the runtime base dir, obtain our lock */ + if((cntrlfd = openat(cwdfd, + (f & a_USER_LOCK ? uidbuf : a_LOCK_FILE), + (O_CREAT | O_WRONLY | O_NOFOLLOW | O_NOCTTY), + (S_IRUSR | S_IWUSR))) == -1){ + emsg = "cannot open control lock file"; + goto jerr; + } + + for(res = a_LOCK_TRIES;;){ + struct flock flp; + + memset(&flp, 0, sizeof flp); + flp.l_type = F_WRLCK; + flp.l_start = 0; + flp.l_whence = SEEK_SET; + flp.l_len = 0; + + if(fcntl(cntrlfd, F_SETLKW, &flp) != -1) + break; + + /* XXX It may happen we cannot manage the lock and thus not access + * XXX the session counter, ie this session is zombie to us. + * XXX Just like counter below, should globally disable sessions!! */ + if(errno != EINTR){ + emsg = "unexpected error obtaining lock on lock control file"; + goto jerr; + } + if(--res == 0){ + emsg = "cannot obtain lock on lock control file"; + goto jerr; + } + } + + sessions = 0; + + if((datfd = openat(cwdfd, a_DAT_FILE, O_RDONLY)) != -1){ + char *ep; + ssize_t r; + + while((r = read(datfd, xbuf, sizeof(xbuf) -1)) == -1){ + if(errno != EINTR) + goto jecnt; + } + + close(datfd); + datfd = -1; + + xbuf[(size_t)r] = '\0'; + sessions = strtoull(xbuf, &ep, 10); + /* Do not log too often for "session counter error"s, as below */ + if(ep == xbuf){ + res = PAM_SESSION_ERR; + goto jleave; + }else if(sessions == ULLONG_MAX || ep != &xbuf[(size_t)r]) + goto jecnt; + } + + if(isopen) + ++sessions; + else if(sessions > 0) + --sessions; + + if(!isopen && sessions == 0){ /* former.. hmmm. */ + /* Ridiculously simple, but everything else would be the opposite. + * Ie, E[MN]FILE failures, or whatever else */ + char const cmd[] = "rm -rf " a_RUNTIME_DIR_OUTER "/" + a_RUNTIME_DIR_BASE "/"; + + memcpy(xbuf, cmd, sizeof(cmd) -1); + memcpy(&xbuf[sizeof(cmd) -1], &uidbuf[4], uidbuflen +1); + + res = system(xbuf); + if(!WIFEXITED(res) || WEXITSTATUS(res) != 0){ + emsg = "unable to rm(1) -rf per user XDG_RUNTIME_DIR"; + errno = EINVAL; + goto jerr; + } + /* This is the end .. */ + goto jok; + }else{ + /* Write out session counter */ + res = snprintf(xbuf, sizeof xbuf, "%llu", sessions); /* xxx error? */ + + if(((datfd = openat(cwdfd, a_DAT_FILE, + (O_CREAT | O_TRUNC | O_WRONLY | O_SYNC | O_NOFOLLOW | + O_NOCTTY), + (S_IRUSR | S_IWUSR))) == -1) || + write(datfd, xbuf, res) != res){ +jecnt: + /* Ensure read above fails, so that henceforth session teardown is + * skipped for this user */ + truncate(a_DAT_FILE, 0); + emsg = "counter file error, disabled session tracking for user"; + goto jerr; + } + close(datfd); + datfd = -1; + } + } + /* When opening, we want to put environment variables, too */ if(isopen){ char *cp; /* XDG_RUNTIME_DIR */ - cp = wbuf; + cp = xbuf; memcpy(cp, "XDG_RUNTIME_DIR=", sizeof("XDG_RUNTIME_DIR=") -1); cp += sizeof("XDG_RUNTIME_DIR=") -1; memcpy(cp, a_RUNTIME_DIR_OUTER, sizeof(a_RUNTIME_DIR_OUTER) -1); @@ -284,9 +396,9 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ memcpy(cp, a_RUNTIME_DIR_BASE, sizeof(a_RUNTIME_DIR_BASE) -1); cp += sizeof(a_RUNTIME_DIR_BASE) -1; *cp++ = '/'; - memcpy(cp, &uidbuf[1], uidbuflen); + memcpy(cp, &uidbuf[4], uidbuflen); - if((res = pam_putenv(pamh, wbuf)) != PAM_SUCCESS) + if((res = pam_putenv(pamh, xbuf)) != PAM_SUCCESS) goto jepam; /* And the rest unless disallowed */ @@ -318,7 +430,7 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ i = strlen(pwp->pw_dir); for(adp = a_dirs; adp->name != NULL; ++adp){ - cp = wbuf; + cp = xbuf; memcpy(cp, adp->name, adp->len); cp += adp->len; if(*(src = adp->defval) == '\1'){ @@ -328,7 +440,7 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ } memcpy(cp, src, strlen(src) +1); - if((res = pam_putenv(pamh, wbuf)) != PAM_SUCCESS) + if((res = pam_putenv(pamh, xbuf)) != PAM_SUCCESS) goto jepam; } } @@ -337,6 +449,10 @@ a_xdg(int isopen, pam_handle_t *pamh, int flags, int argc, const char **argv){ jok: res = PAM_SUCCESS; jleave: + if(datfd != -1) + close(datfd); + if(cntrlfd != -1) + close(cntrlfd); if(cwdfd != -1 && cwdfd != AT_FDCWD) /* >=0, but AT_FDCWD unspecified */ close(cwdfd);

1 0

ports/contrib (3.6): openjdk11-jdk: 11.0.12+5 -> 11.0.12+7
by crux＠crux.nu 01 Aug '21

01 Aug '21

commit 0360f776d74390ac0c44d9935cc4767491441cc8 Author: Danny Rawlins <contact(a)romster.me> Date: Sun Aug 1 17:47:47 2021 +1000 openjdk11-jdk: 11.0.12+5 -> 11.0.12+7 diff --git a/openjdk11-jdk/.footprint b/openjdk11-jdk/.footprint index c7b43799f..e8460edf7 100644 --- a/openjdk11-jdk/.footprint +++ b/openjdk11-jdk/.footprint @@ -159,7 +159,6 @@ drwxr-xr-x root/root usr/lib/java/openjdk11-jdk/lib/jli/ -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libdt_socket.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libextnet.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libfontmanager.so --rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libharfbuzz.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libinstrument.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libj2gss.so -rw-r--r-- root/root usr/lib/java/openjdk11-jdk/lib/libj2pcsc.so diff --git a/openjdk11-jdk/.signature b/openjdk11-jdk/.signature index 5a0a95d02..9289f2d81 100644 --- a/openjdk11-jdk/.signature +++ b/openjdk11-jdk/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36HWW89JdxA6N4ULM4OR3Ar404n4OumWpsqTi2SEAcEByZj5Bn2+CUbBn6cJQ/r+teUFnXWAzij4qpQj+Lf+Cwc= -SHA256 (Pkgfile) = 0f2fe43d78c819b8790281f02ad8b63ca717f6c7d4c0b46f20cc5ce39b535cba -SHA256 (.footprint) = c8ab3ec872b24b9ea40814b91dc3f78c20f56e29d7069d9b51a7fc7f42ca5a06 -SHA256 (jdk-11.0.12+5.tar.bz2) = d2845669a9791c2a807fcdc859b059e36c07d0b4e7c0b9e6bc3699a94d8809c2 +RWSagIOpLGJF330DmDBu1fPzwfCikPGDkbFt6Zjw/b52SAE/khJjvt5gAttQDzLu1Cop6KNyglDoE5qgJ+d/PRno28RVaIH6nw0= +SHA256 (Pkgfile) = 1acfc718344a7701ad890a493ee7523c43ef0bfbdc6093994fc0ce841d7abe01 +SHA256 (.footprint) = 03377f0471c2680d08f519ce02e0b2f9e6e3c34c4cd8fa7c695029043ca80666 +SHA256 (jdk-11.0.12+7.tar.bz2) = 03531735116e74644b729fc0b8663ed72f7c83ebe093c02f1887be89264d8b92 SHA256 (openjdk11-boot-20210620.tar.xz) = 03a0f8cb544282c589bd8e701311841a68558b93ea36cebf76e1f21c444e204b SHA256 (java_cacerts-20210620) = 860324d9e2ea9a54e93bbfc012896623596407abd3a47d395475a52e08f46a3e diff --git a/openjdk11-jdk/Pkgfile b/openjdk11-jdk/Pkgfile index 7ef7daada..5e49db2c8 100644 --- a/openjdk11-jdk/Pkgfile +++ b/openjdk11-jdk/Pkgfile @@ -5,7 +5,7 @@ # Depends on: alsa-lib cups fontconfig giflib krb5 lcms2 libxslt nss unzip xorg-libxrandr xorg-libxt xorg-libxtst zip name=openjdk11-jdk -version=11.0.12+5 +version=11.0.12+7 _boot_ver=20210620 _cert_ver=20210620 release=1 @@ -23,14 +23,23 @@ build() { export JAVA_HOME=$SRC/openjdk11-boot export PATH=$JAVA_HOME/bin:$OLD_PATH + export MAKEFLAGS=${MAKEFLAGS/-j${MAKEFLAG_J}/} + # Avoid optimization of HotSpot being lowered from O3 to O2 + local _CFLAGS+=" ${CFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon" + local _CXXFLAGS+=" ${CXXFLAGS//-O2/-O3} ${CPPFLAGS} -fcommon" + local _LDFLAGS="${LDFLAGS}" + + [ -z $JOBS ] && JOBS=$(nproc) + + # CFLAGS, CXXFLAGS and LDFLAGS are ignored as shown by a warning + # in the output of ./configure unless used like such: + # --with-extra-cflags="${CFLAGS}" + # --with-extra-cxxflags="${CXXFLAGS}" + # --with-extra-ldflags="${LDFLAGS}" + # See also paragraph "Configure Control Variables" from common/doc/building.md unset CFLAGS unset CXXFLAGS unset LDFLAGS - unset MAKEFLAGS - export _CFLAGS+=' -fcommon' - export _CXXFLAGS+=' -fcommon' - - [ -z $JOBS ] && JOBS=$(nproc) mkdir $SRC/build cd $SRC/build @@ -54,13 +63,17 @@ build() { --with-version-build="${version#*+}" \ --with-vendor-name="CRUX" \ --with-jobs=$JOBS \ + --with-num-cores=$JOBS \ --with-libjpeg=system \ --with-giflib=system \ --with-libpng=system \ --with-zlib=system \ --with-lcms=system \ - --with-extra-cflags="$_CFLAGS" \ - --with-extra-cxxflags="$_CXXFLAGS" + --with-harfbuzz=system \ + --with-jvm-features=zgc \ + --with-extra-cflags="${_CFLAGS}" \ + --with-extra-cxxflags="${_CXXFLAGS}" \ + --with-extra-ldflags="${_LDFLAGS}" # NOTE: for debugging build issues: set LOG to debug, JOBS to 1. LC_ALL=C \

1 0