diff options
Diffstat (limited to 'sysutils')
58 files changed, 1284 insertions, 320 deletions
diff --git a/sysutils/btop/Makefile b/sysutils/btop/Makefile index d73d92e7859a..32e316056391 100644 --- a/sysutils/btop/Makefile +++ b/sysutils/btop/Makefile @@ -1,6 +1,6 @@ PORTNAME= btop DISTVERSIONPREFIX= v -DISTVERSION= 1.4.2 +DISTVERSION= 1.4.3 CATEGORIES= sysutils MAINTAINER= pkubaj@FreeBSD.org diff --git a/sysutils/btop/distinfo b/sysutils/btop/distinfo index cc8358b3bd4e..5a6c87943c46 100644 --- a/sysutils/btop/distinfo +++ b/sysutils/btop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746184738 -SHA256 (aristocratos-btop-v1.4.2_GH0.tar.gz) = c7c0fb625af269d47eed926784900c8e154fdf71703f4325cffdf26357338c85 -SIZE (aristocratos-btop-v1.4.2_GH0.tar.gz) = 1244982 +TIMESTAMP = 1746925325 +SHA256 (aristocratos-btop-v1.4.3_GH0.tar.gz) = 81b133e59699a7fd89c5c54806e16452232f6452be9c14b3a634122e3ebed592 +SIZE (aristocratos-btop-v1.4.3_GH0.tar.gz) = 1245882 diff --git a/sysutils/cardano-cli/Makefile b/sysutils/cardano-cli/Makefile index d357175c1a2d..fe4cb2f3da3a 100644 --- a/sysutils/cardano-cli/Makefile +++ b/sysutils/cardano-cli/Makefile @@ -1,6 +1,7 @@ PORTNAME= cardano-cli DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 10.8.0.0 +PORTREVISION= 1 CATEGORIES= sysutils net-p2p MASTER_SITES= https://chap.intersectmbo.org/package/:chap @@ -76,7 +77,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ bech32-th-1.1.8 \ bifunctors-5.6.2_2 \ bimap-0.5.0 \ - bin-0.1.4_1 \ + bin-0.1.4_2 \ binary-orphans-1.0.5_1 \ bitvec-1.1.5.0_3 \ blaze-builder-0.4.2.3 \ @@ -172,7 +173,6 @@ USE_CABAL= Cabal-3.14.2.0_1 \ dictionary-sharing-0.1.0.0_4 \ diff-containers-1.3.0.0:chap \ digest-0.0.2.1 \ - directory-1.3.9.0_1 \ directory-ospath-streaming-0.2.2 \ distributive-0.6.2.1_1 \ dlist-1.0_2 \ @@ -186,7 +186,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ file-embed-0.0.16.0 \ file-io-0.1.5 \ filelock-0.1.1.7 \ - fin-0.3.2 \ + fin-0.3.2_1 \ fingertree-0.1.5.0 \ fingertree-rm-1.0.0.4:chap \ flat-0.6 \ @@ -211,7 +211,6 @@ USE_CABAL= Cabal-3.14.2.0_1 \ happy-2.1.5 \ happy-lib-2.1.5 \ hashable-1.4.7.0 \ - haskeline-0.8.3.0 \ haskell-lexer-1.2.1 \ heapwords-0.1.0.2:chap \ hedgehog-1.5_2 \ @@ -260,7 +259,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ megaparsec-9.7.0 \ memory-0.18.0_1 \ memory-pool-0.1.0.0 \ - mempack-0.1.1.0_1 \ + mempack-0.1.1.0_2 \ microlens-0.4.13.1_1 \ microlens-aeson-2.5.2 \ microlens-mtl-0.2.1.0 \ @@ -323,7 +322,6 @@ USE_CABAL= Cabal-3.14.2.0_1 \ prettyprinter-configurable-1.36.0.0:chap \ primes-0.2.1.0 \ primitive-0.9.1.0 \ - process-1.6.25.0_1 \ profunctors-5.6.2_3 \ psqueues-0.2.8.1 \ pvar-1.0.0.0_1 \ @@ -333,7 +331,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ quickcheck-state-machine-0.10.1 \ quickcheck-transformer-0.3.1.2_1 \ quiet-0.2 \ - ral-0.2.2_1 \ + ral-0.2.2_2 \ random-1.2.1.3 \ random-shuffle-0.0.4 \ rawlock-0.1.1.0_2 \ @@ -349,7 +347,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ safe-exceptions-0.1.7.4_1 \ safe-wild-cards-1.0.0.2_2 \ scientific-0.3.8.0_2 \ - selective-0.5 \ + selective-0.7.0.1 \ semialign-1.3.1_2 \ semigroupoids-6.0.1_2 \ semigroups-0.20 \ @@ -358,7 +356,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ si-timers-1.5.0.0_2 \ simple-sendfile-0.2.32 \ singletons-3.0.4 \ - singletons-th-3.2 \ + singletons-th-3.3 \ size-based-0.1.3.3_1 \ small-steps-1.1.1.0:chap \ socks-0.6.1 \ @@ -399,9 +397,9 @@ USE_CABAL= Cabal-3.14.2.0_1 \ text-short-0.1.6_3 \ text-zipper-0.13 \ tf-random-0.5 \ - th-abstraction-0.6.0.0_2 \ + th-abstraction-0.7.1.0_1 \ th-compat-0.1.6 \ - th-desugar-1.15_1 \ + th-desugar-1.16_1 \ th-env-0.1.1 \ th-expand-syns-0.4.12.0 \ th-lift-0.8.6 \ @@ -417,7 +415,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ transformers-base-0.4.6 \ transformers-compat-0.7.2 \ transformers-except-0.1.4_1 \ - tree-diff-0.3.4 \ + tree-diff-0.3.4_1 \ typed-process-0.2.13.0 \ typed-protocols-0.3.0.0:chap \ typed-protocols-cborg-0.3.0.0:chap \ @@ -426,7 +424,6 @@ USE_CABAL= Cabal-3.14.2.0_1 \ typed-protocols-stateful-cborg-0.3.0.0:chap \ unbounded-delays-0.1.1.1 \ universe-base-1.1.4_1 \ - unix-2.8.6.0_1 \ unix-bytestring-0.4.0.3 \ unix-compat-0.7.4 \ unix-time-0.4.16 \ @@ -436,7 +433,7 @@ USE_CABAL= Cabal-3.14.2.0_1 \ utf8-string-1.0.2 \ uuid-types-1.0.6_3 \ validation-1.1.3_1 \ - validation-selective-0.2.0.0.0.0.0.0.1:chap \ + validation-selective-0.2.0.0_5 \ validity-0.12.1.0 \ vary-0.1.1.2 \ vault-0.3.1.5_10 \ diff --git a/sysutils/cardano-cli/distinfo b/sysutils/cardano-cli/distinfo index 7c5039b23bc6..7ceeb3c652ca 100644 --- a/sysutils/cardano-cli/distinfo +++ b/sysutils/cardano-cli/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1745743113 +TIMESTAMP = 1747064667 SHA256 (cabal/Cabal-3.14.2.0/Cabal-3.14.2.0.tar.gz) = a58ca2b17c250472ed4dac0ec0aa2c65173701cbfdfecca104713f73b4429432 SIZE (cabal/Cabal-3.14.2.0/Cabal-3.14.2.0.tar.gz) = 475699 SHA256 (cabal/Cabal-3.14.2.0/revision/1.cabal) = f98aa86a37b9920dc6dfc8d79119a10df69542734f158a1c66ff144592f1d004 @@ -129,8 +129,8 @@ SHA256 (cabal/bimap-0.5.0/bimap-0.5.0.tar.gz) = b0b44b0f2eaceb83f46dfa3d1747e080 SIZE (cabal/bimap-0.5.0/bimap-0.5.0.tar.gz) = 11205 SHA256 (cabal/bin-0.1.4/bin-0.1.4.tar.gz) = f77e955b143a87e34aa12c21d3c6a51e9723cf93cca79549bd525c83952dbf2a SIZE (cabal/bin-0.1.4/bin-0.1.4.tar.gz) = 16645 -SHA256 (cabal/bin-0.1.4/revision/1.cabal) = 5556549006c455bbf217fb5d526133f1fef399060ad0b5ebcdfc7f31585fbeaf -SIZE (cabal/bin-0.1.4/revision/1.cabal) = 2388 +SHA256 (cabal/bin-0.1.4/revision/2.cabal) = f497bf4be74947f4649518626c9255a1f642d98ccde7b55f60298ef8a6b55c50 +SIZE (cabal/bin-0.1.4/revision/2.cabal) = 2403 SHA256 (cabal/binary-orphans-1.0.5/binary-orphans-1.0.5.tar.gz) = 39fbae9e8c2a5193c07afeea34173e5022f82885d6cbb32062b5f1645c44408d SIZE (cabal/binary-orphans-1.0.5/binary-orphans-1.0.5.tar.gz) = 3289 SHA256 (cabal/binary-orphans-1.0.5/revision/1.cabal) = 1217df567aae672d09979480c362d27559d226081b9b9bc4107d4af008da1f5f @@ -361,10 +361,6 @@ SHA256 (cabal/diff-containers-1.3.0.0.tar.gz) = f826223608e030e658caf6a556952865 SIZE (cabal/diff-containers-1.3.0.0.tar.gz) = 11593 SHA256 (cabal/digest-0.0.2.1/digest-0.0.2.1.tar.gz) = cbf87b02e01f97dfe6d2d7f08065826cf552c8e8467ea990ed0d2f502e0a6498 SIZE (cabal/digest-0.0.2.1/digest-0.0.2.1.tar.gz) = 23636 -SHA256 (cabal/directory-1.3.9.0/directory-1.3.9.0.tar.gz) = 20a24846117fc5f8751d974b7de07210a161989410467e9adca525381b8e64cc -SIZE (cabal/directory-1.3.9.0/directory-1.3.9.0.tar.gz) = 98128 -SHA256 (cabal/directory-1.3.9.0/revision/1.cabal) = 2490137bb7738bd79392959458ef5f276219ea5ba8a9a56d3e0b06315c1bb917 -SIZE (cabal/directory-1.3.9.0/revision/1.cabal) = 3307 SHA256 (cabal/directory-ospath-streaming-0.2.2/directory-ospath-streaming-0.2.2.tar.gz) = 1ade8fbee13db15e8d22a1ecdca54794617cabc69911b51d46a65e12f4554ef7 SIZE (cabal/directory-ospath-streaming-0.2.2/directory-ospath-streaming-0.2.2.tar.gz) = 13734 SHA256 (cabal/distributive-0.6.2.1/distributive-0.6.2.1.tar.gz) = d7351392e078f58caa46630a4b9c643e1e2e9dddee45848c5c8358e7b1316b91 @@ -403,6 +399,8 @@ SHA256 (cabal/filelock-0.1.1.7/filelock-0.1.1.7.tar.gz) = 4d35645cdf4f0b7aa8d222 SIZE (cabal/filelock-0.1.1.7/filelock-0.1.1.7.tar.gz) = 8109 SHA256 (cabal/fin-0.3.2/fin-0.3.2.tar.gz) = b92559549f4f03ee1acbe6aa93f13ad856213d37b887e603502b4fe159162141 SIZE (cabal/fin-0.3.2/fin-0.3.2.tar.gz) = 15913 +SHA256 (cabal/fin-0.3.2/revision/1.cabal) = 5bff3c1553a694499d65d46a23e30c06473ec64ab266cf755f7fca3af1169054 +SIZE (cabal/fin-0.3.2/revision/1.cabal) = 3725 SHA256 (cabal/fingertree-0.1.5.0/fingertree-0.1.5.0.tar.gz) = f3263c92fa8b18f1e1a64cd12480c8c1bee2c1fa0584ab3345f3dd8522bdbf71 SIZE (cabal/fingertree-0.1.5.0/fingertree-0.1.5.0.tar.gz) = 20656 SHA256 (cabal/fingertree-rm-1.0.0.4.tar.gz) = e3515befeefcf670eb54215fb113e60f465c9d434449007b56422b6e4e3efc64 @@ -469,8 +467,6 @@ SHA256 (cabal/happy-lib-2.1.5/happy-lib-2.1.5.tar.gz) = a25a6c5a2db150caf4b8c91e SIZE (cabal/happy-lib-2.1.5/happy-lib-2.1.5.tar.gz) = 93792 SHA256 (cabal/hashable-1.4.7.0/hashable-1.4.7.0.tar.gz) = 3baee4c9027a08830d148ec524cbc0471de645e1e8426d46780ef2758df0e8da SIZE (cabal/hashable-1.4.7.0/hashable-1.4.7.0.tar.gz) = 89467 -SHA256 (cabal/haskeline-0.8.3.0/haskeline-0.8.3.0.tar.gz) = 9157d281f4fd5f649f35c1bff5ae1f106a057823d6af8ae4c628bc5eab643585 -SIZE (cabal/haskeline-0.8.3.0/haskeline-0.8.3.0.tar.gz) = 73064 SHA256 (cabal/haskell-lexer-1.2.1/haskell-lexer-1.2.1.tar.gz) = 9d76e1528106b1b32e6e465264e39381ca4b450b72a4b5331e7e5127640a1a41 SIZE (cabal/haskell-lexer-1.2.1/haskell-lexer-1.2.1.tar.gz) = 14602 SHA256 (cabal/heapwords-0.1.0.2.tar.gz) = a0285b2d6ce541a6ea76db152a61a7250b094712b4ad421b3afdc3fca458b5ef @@ -601,8 +597,8 @@ SHA256 (cabal/memory-pool-0.1.0.0/memory-pool-0.1.0.0.tar.gz) = 313f52b1d3b7a740 SIZE (cabal/memory-pool-0.1.0.0/memory-pool-0.1.0.0.tar.gz) = 12355 SHA256 (cabal/mempack-0.1.1.0/mempack-0.1.1.0.tar.gz) = d810ce2f0a9b78559cce321161d9476c30bcb88467988c34761850902345def5 SIZE (cabal/mempack-0.1.1.0/mempack-0.1.1.0.tar.gz) = 17442 -SHA256 (cabal/mempack-0.1.1.0/revision/1.cabal) = f5e81715af31f133b36aa5a05282a0ecd3fc5a4d788fa75ae08e974d35bb3a74 -SIZE (cabal/mempack-0.1.1.0/revision/1.cabal) = 3262 +SHA256 (cabal/mempack-0.1.1.0/revision/2.cabal) = ea2b2984e8881a7f45cb24b45c409185f7e32bc09837d11666e80d4dc6500965 +SIZE (cabal/mempack-0.1.1.0/revision/2.cabal) = 3270 SHA256 (cabal/microlens-0.4.13.1/microlens-0.4.13.1.tar.gz) = 0a54abee8ff4f6aeb4bea0783409a3dbd28a4e7a892bac916b0fb6a71382d7fc SIZE (cabal/microlens-0.4.13.1/microlens-0.4.13.1.tar.gz) = 27436 SHA256 (cabal/microlens-0.4.13.1/revision/1.cabal) = fc256e2b5d78e8e4f39b3dd359c57b8c19df50853a86eaf8f154a17441a5a51d @@ -761,10 +757,6 @@ SHA256 (cabal/primes-0.2.1.0/primes-0.2.1.0.tar.gz) = 74d66558fb638ea4d31eae2fe1 SIZE (cabal/primes-0.2.1.0/primes-0.2.1.0.tar.gz) = 4602 SHA256 (cabal/primitive-0.9.1.0/primitive-0.9.1.0.tar.gz) = 44b4de41813c7bc5db8a57f87c3612a069b65086946268ba165097252ebd3d76 SIZE (cabal/primitive-0.9.1.0/primitive-0.9.1.0.tar.gz) = 61724 -SHA256 (cabal/process-1.6.25.0/process-1.6.25.0.tar.gz) = 496fe0566c3915b112e9772ac9c967dfeb8d5ca04895e54ae0160522bee76e65 -SIZE (cabal/process-1.6.25.0/process-1.6.25.0.tar.gz) = 100551 -SHA256 (cabal/process-1.6.25.0/revision/1.cabal) = 092ab61596e914d21983aa2e9206a74c4faa38a5a636446b5c954305821cb496 -SIZE (cabal/process-1.6.25.0/revision/1.cabal) = 2749 SHA256 (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a SIZE (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 28522 SHA256 (cabal/profunctors-5.6.2/revision/3.cabal) = e178ba4468982326656626e2089e296f64485e68fdddc9f4476dcd5d612b4f78 @@ -793,8 +785,8 @@ SHA256 (cabal/quiet-0.2/quiet-0.2.tar.gz) = 118bf67379dce4737619998380e399acba30 SIZE (cabal/quiet-0.2/quiet-0.2.tar.gz) = 4377 SHA256 (cabal/ral-0.2.2/ral-0.2.2.tar.gz) = 46c70ee0cae8625edf2aaf47ddcad9d582f5b3841b75b2dee4066156130d60b0 SIZE (cabal/ral-0.2.2/ral-0.2.2.tar.gz) = 21439 -SHA256 (cabal/ral-0.2.2/revision/1.cabal) = abcbf91621c891244a7f5f74a886ee2c88068f3ff551877a2a5af64eb4c26ec8 -SIZE (cabal/ral-0.2.2/revision/1.cabal) = 3539 +SHA256 (cabal/ral-0.2.2/revision/2.cabal) = b52967fc000cc2e907a0452c97bcc97703192d54c1a5512737e9ceb48a1f2ca8 +SIZE (cabal/ral-0.2.2/revision/2.cabal) = 3554 SHA256 (cabal/random-1.2.1.3/random-1.2.1.3.tar.gz) = e9c81926a7d1e40328f645f73592b31efc9c631589669a7f130687b9cc3051dc SIZE (cabal/random-1.2.1.3/random-1.2.1.3.tar.gz) = 47117 SHA256 (cabal/random-shuffle-0.0.4/random-shuffle-0.0.4.tar.gz) = 52704411f040fd0bf2361dad162e35dc13caa6535b2e4908d3513c00a95d0615 @@ -843,8 +835,8 @@ SHA256 (cabal/scientific-0.3.8.0/scientific-0.3.8.0.tar.gz) = 13b343bca8aa26d771 SIZE (cabal/scientific-0.3.8.0/scientific-0.3.8.0.tar.gz) = 24314 SHA256 (cabal/scientific-0.3.8.0/revision/2.cabal) = ba83a6701dd0110138443757aca4a42786afa94272b73045ef878fd860d1732e SIZE (cabal/scientific-0.3.8.0/revision/2.cabal) = 4397 -SHA256 (cabal/selective-0.5/selective-0.5.tar.gz) = b0fda80309a83d8f9eed9b8798b3c8c6626600154948323a8d80ab8e2c2f8da3 -SIZE (cabal/selective-0.5/selective-0.5.tar.gz) = 34055 +SHA256 (cabal/selective-0.7.0.1/selective-0.7.0.1.tar.gz) = dbfb4be71c7956f54e099c34ffe538dfaa99ed3911208df5828563da22b6aee3 +SIZE (cabal/selective-0.7.0.1/selective-0.7.0.1.tar.gz) = 36061 SHA256 (cabal/semialign-1.3.1/semialign-1.3.1.tar.gz) = 66e87bc254ffec2ee908bf625c42d3b7363238d6ab1cfba8934bbee7590c9df7 SIZE (cabal/semialign-1.3.1/semialign-1.3.1.tar.gz) = 10117 SHA256 (cabal/semialign-1.3.1/revision/2.cabal) = dfe515a9e43230f5308564a649a04ea1538499ed98b944644b77bed5394b9deb @@ -869,8 +861,8 @@ SHA256 (cabal/simple-sendfile-0.2.32/simple-sendfile-0.2.32.tar.gz) = 9f28d0a67a SIZE (cabal/simple-sendfile-0.2.32/simple-sendfile-0.2.32.tar.gz) = 343565 SHA256 (cabal/singletons-3.0.4/singletons-3.0.4.tar.gz) = 01334b3b8f1f7d8bc59e413756fa3bbca5f322fd326af7fac0f7c79d285a9d65 SIZE (cabal/singletons-3.0.4/singletons-3.0.4.tar.gz) = 41973 -SHA256 (cabal/singletons-th-3.2/singletons-th-3.2.tar.gz) = 775e084f4304e9aba82642da37d3e9111dade2eff2603538a70661ce134c95e4 -SIZE (cabal/singletons-th-3.2/singletons-th-3.2.tar.gz) = 99302 +SHA256 (cabal/singletons-th-3.3/singletons-th-3.3.tar.gz) = 1b0b456b9ff08638500ea90ad02e5fbeb3b0fca4a192deb1eabc0ed2dd333b8c +SIZE (cabal/singletons-th-3.3/singletons-th-3.3.tar.gz) = 109791 SHA256 (cabal/size-based-0.1.3.3/size-based-0.1.3.3.tar.gz) = 2fe4ea0c7fb7f83819c2075bfed933c569ce85e64664084faa30ed537c0c83f5 SIZE (cabal/size-based-0.1.3.3/size-based-0.1.3.3.tar.gz) = 10708 SHA256 (cabal/size-based-0.1.3.3/revision/1.cabal) = ea75ae5b1053894d08ad51fe80c7379e2f997e3cddc40fb0e2d22a41a690b845 @@ -979,16 +971,16 @@ SHA256 (cabal/text-zipper-0.13/text-zipper-0.13.tar.gz) = 06521cc7c435f8e85aeb3e SIZE (cabal/text-zipper-0.13/text-zipper-0.13.tar.gz) = 9698 SHA256 (cabal/tf-random-0.5/tf-random-0.5.tar.gz) = 2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510 SIZE (cabal/tf-random-0.5/tf-random-0.5.tar.gz) = 18483 -SHA256 (cabal/th-abstraction-0.6.0.0/th-abstraction-0.6.0.0.tar.gz) = 69ea6eca1f0c00b6e1e1f8329c908ec76e73855e2ce6e91ace2f8bbf92c51a30 -SIZE (cabal/th-abstraction-0.6.0.0/th-abstraction-0.6.0.0.tar.gz) = 43152 -SHA256 (cabal/th-abstraction-0.6.0.0/revision/2.cabal) = 313760d630851a0eba6bdcb1a1eb543c4c9c583072d704067fa3248a5252a8ae -SIZE (cabal/th-abstraction-0.6.0.0/revision/2.cabal) = 2303 +SHA256 (cabal/th-abstraction-0.7.1.0/th-abstraction-0.7.1.0.tar.gz) = f9b6184aba4c6b61dd0d96f7dad41a4c9db0a01d3cdbf993a7d860488f1c04c5 +SIZE (cabal/th-abstraction-0.7.1.0/th-abstraction-0.7.1.0.tar.gz) = 45428 +SHA256 (cabal/th-abstraction-0.7.1.0/revision/1.cabal) = 3011403d85b0070630e33d66b9370535ccd1e0e672ae58f847550b2b15bb4fd8 +SIZE (cabal/th-abstraction-0.7.1.0/revision/1.cabal) = 2268 SHA256 (cabal/th-compat-0.1.6/th-compat-0.1.6.tar.gz) = b781a0c059872bc95406d00e98f6fa7d9e81e744730f75186583cb4dcea0a4eb SIZE (cabal/th-compat-0.1.6/th-compat-0.1.6.tar.gz) = 14622 -SHA256 (cabal/th-desugar-1.15/th-desugar-1.15.tar.gz) = 179e2cddabb1af642d08e304fa24f4910ad42aae10095961a47d0c916e5ffe98 -SIZE (cabal/th-desugar-1.15/th-desugar-1.15.tar.gz) = 98298 -SHA256 (cabal/th-desugar-1.15/revision/1.cabal) = 32a5054fe3c24b5b09690482fb133311415078193df060d26825952b5278f1d6 -SIZE (cabal/th-desugar-1.15/revision/1.cabal) = 3755 +SHA256 (cabal/th-desugar-1.16/th-desugar-1.16.tar.gz) = 4ecb87e0d361278c40a62410cdb5580029ecd630cfd2c619ce41812518868210 +SIZE (cabal/th-desugar-1.16/th-desugar-1.16.tar.gz) = 103239 +SHA256 (cabal/th-desugar-1.16/revision/1.cabal) = f163f1d023130c33b4c0a3b7f59b6b32214a63b1198680278b707de9d78c12a3 +SIZE (cabal/th-desugar-1.16/revision/1.cabal) = 3864 SHA256 (cabal/th-env-0.1.1/th-env-0.1.1.tar.gz) = fc01b166df6ba45f6ce157165eb786da208dbab41252fd81134f8ba02cf3f505 SIZE (cabal/th-env-0.1.1/th-env-0.1.1.tar.gz) = 2724 SHA256 (cabal/th-expand-syns-0.4.12.0/th-expand-syns-0.4.12.0.tar.gz) = 18e19967329c89f376cfc9ec04bd7871854ce0c70f803a1af15532be00c6ef0f @@ -1025,6 +1017,8 @@ SHA256 (cabal/transformers-except-0.1.4/revision/1.cabal) = 3ce3fd4deb67beebfd35 SIZE (cabal/transformers-except-0.1.4/revision/1.cabal) = 1175 SHA256 (cabal/tree-diff-0.3.4/tree-diff-0.3.4.tar.gz) = 5e9ae804207df625cf28385937a35152b12605dd4ed350c447c92db054f60e3b SIZE (cabal/tree-diff-0.3.4/tree-diff-0.3.4.tar.gz) = 26431 +SHA256 (cabal/tree-diff-0.3.4/revision/1.cabal) = 20d4d57fb8d964a4a25b5811f57a021d7dc3b42d4bd95a0fdf67dcff495f06db +SIZE (cabal/tree-diff-0.3.4/revision/1.cabal) = 4483 SHA256 (cabal/typed-process-0.2.13.0/typed-process-0.2.13.0.tar.gz) = 9400966013b541df2e54ac8d57c3a670fc28bde2be87767ce98f13bbe2aa43a0 SIZE (cabal/typed-process-0.2.13.0/typed-process-0.2.13.0.tar.gz) = 19160 SHA256 (cabal/typed-protocols-0.3.0.0.tar.gz) = 29c1a5ecda028fb6e73990fcc42a17f9c05deefc58110ebaf8284bc57509de8b @@ -1043,10 +1037,6 @@ SHA256 (cabal/universe-base-1.1.4/universe-base-1.1.4.tar.gz) = aee5589f372927dc SIZE (cabal/universe-base-1.1.4/universe-base-1.1.4.tar.gz) = 9986 SHA256 (cabal/universe-base-1.1.4/revision/1.cabal) = 8a203a5cda5a7eac7985f4719e2c4ffb94fe57f45b1d210826cfb027b4a87d12 SIZE (cabal/universe-base-1.1.4/revision/1.cabal) = 2261 -SHA256 (cabal/unix-2.8.6.0/unix-2.8.6.0.tar.gz) = 8117599bb3e4aa1d4656710afbc85aef2a75483eddfac5338f8cc88fb505eea2 -SIZE (cabal/unix-2.8.6.0/unix-2.8.6.0.tar.gz) = 184419 -SHA256 (cabal/unix-2.8.6.0/revision/1.cabal) = 5b7f8afd7a879c3c8c3c636fd3c7543cdd5e0b514b7da90e76907ccd11434031 -SIZE (cabal/unix-2.8.6.0/revision/1.cabal) = 10177 SHA256 (cabal/unix-bytestring-0.4.0.3/unix-bytestring-0.4.0.3.tar.gz) = 548ccdc28092796c16710cb1223d0eb590fad5542f986db870bac87460c3b678 SIZE (cabal/unix-bytestring-0.4.0.3/unix-bytestring-0.4.0.3.tar.gz) = 15706 SHA256 (cabal/unix-compat-0.7.4/unix-compat-0.7.4.tar.gz) = 689b3a960c8fe12910554aa5b739d5c4769c1d180ade20402fde2ed49db7eff4 @@ -1073,8 +1063,10 @@ SHA256 (cabal/validation-1.1.3/validation-1.1.3.tar.gz) = 7b41e914cdca32a4e17667 SIZE (cabal/validation-1.1.3/validation-1.1.3.tar.gz) = 7761 SHA256 (cabal/validation-1.1.3/revision/1.cabal) = 3fdc553ee28ec1c954e5658cf0476b4c0b0fcff408c79343a2e580953dd2b952 SIZE (cabal/validation-1.1.3/revision/1.cabal) = 3699 -SHA256 (cabal/validation-selective-0.2.0.0.0.0.0.0.1.tar.gz) = d1f97b6600455009e0a5c72b5e578875d241ab5960f79997be2f45931df94f57 -SIZE (cabal/validation-selective-0.2.0.0.0.0.0.0.1.tar.gz) = 22371 +SHA256 (cabal/validation-selective-0.2.0.0/validation-selective-0.2.0.0.tar.gz) = 9a884e97e6a64f2cacadec8d5ea7e8ba7562d0c8fa9ab7cd5c34055eaec64987 +SIZE (cabal/validation-selective-0.2.0.0/validation-selective-0.2.0.0.tar.gz) = 22397 +SHA256 (cabal/validation-selective-0.2.0.0/revision/5.cabal) = 3fb7836ae5c8be1b41a69f31944c3a8dcf1b8d934ceb68b4989bc55aaad39316 +SIZE (cabal/validation-selective-0.2.0.0/revision/5.cabal) = 3917 SHA256 (cabal/validity-0.12.1.0/validity-0.12.1.0.tar.gz) = e28a560939523ae649b94140a3412ad253ce2d969b509dfad76186bc94c2a6df SIZE (cabal/validity-0.12.1.0/validity-0.12.1.0.tar.gz) = 9483 SHA256 (cabal/vary-0.1.1.2/vary-0.1.1.2.tar.gz) = ddf397bced603525ebabe415677f8e84a7cc638e9979f915cd72415ab3a0d1ea diff --git a/sysutils/cpu-microcode-intel/Makefile b/sysutils/cpu-microcode-intel/Makefile index 302a7aebcbb2..c4b237324972 100644 --- a/sysutils/cpu-microcode-intel/Makefile +++ b/sysutils/cpu-microcode-intel/Makefile @@ -1,6 +1,6 @@ PORTNAME= microcode DISTVERSIONPREFIX= microcode- -DISTVERSION= 20250211 +DISTVERSION= 20250512 CATEGORIES= sysutils PKGNAMEPREFIX= cpu- PKGNAMESUFFIX= -intel diff --git a/sysutils/cpu-microcode-intel/distinfo b/sysutils/cpu-microcode-intel/distinfo index cca1cc4aee90..0a4f61d248ad 100644 --- a/sysutils/cpu-microcode-intel/distinfo +++ b/sysutils/cpu-microcode-intel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1739373225 -SHA256 (intel-Intel-Linux-Processor-Microcode-Data-Files-microcode-20250211_GH0.tar.gz) = 1da88b51953c9da2e20b5c94b3d7270cf87ea5babcaa56e3d6a5c9eaf11694b3 -SIZE (intel-Intel-Linux-Processor-Microcode-Data-Files-microcode-20250211_GH0.tar.gz) = 11844354 +TIMESTAMP = 1747074761 +SHA256 (intel-Intel-Linux-Processor-Microcode-Data-Files-microcode-20250512_GH0.tar.gz) = 041af7d2f5791a47c1e914abd7d6255de4d4fc61b0f8e49ada6ee7014bcc3614 +SIZE (intel-Intel-Linux-Processor-Microcode-Data-Files-microcode-20250512_GH0.tar.gz) = 14985022 diff --git a/sysutils/cpu-microcode-intel/pkg-plist b/sysutils/cpu-microcode-intel/pkg-plist index 199eb1b0c6a7..982ddb37840b 100644 --- a/sysutils/cpu-microcode-intel/pkg-plist +++ b/sysutils/cpu-microcode-intel/pkg-plist @@ -121,7 +121,6 @@ %%SPLIT%%%%DATADIR%%/06-55-03.97 %%SPLIT%%%%DATADIR%%/06-55-04.b7 %%SPLIT%%%%DATADIR%%/06-55-05.b7 -%%SPLIT%%%%DATADIR%%/06-55-06.bf %%SPLIT%%%%DATADIR%%/06-55-07.bf %%SPLIT%%%%DATADIR%%/06-55-0b.bf %%SPLIT%%%%DATADIR%%/06-56-02.10 @@ -168,10 +167,15 @@ %%SPLIT%%%%DATADIR%%/06-a6-01.80 %%SPLIT%%%%DATADIR%%/06-a7-01.02 %%SPLIT%%%%DATADIR%%/06-aa-04.e6 +%%SPLIT%%%%DATADIR%%/06-ad-01.20 +%%SPLIT%%%%DATADIR%%/06-ad-01.95 %%SPLIT%%%%DATADIR%%/06-af-03.01 +%%SPLIT%%%%DATADIR%%/06-b5-00.80 %%SPLIT%%%%DATADIR%%/06-b7-01.32 %%SPLIT%%%%DATADIR%%/06-ba-02.e0 +%%SPLIT%%%%DATADIR%%/06-bd-01.80 %%SPLIT%%%%DATADIR%%/06-be-00.19 +%%SPLIT%%%%DATADIR%%/06-c6-02.82 %%SPLIT%%%%DATADIR%%/06-cf-02.87 %%SPLIT%%%%DATADIR%%/0f-00-07.01 %%SPLIT%%%%DATADIR%%/0f-00-07.02 diff --git a/sysutils/cpupdate/Makefile b/sysutils/cpupdate/Makefile index 9e37d8fdd51e..2af68aa68019 100644 --- a/sysutils/cpupdate/Makefile +++ b/sysutils/cpupdate/Makefile @@ -1,6 +1,6 @@ PORTNAME= cpupdate DISTVERSION= g20180513 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= sysutils MAINTAINER= eugen@FreeBSD.org @@ -34,10 +34,10 @@ GH_TAGNAME= 48e42d5 PLIST_FILES= sbin/${PORTNAME} share/man/man8/${PORTNAME}.8.gz -# MCE DB r312 +# MCE DB r332 CPM_ACCOUNT= platomav CPM_PROJECT= CPUMicrocodes -CPM_TAGNAME= 7d439dd +CPM_TAGNAME= 2bcc2d8 OPTIONS_DEFINE= CPM INTEL CPM_DESC= Download platomav/CPUMicrocodes collection @@ -48,7 +48,7 @@ CPM_PACK?= ${CPM_ACCOUNT}-${CPM_PROJECT}-${CPM_TAGNAME}_GH0.tar.gz CPM_DIR= ${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME} CPM_DATADIR= ${DATADIR}/CPUMicrocodes/secondary/Intel -INTEL_PACK= microcode-20241112 +INTEL_PACK= microcode-20250512 INTEL_DESC= Download Intel microcode pack ${INTEL_PACK} INTEL_PROJECT= Intel-Linux-Processor-Microcode-Data-Files INTEL_MASTER_SITES= https://codeload.github.com/intel/${INTEL_PROJECT}/tar.gz/:intel diff --git a/sysutils/cpupdate/distinfo b/sysutils/cpupdate/distinfo index 0b439b7030aa..6471c007a185 100644 --- a/sysutils/cpupdate/distinfo +++ b/sysutils/cpupdate/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1731442370 -SHA256 (microcode-20241112) = 37246208ef68039be752438c72400a688a2238df13a7f5282497c80be2d8366d -SIZE (microcode-20241112) = 12923653 +TIMESTAMP = 1747230739 +SHA256 (microcode-20250512) = 041af7d2f5791a47c1e914abd7d6255de4d4fc61b0f8e49ada6ee7014bcc3614 +SIZE (microcode-20250512) = 14985022 SHA256 (kernschmelze-cpupdate-g20180513-48e42d5_GH0.tar.gz) = d28582fe7edfb57da99fb2466417033ee619c32de9c6b5f1a5fae7d9be8253da SIZE (kernschmelze-cpupdate-g20180513-48e42d5_GH0.tar.gz) = 4566722 -SHA256 (platomav-CPUMicrocodes-7d439dd_GH0.tar.gz) = 0f1bbd9f14d9ae385a640c84e58e353cf644192e0c22dbd60ad20a58e9375b51 -SIZE (platomav-CPUMicrocodes-7d439dd_GH0.tar.gz) = 27372480 +SHA256 (platomav-CPUMicrocodes-2bcc2d8_GH0.tar.gz) = 85cc2c012cae9bc1916fb70652cd05d616cd08eb35969cbc19e29ed5f5a7fba1 +SIZE (platomav-CPUMicrocodes-2bcc2d8_GH0.tar.gz) = 31583994 diff --git a/sysutils/eksctl/Makefile b/sysutils/eksctl/Makefile index af0e8ce8ee4e..b95da44a879c 100644 --- a/sysutils/eksctl/Makefile +++ b/sysutils/eksctl/Makefile @@ -1,5 +1,5 @@ PORTNAME= eksctl -PORTVERSION= 0.207.0 +PORTVERSION= 0.208.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -17,7 +17,7 @@ PLIST_FILES= bin/${PORTNAME} GO_MODULE= github.com/eksctl-io/${PORTNAME} GO_TARGET= ./cmd/${PORTNAME} -GO_BUILDFLAGS= -ldflags="-X github.com/weaveworks/eksctl/pkg/version.gitCommit=87e1d6e6eabc \ +GO_BUILDFLAGS= -ldflags="-X github.com/weaveworks/eksctl/pkg/version.gitCommit=bcdd6ecb06ba \ -X github.com/weaveworks/eksctl/pkg/version.buildDate=$$(date +%Y-%m-%dT%H:%M:%SZ)" .include <bsd.port.mk> diff --git a/sysutils/eksctl/distinfo b/sysutils/eksctl/distinfo index 2967d2017be6..c3923f220ec9 100644 --- a/sysutils/eksctl/distinfo +++ b/sysutils/eksctl/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1743802961 -SHA256 (go/sysutils_eksctl/eksctl-v0.207.0/v0.207.0.mod) = 3cd6a460d0bb2ccffc8e7165f1418e4a2dbc2eb5b1c70f1be88e656d2aae6c06 -SIZE (go/sysutils_eksctl/eksctl-v0.207.0/v0.207.0.mod) = 24577 -SHA256 (go/sysutils_eksctl/eksctl-v0.207.0/v0.207.0.zip) = 8865f8c3a0f256ad9b19fa63dd13bd7f98904c0de878a1a4c1928f1ef84a12f4 -SIZE (go/sysutils_eksctl/eksctl-v0.207.0/v0.207.0.zip) = 13751745 +TIMESTAMP = 1747339882 +SHA256 (go/sysutils_eksctl/eksctl-v0.208.0/v0.208.0.mod) = 45258565727b1e20400216f9cc485c5d8f90ed79f3686bd827f6fab5e5d3a23c +SIZE (go/sysutils_eksctl/eksctl-v0.208.0/v0.208.0.mod) = 24577 +SHA256 (go/sysutils_eksctl/eksctl-v0.208.0/v0.208.0.zip) = 90b3474a4b99bc3e058756a9bcc816ddc365e2a7e954ee53ee31fca3c737132e +SIZE (go/sysutils_eksctl/eksctl-v0.208.0/v0.208.0.zip) = 13758328 diff --git a/sysutils/fastfetch/Makefile b/sysutils/fastfetch/Makefile index 40a4c934ec25..da85017f7c06 100644 --- a/sysutils/fastfetch/Makefile +++ b/sysutils/fastfetch/Makefile @@ -1,5 +1,5 @@ PORTNAME= fastfetch -DISTVERSION= 2.42.0 +DISTVERSION= 2.43.0 CATEGORIES= sysutils MAINTAINER= pkubaj@FreeBSD.org diff --git a/sysutils/fastfetch/distinfo b/sysutils/fastfetch/distinfo index 4806dc109aef..186f86ab9e81 100644 --- a/sysutils/fastfetch/distinfo +++ b/sysutils/fastfetch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745925528 -SHA256 (fastfetch-cli-fastfetch-2.42.0_GH0.tar.gz) = 9f94fdbe0642b2402517bba2fff4dd31099649d4e066f4c39b5b728cc3627f01 -SIZE (fastfetch-cli-fastfetch-2.42.0_GH0.tar.gz) = 1282221 +TIMESTAMP = 1747220428 +SHA256 (fastfetch-cli-fastfetch-2.43.0_GH0.tar.gz) = 192ddb57d021436d93ed8ad1fadaaeef20ce59a2296f31af65e12978b48feda5 +SIZE (fastfetch-cli-fastfetch-2.43.0_GH0.tar.gz) = 1301605 diff --git a/sysutils/fluent-bit/Makefile b/sysutils/fluent-bit/Makefile index 8f4c7be879eb..51514141edf4 100644 --- a/sysutils/fluent-bit/Makefile +++ b/sysutils/fluent-bit/Makefile @@ -1,6 +1,6 @@ PORTNAME= fluent-bit DISTVERSIONPREFIX= v -DISTVERSION= 4.0.1 +DISTVERSION= 4.0.2 CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org diff --git a/sysutils/fluent-bit/distinfo b/sysutils/fluent-bit/distinfo index 8897456be540..4d8eac98534e 100644 --- a/sysutils/fluent-bit/distinfo +++ b/sysutils/fluent-bit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745517768 -SHA256 (fluent-fluent-bit-v4.0.1_GH0.tar.gz) = 9efbc1ef6fb6d2c63f218c01c6c2323f3e1cdc336b815277a5b0f9f2e1acb052 -SIZE (fluent-fluent-bit-v4.0.1_GH0.tar.gz) = 32928399 +TIMESTAMP = 1747301106 +SHA256 (fluent-fluent-bit-v4.0.2_GH0.tar.gz) = aa0577ba7251081c8d5398b2a905b5b0585bb657ca13b39a5e12931437516f08 +SIZE (fluent-fluent-bit-v4.0.2_GH0.tar.gz) = 32926587 diff --git a/sysutils/hs-cputype/Makefile b/sysutils/hs-cputype/Makefile index 313bb32d61eb..72fcf90d4233 100644 --- a/sysutils/hs-cputype/Makefile +++ b/sysutils/hs-cputype/Makefile @@ -1,6 +1,6 @@ PORTNAME= cputype PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils haskell MAINTAINER= arrowd@FreeBSD.org @@ -16,16 +16,18 @@ GL_SITE= https://foss.heptapod.net GL_ACCOUNT= bsdutils GL_TAGNAME= ae3a01cc39547e6e014e40bd7c2cc0f6810ec616 -USE_CABAL= ansi-terminal-1.0 \ - ansi-terminal-types-0.11.5_1 \ - ansi-wl-pprint-0.6.9_4 \ - attoparsec-0.14.4_3 \ +USE_CABAL= ansi-terminal-1.1.2 \ + ansi-terminal-types-1.1 \ + attoparsec-0.14.4_6 \ colour-2.3.6 \ - hashable-1.4.2.0_1 \ - integer-logarithms-1.0.3.1_4 \ - optparse-applicative-0.17.0.0 \ - primitive-0.8.0.0 \ - scientific-0.3.7.0_5 \ + hashable-1.5.0.0_1 \ + integer-logarithms-1.0.4 \ + optparse-applicative-0.18.1.0_1 \ + os-string-2.0.7 \ + prettyprinter-1.7.1 \ + prettyprinter-ansi-terminal-1.1.3 \ + primitive-0.9.1.0 \ + scientific-0.3.8.0_2 \ transformers-compat-0.7.2 .include <bsd.port.mk> diff --git a/sysutils/hs-cputype/distinfo b/sysutils/hs-cputype/distinfo index b207d548d69e..229ab8c089cb 100644 --- a/sysutils/hs-cputype/distinfo +++ b/sysutils/hs-cputype/distinfo @@ -1,36 +1,36 @@ -TIMESTAMP = 1684493499 -SHA256 (cabal/ansi-terminal-1.0/ansi-terminal-1.0.tar.gz) = 0798a98f79189e62b5ff0aa247ba95fc3845f0f6f1e14ecceb37facfbdd5cfc9 -SIZE (cabal/ansi-terminal-1.0/ansi-terminal-1.0.tar.gz) = 31745 -SHA256 (cabal/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz) = bf7b230389f43105100a6d5740822598a88b38eaaf7d042de595ccf72db4fdd1 -SIZE (cabal/ansi-terminal-types-0.11.5/ansi-terminal-types-0.11.5.tar.gz) = 4660 -SHA256 (cabal/ansi-terminal-types-0.11.5/revision/1.cabal) = f78440dfd95c4509e88855ac7cc2d9566ddf956a92c1290404cac93ad1a1b00a -SIZE (cabal/ansi-terminal-types-0.11.5/revision/1.cabal) = 1482 -SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac -SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723 -SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/4.cabal) = fb737bc96e2aef34ad595d54ced7a73f648c521ebcb00fe0679aff45ccd49212 -SIZE (cabal/ansi-wl-pprint-0.6.9/revision/4.cabal) = 2448 +TIMESTAMP = 1747066982 +SHA256 (cabal/ansi-terminal-1.1.2/ansi-terminal-1.1.2.tar.gz) = a8d04a3e0451e22a6499a92311f0df1196dc65b687df7d10e3f30d92420156b0 +SIZE (cabal/ansi-terminal-1.1.2/ansi-terminal-1.1.2.tar.gz) = 36259 +SHA256 (cabal/ansi-terminal-types-1.1/ansi-terminal-types-1.1.tar.gz) = f2e5333eb78da5f4dd330fca0c81a59276cc150c625647cd20f57b7f297a5d25 +SIZE (cabal/ansi-terminal-types-1.1/ansi-terminal-types-1.1.tar.gz) = 4746 SHA256 (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c SIZE (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 160701 -SHA256 (cabal/attoparsec-0.14.4/revision/3.cabal) = 50475b722305175f57a3ee3dbaee10aa4b91f61c9717b85b718a7df37c223fb2 -SIZE (cabal/attoparsec-0.14.4/revision/3.cabal) = 5679 +SHA256 (cabal/attoparsec-0.14.4/revision/6.cabal) = 35129d0ab1741f000f1a7d2fc839544919ee6fbb8f2d6e7f0a629c41f91035f3 +SIZE (cabal/attoparsec-0.14.4/revision/6.cabal) = 5914 SHA256 (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 2cd35dcd6944a5abc9f108a5eb5ee564b6b1fa98a9ec79cefcc20b588991f871 SIZE (cabal/colour-2.3.6/colour-2.3.6.tar.gz) = 20675 -SHA256 (cabal/hashable-1.4.2.0/hashable-1.4.2.0.tar.gz) = 1b4000ea82b81f69d46d0af4152c10c6303873510738e24cfc4767760d30e3f8 -SIZE (cabal/hashable-1.4.2.0/hashable-1.4.2.0.tar.gz) = 25094 -SHA256 (cabal/hashable-1.4.2.0/revision/1.cabal) = 585792335d5541dba78fa8dfcb291a89cd5812a281825ff7a44afa296ab5d58a -SIZE (cabal/hashable-1.4.2.0/revision/1.cabal) = 4520 -SHA256 (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f -SIZE (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9023 -SHA256 (cabal/integer-logarithms-1.0.3.1/revision/4.cabal) = 336fb40c3af19a59dbeb4e5b7bffe4b4c7fa04ab06006a8d4b70b1febc1bb4ca -SIZE (cabal/integer-logarithms-1.0.3.1/revision/4.cabal) = 3262 -SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724 -SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409 -SHA256 (cabal/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz) = 5553c21b4a789f9b591eed69e598cc58484c274af29250e517b5a8bcc62b995f -SIZE (cabal/primitive-0.8.0.0/primitive-0.8.0.0.tar.gz) = 57222 -SHA256 (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = a3a121c4b3d68fb8b9f8c709ab012e48f090ed553609247a805ad070d6b343a9 -SIZE (cabal/scientific-0.3.7.0/scientific-0.3.7.0.tar.gz) = 24723 -SHA256 (cabal/scientific-0.3.7.0/revision/5.cabal) = 26d8109106963a345368011081453d25ee1dfa6afae2b1f57b426b4bcd392d91 -SIZE (cabal/scientific-0.3.7.0/revision/5.cabal) = 4854 +SHA256 (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = e58b3a8e18da5f6cd7e937e5fd683e500bb1f8276b3768269759119ca0cddb6a +SIZE (cabal/hashable-1.5.0.0/hashable-1.5.0.0.tar.gz) = 89062 +SHA256 (cabal/hashable-1.5.0.0/revision/1.cabal) = 2f23146cbe0325029927b221647695a4c7d6e97548ff731110979e34361f58ef +SIZE (cabal/hashable-1.5.0.0/revision/1.cabal) = 5914 +SHA256 (cabal/integer-logarithms-1.0.4/integer-logarithms-1.0.4.tar.gz) = 6a93c76c2518cbe2d72ab17da6ae46d8cae93cbfb7c5a5ad5783f903c1448f45 +SIZE (cabal/integer-logarithms-1.0.4/integer-logarithms-1.0.4.tar.gz) = 8948 +SHA256 (cabal/optparse-applicative-0.18.1.0/optparse-applicative-0.18.1.0.tar.gz) = 63811ab4fd26e829b8868364325a88be3acc79819f5bb5005b2dd3b961ecc491 +SIZE (cabal/optparse-applicative-0.18.1.0/optparse-applicative-0.18.1.0.tar.gz) = 60682 +SHA256 (cabal/optparse-applicative-0.18.1.0/revision/1.cabal) = f30973861ac7e7ebff05ff8c7c3d1e4d283a1f3850e1cc14106b0693ec1b6d82 +SIZE (cabal/optparse-applicative-0.18.1.0/revision/1.cabal) = 5289 +SHA256 (cabal/os-string-2.0.7/os-string-2.0.7.tar.gz) = 339c35fd3a290522f23de4e33528423cfd0b0a8f22946b0b9816a817b926cba0 +SIZE (cabal/os-string-2.0.7/os-string-2.0.7.tar.gz) = 44683 +SHA256 (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 5e6ea6903114fa118fcc359633dfb7ecddecb92c06c853d02a77b72b251f0b45 +SIZE (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 56907 +SHA256 (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 813739308ad6050620578994effe21058a170a341716acf52573fae42b5b1db3 +SIZE (cabal/prettyprinter-ansi-terminal-1.1.3/prettyprinter-ansi-terminal-1.1.3.tar.gz) = 8879 +SHA256 (cabal/primitive-0.9.1.0/primitive-0.9.1.0.tar.gz) = 44b4de41813c7bc5db8a57f87c3612a069b65086946268ba165097252ebd3d76 +SIZE (cabal/primitive-0.9.1.0/primitive-0.9.1.0.tar.gz) = 61724 +SHA256 (cabal/scientific-0.3.8.0/scientific-0.3.8.0.tar.gz) = 13b343bca8aa26d7718e52e622e5a118056653edafcbc7ccc5333be7217218cf +SIZE (cabal/scientific-0.3.8.0/scientific-0.3.8.0.tar.gz) = 24314 +SHA256 (cabal/scientific-0.3.8.0/revision/2.cabal) = ba83a6701dd0110138443757aca4a42786afa94272b73045ef878fd860d1732e +SIZE (cabal/scientific-0.3.8.0/revision/2.cabal) = 4397 SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c7304c9f3cbc9463d0739aa85cb9489f217ea092b9d625d417514fbcc9d6a SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485 SHA256 (cabal/bsdutils-cputype-ae3a01cc39547e6e014e40bd7c2cc0f6810ec616_GL0.tar.gz) = 21ec37441fba9f0b661074e57adccc69096bfce56a81f77ccea1684f00ccc00e diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile index 259401ffafee..1f1d40910041 100644 --- a/sysutils/ipmitool/Makefile +++ b/sysutils/ipmitool/Makefile @@ -1,6 +1,6 @@ PORTNAME= ipmitool PORTVERSION= 1.8.19 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= https://codeberg.org/IPMITool/${PORTNAME}/archive/:ipmi \ LOCAL/zi/:iana diff --git a/sysutils/ipmitool/files/patch-buffer-overrun-PR24 b/sysutils/ipmitool/files/patch-buffer-overrun-PR24 new file mode 100644 index 000000000000..21369ef063a1 --- /dev/null +++ b/sysutils/ipmitool/files/patch-buffer-overrun-PR24 @@ -0,0 +1,33 @@ +From b4bc5c335159b1c272e06dba98e2916e3ecc0462 Mon Sep 17 00:00:00 2001 +From: Howitzer105mm <howitzer105mm@noreply.codeberg.org> +Date: Tue, 26 Mar 2024 11:28:16 +0000 +Subject: [PATCH] open: Eliminate buffer overrun (#24) + +clangd reports a buffer overrun issue in `open` interface. + +The sprintf() used to fill ipmi_devfs2 requires 17 bytes to store the +null terminated string. The character buffer is only 16 bytes in +length. + +Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com> +Reviewed-on: https://codeberg.org/IPMITool/ipmitool/pulls/24 +Reviewed-by: Alexander Amelkin <alexander@amelkin.msk.ru> +Co-authored-by: Howitzer105mm <howitzer105mm@noreply.codeberg.org> +Co-committed-by: Howitzer105mm <howitzer105mm@noreply.codeberg.org> +--- + src/plugins/open/open.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/plugins/open/open.c src/plugins/open/open.c +index 39c8ea2..88cb6c3 100644 +--- src/plugins/open/open.c ++++ src/plugins/open/open.c +@@ -94,7 +94,7 @@ ipmi_openipmi_open(struct ipmi_intf *intf) + { + char ipmi_dev[16]; + char ipmi_devfs[16]; +- char ipmi_devfs2[16]; ++ char ipmi_devfs2[17]; + int devnum = 0; + + devnum = intf->devnum; diff --git a/sysutils/ipmitool/files/patch-dcmi b/sysutils/ipmitool/files/patch-dcmi new file mode 100644 index 000000000000..0fc588c31360 --- /dev/null +++ b/sysutils/ipmitool/files/patch-dcmi @@ -0,0 +1,57 @@ +From ab5ce5baff097ebb6e2a17a171858be213ee68d3 Mon Sep 17 00:00:00 2001 +From: Thang Tran <thuutran@amperecomputing.com> +Date: Tue, 11 Jul 2023 17:27:12 +0700 +Subject: [PATCH] dcmi: update parameters to read temperature sensors + +Issue: +When the system has number of CPU temperature sensors more than 8, +"ipmitool dcmi get_temp_reading" can not show all of sensors. + +Root cause: +To request to read multiple sensors for each message, ipmitool has to +send "Get Temperature Readings" command with the "Entity Instance" always +0 and the "Entity Instance Start" as the offset. But the current code is +sending "Entity Instance" is offset and "Entity Instance Start" always is +0. It makes ipmitool only read 1 sensor each time. Besides that, the +"Entity Instance Start" value starts from 1 (not 0), therefore, the +initialization has to be set to 1. + +Solution: +This commit corrects the order of parameters and the initialization of +"Entity Instance Start" byte. + +Resolves ipmitool/ipmitool#3 + +Tested: +1. Update BMC software to support 24 CPU temperature sensors +2. Request to read the temperature sensors +$ipmitool dcmi get_temp_reading +3. Display full 24 CPU temperature sensors. + +Signed-off-by: Thang Tran <thuutran@amperecomputing.com> +--- + lib/ipmi_dcmi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git lib/ipmi_dcmi.c lib/ipmi_dcmi.c +index 8ed87a9..8cf6d66 100644 +--- lib/ipmi_dcmi.c ++++ lib/ipmi_dcmi.c +@@ -1595,7 +1595,7 @@ ipmi_dcmi_prnt_get_temp_readings(struct ipmi_intf * intf) + continue; + } + /* Total number of available instances for the Entity ID */ +- offset = 0; ++ offset = 1; + tota_inst = rsp->data[1]; + while (tota_inst > 0) { + get_inst = ((tota_inst / DCMI_MAX_BYTE_TEMP_READ_SIZE) ? +@@ -1603,7 +1603,7 @@ ipmi_dcmi_prnt_get_temp_readings(struct ipmi_intf * intf) + (tota_inst % DCMI_MAX_BYTE_TEMP_READ_SIZE)); + rsp = ipmi_dcmi_get_temp_readings(intf, + dcmi_temp_read_vals[i].val, +- offset, 0); ++ 0, offset); + if (chk_rsp(rsp)) { + continue; + } diff --git a/sysutils/ipmitool/files/patch-fru-PR368 b/sysutils/ipmitool/files/patch-fru-PR368 new file mode 100644 index 000000000000..bdef578767ec --- /dev/null +++ b/sysutils/ipmitool/files/patch-fru-PR368 @@ -0,0 +1,296 @@ +From 81011685ea5e8897f8c0971eca5feb93c6880f09 Mon Sep 17 00:00:00 2001 +From: Andrew Liao <andrew8325@outlook.com> +Date: Fri, 23 Sep 2022 10:11:04 +0800 +Subject: [PATCH 1/2] fru: Update the fru section offset only when they exist + (offset is not 0) + +--- + lib/ipmi_fru.c | 52 ++++++++++++++++++++++++++++---------------------- + 1 file changed, 29 insertions(+), 23 deletions(-) + +diff --git lib/ipmi_fru.c lib/ipmi_fru.c +index 3d1d8a1a..a994f3cf 100644 +--- lib/ipmi_fru.c ++++ lib/ipmi_fru.c +@@ -5052,35 +5052,41 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId, + /* Chassis type field */ + if (f_type == 'c' ) + { +- printf("Moving Section Chassis, from %i to %i\n", +- ((header.offset.board) * 8), +- ((header.offset.board + change_size_by_8) * 8) +- ); +- memcpy( +- (fru_data_new + ((header.offset.board + change_size_by_8) * 8)), +- (fru_data_old + (header.offset.board) * 8), +- board_len +- ); +- header.offset.board += change_size_by_8; ++ if (header.offset.board != 0) { ++ printf("Moving Section Chassis, from %i to %i\n", ++ ((header.offset.board) * 8), ++ ((header.offset.board + change_size_by_8) * 8) ++ ); ++ memcpy( ++ (fru_data_new + ((header.offset.board + change_size_by_8) * 8)), ++ (fru_data_old + (header.offset.board) * 8), ++ board_len ++ ); ++ header.offset.board += change_size_by_8; ++ } + } + /* Board type field */ + if ((f_type == 'c' ) || (f_type == 'b' )) + { +- printf("Moving Section Product, from %i to %i\n", +- ((header.offset.product) * 8), +- ((header.offset.product + change_size_by_8) * 8) +- ); +- memcpy( +- (fru_data_new + ((header.offset.product + change_size_by_8) * 8)), +- (fru_data_old + (header.offset.product) * 8), +- product_len +- ); +- header.offset.product += change_size_by_8; ++ if (header.offset.product != 0) { ++ printf("Moving Section Product, from %i to %i\n", ++ ((header.offset.product) * 8), ++ ((header.offset.product + change_size_by_8) * 8) ++ ); ++ memcpy( ++ (fru_data_new + ((header.offset.product + change_size_by_8) * 8)), ++ (fru_data_old + (header.offset.product) * 8), ++ product_len ++ ); ++ header.offset.product += change_size_by_8; ++ } + } + +- if ((f_type == 'c' ) || (f_type == 'b' ) || (f_type == 'p' )) { +- printf("Change multi offset from %d to %d\n", header.offset.multi, header.offset.multi + change_size_by_8); +- header.offset.multi += change_size_by_8; ++ if (header.offset.multi != 0) { ++ if ((f_type == 'c' ) || (f_type == 'b' ) || (f_type == 'p' )) { ++ printf("Change multi offset from %d to %d\n", header.offset.multi, header.offset.multi + change_size_by_8); ++ header.offset.multi += change_size_by_8; ++ } + } + + /* Adjust length of the section */ + +From fe70e7d81334ba37614ca5cd0580b2a91a969fc1 Mon Sep 17 00:00:00 2001 +From: "Andrew.Liao" <andrew.liao@quantatw.com> +Date: Mon, 26 Sep 2022 17:16:52 +0800 +Subject: [PATCH 2/2] fru: Adjust the fru section by their offset order + +Originally, ipmitool will assume the FRU section offset will follow a specific order, but this is not true (or not be defined in IPMI FRU SPEC). So change the FRU edit method, now it will: + - Calculate the section offset one by one according to their offset + - Ignore the FRU section offset if its offset is 00 (area does not exist) + - If the new FRU become smaller, reset the redundant data to 0 +Fixes #364 +--- + lib/ipmi_fru.c | 151 +++++++++++++++++++++++++++++-------------------- + 1 file changed, 90 insertions(+), 61 deletions(-) + +diff --git lib/ipmi_fru.c lib/ipmi_fru.c +index a994f3cf..3bf8416d 100644 +--- lib/ipmi_fru.c ++++ lib/ipmi_fru.c +@@ -4889,7 +4889,7 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId, + struct fru_info fru, struct fru_header header, + uint8_t f_type, uint8_t f_index, char *f_string) + { +- int i = 0; ++ int i = 0, j; + uint8_t *fru_data_old = NULL; + uint8_t *fru_data_new = NULL; + uint8_t *fru_area = NULL; +@@ -4901,6 +4901,7 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId, + uint32_t counter; + unsigned char cksum; + int rc = 1; ++ char section_list[] = {'i', 'c', 'b', 'p', 'm'}; + + fru_data_old = calloc( fru.size, sizeof(uint8_t) ); + +@@ -5018,8 +5019,10 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId, + 5) Check if section must be resize. This occur when padding length is not between 0 and 7 */ + if( (padding_len < 0) || (padding_len >= 8)) + { +- uint32_t remaining_offset = ((header.offset.product * 8) + product_len); +- int change_size_by_8; ++ int change_size_by_8, section_len; ++ char *name; ++ uint8_t *section_offset_by_8; ++ uint8_t last_offset_by_8 = 0; + + if(padding_len >= 8) + { +@@ -5044,48 +5047,85 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId, + #endif + + /* Must move sections */ +- /* Section that can be modified are as follow +- Chassis +- Board +- product */ ++ /* The IPMI FRU SPEC doesn't define the sequence of each FRU area. ++ * Therefore we need to find out the affected section in this change based on ++ * their current offset and adjust each of them. ++ */ + +- /* Chassis type field */ +- if (f_type == 'c' ) +- { +- if (header.offset.board != 0) { +- printf("Moving Section Chassis, from %i to %i\n", +- ((header.offset.board) * 8), +- ((header.offset.board + change_size_by_8) * 8) +- ); +- memcpy( +- (fru_data_new + ((header.offset.board + change_size_by_8) * 8)), +- (fru_data_old + (header.offset.board) * 8), +- board_len +- ); +- header.offset.board += change_size_by_8; ++ /* Find out the section behind the edited section and adjust them */ ++ for (j = 0; j < sizeof(section_list); j++) { ++ section_offset_by_8 = NULL; ++ name = NULL; ++ ++ switch (section_list[j]) { ++ case 'i': ++ section_offset_by_8 = &header.offset.internal; ++ name = "Internal"; ++ break; ++ case 'c': ++ section_offset_by_8 = &header.offset.chassis; ++ name = "Chassis"; ++ break; ++ case 'b': ++ section_offset_by_8 = &header.offset.board; ++ name = "Board"; ++ break; ++ case 'p': ++ section_offset_by_8 = &header.offset.product; ++ name = "Product"; ++ break; ++ case 'm': ++ section_offset_by_8 = &header.offset.multi; ++ name = "MitiRecord"; ++ break; ++ default: ++ /* Should not go into here */ ++ break; + } +- } +- /* Board type field */ +- if ((f_type == 'c' ) || (f_type == 'b' )) +- { +- if (header.offset.product != 0) { +- printf("Moving Section Product, from %i to %i\n", +- ((header.offset.product) * 8), +- ((header.offset.product + change_size_by_8) * 8) ++ ++ /* Should never happened */ ++ if (section_offset_by_8 == NULL || name == NULL) { ++ continue; ++ } ++ ++ /* Ignore the section that doesn't exist */ ++ if (*section_offset_by_8 == 0) { ++ continue; ++ } ++ ++ /* Store the last offset in case we need to reset the last part */ ++ if (last_offset_by_8 < *section_offset_by_8) { ++ last_offset_by_8 = *section_offset_by_8; ++ } ++ ++ /* Adjust the section offset that locates behind the current edit section */ ++ if (*section_offset_by_8 > (header_offset / 8)) { ++ ++ /* Make sure the adjusted offset range is still inside the FRU field */ ++ section_len = *(fru_data_old + (*section_offset_by_8 * 8) + 1) * 8; ++ if (((*section_offset_by_8 * 8) + section_len + (change_size_by_8 * 8)) > fru.size) ++ { ++ /* Return error if oversize */ ++ printf("Internal error, section %s out of FRU field. %i > %i\n", ++ name, ++ ((*section_offset_by_8 * 8) + section_len + (change_size_by_8 * 8)), ++ fru.size); ++ rc = -1; ++ goto ipmi_fru_set_field_string_rebuild_out; ++ } ++ ++ /* Copy the section to adjusted offset */ ++ printf("Moving Section %s, from %i to %i\n", ++ name, ++ ((*section_offset_by_8) * 8), ++ ((*section_offset_by_8 + change_size_by_8) * 8) + ); + memcpy( +- (fru_data_new + ((header.offset.product + change_size_by_8) * 8)), +- (fru_data_old + (header.offset.product) * 8), +- product_len ++ (fru_data_new + ((*section_offset_by_8 + change_size_by_8) * 8)), ++ (fru_data_old + (*section_offset_by_8) * 8), ++ section_len + ); +- header.offset.product += change_size_by_8; +- } +- } +- +- if (header.offset.multi != 0) { +- if ((f_type == 'c' ) || (f_type == 'b' ) || (f_type == 'p' )) { +- printf("Change multi offset from %d to %d\n", header.offset.multi, header.offset.multi + change_size_by_8); +- header.offset.multi += change_size_by_8; ++ *section_offset_by_8 += change_size_by_8; + } + } + +@@ -5101,7 +5141,6 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId, + else if( f_type == 'p') + { + *(fru_data_new + product_offset + 1) += change_size_by_8; +- product_len_new = *(fru_data_new + product_offset + 1) * 8; + } + + /* Rebuild Header checksum */ +@@ -5116,26 +5155,16 @@ ipmi_fru_set_field_string_rebuild(struct ipmi_intf * intf, uint8_t fruId, + memcpy(fru_data_new, pfru_header, sizeof(struct fru_header)); + } + +- /* Move remaining sections in 1 copy */ +- printf("Moving Remaining Bytes (Multi-Rec , etc..), from %i to %i\n", +- remaining_offset, +- ((header.offset.product) * 8) + product_len_new +- ); +- if(((header.offset.product * 8) + product_len_new - remaining_offset) < 0) +- { +- memcpy( +- fru_data_new + (header.offset.product * 8) + product_len_new, +- fru_data_old + remaining_offset, +- fru.size - remaining_offset +- ); +- } +- else +- { +- memcpy( +- fru_data_new + (header.offset.product * 8) + product_len_new, +- fru_data_old + remaining_offset, +- fru.size - ((header.offset.product * 8) + product_len_new) +- ); ++ /* Reset the last part to 0 if the new FRU is smaller them old one */ ++ if (change_size_by_8 < 0) { ++ section_len = *(fru_data_old + (last_offset_by_8 * 8) + 1) * 8; ++ ++ /* Get the reset start offset and reset size */ ++ int reset_start = ((last_offset_by_8 * 8) + section_len + (change_size_by_8 * 8)); ++ int reset_size = (change_size_by_8 * (-1)) * 8; ++ ++ printf("Reset to 0 from %i to %i\n", reset_start, reset_start + reset_size); ++ memset(fru_data_new + reset_start, 0, reset_size); + } + } + diff --git a/sysutils/ipmitool/files/patch-lan-PR389 b/sysutils/ipmitool/files/patch-lan-PR389 new file mode 100644 index 000000000000..1684d43d5be4 --- /dev/null +++ b/sysutils/ipmitool/files/patch-lan-PR389 @@ -0,0 +1,33 @@ +From b293d87cac0183ca6872c450cb87d2dc873359a3 Mon Sep 17 00:00:00 2001 +From: Daniel Van Allen <dvanallen@google.com> +Date: Wed, 21 Dec 2022 14:38:47 -0500 +Subject: [PATCH] lanp: Fix error response from Unsupported Parameter lookup + +Return a pointer to the lan_param instead of NULL in the case when the +parameter is not supported. + +Resolves ipmitool/ipmitool#388 +Signed-off-by Daniel Van Allen <dvanallen@google.com> +--- + lib/ipmi_lanp.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git lib/ipmi_lanp.c lib/ipmi_lanp.c +index 16c0d9a9..49dc697f 100644 +--- lib/ipmi_lanp.c ++++ lib/ipmi_lanp.c +@@ -236,8 +236,12 @@ get_lan_param_select(struct ipmi_intf *intf, uint8_t chan, int param, int select + /* We treat them as valid but empty response */ + p->data = NULL; + p->data_len = 0; +- rc = p; +- /* fall through */ ++ lprintf(LOG_INFO, "Get LAN Parameter '%s' command unsupported: %s", ++ p->desc, ++ specific_val2str(rsp->ccode, ++ get_lan_cc_vals, ++ completion_code_vals)); ++ return p; + default: + /* other completion codes are treated as error */ + lprintf(LOG_INFO, "Get LAN Parameter '%s' command failed: %s", diff --git a/sysutils/ipmitool/files/patch-lan-print b/sysutils/ipmitool/files/patch-lan-print new file mode 100644 index 000000000000..858e27954b66 --- /dev/null +++ b/sysutils/ipmitool/files/patch-lan-print @@ -0,0 +1,36 @@ +From 137aeb64cbb493d61d6945cac156aba5f0510780 Mon Sep 17 00:00:00 2001 +From: Miao Wang <shankerwangmiao@gmail.com> +Date: Sat, 10 Feb 2024 12:51:15 +0800 +Subject: [PATCH] lan: fix lan print fails on unsupported parameters + +After upgrading to ipmitool 1.8.19, ipmitool lan print can only print out +`Set in Progress` and other parameters are missing on our servers. After +bisecting, commit: + + 351dad24a26f lan: Add processing of get/set specific CCs + +is identified to be the source of the problem, where the function +get_lan_param_select is expected to consider severial error codes it +receives as empty response. It then constructs an empty response in `p` +and assigns `p` to `rc` and the control flow falls through to the +default case, which prints the error code in verbose mode and should +return `rc` instead of `NULL`. + +Signed-off-by: Miao Wang <shankerwangmiao@gmail.com> +--- + lib/ipmi_lanp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git lib/ipmi_lanp.c lib/ipmi_lanp.c +index fe0046f..26e7365 100644 +--- lib/ipmi_lanp.c ++++ lib/ipmi_lanp.c +@@ -245,7 +245,7 @@ get_lan_param_select(struct ipmi_intf *intf, uint8_t chan, int param, int select + specific_val2str(rsp->ccode, + get_lan_cc_vals, + completion_code_vals)); +- return NULL; ++ return rc; + } + + p->data = rsp->data + 1; diff --git a/sysutils/ipmitool/files/patch-lib_ipmi_sdr.c b/sysutils/ipmitool/files/patch-lib_ipmi_sdr.c new file mode 100644 index 000000000000..961168c879d3 --- /dev/null +++ b/sysutils/ipmitool/files/patch-lib_ipmi_sdr.c @@ -0,0 +1,35 @@ +Description: Fix soensor reading +Author: mareedu srinivasa rao +Origin: upstream, https://sourceforge.net/p/ipmitool/bugs/490/ +Bug: https://sourceforge.net/p/ipmitool/bugs/490/ +Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983082 +Forwarded: not-needed +Last-Update: 2022-10-29 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: lib/ipmi_sdr.c +=================================================================== +--- lib/ipmi_sdr.c ++++ lib/ipmi_sdr.c +@@ -1799,7 +1799,7 @@ ipmi_sdr_print_sensor_fc(struct ipmi_int + sr->s_a_units); + } else /* Discrete */ + snprintf(sval, sizeof(sval), +- "0x%02x", sr->s_reading); ++ "0x%02x", sr->s_data2); + } + else if (sr->s_scanning_disabled) + snprintf(sval, sizeof (sval), sr->full ? "disabled" : "Not Readable"); +Index: lib/ipmi_sensor.c +=================================================================== +--- lib/ipmi_sensor.c ++++ lib/ipmi_sensor.c +@@ -201,7 +201,7 @@ ipmi_sensor_print_fc_discrete(struct ipm + sr->s_a_str, sr->s_a_units, "ok"); + } else { + printf("| 0x%-8x | %-10s | 0x%02x%02x", +- sr->s_reading, "discrete", ++ sr->s_data2, "discrete", + sr->s_data2, sr->s_data3); + } + } else { diff --git a/sysutils/ipmitool/files/patch-sdr b/sysutils/ipmitool/files/patch-sdr new file mode 100644 index 000000000000..b7c2ef8c2e9a --- /dev/null +++ b/sysutils/ipmitool/files/patch-sdr @@ -0,0 +1,75 @@ +From 202f7427e0a4d1f319fc4b914676cc2f08da6c6c Mon Sep 17 00:00:00 2001 +From: Alexander Amelkin <alexander@amelkin.msk.ru> +Date: Tue, 17 Sep 2024 15:15:45 +0300 +Subject: [PATCH] sdr: Refix 6e037d6bfbbb93b349c8ca331ebde03a (#41) + +A bug was introduced by commit 6e037d6bfbbb93b349c8ca331ebde03a837f76bf +due to which the command `ipmitool sdr type` stopped accepting raw +hex values for the type and would only accept strings. + +Fix that by partially reverting the troublesome commit. + +Additionally, apply the logic of that commit to calls of +`strcasecmp()` in ipmi_sdr.c. + +Resolves https://codeberg.org/IPMITool/ipmitool/issues/41 + +Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru> +--- + lib/ipmi_sdr.c | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git lib/ipmi_sdr.c lib/ipmi_sdr.c +index abd4ee1..4732762 100644 +--- lib/ipmi_sdr.c ++++ lib/ipmi_sdr.c +@@ -4570,8 +4570,9 @@ ipmi_sdr_print_type(struct ipmi_intf *intf, char *type) + uint8_t sensor_type = 0; + + if (!type || +- strcasecmp(type, "help") == 0 || +- strcasecmp(type, "list") == 0) { ++ !strcasecmp(type, "help") || ++ !strcasecmp(type, "list")) ++ { + printf("Sensor Types:\n"); + for (x = 1; x < SENSOR_TYPE_MAX; x += 2) { + printf("\t%-25s (0x%02x) %-25s (0x%02x)\n", +@@ -4581,7 +4582,7 @@ ipmi_sdr_print_type(struct ipmi_intf *intf, char *type) + return 0; + } + +- if (!strcmp(type, "0x")) { ++ if (!strncmp(type, "0x", 2)) { + /* begins with 0x so let it be entered as raw hex value */ + if (str2uchar(type, &sensor_type) != 0) { + lprintf(LOG_ERR, +@@ -4591,7 +4592,7 @@ ipmi_sdr_print_type(struct ipmi_intf *intf, char *type) + } + } else { + for (x = 1; x < SENSOR_TYPE_MAX; x++) { +- if (strcasecmp(sensor_type_desc[x], type) == 0) { ++ if (!strcasecmp(sensor_type_desc[x], type)) { + sensor_type = x; + break; + } +@@ -4638,8 +4639,8 @@ ipmi_sdr_print_entity(struct ipmi_intf *intf, char *entitystr) + int rc = 0; + + if (!entitystr || +- strcasecmp(entitystr, "help") == 0 || +- strcasecmp(entitystr, "list") == 0) { ++ !strcasecmp(entitystr, "help") || ++ !strcasecmp(entitystr, "list")) { + print_valstr_2col(entity_id_vals, "Entity IDs", -1); + return 0; + } +@@ -4654,7 +4655,7 @@ ipmi_sdr_print_entity(struct ipmi_intf *intf, char *entitystr) + + /* now try string input */ + for (i = 0; entity_id_vals[i].str; i++) { +- if (strcasecmp(entitystr, entity_id_vals[i].str) == 0) { ++ if (!strcasecmp(entitystr, entity_id_vals[i].str)) { + entity.id = entity_id_vals[i].val; + entity.instance = 0x7f; + j=1; diff --git a/sysutils/k9s/Makefile b/sysutils/k9s/Makefile index 834e9d9eee01..1da043c3e578 100644 --- a/sysutils/k9s/Makefile +++ b/sysutils/k9s/Makefile @@ -1,6 +1,6 @@ PORTNAME= k9s DISTVERSIONPREFIX= v -DISTVERSION= 0.50.4 +DISTVERSION= 0.50.6 CATEGORIES= sysutils MAINTAINER= gogolok@gmail.com @@ -10,11 +10,11 @@ WWW= https://github.com/derailed/k9s LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go:1.21,modules +USES= go:1.24,modules GO_MODULE= github.com/derailed/k9s GO_BUILDFLAGS= -ldflags="-X github.com/derailed/k9s/cmd.version=${DISTVERSIONFULL} \ -X github.com/derailed/k9s/cmd.date=$$(date +'%Y-%m-%dT%H:%M:%SZ') \ - -X github.com/derailed/k9s/cmd.commit=e4e38161857a202f09488c7ab3603a27de464ad4" + -X github.com/derailed/k9s/cmd.commit=13cb55bb66272ac4c872a1f6bfa3e820d7d0ca5b" PLIST_FILES= bin/${PORTNAME} diff --git a/sysutils/k9s/distinfo b/sysutils/k9s/distinfo index 057c925d0896..a9c0dc4bd8a6 100644 --- a/sysutils/k9s/distinfo +++ b/sysutils/k9s/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1745214113 -SHA256 (go/sysutils_k9s/k9s-v0.50.4/v0.50.4.mod) = c94e084dc6f13e2e8cfc09af8745d99d3dcc8a04409eedc5daa4de2e6104f75b -SIZE (go/sysutils_k9s/k9s-v0.50.4/v0.50.4.mod) = 19254 -SHA256 (go/sysutils_k9s/k9s-v0.50.4/v0.50.4.zip) = 617ace92bcdc51d63a63888c070cac98c696345e11bb45be46e4e5fe75a5eaaa -SIZE (go/sysutils_k9s/k9s-v0.50.4/v0.50.4.zip) = 7485788 +TIMESTAMP = 1747190791 +SHA256 (go/sysutils_k9s/k9s-v0.50.6/v0.50.6.mod) = c41f2e178e3e345e07d729f0b53d7f9c3f69f41cbb51ff8550df54bb3d742172 +SIZE (go/sysutils_k9s/k9s-v0.50.6/v0.50.6.mod) = 19270 +SHA256 (go/sysutils_k9s/k9s-v0.50.6/v0.50.6.zip) = 027bb14ec2a3c7211a2233f0eb5ed176de37ef21e4181ac76bf69962dc6b0471 +SIZE (go/sysutils_k9s/k9s-v0.50.6/v0.50.6.zip) = 7496880 diff --git a/sysutils/limine/Makefile b/sysutils/limine/Makefile index 8dc2ce7b315e..4481a732e01f 100644 --- a/sysutils/limine/Makefile +++ b/sysutils/limine/Makefile @@ -1,5 +1,5 @@ PORTNAME= limine -DISTVERSION= 9.2.3 +DISTVERSION= 9.3.0 CATEGORIES= sysutils MASTER_SITES= https://github.com/${PORTNAME}-bootloader/${PORTNAME}/releases/download/v${DISTVERSION}/ diff --git a/sysutils/limine/distinfo b/sysutils/limine/distinfo index 86f1fcfe368d..345dc2ef6043 100644 --- a/sysutils/limine/distinfo +++ b/sysutils/limine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1744523088 -SHA256 (limine-9.2.3.tar.gz) = 29c035cd7ca7b799ea9d0ab7d98dffe535d461b3b1e8bb9b249d7e293ec5a364 -SIZE (limine-9.2.3.tar.gz) = 591893 +TIMESTAMP = 1747007996 +SHA256 (limine-9.3.0.tar.gz) = f6b6e498f16ddc12de86791802892d7cee001ead42d30cc63c9666ebb2b16d0b +SIZE (limine-9.3.0.tar.gz) = 598597 diff --git a/sysutils/py-ansible-core/Makefile b/sysutils/py-ansible-core/Makefile index 993c3ca2df07..d334c5a230f1 100644 --- a/sysutils/py-ansible-core/Makefile +++ b/sysutils/py-ansible-core/Makefile @@ -1,5 +1,6 @@ PORTNAME= ansible-core DISTVERSION= 2.18.5 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,6 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=3.0.0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}resolvelib>=0.5.3<1.1.0:devel/py-resolvelib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}toml>0:textproc/py-toml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=5.1:devel/py-pyyaml@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ diff --git a/sysutils/screen-devel/Makefile b/sysutils/screen-devel/Makefile index 8925c4affc6d..a088f2361871 100644 --- a/sysutils/screen-devel/Makefile +++ b/sysutils/screen-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= screen DISTVERSION= 5.0.0.${SCREEN_COMMIT_DATE} +PORTREVISION= 3 CATEGORIES= sysutils PKGNAMESUFFIX= -devel MASTER_SITES= # @@ -44,6 +45,7 @@ NCURSES_PORT_USES= ncurses:port OPTIONS_SUB= USES= autoreconf:build gmake cpe +CONFIGURE_ARGS= --with-system_screenrc=${ETCDIR}/screenrc MAKE_ARGS+= WITH_MAN=1 CPE_VENDOR= gnu diff --git a/sysutils/screen-devel/files/screenrc.sample b/sysutils/screen-devel/files/screenrc.sample index 1ce5561ebf31..3762f6c5da7b 100644 --- a/sysutils/screen-devel/files/screenrc.sample +++ b/sysutils/screen-devel/files/screenrc.sample @@ -3,7 +3,7 @@ defscrollback 5000 termcapinfo xterm ti@:te@ termcapinfo xterm-color ti@:te@ hardstatus alwayslastline -hardstatus string '%{gk}[%{G}%H%{g}][%= %{wk}%?%-Lw%?%{=b kR}(%{W}%n*%f %t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}]%{=b C}[%m/%d/%y %C %A]%{W}' +hardstatus string '%{2;0}[%{+b2}%H%{-}][%= %{7}%?%-Lw%?%{+b1}(%{+b7}%n%f%t%?(%u)%?%{-})%{-}%?%+Lw%?%= %{-}]%{+b6}[%m/%d/%y %c]%{-}%{-}' vbell off shell -$SHELL logtstamp on diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile index 29a375dce6ae..6f21f4002217 100644 --- a/sysutils/screen/Makefile +++ b/sysutils/screen/Makefile @@ -1,5 +1,5 @@ -VERSIONS= 49 -SCREEN_VERSION?= 49 +VERSIONS= 50 +SCREEN_VERSION?= 50 MASTERDIR= ${.CURDIR}/../screen${SCREEN_VERSION} diff --git a/sysutils/screen49/Makefile b/sysutils/screen49/Makefile index a7173267826b..580f13c0a7c1 100644 --- a/sysutils/screen49/Makefile +++ b/sysutils/screen49/Makefile @@ -1,6 +1,6 @@ PORTNAME= screen PORTVERSION= 4.9.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= GNU \ ftp://ftp.gnu.org/gnu/screen/ \ diff --git a/sysutils/screen49/files/patch-attacher.c b/sysutils/screen49/files/patch-attacher.c index 0f89189898e3..c5f670bb6ceb 100644 --- a/sysutils/screen49/files/patch-attacher.c +++ b/sysutils/screen49/files/patch-attacher.c @@ -1,6 +1,75 @@ ---- attacher.c.orig 2003-09-08 07:24:48.000000000 -0700 -+++ attacher.c 2011-01-02 21:42:39.547897531 -0800 -@@ -662,7 +662,7 @@ +--- attacher.c.orig 2023-08-16 00:29:26 UTC ++++ attacher.c +@@ -73,7 +73,6 @@ extern int multiattach, multi_uid, own_uid; + #ifdef MULTIUSER + extern char *multi; + extern int multiattach, multi_uid, own_uid; +-extern int tty_mode, tty_oldmode; + # ifndef USE_SETEUID + static int multipipe[2]; + # endif +@@ -160,9 +159,6 @@ int how; + + if (pipe(multipipe)) + Panic(errno, "pipe"); +- if (chmod(attach_tty, 0666)) +- Panic(errno, "chmod %s", attach_tty); +- tty_oldmode = tty_mode; + eff_uid = -1; /* make UserContext fork */ + real_uid = multi_uid; + if ((ret = UserContext()) <= 0) +@@ -174,11 +170,6 @@ int how; + Panic(errno, "UserContext"); + close(multipipe[1]); + read(multipipe[0], &dummy, 1); +- if (tty_oldmode >= 0) +- { +- chmod(attach_tty, tty_oldmode); +- tty_oldmode = -1; +- } + ret = UserStatus(); + #ifdef LOCK + if (ret == SIG_LOCK) +@@ -224,9 +215,6 @@ int how; + xseteuid(multi_uid); + xseteuid(own_uid); + #endif +- if (chmod(attach_tty, 0666)) +- Panic(errno, "chmod %s", attach_tty); +- tty_oldmode = tty_mode; + } + # endif /* USE_SETEUID */ + #endif /* MULTIUSER */ +@@ -423,13 +411,6 @@ int how; + ContinuePlease = 0; + # ifndef USE_SETEUID + close(multipipe[1]); +-# else +- xseteuid(own_uid); +- if (tty_oldmode >= 0) +- if (chmod(attach_tty, tty_oldmode)) +- Panic(errno, "chmod %s", attach_tty); +- tty_oldmode = -1; +- xseteuid(real_uid); + # endif + } + #endif +@@ -505,14 +486,6 @@ AttacherFinit SIGDEFARG + close(s); + } + } +-#ifdef MULTIUSER +- if (tty_oldmode >= 0) +- { +- if (setuid(own_uid)) +- Panic(errno, "setuid"); +- chmod(attach_tty, tty_oldmode); +- } +-#endif + exit(0); + SIGRETURN; + } +@@ -732,7 +705,7 @@ LockTerminal() printf("\n"); prg = getenv("LOCKPRG"); @@ -9,8 +78,8 @@ { signal(SIGCHLD, SIG_DFL); debug1("lockterminal: '%s' seems executable, execl it!\n", prg); -@@ -676,7 +676,11 @@ - setuid(real_uid); /* this should be done already */ +@@ -751,7 +724,11 @@ LockTerminal() + Panic(errno, "setuid"); #endif closeallfiles(0); /* important: /etc/shadow may be open */ - execl(prg, "SCREEN-LOCK", NULL); diff --git a/sysutils/screen49/files/patch-configure.ac b/sysutils/screen49/files/patch-configure.ac index 1f32616b3797..1fc7eb310d6a 100644 --- a/sysutils/screen49/files/patch-configure.ac +++ b/sysutils/screen49/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- configure.ac.orig 2023-08-15 17:29:26.000000000 -0700 -+++ configure.ac 2024-01-02 18:30:11.205776000 -0800 -@@ -669,7 +669,7 @@ +--- configure.ac.orig 2023-08-16 00:29:26 UTC ++++ configure.ac +@@ -669,7 +669,7 @@ olibs="$LIBS" tgetent((char *)0, (char *)0); ],, olibs="$LIBS" @@ -9,7 +9,7 @@ AC_CHECKING(libcurses) AC_TRY_LINK([ #include <curses.h> -@@ -756,19 +756,6 @@ +@@ -756,19 +756,6 @@ fi fi fi @@ -29,7 +29,7 @@ AC_CHECK_FUNCS(getpt) dnl check for openpty() -@@ -900,11 +887,11 @@ +@@ -900,11 +887,11 @@ dnl dnl dnl **** utmp handling **** dnl @@ -43,7 +43,7 @@ #include <utmpx.h> #define utmp utmpx #else -@@ -917,11 +904,11 @@ +@@ -917,11 +904,11 @@ LIBS="$LIBS -lgen" [int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), olibs="$LIBS" LIBS="$LIBS -lgen" @@ -57,7 +57,7 @@ #include <utmpx.h> #define utmp utmpx #else -@@ -931,13 +918,13 @@ +@@ -931,13 +918,13 @@ AC_TRY_LINK([ #define pututline _pututline #endif ], diff --git a/sysutils/screen49/files/patch-doc__Makefile.in b/sysutils/screen49/files/patch-doc__Makefile.in index 8666be063fe5..c90450268d09 100644 --- a/sysutils/screen49/files/patch-doc__Makefile.in +++ b/sysutils/screen49/files/patch-doc__Makefile.in @@ -1,7 +1,7 @@ ---- doc/Makefile.in.orig 2014-04-29 20:26:42.618832001 -0700 -+++ doc/Makefile.in 2014-04-29 20:29:26.379384101 -0700 -@@ -31,7 +31,10 @@ - $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info +--- doc/Makefile.in.orig 2023-08-16 00:29:26 UTC ++++ doc/Makefile.in +@@ -31,7 +31,10 @@ install: installdirs + $(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info install: installdirs +ifeq (${WITH_MAN},1) @@ -11,8 +11,8 @@ -$(MAKE) screen.info -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ if test -f $$d/screen.info; then \ -@@ -40,13 +43,19 @@ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ +@@ -40,13 +43,19 @@ install: installdirs + install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \ else true; fi; \ fi +endif diff --git a/sysutils/screen49/files/patch-misc.c b/sysutils/screen49/files/patch-misc.c index 1364b230d55a..6ea949fbf7a4 100644 --- a/sysutils/screen49/files/patch-misc.c +++ b/sysutils/screen49/files/patch-misc.c @@ -1,4 +1,4 @@ ---- misc.c.orig 2022-01-28 14:06:02 UTC +--- misc.c.orig 2023-08-16 00:29:26 UTC +++ misc.c @@ -28,8 +28,10 @@ @@ -11,7 +11,7 @@ #include "config.h" #include "screen.h" -@@ -796,3 +798,17 @@ +@@ -720,3 +722,17 @@ xvsnprintf(char *s, int n, char *fmt, xva_list stack) } #endif diff --git a/sysutils/screen49/files/patch-os.h b/sysutils/screen49/files/patch-os.h index 80e7ec3c0bcb..ca0237af91ac 100644 --- a/sysutils/screen49/files/patch-os.h +++ b/sysutils/screen49/files/patch-os.h @@ -1,6 +1,6 @@ ---- os.h.orig 2019-10-01 15:08:00.000000000 -0700 -+++ os.h 2019-10-28 19:37:41.585526000 -0700 -@@ -250,9 +250,11 @@ +--- os.h.orig 2023-08-16 00:29:26 UTC ++++ os.h +@@ -250,9 +250,11 @@ extern int errno; #endif #if defined(UTMPOK) || defined(BUGGYGETLOGIN) @@ -23,7 +23,7 @@ #endif #ifndef MAXPATHLEN -@@ -524,6 +526,6 @@ +@@ -524,6 +526,6 @@ typedef struct fd_set { int fds_bits[1]; } fd_set; /* Changing those you won't be able to attach to your old sessions * when changing those values in official tree don't forget to bump * MSG_VERSION */ diff --git a/sysutils/screen49/files/patch-osdef.h.in b/sysutils/screen49/files/patch-osdef.h.in index 3b32fe80ed81..c8249fc3d3bc 100644 --- a/sysutils/screen49/files/patch-osdef.h.in +++ b/sysutils/screen49/files/patch-osdef.h.in @@ -1,5 +1,5 @@ ---- osdef.h.in.orig 2023-08-15 17:29:26.000000000 -0700 -+++ osdef.h.in 2024-07-17 20:59:56.936179000 -0700 +--- osdef.h.in.orig 2023-08-16 00:29:26 UTC ++++ osdef.h.in @@ -28,6 +28,8 @@ **************************************************************** */ @@ -9,7 +9,7 @@ extern int printf __P((char *, ...)); extern int fprintf __P((FILE *, char *, ...)); extern int sprintf __P((char *, char *, ...)); -@@ -71,6 +73,7 @@ +@@ -71,6 +73,7 @@ extern void bcopy __P((char *, char *, int)); #else extern void bcopy __P((char *, char *, int)); #endif diff --git a/sysutils/screen49/files/patch-resize.c b/sysutils/screen49/files/patch-resize.c index a2af125f12ff..216fec9c1ab6 100644 --- a/sysutils/screen49/files/patch-resize.c +++ b/sysutils/screen49/files/patch-resize.c @@ -1,8 +1,8 @@ ---- resize.c.orig Mon Sep 8 07:26:31 2003 -+++ resize.c Mon Dec 1 17:16:29 2003 -@@ -682,6 +682,17 @@ - if (wi == 0) - he = hi = 0; +--- resize.c.orig 2023-08-16 00:29:26 UTC ++++ resize.c +@@ -683,6 +683,17 @@ int wi, he, hi; + he = MAXWIDTH; + } + if (wi > 1000) + { diff --git a/sysutils/screen49/files/patch-screen.c b/sysutils/screen49/files/patch-screen.c index 50b28c02a955..bde83a3b06cc 100644 --- a/sysutils/screen49/files/patch-screen.c +++ b/sysutils/screen49/files/patch-screen.c @@ -1,6 +1,115 @@ ---- screen.c.orig 2017-07-10 12:26:25.000000000 -0700 -+++ screen.c 2017-08-25 20:20:20.471073000 -0700 -@@ -2214,7 +2214,7 @@ +--- screen.c.orig 2023-08-16 00:29:26 UTC ++++ screen.c +@@ -230,8 +230,6 @@ int multiattach; + int multi_uid; + int own_uid; + int multiattach; +-int tty_mode; +-int tty_oldmode = -1; + #endif + + char HostName[MAXSTR]; +@@ -1009,9 +1007,6 @@ int main(int ac, char** av) + + /* ttyname implies isatty */ + SetTtyname(true, &st); +-#ifdef MULTIUSER +- tty_mode = (int)st.st_mode & 0777; +-#endif + + fl = fcntl(0, F_GETFL, 0); + if (fl != -1 && (fl & (O_RDWR|O_RDONLY|O_WRONLY)) == O_RDWR) +@@ -1127,15 +1122,28 @@ int main(int ac, char** av) + #endif + } + +- if (stat(SockPath, &st) == -1) +- Panic(errno, "Cannot access %s", SockPath); +- else +- if (!S_ISDIR(st.st_mode)) ++ if (stat(SockPath, &st) == -1) { ++ if (eff_uid == real_uid) { ++ Panic(errno, "Cannot access %s", SockPath); ++ } else { ++ Panic(0, "Error accessing %s", SockPath); ++ } ++ } else if (!S_ISDIR(st.st_mode)) { ++ if (eff_uid == real_uid || st.st_uid == real_uid) { + Panic(0, "%s is not a directory.", SockPath); ++ } else { ++ Panic(0, "Error accessing %s", SockPath); ++ } ++ } + #ifdef MULTIUSER + if (multi) { +- if ((int)st.st_uid != multi_uid) +- Panic(0, "%s is not the owner of %s.", multi, SockPath); ++ if ((int)st.st_uid != multi_uid) { ++ if (eff_uid == real_uid || st.st_uid == real_uid) { ++ Panic(0, "%s is not the owner of %s.", multi, SockPath); ++ } else { ++ Panic(0, "Error accessing %s", SockPath); ++ } ++ } + } + else + #endif +@@ -1149,9 +1157,13 @@ int main(int ac, char** av) + Panic(0, "You are not the owner of %s.", SockPath); + #endif + } +- +- if ((st.st_mode & 0777) != 0700) +- Panic(0, "Directory %s must have mode 700.", SockPath); ++ if ((st.st_mode & 0777) != 0700) { ++ if (eff_uid == real_uid || st.st_uid == real_uid) { ++ Panic(0, "Directory %s must have mode 700.", SockPath); ++ } else { ++ Panic(0, "Error accessing %s", SockPath); ++ } ++ } + if (SockMatch && index(SockMatch, '/')) + Panic(0, "Bad session name '%s'", SockMatch); + SockName = SockPath + strlen(SockPath) + 1; +@@ -1189,8 +1201,14 @@ int main(int ac, char** av) + else + exit(9 + (fo || oth ? 1 : 0) + fo); + } +- if (fo == 0) +- Panic(0, "No Sockets found in %s.\n", SockPath); ++ if (fo == 0) { ++ if (eff_uid == real_uid || st.st_uid == real_uid) { ++ Panic(0, "No Sockets found in %s.\n", SockPath); ++ } else { ++ Panic(0, "Error accessing %s", SockPath); ++ } ++ } ++ + Msg(0, "%d Socket%s in %s.", fo, fo > 1 ? "s" : "", SockPath); + eexit(0); + } +@@ -2170,20 +2188,6 @@ DEFINE_VARARGS_FN(Panic) + if (D_userpid) + Kill(D_userpid, SIG_BYE); + } +-#ifdef MULTIUSER +- if (tty_oldmode >= 0) { +- +-# ifdef USE_SETEUID +- if (setuid(own_uid)) +- xseteuid(own_uid); /* may be a loop. sigh. */ +-# else +- setuid(own_uid); +-# endif +- +- debug1("Panic: changing back modes from %s\n", attach_tty); +- chmod(attach_tty, tty_oldmode); +- } +-#endif + eexit(1); + } + +@@ -2234,7 +2238,7 @@ static char *pad_expand(char *buf, char *p, int numpad pn2 = pn = p + padlen; r = winmsg_numrend; while (p >= buf) { diff --git a/sysutils/screen49/files/patch-socket.c b/sysutils/screen49/files/patch-socket.c index cfa52856c2e7..01bd213ae5c4 100644 --- a/sysutils/screen49/files/patch-socket.c +++ b/sysutils/screen49/files/patch-socket.c @@ -1,84 +1,97 @@ ---- socket.c.orig 2022-01-28 14:06:02 UTC +--- socket.c.orig 2025-05-13 14:58:03 UTC +++ socket.c -@@ -141,12 +141,14 @@ - char *firstn = NULL; - int nfound = 0, ngood = 0, ndead = 0, nwipe = 0, npriv = 0; - int nperfect = 0; -+ char timestr[64]; - struct sent - { - struct sent *next; - int mode; - char *name; -- } *slist, **slisttail, *sent, *nsent; -+ time_t time_created; -+ } *slist, **slisttail, *sent, *nsent, *schosen; +@@ -171,8 +171,13 @@ bool *is_sock; + xsetegid(real_gid); + #endif - if (match) - { -@@ -258,8 +260,13 @@ - sent->next = 0; - sent->name = SaveStr(name); - sent->mode = mode; -+ sent->time_created = SessionCreationTime(name); -+ for (slisttail = &slist; *slisttail; slisttail = &((*slisttail)->next)) -+ { -+ if ((*slisttail)->time_created < sent->time_created) break; -+ } -+ sent->next = *slisttail; - *slisttail = sent; -- slisttail = &sent->next; - nfound++; - sockfd = MakeClientSocket(0, *is_sock); - #ifdef USE_SETEUID -@@ -359,34 +366,42 @@ - } - for (sent = slist; sent; sent = sent->next) +- if ((dirp = opendir(SockPath)) == 0) +- Panic(errno, "Cannot opendir %s", SockPath); ++ if ((dirp = opendir(SockPath)) == 0) { ++ if (eff_uid == real_uid) { ++ Panic(errno, "Cannot opendir %s", SockPath); ++ } else { ++ Panic(0, "Error accessing %s", SockPath); ++ } ++ } + + slist = 0; + slisttail = &slist; +@@ -841,6 +846,11 @@ int pid; + return UserStatus(); + } + ++static void KillUnpriv(pid_t pid, int sig) { ++ UserContext(); ++ UserReturn(kill(pid, sig)); ++} ++ + #ifdef hpux + /* + * From: "F. K. Bruner" <napalm@ugcs.caltech.edu> +@@ -926,14 +936,14 @@ struct win *wi; + { + Msg(errno, "Could not perform necessary sanity checks on pts device."); + close(i); +- Kill(pid, SIG_BYE); ++ KillUnpriv(pid, SIG_BYE); + return -1; + } + if (strcmp(ttyname_in_ns, m->m_tty)) + { + Msg(errno, "Attach: passed fd does not match tty: %s - %s!", ttyname_in_ns, m->m_tty[0] != '\0' ? m->m_tty : "(null)"); + close(i); +- Kill(pid, SIG_BYE); ++ KillUnpriv(pid, SIG_BYE); + return -1; + } + /* m->m_tty so far contains the actual name of the pts device in the +@@ -950,19 +960,19 @@ struct win *wi; { -+ if (sent->time_created == 0) -+ { -+ sprintf(timestr, "??" "?"); -+ } -+ else -+ { -+ strftime(timestr, 64, "%x %X", localtime(&sent->time_created)); -+ } - switch (sent->mode) - { - case 0700: -- printf("\t%s\t(Attached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Attached)\n", sent->name, timestr); - break; - case 0600: -- printf("\t%s\t(Detached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Detached)\n", sent->name, timestr); - break; + Msg(errno, "Attach: passed fd does not match tty: %s - %s!", m->m_tty, myttyname ? myttyname : "NULL"); + close(i); +- Kill(pid, SIG_BYE); ++ KillUnpriv(pid, SIG_BYE); + return -1; + } + } + else if ((i = secopen(m->m_tty, O_RDWR | O_NONBLOCK, 0)) < 0) + { + Msg(errno, "Attach: Could not open %s!", m->m_tty); +- Kill(pid, SIG_BYE); ++ KillUnpriv(pid, SIG_BYE); + return -1; + } #ifdef MULTIUSER - case 0701: -- printf("\t%s\t(Multi, attached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Multi, attached)\n", sent->name, timestr); - break; - case 0601: -- printf("\t%s\t(Multi, detached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Multi, detached)\n", sent->name, timestr); - break; + if (attach) +- Kill(pid, SIGCONT); ++ KillUnpriv(pid, SIGCONT); #endif - case -1: - /* No trigraphs here! */ -- printf("\t%s\t(Dead ?%c?)\n", sent->name, '?'); -+ printf("\t%s\t(%s)\t(Dead ?%c?)\n", sent->name, timestr, '?'); - break; - case -2: -- printf("\t%s\t(Removed)\n", sent->name); -+ printf("\t%s\t(%s)\t(Removed)\n", sent->name, timestr); - break; - case -3: -- printf("\t%s\t(Remote or dead)\n", sent->name); -+ printf("\t%s\t(%s)\t(Remote or dead)\n", sent->name, timestr); - break; - case -4: -- printf("\t%s\t(Private)\n", sent->name); -+ printf("\t%s\t(%s)\t(Private)\n", sent->name, timestr); - break; - } + + #if defined(ultrix) || defined(pyr) || defined(NeXT) +@@ -975,7 +985,7 @@ struct win *wi; + { + write(i, "Attaching from inside of screen?\n", 33); + close(i); +- Kill(pid, SIG_BYE); ++ KillUnpriv(pid, SIG_BYE); + Msg(0, "Attach msg ignored: coming from inside."); + return -1; } +@@ -986,7 +996,7 @@ struct win *wi; + { + write(i, "Access to session denied.\n", 26); + close(i); +- Kill(pid, SIG_BYE); ++ KillUnpriv(pid, SIG_BYE); + Msg(0, "Attach: access denied for user %s.", user); + return -1; + } +@@ -1304,7 +1314,7 @@ ReceiveMsg() + Msg(0, "Query attempt with bad pid(%d)!", m.m.command.apid); + } + else { +- Kill(m.m.command.apid, ++ KillUnpriv(m.m.command.apid, + (queryflag >= 0) + ? SIGCONT + : SIG_BYE); /* Send SIG_BYE if an error happened */ diff --git a/sysutils/screen49/files/patch-termcap.c b/sysutils/screen49/files/patch-termcap.c index cbe7a90f11a2..a7abaa54ce81 100644 --- a/sysutils/screen49/files/patch-termcap.c +++ b/sysutils/screen49/files/patch-termcap.c @@ -1,6 +1,6 @@ ---- termcap.c.orig 2020-02-05 12:09:38.000000000 -0800 -+++ termcap.c 2020-02-11 20:10:12.747990000 -0800 -@@ -361,11 +361,7 @@ +--- termcap.c.orig 2023-08-16 00:29:26 UTC ++++ termcap.c +@@ -361,11 +361,7 @@ int he; if (D_CG0) { if (D_CS0 == 0) diff --git a/sysutils/screen49/files/patch-terminfo__checktc.c b/sysutils/screen49/files/patch-terminfo__checktc.c index d4ffb75cc0c1..7c38ac40c386 100644 --- a/sysutils/screen49/files/patch-terminfo__checktc.c +++ b/sysutils/screen49/files/patch-terminfo__checktc.c @@ -1,6 +1,6 @@ ---- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995 -+++ terminfo/checktc.c Tue Apr 22 20:37:18 2003 -@@ -171,6 +171,7 @@ +--- terminfo/checktc.c.orig 2023-08-16 00:29:26 UTC ++++ terminfo/checktc.c +@@ -171,6 +171,7 @@ char *s; fflush(stdout); } @@ -8,7 +8,7 @@ void CPutStr(s, c) char *s; int c; -@@ -178,6 +179,7 @@ +@@ -178,6 +179,7 @@ int c; tputs(tgoto(s, 0, c), 1, putcha); fflush(stdout); } diff --git a/sysutils/screen49/files/patch-utmp.c b/sysutils/screen49/files/patch-utmp.c index 0573d96ceab5..e019f8cedc09 100644 --- a/sysutils/screen49/files/patch-utmp.c +++ b/sysutils/screen49/files/patch-utmp.c @@ -1,5 +1,5 @@ ---- utmp.c.orig 2023-08-15 17:29:26.000000000 -0700 -+++ utmp.c 2023-08-19 08:57:48.376313000 -0700 +--- utmp.c.orig 2023-08-16 00:29:26 UTC ++++ utmp.c @@ -26,6 +26,7 @@ **************************************************************** */ @@ -8,7 +8,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -@@ -89,11 +90,13 @@ +@@ -89,11 +90,13 @@ static struct utmp *getutslot __P((slot_t)); static int pututslot __P((slot_t, struct utmp *, char *, struct win *)); static struct utmp *getutslot __P((slot_t)); #ifndef GETUTENT @@ -22,7 +22,7 @@ #if defined(linux) && defined(GETUTENT) static struct utmp *xpututline __P((struct utmp *utmp)); # define pututline xpututline -@@ -102,9 +105,7 @@ +@@ -102,9 +105,7 @@ static char UtmpName[] = UTMPFILE; static int utmpok; static char UtmpName[] = UTMPFILE; @@ -32,7 +32,7 @@ # if defined(GETUTENT) && (!defined(SVR4) || defined(__hpux)) && ! defined(__CYGWIN__) -@@ -409,12 +410,6 @@ +@@ -409,12 +410,6 @@ struct win *wi; register slot_t slot; struct utmp u; int saved_ut; @@ -45,7 +45,7 @@ wi->w_slot = (slot_t)0; if (!utmpok || wi->w_type != W_TYPE_PTY) -@@ -435,51 +430,13 @@ +@@ -435,51 +430,13 @@ struct win *wi; makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid); #ifdef UTHOST @@ -100,7 +100,7 @@ { Msg(errno,"Could not write %s", UtmpName); UT_CLOSE; -@@ -607,7 +564,7 @@ +@@ -607,7 +564,7 @@ struct utmp *u; struct utmp *u; { u->ut_type = DEAD_PROCESS; @@ -109,7 +109,7 @@ u->ut_exit.e_termination = 0; u->ut_exit.e_exit = 0; #endif -@@ -640,7 +597,11 @@ +@@ -640,7 +597,11 @@ int pid; /* must use temp variable because of NetBSD/sparc64, where * ut_xtime is long(64) but time_t is int(32) */ (void)time(&now); @@ -122,7 +122,7 @@ } static slot_t -@@ -670,6 +631,7 @@ +@@ -670,6 +631,7 @@ initutmp() return (utmpfd = open(UtmpName, O_RDWR)) >= 0; } @@ -130,7 +130,7 @@ static void setutent() { -@@ -694,6 +656,7 @@ +@@ -694,6 +656,7 @@ getutent() return 0; return &uent; } @@ -138,7 +138,7 @@ static struct utmp * getutslot(slot) -@@ -750,9 +713,13 @@ +@@ -750,9 +713,13 @@ int pid; { time_t now; strncpy(u->ut_line, line, sizeof(u->ut_line)); diff --git a/sysutils/screen50/Makefile b/sysutils/screen50/Makefile index 2cc390901d9b..221f4fd63eb0 100644 --- a/sysutils/screen50/Makefile +++ b/sysutils/screen50/Makefile @@ -1,14 +1,15 @@ PORTNAME= screen -DISTVERSION= 5.0.0 +DISTVERSION= 5.0.1 +PORTREVISION= 3 CATEGORIES= sysutils -MASTER_SITES= GNU \ - ftp://ftp.gnu.org/gnu/screen/ \ - ftp://gnu.mirror.iweb.com/screen/ \ - http://gnu.mirror.iweb.com/screen/ \ - http://mirror.sdunix.com/gnu/ \ - ftp://mirrors.kernel.org/gnu/screen/ \ - http://cschubert.com/distfiles/ \ - LOCAL/cy +# MASTER_SITES= GNU \ +# ftp://ftp.gnu.org/gnu/screen/ \ +# ftp://gnu.mirror.iweb.com/screen/ \ +# http://gnu.mirror.iweb.com/screen/ \ +# http://mirror.sdunix.com/gnu/ \ +# ftp://mirrors.kernel.org/gnu/screen/ \ +# http://cschubert.com/distfiles/ \ +# LOCAL/cy .if !defined(MASTERDIR) PKGNAMESUFFIX= 50 CONFLICTS= screen-* screen49* @@ -20,6 +21,10 @@ WWW= https://www.gnu.org/software/screen/ CONFLICTS+= screen-devel +GIT_TAGNAME= v.${DISTVERSION} + +WRKSRC= ${WRKDIR}/${PORTNAME}-${GIT_TAGNAME}-ad9db35/src + LICENSE= GPLv3 OPTIONS_DEFINE= INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \ @@ -49,6 +54,7 @@ NCURSES_PORT_USES= ncurses:port OPTIONS_SUB= USES= autoreconf:build gmake cpe +CONFIGURE_ARGS= --with-system_screenrc=${ETCDIR}/screenrc MAKE_ARGS+= WITH_MAN=1 CPE_VENDOR= gnu @@ -57,7 +63,7 @@ CPE_VENDOR= gnu GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CFLAGS+= -I${NCURSESINC} +CFLAGS+= -I${NCURSESINC} -DSVR4 -DGETUTENT LDFLAGS+= -L${NCURSESLIB} .if ${PORT_OPTIONS:MINFO} @@ -86,6 +92,13 @@ CONFIGURE_ARGS+= --disable-socket-dir CONFIGURE_ARGS+= --with-socket-dir=${SCREEN_SOCKET_DIR} .endif +do-fetch: + @cd ${DISTDIR} && \ + if [ ! -f ${DISTNAME}${EXTRACT_SUFX} ]; then \ + fetch -o ${DISTNAME}${EXTRACT_SUFX} \ + "https://git.savannah.gnu.org/gitweb/?p=screen.git;a=snapshot;h=${GIT_TAGNAME};sf=tgz"; \ + fi + post-patch: @${RM} ${WRKSRC}/doc/screen.info* diff --git a/sysutils/screen50/distinfo b/sysutils/screen50/distinfo index 94c47f76c8ea..9e15a22d3ae3 100644 --- a/sysutils/screen50/distinfo +++ b/sysutils/screen50/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724900361 -SHA256 (screen-5.0.0.tar.gz) = f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 -SIZE (screen-5.0.0.tar.gz) = 895882 +TIMESTAMP = 1747082803 +SHA256 (screen-5.0.1.tar.gz) = 0ac9682fcfca3c02d84e8402c49396eb7ace9383234aeb62a4c267a8480bf35b +SIZE (screen-5.0.1.tar.gz) = 723528 diff --git a/sysutils/screen50/files/patch-misc.h b/sysutils/screen50/files/patch-misc.h deleted file mode 100644 index 818c716ad6cf..000000000000 --- a/sysutils/screen50/files/patch-misc.h +++ /dev/null @@ -1,12 +0,0 @@ ---- misc.h.orig 2024-03-26 16:41:57.000000000 -0700 -+++ misc.h 2024-04-03 11:30:19.350562000 -0700 -@@ -28,6 +28,9 @@ - int AddXChar (char *, int); - int AddXChars (char *, int, char *); - -+time_t SessionCreationTime(const char *fifo); -+ -+ - #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) - - #endif /* SCREEN_MISC_H */ diff --git a/sysutils/screen50/files/screenrc.sample b/sysutils/screen50/files/screenrc.sample index 1ce5561ebf31..3762f6c5da7b 100644 --- a/sysutils/screen50/files/screenrc.sample +++ b/sysutils/screen50/files/screenrc.sample @@ -3,7 +3,7 @@ defscrollback 5000 termcapinfo xterm ti@:te@ termcapinfo xterm-color ti@:te@ hardstatus alwayslastline -hardstatus string '%{gk}[%{G}%H%{g}][%= %{wk}%?%-Lw%?%{=b kR}(%{W}%n*%f %t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}]%{=b C}[%m/%d/%y %C %A]%{W}' +hardstatus string '%{2;0}[%{+b2}%H%{-}][%= %{7}%?%-Lw%?%{+b1}(%{+b7}%n%f%t%?(%u)%?%{-})%{-}%?%+Lw%?%= %{-}]%{+b6}[%m/%d/%y %c]%{-}%{-}' vbell off shell -$SHELL logtstamp on diff --git a/sysutils/screen50/pkg-plist b/sysutils/screen50/pkg-plist index 827afbb2d2d1..aabb61708efd 100644 --- a/sysutils/screen50/pkg-plist +++ b/sysutils/screen50/pkg-plist @@ -1,5 +1,5 @@ bin/screen -%%MULTISUID%%bin/screen-5.0.0 +%%MULTISUID%%bin/screen-5.0.1 share/man/man1/screen.1.gz %%DATADIR%%/utf8encodings/01 %%DATADIR%%/utf8encodings/02 diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile index 7cdd2f08a275..85d841432579 100644 --- a/sysutils/smartmontools/Makefile +++ b/sysutils/smartmontools/Makefile @@ -1,6 +1,5 @@ PORTNAME= smartmontools -DISTVERSION= 7.4 -PORTREVISION= 2 +DISTVERSION= 7.5 CATEGORIES= sysutils MASTER_SITES= SF @@ -11,26 +10,30 @@ WWW= https://www.smartmontools.org LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -USES= compiler:c++11-lib cpe shebangfix +USES= compiler:c++11-lib cpe + USE_RC_SUBR= smartd -SHEBANG_FILES= examplescripts/Example5 GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share + +PORTDOCS= * +SUB_FILES= pkg-message smart + CONFIGURE_ARGS= --disable-dependency-tracking \ --enable-sample \ --with-gnupg=yes \ --with-initscriptdir=${PREFIX}/etc/rc.d \ --with-nvme-devicescan=yes -SUB_FILES= pkg-message smart - -PORTDOCS= * - OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e 's| install-initdDATA| |' ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's| install-initdDATA| |g' \ + ${PATCH_WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|install-drivedbinstDATA install-examplesDATA|install-drivedbinstDATA|g' \ + ${PATCH_WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e 's|install-examplesSCRIPTS install-man|install-man|g' \ + ${PATCH_WRKSRC}/Makefile.in post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily diff --git a/sysutils/smartmontools/distinfo b/sysutils/smartmontools/distinfo index 1f03708cea1b..b80ab90f24f2 100644 --- a/sysutils/smartmontools/distinfo +++ b/sysutils/smartmontools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1690890805 -SHA256 (smartmontools-7.4.tar.gz) = e9a61f641ff96ca95319edfb17948cd297d0cd3342736b2c49c99d4716fb993d -SIZE (smartmontools-7.4.tar.gz) = 1094955 +TIMESTAMP = 1746144306 +SHA256 (smartmontools-7.5.tar.gz) = 690b83ca331378da9ea0d9d61008c4b22dde391387b9bbad7f29387f2595f76e +SIZE (smartmontools-7.5.tar.gz) = 1122317 diff --git a/sysutils/swtpm/Makefile b/sysutils/swtpm/Makefile index 2ba41891d2fe..c636d8022344 100644 --- a/sysutils/swtpm/Makefile +++ b/sysutils/swtpm/Makefile @@ -1,7 +1,6 @@ PORTNAME= swtpm DISTVERSIONPREFIX= v -DISTVERSION= 0.9.0 -PORTREVISION= 2 +DISTVERSION= 0.10.1 CATEGORIES= sysutils MAINTAINER= meka@tilda.center @@ -24,19 +23,28 @@ LIB_DEPENDS= libfuse.so:filesystems/fusefs-libs \ libtpms.so:sysutils/libtpms USES= autoreconf gettext-runtime gmake gnome libtool pathfix \ - pkgconfig ssl + pkgconfig python:env,test shebangfix ssl USE_GITHUB= yes GH_ACCOUNT= stefanberger USE_GNOME= glib20 USE_LDCONFIG= yes USE_RC_SUBR= ${PORTNAME} +SHEBANG_FILES= tests/_* tests/test_clientfds.py tests/test_setdatafd.py -USERS= _tss -GROUPS= ${USERS} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-tss-user=${USERS} \ - --with-tss-group=${GROUPS} +CONFIGURE_ARGS+= --with-tss-group=${GROUPS} \ + --with-tss-user=${USERS} INSTALL_TARGET= install-strip +TEST_ENV= LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib/swtpm:${LD_LIBRARY_PATH} \ + PATH=${PATH}:${STAGEDIR}${PREFIX}/bin +TEST_TARGET= ./installed-runner.sh +TEST_WRKSRC= ${STAGEDIR}${PREFIX}/libexec/installed-tests/swtpm + +USERS= _tss +GROUPS= ${USERS} + +do-test: + cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${TEST_TARGET} .include <bsd.port.mk> diff --git a/sysutils/swtpm/distinfo b/sysutils/swtpm/distinfo index 8198d3275f25..273fae772351 100644 --- a/sysutils/swtpm/distinfo +++ b/sysutils/swtpm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1722686189 -SHA256 (stefanberger-swtpm-v0.9.0_GH0.tar.gz) = 9679ca171e8aaa3c4e4053e8bc1d10c8dabf0220bd4b16aba78743511c25f731 -SIZE (stefanberger-swtpm-v0.9.0_GH0.tar.gz) = 370942 +TIMESTAMP = 1746085619 +SHA256 (stefanberger-swtpm-v0.10.1_GH0.tar.gz) = f8da11cadfed27e26d26c5f58a7b8f2d14d684e691927348906b5891f525c684 +SIZE (stefanberger-swtpm-v0.10.1_GH0.tar.gz) = 415992 diff --git a/sysutils/swtpm/files/patch-tests_Makefile.am b/sysutils/swtpm/files/patch-tests_Makefile.am new file mode 100644 index 000000000000..f5d07e83864c --- /dev/null +++ b/sysutils/swtpm/files/patch-tests_Makefile.am @@ -0,0 +1,10 @@ +--- tests/Makefile.am.orig 2025-05-12 20:33:40 UTC ++++ tests/Makefile.am +@@ -19,7 +19,6 @@ TESTS += \ + + TESTS += \ + test_commandline \ +- test_ctrlchannel \ + test_ctrlchannel2 \ + test_ctrlchannel3 \ + test_ctrlchannel4 \ diff --git a/sysutils/swtpm/files/swtpm.in b/sysutils/swtpm/files/swtpm.in index 637d1279aa48..15e24e044108 100644 --- a/sysutils/swtpm/files/swtpm.in +++ b/sysutils/swtpm/files/swtpm.in @@ -30,7 +30,6 @@ pidpath="/var/run/${name}" # required_modules="cuse" swtpm_default_args="\ - --daemon \ --tpmstate dir=${pidpath} \ --tpm2 \ --log level=20" @@ -64,6 +63,7 @@ start_instance() echo -n "Starting SWTPM config ${config} ..." ${command} \ ${command_args} \ + --daemon \ --pid file=${pidpath}/${config}.pid \ --ctrl type=unixio,path=${pidpath}/${config} \ ${instance_args} diff --git a/sysutils/swtpm/pkg-plist b/sysutils/swtpm/pkg-plist index 34009be0c8ba..763381418dc2 100644 --- a/sysutils/swtpm/pkg-plist +++ b/sysutils/swtpm/pkg-plist @@ -13,6 +13,193 @@ lib/swtpm/libswtpm_libtpms.a lib/swtpm/libswtpm_libtpms.so lib/swtpm/libswtpm_libtpms.so.0 lib/swtpm/libswtpm_libtpms.so.0.0.0 +libexec/installed-tests/swtpm/_test_encrypted_state +libexec/installed-tests/swtpm/_test_getcap +libexec/installed-tests/swtpm/_test_hashing +libexec/installed-tests/swtpm/_test_hashing2 +libexec/installed-tests/swtpm/_test_init +libexec/installed-tests/swtpm/_test_locality +libexec/installed-tests/swtpm/_test_migration_key +libexec/installed-tests/swtpm/_test_migration_key_2 +libexec/installed-tests/swtpm/_test_print_capabilities +libexec/installed-tests/swtpm/_test_print_states +libexec/installed-tests/swtpm/_test_resume_volatile +libexec/installed-tests/swtpm/_test_save_load_encrypted_state +libexec/installed-tests/swtpm/_test_save_load_state +libexec/installed-tests/swtpm/_test_setbuffersize +libexec/installed-tests/swtpm/_test_swtpm_bios +libexec/installed-tests/swtpm/_test_tpm2_avoid_da_lockout +libexec/installed-tests/swtpm/_test_tpm2_derived_keys +libexec/installed-tests/swtpm/_test_tpm2_encrypted_state +libexec/installed-tests/swtpm/_test_tpm2_file_permissions +libexec/installed-tests/swtpm/_test_tpm2_getcap +libexec/installed-tests/swtpm/_test_tpm2_hashing +libexec/installed-tests/swtpm/_test_tpm2_hashing2 +libexec/installed-tests/swtpm/_test_tpm2_hashing3 +libexec/installed-tests/swtpm/_test_tpm2_init +libexec/installed-tests/swtpm/_test_tpm2_locality +libexec/installed-tests/swtpm/_test_tpm2_migration_key +libexec/installed-tests/swtpm/_test_tpm2_print_capabilities +libexec/installed-tests/swtpm/_test_tpm2_print_states +libexec/installed-tests/swtpm/_test_tpm2_probe +libexec/installed-tests/swtpm/_test_tpm2_resume_volatile +libexec/installed-tests/swtpm/_test_tpm2_save_load_encrypted_state +libexec/installed-tests/swtpm/_test_tpm2_save_load_state +libexec/installed-tests/swtpm/_test_tpm2_save_load_state_da_timeout +libexec/installed-tests/swtpm/_test_tpm2_save_load_state_locking +libexec/installed-tests/swtpm/_test_tpm2_savestate +libexec/installed-tests/swtpm/_test_tpm2_setbuffersize +libexec/installed-tests/swtpm/_test_tpm2_swtpm_bios +libexec/installed-tests/swtpm/_test_tpm2_volatilestate +libexec/installed-tests/swtpm/_test_tpm2_wrongorder +libexec/installed-tests/swtpm/_test_tpm_probe +libexec/installed-tests/swtpm/_test_volatilestate +libexec/installed-tests/swtpm/_test_wrongorder +libexec/installed-tests/swtpm/common +libexec/installed-tests/swtpm/create_certs.sh +libexec/installed-tests/swtpm/data/ecprivek.pem +libexec/installed-tests/swtpm/data/ecpubek.pem +libexec/installed-tests/swtpm/data/issuercert.pem +libexec/installed-tests/swtpm/data/keyfile.txt +libexec/installed-tests/swtpm/data/keyfile256bit.txt +libexec/installed-tests/swtpm/data/migkey1/tpm2-volatilestate.bin +libexec/installed-tests/swtpm/data/migkey1/volatilestate.bin +libexec/installed-tests/swtpm/data/pubek.pem +libexec/installed-tests/swtpm/data/pwdfile.txt +libexec/installed-tests/swtpm/data/signkey-encrypted.pem +libexec/installed-tests/swtpm/data/signkey.pem +libexec/installed-tests/swtpm/data/tpm2state1/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state1/tpm2-00.volatilestate +libexec/installed-tests/swtpm/data/tpm2state2/pwdfile.txt +libexec/installed-tests/swtpm/data/tpm2state2/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state2/tpm2-00.volatilestate +libexec/installed-tests/swtpm/data/tpm2state2b/pwdfile.txt +libexec/installed-tests/swtpm/data/tpm2state2b/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state2b/tpm2-00.volatilestate +libexec/installed-tests/swtpm/data/tpm2state3/hkey.priv +libexec/installed-tests/swtpm/data/tpm2state3/hkey.pub +libexec/installed-tests/swtpm/data/tpm2state3/signature.bin +libexec/installed-tests/swtpm/data/tpm2state3/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state3b/h02000000.bin +libexec/installed-tests/swtpm/data/tpm2state3b/h81000000.bin +libexec/installed-tests/swtpm/data/tpm2state3b/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state3b/tpm2-00.volatilestate +libexec/installed-tests/swtpm/data/tpm2state3c/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state3c/tpm2-00.volatilestate +libexec/installed-tests/swtpm/data/tpm2state3d/signature2.bin +libexec/installed-tests/swtpm/data/tpm2state3d/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state3d/tpm2-00.volatilestate +libexec/installed-tests/swtpm/data/tpm2state4/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state4/tpm2-00.volatilestate +libexec/installed-tests/swtpm/data/tpm2state5/signature.bin +libexec/installed-tests/swtpm/data/tpm2state5/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpm2state6/tpm2-00.permall +libexec/installed-tests/swtpm/data/tpmstate1/README +libexec/installed-tests/swtpm/data/tpmstate1/tpm-00.permall +libexec/installed-tests/swtpm/data/tpmstate1/tpm-00.volatilestate +libexec/installed-tests/swtpm/data/tpmstate2/README +libexec/installed-tests/swtpm/data/tpmstate2/pwdfile.txt +libexec/installed-tests/swtpm/data/tpmstate2/tpm-00.permall +libexec/installed-tests/swtpm/data/tpmstate2/tpm-00.volatilestate +libexec/installed-tests/swtpm/data/tpmstate2b/pwdfile.txt +libexec/installed-tests/swtpm/data/tpmstate2b/tpm-00.permall +libexec/installed-tests/swtpm/data/tpmstate2b/tpm-00.volatilestate +libexec/installed-tests/swtpm/fileinstall +libexec/installed-tests/swtpm/installed-runner.sh +libexec/installed-tests/swtpm/load_vtpm_proxy +libexec/installed-tests/swtpm/patches/0001-Deactivate-test-cases-accessing-rootcerts.txt.patch +libexec/installed-tests/swtpm/patches/0002-Implement-powerup-for-swtpm.patch +libexec/installed-tests/swtpm/patches/0003-Set-CRYPTOLIBRARY-to-openssl.patch +libexec/installed-tests/swtpm/patches/0004-Store-and-restore-volatile-state-at-every-step.patch +libexec/installed-tests/swtpm/patches/0005-Disable-tests-related-to-events.patch +libexec/installed-tests/swtpm/patches/0010-Adjust-test-cases-for-OpenSSL-3.patch +libexec/installed-tests/swtpm/patches/0012-Disable-Nuvoton-commands.patch +libexec/installed-tests/swtpm/patches/libtpm.patch +libexec/installed-tests/swtpm/sed-inplace +libexec/installed-tests/swtpm/softhsm_setup +libexec/installed-tests/swtpm/swtpm_setup.conf +libexec/installed-tests/swtpm/test_clientfds.py +libexec/installed-tests/swtpm/test_commandline +libexec/installed-tests/swtpm/test_common +libexec/installed-tests/swtpm/test_config +libexec/installed-tests/swtpm/test_ctrlchannel2 +libexec/installed-tests/swtpm/test_ctrlchannel3 +libexec/installed-tests/swtpm/test_ctrlchannel4 +libexec/installed-tests/swtpm/test_cuse +libexec/installed-tests/swtpm/test_encrypted_state +libexec/installed-tests/swtpm/test_getcap +libexec/installed-tests/swtpm/test_hashing +libexec/installed-tests/swtpm/test_hashing2 +libexec/installed-tests/swtpm/test_init +libexec/installed-tests/swtpm/test_locality +libexec/installed-tests/swtpm/test_migration_key +libexec/installed-tests/swtpm/test_parameters +libexec/installed-tests/swtpm/test_print_capabilities +libexec/installed-tests/swtpm/test_print_states +libexec/installed-tests/swtpm/test_resume_volatile +libexec/installed-tests/swtpm/test_samples_create_tpmca +libexec/installed-tests/swtpm/test_save_load_encrypted_state +libexec/installed-tests/swtpm/test_save_load_state +libexec/installed-tests/swtpm/test_setbuffersize +libexec/installed-tests/swtpm/test_setdatafd.py +libexec/installed-tests/swtpm/test_swtpm_bios +libexec/installed-tests/swtpm/test_swtpm_cert +libexec/installed-tests/swtpm/test_swtpm_setup_create_cert +libexec/installed-tests/swtpm/test_swtpm_setup_file_backend +libexec/installed-tests/swtpm/test_swtpm_setup_misc +libexec/installed-tests/swtpm/test_swtpm_setup_overwrite +libexec/installed-tests/swtpm/test_tpm12 +libexec/installed-tests/swtpm/test_tpm2_avoid_da_lockout +libexec/installed-tests/swtpm/test_tpm2_chroot_chardev +libexec/installed-tests/swtpm/test_tpm2_chroot_cuse +libexec/installed-tests/swtpm/test_tpm2_chroot_socket +libexec/installed-tests/swtpm/test_tpm2_ctrlchannel2 +libexec/installed-tests/swtpm/test_tpm2_ctrlchannel3 +libexec/installed-tests/swtpm/test_tpm2_derived_keys +libexec/installed-tests/swtpm/test_tpm2_encrypted_state +libexec/installed-tests/swtpm/test_tpm2_file_permissions +libexec/installed-tests/swtpm/test_tpm2_getcap +libexec/installed-tests/swtpm/test_tpm2_hashing +libexec/installed-tests/swtpm/test_tpm2_hashing2 +libexec/installed-tests/swtpm/test_tpm2_hashing3 +libexec/installed-tests/swtpm/test_tpm2_ibmtss2 +libexec/installed-tests/swtpm/test_tpm2_init +libexec/installed-tests/swtpm/test_tpm2_libtpms_versions_profiles +libexec/installed-tests/swtpm/test_tpm2_locality +libexec/installed-tests/swtpm/test_tpm2_migration_key +libexec/installed-tests/swtpm/test_tpm2_parameters +libexec/installed-tests/swtpm/test_tpm2_partial_reads +libexec/installed-tests/swtpm/test_tpm2_print_capabilities +libexec/installed-tests/swtpm/test_tpm2_print_states +libexec/installed-tests/swtpm/test_tpm2_probe +libexec/installed-tests/swtpm/test_tpm2_resume_volatile +libexec/installed-tests/swtpm/test_tpm2_save_load_encrypted_state +libexec/installed-tests/swtpm/test_tpm2_save_load_state +libexec/installed-tests/swtpm/test_tpm2_save_load_state_2 +libexec/installed-tests/swtpm/test_tpm2_save_load_state_2_block +libexec/installed-tests/swtpm/test_tpm2_save_load_state_2_linear +libexec/installed-tests/swtpm/test_tpm2_save_load_state_3 +libexec/installed-tests/swtpm/test_tpm2_save_load_state_da_timeout +libexec/installed-tests/swtpm/test_tpm2_save_load_state_locking +libexec/installed-tests/swtpm/test_tpm2_savestate +libexec/installed-tests/swtpm/test_tpm2_setbuffersize +libexec/installed-tests/swtpm/test_tpm2_swtpm_bios +libexec/installed-tests/swtpm/test_tpm2_swtpm_cert +libexec/installed-tests/swtpm/test_tpm2_swtpm_cert_ecc +libexec/installed-tests/swtpm/test_tpm2_swtpm_localca +libexec/installed-tests/swtpm/test_tpm2_swtpm_localca_pkcs11.test +libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_create_cert +libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_overwrite +libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_profile +libexec/installed-tests/swtpm/test_tpm2_swtpm_setup_profile_name +libexec/installed-tests/swtpm/test_tpm2_volatilestate +libexec/installed-tests/swtpm/test_tpm2_vtpm_proxy +libexec/installed-tests/swtpm/test_tpm2_wrongorder +libexec/installed-tests/swtpm/test_tpm_probe +libexec/installed-tests/swtpm/test_volatilestate +libexec/installed-tests/swtpm/test_vtpm_proxy +libexec/installed-tests/swtpm/test_wrongorder +libexec/installed-tests/swtpm/tests share/man/man3/swtpm_ioctls.3.gz share/man/man5/swtpm-localca.conf.5.gz share/man/man5/swtpm-localca.options.5.gz |