diff options
Diffstat (limited to 'sysutils')
28 files changed, 444 insertions, 255 deletions
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/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/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 |