From a181190b3f136b96ef9f300c832ac16c67dce3b0 Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Wed, 4 Jun 2025 15:15:02 +0200 Subject: [PATCH] Cleanup --- devel/etcd35/Makefile | 143 -- devel/etcd35/distinfo | 153 -- devel/etcd35/pkg-descr | 11 - devel/gmake3/Makefile | 29 + devel/gmake3/distinfo | 3 + devel/gmake3/pkg-descr | 4 + devel/gmake3/pkg-plist | 2 + security/openssh-portable/Makefile | 245 ---- security/openssh-portable/distinfo | 5 - .../files/extra-patch-blacklistd | 419 ------ .../files/extra-patch-gssapi-kexgssc.c | 14 - .../files/extra-patch-gssapi-kexgsss.c | 14 - .../openssh-portable/files/extra-patch-hpn | 1300 ----------------- .../files/extra-patch-hpn-compat | 46 - .../files/extra-patch-hpn-gss-glue | 57 - .../files/extra-patch-pam-sshd_config | 31 - .../files/extra-patch-tcpwrappers | 151 -- .../files/extra-patch-version-addendum | 5 - security/openssh-portable/files/openssh.in | 179 --- .../files/patch-regress__test-exec.sh | 10 - .../openssh-portable/files/patch-servconf.c | 52 - .../openssh-portable/files/patch-session.c | 78 - .../openssh-portable/files/patch-ssh-agent.1 | 26 - .../openssh-portable/files/patch-ssh-agent.c | 97 -- security/openssh-portable/files/patch-ssh.c | 33 - .../openssh-portable/files/patch-ssh_config | 11 - .../openssh-portable/files/patch-ssh_config.5 | 13 - security/openssh-portable/files/patch-sshd.8 | 26 - security/openssh-portable/files/patch-sshd.c | 101 -- .../openssh-portable/files/patch-sshd_config | 33 - .../files/patch-sshd_config.5 | 59 - security/openssh-portable/pkg-descr | 13 - security/openssh-portable/pkg-message | 22 - security/openssh-portable/pkg-plist | 35 - sysutils/py-salt/Makefile | 131 -- sysutils/py-salt/distinfo | 3 - .../py-salt/files/patch-requirements_base.txt | 8 - .../files/patch-salt_ext_tornado_iostream.py | 10 - .../py-salt/files/patch-salt_loader_lazy.py | 11 - .../files/patch-salt_modules_config.py | 17 - .../py-salt/files/patch-salt_utils_process.py | 14 - sysutils/py-salt/files/pkg-message.in | 36 - sysutils/py-salt/files/salt_api.in | 29 - sysutils/py-salt/files/salt_master.in | 42 - sysutils/py-salt/files/salt_minion.in | 42 - sysutils/py-salt/files/salt_proxy.in | 57 - sysutils/py-salt/files/salt_syndic.in | 29 - sysutils/py-salt/pkg-descr | 7 - sysutils/py-salt/pkg-plist | 7 - 49 files changed, 38 insertions(+), 3825 deletions(-) delete mode 100644 devel/etcd35/Makefile delete mode 100644 devel/etcd35/distinfo delete mode 100644 devel/etcd35/pkg-descr create mode 100644 devel/gmake3/Makefile create mode 100644 devel/gmake3/distinfo create mode 100644 devel/gmake3/pkg-descr create mode 100644 devel/gmake3/pkg-plist delete mode 100644 security/openssh-portable/Makefile delete mode 100644 security/openssh-portable/distinfo delete mode 100644 security/openssh-portable/files/extra-patch-blacklistd delete mode 100644 security/openssh-portable/files/extra-patch-gssapi-kexgssc.c delete mode 100644 security/openssh-portable/files/extra-patch-gssapi-kexgsss.c delete mode 100644 security/openssh-portable/files/extra-patch-hpn delete mode 100644 security/openssh-portable/files/extra-patch-hpn-compat delete mode 100644 security/openssh-portable/files/extra-patch-hpn-gss-glue delete mode 100644 security/openssh-portable/files/extra-patch-pam-sshd_config delete mode 100644 security/openssh-portable/files/extra-patch-tcpwrappers delete mode 100644 security/openssh-portable/files/extra-patch-version-addendum delete mode 100644 security/openssh-portable/files/openssh.in delete mode 100644 security/openssh-portable/files/patch-regress__test-exec.sh delete mode 100644 security/openssh-portable/files/patch-servconf.c delete mode 100644 security/openssh-portable/files/patch-session.c delete mode 100644 security/openssh-portable/files/patch-ssh-agent.1 delete mode 100644 security/openssh-portable/files/patch-ssh-agent.c delete mode 100644 security/openssh-portable/files/patch-ssh.c delete mode 100644 security/openssh-portable/files/patch-ssh_config delete mode 100644 security/openssh-portable/files/patch-ssh_config.5 delete mode 100644 security/openssh-portable/files/patch-sshd.8 delete mode 100644 security/openssh-portable/files/patch-sshd.c delete mode 100644 security/openssh-portable/files/patch-sshd_config delete mode 100644 security/openssh-portable/files/patch-sshd_config.5 delete mode 100644 security/openssh-portable/pkg-descr delete mode 100644 security/openssh-portable/pkg-message delete mode 100644 security/openssh-portable/pkg-plist delete mode 100644 sysutils/py-salt/Makefile delete mode 100644 sysutils/py-salt/distinfo delete mode 100644 sysutils/py-salt/files/patch-requirements_base.txt delete mode 100644 sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py delete mode 100644 sysutils/py-salt/files/patch-salt_loader_lazy.py delete mode 100644 sysutils/py-salt/files/patch-salt_modules_config.py delete mode 100644 sysutils/py-salt/files/patch-salt_utils_process.py delete mode 100644 sysutils/py-salt/files/pkg-message.in delete mode 100644 sysutils/py-salt/files/salt_api.in delete mode 100644 sysutils/py-salt/files/salt_master.in delete mode 100644 sysutils/py-salt/files/salt_minion.in delete mode 100644 sysutils/py-salt/files/salt_proxy.in delete mode 100644 sysutils/py-salt/files/salt_syndic.in delete mode 100644 sysutils/py-salt/pkg-descr delete mode 100644 sysutils/py-salt/pkg-plist diff --git a/devel/etcd35/Makefile b/devel/etcd35/Makefile deleted file mode 100644 index 58e16eb..0000000 --- a/devel/etcd35/Makefile +++ /dev/null @@ -1,143 +0,0 @@ -PORTNAME= etcd -PORTVERSION= 3.5.18 -DISTVERSIONPREFIX= v -#PORTREVISION= 25 -CATEGORIES= devel -PKGNAMEPREFIX= coreos- -#PKGNAMESUFFIX= 34 - -MAINTAINER= kiwi@oav.net -COMMENT= Highly-available key value store and service discovery -WWW= https://github.com/coreos/etcd - -LICENSE= APACHE20 -LICENSE_FILE= ${WRKSRC}/LICENSE - -USES= cpe go:1.21,modules -USE_GITHUB= yes -GH_ACCOUNT= coreos -GH_TUPLE= \ - beorn7:perks:v1.0.1:beorn7_perks/vendor/github.com/beorn7/perks \ - bgentry:speakeasy:v0.1.0:bgentry_speakeasy/vendor/github.com/bgentry/speakeasy \ - cenkalti:backoff:v4.2.1:cenkalti_backoff_v4/vendor/github.com/cenkalti/backoff/v4 \ - cespare:xxhash:v2.2.0:cespare_xxhash_v2/vendor/github.com/cespare/xxhash/v2 \ - cheggaaa:pb:v1.0.28:cheggaaa_pb/vendor/gopkg.in/cheggaaa/pb.v1 \ - coreos:go-semver:v0.3.0:coreos_go_semver/vendor/github.com/coreos/go-semver \ - coreos:go-systemd:v22.3.2:coreos_go_systemd_v22/vendor/github.com/coreos/go-systemd/v22 \ - dustin:go-humanize:v1.0.0:dustin_go_humanize/vendor/github.com/dustin/go-humanize \ - etcd-io:bbolt:v1.3.10:etcd_io_bbolt/vendor/go.etcd.io/bbolt \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd/go.etcd.io/etcd/api/v3 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_11/go.etcd.io/etcd/etcdutl/v3 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_12/go.etcd.io/etcd/pkg/v3 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_14/go.etcd.io/etcd/raft/v3 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_17/go.etcd.io/etcd/server/v3 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_2/go.etcd.io/etcd/client/pkg/v3 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_6/go.etcd.io/etcd/client/v3 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_8/go.etcd.io/etcd/etcdctl/v3 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_10 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_13 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_15 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_16 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_19 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_1 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_3 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_7 \ - etcd-io:etcd:v3.5.15:etcd_io_etcd_9 \ - etcd-io:etcd:v3.6.0-alpha.0:etcd_io_etcd_4/go.etcd.io/etcd/client/v2 \ - go-logr:logr:v1.3.0:go_logr_logr/vendor/github.com/go-logr/logr \ - go-logr:stdr:v1.2.2:go_logr_stdr/vendor/github.com/go-logr/stdr \ - go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \ - gogo:protobuf:v1.3.2:gogo_protobuf/vendor/github.com/gogo/protobuf \ - golang-jwt:jwt:v4.4.2:golang_jwt_jwt_v4/vendor/github.com/golang-jwt/jwt/v4 \ - golang:crypto:v0.21.0:golang_crypto/vendor/golang.org/x/crypto \ - golang:groupcache:41bb18bfe9da:golang_groupcache/vendor/github.com/golang/groupcache \ - golang:net:v0.23.0:golang_net/vendor/golang.org/x/net \ - golang:protobuf:v1.5.4:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:v0.18.0:golang_sys/vendor/golang.org/x/sys \ - golang:text:v0.14.0:golang_text/vendor/golang.org/x/text \ - golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \ - google:btree:v1.0.1:google_btree/vendor/github.com/google/btree \ - google:go-genproto:b8732ec3820d:google_go_genproto/vendor/google.golang.org/genproto \ - gorilla:websocket:v1.4.2:gorilla_websocket/vendor/github.com/gorilla/websocket \ - grpc-ecosystem:go-grpc-middleware:v1.3.0:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ - grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \ - grpc-ecosystem:grpc-gateway:v1.16.0:grpc_ecosystem_grpc_gateway/vendor/github.com/grpc-ecosystem/grpc-gateway \ - grpc-ecosystem:grpc-gateway:v2.16.0:grpc_ecosystem_grpc_gateway_v2/vendor/github.com/grpc-ecosystem/grpc-gateway/v2 \ - grpc:grpc-go:v1.59.0:grpc_grpc_go/vendor/google.golang.org/grpc \ - inconshreveable:mousetrap:v1.0.0:inconshreveable_mousetrap/vendor/github.com/inconshreveable/mousetrap \ - jonboulle:clockwork:v0.2.2:jonboulle_clockwork/vendor/github.com/jonboulle/clockwork \ - json-iterator:go:v1.1.11:json_iterator_go/vendor/github.com/json-iterator/go \ - kubernetes-sigs:yaml:v1.2.0:kubernetes_sigs_yaml/vendor/sigs.k8s.io/yaml \ - mattn:go-colorable:v0.1.11:mattn_go_colorable/vendor/github.com/mattn/go-colorable \ - mattn:go-runewidth:v0.0.9:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \ - matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ - modern-go:concurrent:bacd9c7ef1dd:modern_go_concurrent/vendor/github.com/modern-go/concurrent \ - modern-go:reflect2:v1.0.1:modern_go_reflect2/vendor/github.com/modern-go/reflect2 \ - natefinch:lumberjack:v2.0.0:natefinch_lumberjack/vendor/gopkg.in/natefinch/lumberjack.v2 \ - olekukonko:tablewriter:v0.0.5:olekukonko_tablewriter/vendor/github.com/olekukonko/tablewriter \ - open-telemetry:opentelemetry-go-contrib:instrumentation/google.golang.org/grpc/otelgrpc/v0.46.0:open_telemetry_opentelemetry_go_contrib/vendor/go.opentelemetry.io/contrib \ - open-telemetry:opentelemetry-go:v1.20.0:open_telemetry_opentelemetry_go/vendor/go.opentelemetry.io/otel \ - open-telemetry:opentelemetry-proto-go:v1.0.0:open_telemetry_opentelemetry_proto_go/vendor/go.opentelemetry.io/proto/otlp \ - prometheus:client_golang:v1.11.1:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ - prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \ - prometheus:common:v0.26.0:prometheus_common/vendor/github.com/prometheus/common \ - prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \ - protocolbuffers:protobuf-go:v1.33.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \ - sirupsen:logrus:v1.9.3:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ - soheilhy:cmux:v0.1.5:soheilhy_cmux/vendor/github.com/soheilhy/cmux \ - spf13:cobra:v1.1.3:spf13_cobra/vendor/github.com/spf13/cobra \ - spf13:pflag:v1.0.5:spf13_pflag/vendor/github.com/spf13/pflag \ - tmc:grpc-websocket-proxy:e5319fda7802:tmc_grpc_websocket_proxy/vendor/github.com/tmc/grpc-websocket-proxy \ - uber-go:atomic:v1.7.0:uber_go_atomic/vendor/go.uber.org/atomic \ - uber-go:multierr:v1.6.0:uber_go_multierr/vendor/go.uber.org/multierr \ - uber-go:zap:v1.17.0:uber_go_zap/vendor/go.uber.org/zap \ - xiang90:probing:43a291ad63a2:xiang90_probing/vendor/github.com/xiang90/probing - - #etcd-io:etcd:v3.0.0-00010101000000-000000000000:etcd_io_etcd_18/go.etcd.io/etcd/tests/v3 \ - #etcd-io:etcd:v2.306.0-alpha.0:etcd_io_etcd_4/go.etcd.io/etcd/client/v2 \ - #etcd-io:etcd:v2.305.15:etcd_io_etcd_5 \ - -GO_PKGNAME= github.com/coreos/etcd -GO_TARGET= ./server ./etcdctl ./etcdutl - -CONFLICTS_INSTALL= coreos-etcd[0-9][0-9] - -PLIST_FILES= bin/etcd \ - bin/etcdctl -PORTDOCS= README.md - -OPTIONS_DEFINE= DOCS -DOCS_DESC= Install etcd README file - -#pre-patch: -# ${RM} ${WRKSRC}/vendor/modules.txt -# ${RM} -r ${WRKSRC}/vendor/golang.org/x/sys -# ${LN} -s ${WRKDIR}/sys-* ${WRKSRC}/vendor/golang.org/x/sys - -post-extract: - ${RLN} ${WRKSRC_etcd_io_etcd_1} ${WRKSRC}/api - #${RLN} ${WRKSRC_etcd_io_etcd} ${WRKSRC}/api - ${RLN} ${WRKSRC_etcd_io_etcd_3} ${WRKSRC}/client/pkg - #${RLN} ${WRKSRC_etcd_io_etcd_2} ${WRKSRC}/client/pkg - #${RLN} ${WRKSRC_etcd_io_etcd_4} ${WRKSRC}/client/v2 - #${RLN} ${WRKSRC_etcd_io_etcd_5} ${WRKSRC}/client/v2 - ${RLN} ${WRKSRC_etcd_io_etcd_7} ${WRKSRC}/client/v3 - #${RLN} ${WRKSRC_etcd_io_etcd_6} ${WRKSRC}/client/v3 - ${RLN} ${WRKSRC_etcd_io_etcd_9} ${WRKSRC}/etcdctl - #${RLN} ${WRKSRC_etcd_io_etcd_8} ${WRKSRC}/etcdctl - #${RLN} ${WRKSRC_etcd_io_etcd_11} ${WRKSRC}/etcdutl - ${RLN} ${WRKSRC_etcd_io_etcd_10} ${WRKSRC}/etcdutl - ${RLN} ${WRKSRC_etcd_io_etcd_13} ${WRKSRC}/pkg - #${RLN} ${WRKSRC_etcd_io_etcd_12} ${WRKSRC}/pkg - ${RLN} ${WRKSRC_etcd_io_etcd_15} ${WRKSRC}/raft - #${RLN} ${WRKSRC_etcd_io_etcd_14} ${WRKSRC}/raft - ${RLN} ${WRKSRC_etcd_io_etcd_16} ${WRKSRC}/server - #${RLN} ${WRKSRC_etcd_io_etcd_17} ${WRKSRC}/server - #${RLN} ${WRKSRC_etcd_io_etcd_18} ${WRKSRC}/tests - ${RLN} ${WRKSRC_etcd_io_etcd_19} ${WRKSRC}/tests - -do-install-DOCS-on: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR} - -.include diff --git a/devel/etcd35/distinfo b/devel/etcd35/distinfo deleted file mode 100644 index c6f3e06..0000000 --- a/devel/etcd35/distinfo +++ /dev/null @@ -1,153 +0,0 @@ -TIMESTAMP = 1738341575 -SHA256 (coreos-etcd-v3.5.18_GH0.tar.gz) = 8c8890b15c1a19263ab4ee2b374698c1d76c2b31e9b55bdeea47193aa48d8025 -SIZE (coreos-etcd-v3.5.18_GH0.tar.gz) = 4128059 -SHA256 (beorn7-perks-v1.0.1_GH0.tar.gz) = 98db84bb0224a26094e6adba91b7ee7a1a7ace28cb648d818f8e779e6a19f825 -SIZE (beorn7-perks-v1.0.1_GH0.tar.gz) = 10867 -SHA256 (bgentry-speakeasy-v0.1.0_GH0.tar.gz) = 863f57f96f77c2b4e5488e34e8df47478e9ffa9920779ca4df2cc3adc0d03252 -SIZE (bgentry-speakeasy-v0.1.0_GH0.tar.gz) = 7481 -SHA256 (cenkalti-backoff-v4.2.1_GH0.tar.gz) = adb92e0d2ecc3de14f45bea713afb367367bdc89c1af8391b91089ce91ce18f4 -SIZE (cenkalti-backoff-v4.2.1_GH0.tar.gz) = 10394 -SHA256 (cespare-xxhash-v2.2.0_GH0.tar.gz) = b8c684b9e5e136510913727e6a845b28f8176e55db827b11f17769fba970fe13 -SIZE (cespare-xxhash-v2.2.0_GH0.tar.gz) = 12334 -SHA256 (cheggaaa-pb-v1.0.28_GH0.tar.gz) = f745c5636d3fb59bffab5f9d2a745a94a9608166c20c90936fc66848a5e816e6 -SIZE (cheggaaa-pb-v1.0.28_GH0.tar.gz) = 11788 -SHA256 (coreos-go-semver-v0.3.0_GH0.tar.gz) = 1b72134483db366fb43f216727d6bc110086d4450ce0d226960cf4ce823d6eb9 -SIZE (coreos-go-semver-v0.3.0_GH0.tar.gz) = 10663 -SHA256 (coreos-go-systemd-v22.3.2_GH0.tar.gz) = dbb1a3930d43f49e11c53f2010ab9609e18236f776a99921850cd05f54779438 -SIZE (coreos-go-systemd-v22.3.2_GH0.tar.gz) = 72134 -SHA256 (dustin-go-humanize-v1.0.0_GH0.tar.gz) = e4540bd50ac855143b4f2e509313079c50cf5d8774f09cc10dbca5ae9803d8ba -SIZE (dustin-go-humanize-v1.0.0_GH0.tar.gz) = 17260 -SHA256 (etcd-io-bbolt-v1.3.10_GH0.tar.gz) = 4991a0f2cfb4fd4530c450e3b913cf38fc8566d115c514ecbcef5946a7391400 -SIZE (etcd-io-bbolt-v1.3.10_GH0.tar.gz) = 125701 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.5.15_GH0.tar.gz) = bfc9c90f103acd47b0dca2840d4b69af68cb39f22893bef0f4fb5c5351314b84 -SIZE (etcd-io-etcd-v3.5.15_GH0.tar.gz) = 4113649 -SHA256 (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = c101da7821e89ab59f47606b083407462e3ff67fa5d37e161574a1c42b688254 -SIZE (etcd-io-etcd-v3.6.0-alpha.0_GH0.tar.gz) = 4161362 -SHA256 (go-logr-logr-v1.3.0_GH0.tar.gz) = a0ceb13b9611e19ebe3cba015e2e6dbbf3125be9cd7f1d975d4d334da688839a -SIZE (go-logr-logr-v1.3.0_GH0.tar.gz) = 51225 -SHA256 (go-logr-stdr-v1.2.2_GH0.tar.gz) = 37d975b280d884ca0d55a800bc6e47314b6e86268e56254f9d15d19ca9404eb8 -SIZE (go-logr-stdr-v1.2.2_GH0.tar.gz) = 9098 -SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da44f701755babf99b3daf0faac0 -SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209 -SHA256 (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2bb4b13d6e56b3911f09b8e9ddd15708477fbff8823c057cc79dd99c9a452b34 -SIZE (gogo-protobuf-v1.3.2_GH0.tar.gz) = 2038725 -SHA256 (golang-jwt-jwt-v4.4.2_GH0.tar.gz) = 5c48e918854c3fc1c9bbb9ebf747addb960250f977aa8523344f60f4c423c7c1 -SIZE (golang-jwt-jwt-v4.4.2_GH0.tar.gz) = 51392 -SHA256 (golang-crypto-v0.21.0_GH0.tar.gz) = 4c65ea22c4b0bc7380b4213a294698c517fe3378e0edd30c4d2b6cf7f12fc8bd -SIZE (golang-crypto-v0.21.0_GH0.tar.gz) = 1810887 -SHA256 (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 1e89795970d6593affdafe1d09dcf947681ca1ea82528e8e4fb9974a77f2e394 -SIZE (golang-groupcache-41bb18bfe9da_GH0.tar.gz) = 26101 -SHA256 (golang-net-v0.23.0_GH0.tar.gz) = 5d1aeb0051277e79fa692947079dc50ddc284dc0403b22c85692b97060ab4953 -SIZE (golang-net-v0.23.0_GH0.tar.gz) = 1508997 -SHA256 (golang-protobuf-v1.5.4_GH0.tar.gz) = d75e6960ecfabaaa83a7261b1b630d24e9c63aca79615fb15bf33e11b62fd019 -SIZE (golang-protobuf-v1.5.4_GH0.tar.gz) = 172992 -SHA256 (golang-sys-v0.18.0_GH0.tar.gz) = cee1944ab655ddf7eab6301e15cb6d01fdd6cd0a0f0b5896050ee60b124e084c -SIZE (golang-sys-v0.18.0_GH0.tar.gz) = 1448211 -SHA256 (golang-text-v0.14.0_GH0.tar.gz) = c80295e75bda599d17ccf74038139b0957b9915fae4e60d8b46f89454ef171a0 -SIZE (golang-text-v0.14.0_GH0.tar.gz) = 8974094 -SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb -SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656 -SHA256 (google-btree-v1.0.1_GH0.tar.gz) = 240723cff7c3c28e8444d45e500e65b2c25df519273260f248786e1a7367a654 -SIZE (google-btree-v1.0.1_GH0.tar.gz) = 15381 -SHA256 (google-go-genproto-b8732ec3820d_GH0.tar.gz) = b3d7e0e6a90e43230013b4ac375c7d5b5eaa037ef20fbab28567f96da4f765b2 -SIZE (google-go-genproto-b8732ec3820d_GH0.tar.gz) = 5916673 -SHA256 (gorilla-websocket-v1.4.2_GH0.tar.gz) = 91937a36bc9e0da3c895c73d4cb74b2cdb1aff54ab21b0d0724000e7b5b85b84 -SIZE (gorilla-websocket-v1.4.2_GH0.tar.gz) = 54101 -SHA256 (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = c9b908202c05a7f821b03ee49cd678e7e71469519054629770e0565d78275cbc -SIZE (grpc-ecosystem-go-grpc-middleware-v1.3.0_GH0.tar.gz) = 103780 -SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 -SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 -SHA256 (grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 20ba8f2aeb4a580109357fffaa42f8400aba1155b95c8845e412287907e64379 -SIZE (grpc-ecosystem-grpc-gateway-v1.16.0_GH0.tar.gz) = 521578 -SHA256 (grpc-ecosystem-grpc-gateway-v2.16.0_GH0.tar.gz) = f49af0b9a5b260c5a783c30010ba3cca4730abba9246618cbee19070f7a843e7 -SIZE (grpc-ecosystem-grpc-gateway-v2.16.0_GH0.tar.gz) = 821213 -SHA256 (grpc-grpc-go-v1.59.0_GH0.tar.gz) = 0f951688030fdc9a82accb440222ff068440e59bdc44a82d86150cc4cddf1aed -SIZE (grpc-grpc-go-v1.59.0_GH0.tar.gz) = 2010414 -SHA256 (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 5edc7731c819c305623568e317aa253d342be3447def97f1fa9e10eb5ad819f6 -SIZE (inconshreveable-mousetrap-v1.0.0_GH0.tar.gz) = 2290 -SHA256 (jonboulle-clockwork-v0.2.2_GH0.tar.gz) = 79ac7c0e53dfa48aac0622745f133b2438542f1c11d2c09ec1c98affbd62e1f0 -SIZE (jonboulle-clockwork-v0.2.2_GH0.tar.gz) = 9588 -SHA256 (json-iterator-go-v1.1.11_GH0.tar.gz) = 19d0d56ac18a052867360b10201bad614c7b31a3edf2041a331c28860920b932 -SIZE (json-iterator-go-v1.1.11_GH0.tar.gz) = 84401 -SHA256 (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 80612b8cc63863556906f04df7eca89179bf81e5b3d1133c082bd7e5e35d5514 -SIZE (kubernetes-sigs-yaml-v1.2.0_GH0.tar.gz) = 92574 -SHA256 (mattn-go-colorable-v0.1.11_GH0.tar.gz) = b88eae3c846d3c9bee375bfb72b535b726755a06d8e972c937820aba45d2f5e0 -SIZE (mattn-go-colorable-v0.1.11_GH0.tar.gz) = 9800 -SHA256 (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 4f20a337ad06e071f29535afe9c5207d3e8840c8c86672bbc5f9837c6229c835 -SIZE (mattn-go-runewidth-v0.0.9_GH0.tar.gz) = 16714 -SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b -SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 -SHA256 (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = d673e902118a6ece63198dc7e0961e904d0410f142726df0936ec1a52035a60f -SIZE (modern-go-concurrent-bacd9c7ef1dd_GH0.tar.gz) = 7526 -SHA256 (modern-go-reflect2-v1.0.1_GH0.tar.gz) = d24e856d9aa8fd51b9e6c2cdd712a44c8d18cb8b72802f1bd16e0470322363fd -SIZE (modern-go-reflect2-v1.0.1_GH0.tar.gz) = 14394 -SHA256 (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 5817941b45096eb70b8114d7a4bf392ea47c4fe8030ff383ca54c67dfa0617bd -SIZE (natefinch-lumberjack-v2.0.0_GH0.tar.gz) = 12631 -SHA256 (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 14a1294a8267facc9bc99a230b8871517e6db284ccc7e39030313befa124677f -SIZE (olekukonko-tablewriter-v0.0.5_GH0.tar.gz) = 19568 -SHA256 (open-telemetry-opentelemetry-go-contrib-instrumentation-google.golang.org-grpc-otelgrpc-v0.46.0_GH0.tar.gz) = 931da4874869b2790eb317270a5077a2810cf06298b38c3a6be0baec2b12fe2b -SIZE (open-telemetry-opentelemetry-go-contrib-instrumentation-google.golang.org-grpc-otelgrpc-v0.46.0_GH0.tar.gz) = 598954 -SHA256 (open-telemetry-opentelemetry-go-v1.20.0_GH0.tar.gz) = c739ba9a4eb74db325acdec5eca5d2c18f789f63e10f1658d8c5e0061700d18a -SIZE (open-telemetry-opentelemetry-go-v1.20.0_GH0.tar.gz) = 1273769 -SHA256 (open-telemetry-opentelemetry-proto-go-v1.0.0_GH0.tar.gz) = 543b133a09579ad227b2db21460f71baeeb46e4209c2ac5e5621f4ffe7fb192b -SIZE (open-telemetry-opentelemetry-proto-go-v1.0.0_GH0.tar.gz) = 177183 -SHA256 (prometheus-client_golang-v1.11.1_GH0.tar.gz) = edf216320f3e12f5d60e3df52948e73a95b6b3759b45f1970d750016583d052a -SIZE (prometheus-client_golang-v1.11.1_GH0.tar.gz) = 170256 -SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12 -SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986 -SHA256 (prometheus-common-v0.26.0_GH0.tar.gz) = 35cfd6f896655c848042802652394cc9da57ef01437f0d78bffb85a467f62a1b -SIZE (prometheus-common-v0.26.0_GH0.tar.gz) = 116907 -SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c -SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898 -SHA256 (protocolbuffers-protobuf-go-v1.33.0_GH0.tar.gz) = 21661d7634e3f783b015b93ceafc0261f2f02a270799bac871602c3a2172cfbe -SIZE (protocolbuffers-protobuf-go-v1.33.0_GH0.tar.gz) = 1482410 -SHA256 (sirupsen-logrus-v1.9.3_GH0.tar.gz) = cfa48a647a28c1f12fb6a9b672bc4d88b6407ff05aedcf23ce939d342646acce -SIZE (sirupsen-logrus-v1.9.3_GH0.tar.gz) = 50320 -SHA256 (soheilhy-cmux-v0.1.5_GH0.tar.gz) = 199232ece74332f408a38e4d38e7ca942b3e66ae58074ca95d3f069693e0dca1 -SIZE (soheilhy-cmux-v0.1.5_GH0.tar.gz) = 22250 -SHA256 (spf13-cobra-v1.1.3_GH0.tar.gz) = e5f93c61e1236e61c7fc45882d2a03b81f46ebebdf70628ebb64b0b5fe34f6fa -SIZE (spf13-cobra-v1.1.3_GH0.tar.gz) = 146580 -SHA256 (spf13-pflag-v1.0.5_GH0.tar.gz) = 9a2cae1f8e8ab0d2cc8ebe468e871af28d9ac0962cf0520999e3ba85f0c7b808 -SIZE (spf13-pflag-v1.0.5_GH0.tar.gz) = 50796 -SHA256 (tmc-grpc-websocket-proxy-e5319fda7802_GH0.tar.gz) = ab27ebe35674bcc777d63bb1d64874310832d857a3eb573192b082f73afde494 -SIZE (tmc-grpc-websocket-proxy-e5319fda7802_GH0.tar.gz) = 10031 -SHA256 (uber-go-atomic-v1.7.0_GH0.tar.gz) = 4d655e90a23d023b36607e2ce94c3b7bf650d41c81c0faff32432581d9099ad1 -SIZE (uber-go-atomic-v1.7.0_GH0.tar.gz) = 18566 -SHA256 (uber-go-multierr-v1.6.0_GH0.tar.gz) = f8a139a06fd70bbda0f089274bd723a00c33c5b269a696de4d6a8ab455a22717 -SIZE (uber-go-multierr-v1.6.0_GH0.tar.gz) = 12369 -SHA256 (uber-go-zap-v1.17.0_GH0.tar.gz) = 9608554d14e846718c5ebe44ab172ce6b748356679c17e144226af94ff232d9a -SIZE (uber-go-zap-v1.17.0_GH0.tar.gz) = 142719 -SHA256 (xiang90-probing-43a291ad63a2_GH0.tar.gz) = 576dd87a3b8729fd6f2422664897e285d43254138831aaedfac797813964d255 -SIZE (xiang90-probing-43a291ad63a2_GH0.tar.gz) = 3468 diff --git a/devel/etcd35/pkg-descr b/devel/etcd35/pkg-descr deleted file mode 100644 index ea402f1..0000000 --- a/devel/etcd35/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -A highly-available key value store for shared -configuration and service discovery. etcd is -inspired by zookeeper and doozer, with a focus on: - -* Simple: curl'able user facing API (HTTP+JSON) -* Secure: optional SSL client cert authentication -* Fast: benchmarked 1000s of writes/s per instance -* Reliable: Properly distributed using Raft - -Etcd is written in Go and uses the raft consensus -algorithm to manage a highly-available replicated log. diff --git a/devel/gmake3/Makefile b/devel/gmake3/Makefile new file mode 100644 index 0000000..ff94127 --- /dev/null +++ b/devel/gmake3/Makefile @@ -0,0 +1,29 @@ +PORTNAME= make +DISTVERSION= 3.81 +CATEGORIES= devel +MASTER_SITES= GNU +PKGNAMEPREFIX= g +PKGNAMESUFFIX= 3 + +# note: before committing to this port, contact portmgr to arrange for an +# experimental ports run. Untested commits may be backed out at portmgr's +# discretion. +MAINTAINER= allanjude@FreeBSD.org +COMMENT= Last GPLv2 version of GNU 'make' utility +WWW= https://www.gnu.org/software/make/ + +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= cpe tar:bz2 +CPE_VENDOR= gnu + +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +CONFIGURE_ARGS= --program-prefix=g \ + --program-suffix=3 \ + --disable-nls \ + --disable-info \ + --without-guile + +.include diff --git a/devel/gmake3/distinfo b/devel/gmake3/distinfo new file mode 100644 index 0000000..d1fa756 --- /dev/null +++ b/devel/gmake3/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1747413857 +SHA256 (make-3.81.tar.bz2) = f3e69023771e23908f5d5592954d8271d3d6af09693cecfd29cee6fde8550dc8 +SIZE (make-3.81.tar.bz2) = 1151445 diff --git a/devel/gmake3/pkg-descr b/devel/gmake3/pkg-descr new file mode 100644 index 0000000..1a7f080 --- /dev/null +++ b/devel/gmake3/pkg-descr @@ -0,0 +1,4 @@ +This is the last GPLv2 licensed version of GNU make. +GNU make is a tool that controls the generation of executables and other +non-source files from source files. Its purpose is the same as that +of the utility make(1). diff --git a/devel/gmake3/pkg-plist b/devel/gmake3/pkg-plist new file mode 100644 index 0000000..279b5de --- /dev/null +++ b/devel/gmake3/pkg-plist @@ -0,0 +1,2 @@ +bin/gmake3 +share/man/man1/gmake3.1.gz diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile deleted file mode 100644 index 0a9687a..0000000 --- a/security/openssh-portable/Makefile +++ /dev/null @@ -1,245 +0,0 @@ -PORTNAME= openssh -DISTVERSION= 10.0p1 -PORTREVISION= 0 -PORTEPOCH= 1 -CATEGORIES= security -MASTER_SITES= OPENBSD/OpenSSH/portable -PKGNAMESUFFIX?= -portable - -MAINTAINER= bdrewery@FreeBSD.org -COMMENT= The portable version of OpenBSD's OpenSSH -WWW= https://www.openssh.com/portable.html - -LICENSE= OPENSSH -LICENSE_NAME= OpenSSH Licenses -LICENSE_FILE= ${WRKSRC}/LICENCE -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept - -CONFLICTS?= openssh-3.* ssh-1.* ssh2-3.* openssh-portable-devel - -USES= alias autoreconf compiler:c11 cpe localbase ncurses \ - pkgconfig ssl -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --without-zlib-version-check \ - --with-ssl-engine \ - --with-mantype=man - -ETCOLD= ${PREFIX}/etc - -CPE_VENDOR= openbsd - -FLAVORS= default hpn gssapi -default_CONFLICTS_INSTALL= openssh-portable-hpn openssh-portable-gssapi \ - openssh-portable-x509 -hpn_CONFLICTS_INSTALL= openssh-portable openssh-portable-gssapi \ - openssh-portable-x509 -hpn_PKGNAMESUFFIX= -portable-hpn -gssapi_CONFLICTS_INSTALL= openssh-portable openssh-portable-hpn \ - openssh-portable-x509 -gssapi_PKGNAMESUFFIX= -portable-gssapi - -OPTIONS_DEFINE= DOCS PAM TCP_WRAPPERS LIBEDIT BSM \ - HPN KERB_GSSAPI \ - LDNS NONECIPHER XMSS FIDO_U2F BLACKLISTD -OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS LDNS FIDO_U2F -.if ${FLAVOR:U} == hpn -OPTIONS_DEFAULT+= HPN NONECIPHER -.endif -.if ${FLAVOR:U} == gssapi -OPTIONS_DEFAULT+= KERB_GSSAPI MIT -.endif -OPTIONS_RADIO= KERBEROS -OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE -TCP_WRAPPERS_DESC= tcp_wrappers support -BSM_DESC= OpenBSM Auditing -KERB_GSSAPI_DESC= Kerberos/GSSAPI patch (req: GSSAPI) -HPN_DESC= HPN-SSH patch -LDNS_DESC= SSHFP/LDNS support -HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) -HEIMDAL_BASE_DESC= Heimdal Kerberos (base) -MIT_DESC= MIT Kerberos (security/krb5) -NONECIPHER_DESC= NONE Cipher support -XMSS_DESC= XMSS key support (experimental) -FIDO_U2F_DESC= FIDO/U2F support (security/libfido2) -BLACKLISTD_DESC= FreeBSD blacklistd(8) support - -OPTIONS_SUB= yes - -PAM_EXTRA_PATCHES= ${FILESDIR}/extra-patch-pam-sshd_config - -TCP_WRAPPERS_EXTRA_PATCHES=${FILESDIR}/extra-patch-tcpwrappers - -LDNS_CONFIGURE_WITH= ldns=${LOCALBASE} -LDNS_LIB_DEPENDS= libldns.so:dns/ldns - -HPN_CONFIGURE_WITH= hpn -NONECIPHER_CONFIGURE_WITH= nonecipher - -MIT_LIB_DEPENDS= libkrb5.so.3:security/krb5 -HEIMDAL_LIB_DEPENDS= libkrb5.so.26:security/heimdal - -PAM_CONFIGURE_WITH= pam -TCP_WRAPPERS_CONFIGURE_WITH= tcp-wrappers - -LIBEDIT_CONFIGURE_WITH= libedit -LIBEDIT_USES= libedit -BSM_CONFIGURE_ON= --with-audit=bsm - -FIDO_U2F_LIB_DEPENDS= libfido2.so:security/libfido2 -FIDO_U2F_CONFIGURE_ON= --with-security-key-builtin -FIDO_U2F_CONFIGURE_OFF= --disable-security-key - -BLACKLISTD_EXTRA_PATCHES= ${FILESDIR}/extra-patch-blacklistd - -ETCDIR?= ${PREFIX}/etc/ssh - -.include - -PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,hpn,gsskex - -# Must add this patch before HPN due to conflicts -.if ${PORT_OPTIONS:MKERB_GSSAPI} || ${FLAVOR:U} == gssapi -#BROKEN= KERB_GSSAPI No patch for ${DISTVERSION} yet. -. if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER} -# Needed glue for applying HPN patch without conflict -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-gss-glue -. endif -# - See https://sources.debian.org/data/main/o/openssh/ for which subdir to -# pull from. -#GSSAPI_DEBIAN_VERSION= 9.9p2 -GSSAPI_DEBIAN_VERSION= 10.0p1 -GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-5 -# - Debian does not use a versioned filename so we trick fetch to make one for -# us with the ?=/ trick. -PATCH_SITES+= https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex -# Bump this when updating the patch location -#GSSAPI_DISTVERSION= 9.9p1 -GSSAPI_DISTVERSION= 10.0p1 -PATCHFILES+= openssh-${GSSAPI_DISTVERSION:U${DISTVERSION}}-gsskex-all-debian-rh-${GSSAPI_DISTVERSION}.patch:-p1:gsskex -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgssc.c -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgsss.c -.endif - -.if ${PORT_OPTIONS:MBLACKLISTD} -CONFIGURE_LIBS+= -lblacklist -.endif - -# https://www.psc.edu/hpn-ssh https://github.com/rapier1/openssh-portable/tree/hpn-openssl1.1-7_7_P1 -.if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER} -#BROKEN= HPN: Not yet updated for ${DISTVERSION} yet. -PORTDOCS+= HPN-README -HPN_VERSION= 14v15 -HPN_DISTVERSION= 7.7p1 -#PATCH_SITES+= SOURCEFORGE/hpnssh/HPN-SSH%20${HPN_VERSION}%20${HPN_DISTVERSION}/:hpn -#PATCHFILES+= ${PORTNAME}-${HPN_DISTVERSION}-hpnssh${HPN_VERSION}.diff.gz:-p1:hpn -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn:-p2 -.elif !${PORT_OPTIONS:MHPN} && !${PORT_OPTIONS:MNONECIPHER} -# Apply compatibility patch -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-compat -.endif - -CONFIGURE_ARGS+= --disable-utmp --disable-wtmp --disable-wtmpx --without-lastlog - -# Keep this last -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-version-addendum - -.if ${PORT_OPTIONS:MHEIMDAL_BASE} && ${PORT_OPTIONS:MKERB_GSSAPI} -BROKEN= KERB_GSSAPI Requires either MIT or HEMIDAL, does not build with base Heimdal currently -.endif - -.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so) -IGNORE= you have selected HEIMDAL_BASE but do not have heimdal installed in base -.endif - -.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL} || ${PORT_OPTIONS:MHEIMDAL_BASE} -. if ${PORT_OPTIONS:MHEIMDAL_BASE} -CONFIGURE_LIBS+= -lgssapi_krb5 -CONFIGURE_ARGS+= --with-kerberos5=/usr -. else -CONFIGURE_LIBS+= -lgssapi_krb5 -CONFIGURE_ARGS+= --with-kerberos5=${LOCALBASE} -. endif -. if ${OPENSSLBASE} == "/usr" -CONFIGURE_ARGS+= --without-rpath -LDFLAGS= # empty -. endif -.else -. if ${PORT_OPTIONS:MKERB_GSSAPI} -IGNORE= KERB_GSSAPI requires one of MIT HEIMDAL or HEIMDAL_BASE -. endif -.endif - -.if ${OPENSSLBASE} != "/usr" -CONFIGURE_ARGS+= --with-ssl-dir=${OPENSSLBASE} -.endif - -EMPTYDIR= /var/empty - -USE_RC_SUBR= openssh - -# After all -CONFIGURE_ARGS+= --sysconfdir=${ETCDIR} --with-privsep-path=${EMPTYDIR} -.if !empty(CONFIGURE_LIBS) -CONFIGURE_ARGS+= --with-libs='${CONFIGURE_LIBS}' -.endif - -CONFIGURE_ARGS+= --with-xauth=${LOCALBASE}/bin/xauth - -RC_SCRIPT_NAME= openssh -VERSION_ADDENDUM_DEFAULT?= ${OPSYS}-${PKGNAME} - -CFLAGS+= ${CFLAGS_${CHOSEN_COMPILER_TYPE}} -CFLAGS_gcc= -Wno-stringop-truncation -Wno-stringop-overflow - -SSH_ASKPASS_PATH?= ${LOCALBASE}/bin/ssh-askpass - -post-patch: - @${REINPLACE_CMD} \ - -e 's|install: \(.*\) host-key check-config|install: \1|g' \ - ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} \ - -e 's|$$[{(]libexecdir[})]/ssh-askpass|${SSH_ASKPASS_PATH}|' \ - ${WRKSRC}/Makefile.in ${WRKSRC}/configure.ac - @${REINPLACE_CMD} \ - -e 's|\(VersionAddendum\) none|\1 ${VERSION_ADDENDUM_DEFAULT}|' \ - ${WRKSRC}/sshd_config - @${REINPLACE_CMD} \ - -e 's|%%SSH_VERSION_FREEBSD_PORT%%|${VERSION_ADDENDUM_DEFAULT}|' \ - ${WRKSRC}/sshd_config.5 - @${ECHO_CMD} '#define SSH_VERSION_FREEBSD_PORT "${VERSION_ADDENDUM_DEFAULT}"' >> \ - ${WRKSRC}/version.h - -post-configure-XMSS-on: - @${ECHO_CMD} "#define WITH_XMSS 1" >> ${WRKSRC}/config.h - -post-configure-BLACKLISTD-on: - @${ECHO_CMD} "#define USE_BLACKLIST 1" >> ${WRKSRC}/config.h - -post-install: - ${MV} ${STAGEDIR}${ETCDIR}/moduli \ - ${STAGEDIR}${ETCDIR}/moduli.sample - ${MV} ${STAGEDIR}${ETCDIR}/ssh_config \ - ${STAGEDIR}${ETCDIR}/ssh_config.sample - ${MV} ${STAGEDIR}${ETCDIR}/sshd_config \ - ${STAGEDIR}${ETCDIR}/sshd_config.sample - ${MKDIR} ${STAGEDIR}${ETCDIR}/ssh_config.d \ - ${STAGEDIR}${ETCDIR}/sshd_config.d -.if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER} - ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/HPN-README ${STAGEDIR}${DOCSDIR} -.endif - -test: build - cd ${WRKSRC} && ${SETENV} -i \ - OBJ=${WRKDIR} ${MAKE_ENV:NHOME=*} \ - TEST_SHELL=${SH} \ - SUDO="${SUDO}" \ - LOGNAME="${LOGNAME}" \ - HOME="${HOME}" \ - TEST_SSH_TRACE=yes \ - PATH=${WRKSRC}:${PREFIX}/bin:${PREFIX}/sbin:${PATH} \ - ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} tests - -.include diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo deleted file mode 100644 index e011b52..0000000 --- a/security/openssh-portable/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1747920014 -SHA256 (openssh-10.0p1.tar.gz) = 021a2e709a0edf4250b1256bd5a9e500411a90dddabea830ed59cef90eb9d85c -SIZE (openssh-10.0p1.tar.gz) = 1972675 -SHA256 (openssh-10.0p1-gsskex-all-debian-rh-10.0p1.patch) = 6749430c148dacf41b396c0f7a107526e6030379ccd4f57f407993748d4a5912 -SIZE (openssh-10.0p1-gsskex-all-debian-rh-10.0p1.patch) = 126360 diff --git a/security/openssh-portable/files/extra-patch-blacklistd b/security/openssh-portable/files/extra-patch-blacklistd deleted file mode 100644 index a7145e4..0000000 --- a/security/openssh-portable/files/extra-patch-blacklistd +++ /dev/null @@ -1,419 +0,0 @@ ---- blacklist.c.orig 2021-04-28 13:37:52.679784000 -0700 -+++ blacklist.c 2021-04-28 13:56:45.677805000 -0700 -@@ -0,0 +1,92 @@ -+/*- -+ * Copyright (c) 2015 The NetBSD Foundation, Inc. -+ * Copyright (c) 2016 The FreeBSD Foundation, Inc. -+ * All rights reserved. -+ * -+ * Portions of this software were developed by Kurt Lidl -+ * under sponsorship from the FreeBSD Foundation. -+ * -+ * This code is derived from software contributed to The NetBSD Foundation -+ * by Christos Zoulas. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#include "includes.h" -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "ssh.h" -+#include "packet.h" -+#include "log.h" -+#include "misc.h" -+#include -+#include "blacklist_client.h" -+ -+static struct blacklist *blstate = NULL; -+ -+/* internal definition from bl.h */ -+struct blacklist *bl_create(bool, char *, void (*)(int, const char *, va_list)); -+ -+/* impedence match vsyslog() to sshd's internal logging levels */ -+void -+im_log(int priority, const char *message, va_list args) -+{ -+ LogLevel imlevel; -+ -+ switch (priority) { -+ case LOG_ERR: -+ imlevel = SYSLOG_LEVEL_ERROR; -+ break; -+ case LOG_DEBUG: -+ imlevel = SYSLOG_LEVEL_DEBUG1; -+ break; -+ case LOG_INFO: -+ imlevel = SYSLOG_LEVEL_INFO; -+ break; -+ default: -+ imlevel = SYSLOG_LEVEL_DEBUG2; -+ } -+ do_log2(imlevel, message, args); -+} -+ -+void -+blacklist_init(void) -+{ -+ -+ blstate = bl_create(false, NULL, im_log); -+} -+ -+void -+blacklist_notify(int action, struct ssh *ssh, const char *msg) -+{ -+ -+ if (blstate != NULL && ssh_packet_connection_is_on_socket(ssh)) -+ (void)blacklist_r(blstate, action, -+ ssh_packet_get_connection_in(ssh), msg); -+} ---- blacklist_client.h.orig 2020-11-16 16:45:22.823087000 -0800 -+++ blacklist_client.h 2020-11-16 16:45:09.761962000 -0800 -@@ -0,0 +1,61 @@ -+/*- -+ * Copyright (c) 2015 The NetBSD Foundation, Inc. -+ * Copyright (c) 2016 The FreeBSD Foundation, Inc. -+ * All rights reserved. -+ * -+ * Portions of this software were developed by Kurt Lidl -+ * under sponsorship from the FreeBSD Foundation. -+ * -+ * This code is derived from software contributed to The NetBSD Foundation -+ * by Christos Zoulas. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS -+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS -+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#ifndef BLACKLIST_CLIENT_H -+#define BLACKLIST_CLIENT_H -+ -+#ifndef BLACKLIST_API_ENUM -+enum { -+ BLACKLIST_AUTH_OK = 0, -+ BLACKLIST_AUTH_FAIL, -+ BLACKLIST_ABUSIVE_BEHAVIOR, -+ BLACKLIST_BAD_USER -+}; -+#endif -+ -+#ifdef USE_BLACKLIST -+void blacklist_init(void); -+void blacklist_notify(int, struct ssh *, const char *); -+ -+#define BLACKLIST_INIT() blacklist_init() -+#define BLACKLIST_NOTIFY(x, ssh, msg) blacklist_notify(x, ssh, msg) -+ -+#else -+ -+#define BLACKLIST_INIT() -+#define BLACKLIST_NOTIFY(x, ssh, msg) -+ -+#endif -+ -+ -+#endif /* BLACKLIST_CLIENT_H */ ---- servconf.c.orig 2021-04-15 20:55:25.000000000 -0700 -+++ servconf.c 2021-04-28 13:36:19.591999000 -0700 -@@ -172,6 +172,7 @@ initialize_server_options(ServerOptions *options) - options->max_sessions = -1; - options->banner = NULL; - options->use_dns = -1; -+ options->use_blacklist = -1; - options->client_alive_interval = -1; - options->client_alive_count_max = -1; - options->num_authkeys_files = 0; -@@ -410,6 +411,8 @@ fill_default_server_options(ServerOptions *options) - options->max_sessions = DEFAULT_SESSIONS_MAX; - if (options->use_dns == -1) - options->use_dns = 0; -+ if (options->use_blacklist == -1) -+ options->use_blacklist = 0; - if (options->client_alive_interval == -1) - options->client_alive_interval = 0; - if (options->client_alive_count_max == -1) -@@ -506,6 +509,7 @@ typedef enum { - sGatewayPorts, sPubkeyAuthentication, sPubkeyAcceptedAlgorithms, - sXAuthLocation, sSubsystem, sMaxStartups, sMaxAuthTries, sMaxSessions, - sBanner, sUseDNS, sHostbasedAuthentication, -+ sUseBlacklist, - sHostbasedUsesNameFromPacketOnly, sHostbasedAcceptedAlgorithms, - sHostKeyAlgorithms, sPerSourceMaxStartups, sPerSourceNetBlockSize, - sClientAliveInterval, sClientAliveCountMax, sAuthorizedKeysFile, -@@ -642,6 +646,8 @@ static struct { - { "maxsessions", sMaxSessions, SSHCFG_ALL }, - { "banner", sBanner, SSHCFG_ALL }, - { "usedns", sUseDNS, SSHCFG_GLOBAL }, -+ { "useblacklist", sUseBlacklist, SSHCFG_GLOBAL }, -+ { "useblocklist", sUseBlacklist, SSHCFG_GLOBAL } /* alias */, - { "verifyreversemapping", sDeprecated, SSHCFG_GLOBAL }, - { "reversemappingcheck", sDeprecated, SSHCFG_GLOBAL }, - { "clientaliveinterval", sClientAliveInterval, SSHCFG_ALL }, -@@ -1692,6 +1698,10 @@ process_server_config_line_depth(ServerOptions *option - intptr = &options->use_dns; - goto parse_flag; - -+ case sUseBlacklist: -+ intptr = &options->use_blacklist; -+ goto parse_flag; -+ - case sLogFacility: - log_facility_ptr = &options->log_facility; - arg = strdelim(&cp); -@@ -2872,6 +2882,7 @@ dump_config(ServerOptions *o) - dump_cfg_fmtint(sCompression, o->compression); - dump_cfg_fmtint(sGatewayPorts, o->fwd_opts.gateway_ports); - dump_cfg_fmtint(sUseDNS, o->use_dns); -+ dump_cfg_fmtint(sUseBlacklist, o->use_blacklist); - dump_cfg_fmtint(sAllowTcpForwarding, o->allow_tcp_forwarding); - dump_cfg_fmtint(sAllowAgentForwarding, o->allow_agent_forwarding); - dump_cfg_fmtint(sDisableForwarding, o->disable_forwarding); ---- servconf.h.orig 2020-11-16 15:51:00.752090000 -0800 -+++ servconf.h 2020-11-16 15:51:02.962173000 -0800 -@@ -179,6 +179,7 @@ typedef struct { - int max_sessions; - char *banner; /* SSH-2 banner message */ - int use_dns; -+ int use_blacklist; - int client_alive_interval; /* - * poke the client this often to - * see if it's still there ---- auth-pam.c.orig 2020-11-16 15:52:45.816578000 -0800 -+++ auth-pam.c 2020-11-16 15:54:19.796583000 -0800 -@@ -105,6 +105,7 @@ extern char *__progname; - #include "ssh-gss.h" - #endif - #include "monitor_wrap.h" -+#include "blacklist_client.h" - - extern ServerOptions options; - extern struct sshbuf *loginmsg; -@@ -916,6 +917,10 @@ sshpam_query(void *ctx, char **name, char **info, - sshbuf_free(buffer); - return (0); - } -+ /* XXX: ssh context unavailable here, unclear if this is even needed. -+ BLACKLIST_NOTIFY(BLACKLIST_BAD_USER, -+ the_active_state, sshpam_authctxt->user); -+ */ - error("PAM: %s for %s%.100s from %.100s", msg, - sshpam_authctxt->valid ? "" : "illegal user ", - sshpam_authctxt->user, sshpam_rhost); ---- auth.c.orig 2020-11-16 15:52:45.824171000 -0800 -+++ auth.c 2020-11-16 15:57:51.091969000 -0800 -@@ -76,6 +76,7 @@ - #include "ssherr.h" - #include "compat.h" - #include "channels.h" -+#include "blacklist_client.h" - - /* import */ - extern ServerOptions options; -@@ -331,8 +332,11 @@ auth_log(struct ssh *ssh, int authenticated, int parti - authmsg = "Postponed"; - else if (partial) - authmsg = "Partial"; -- else -+ else { - authmsg = authenticated ? "Accepted" : "Failed"; -+ if (authenticated) -+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_OK, ssh, "ssh"); -+ } - - if ((extra = format_method_key(authctxt)) == NULL) { - if (authctxt->auth_method_info != NULL) -@@ -586,6 +590,7 @@ getpwnamallow(struct ssh *ssh, const char *user) - aix_restoreauthdb(); - #endif - if (pw == NULL) { -+ BLACKLIST_NOTIFY(BLACKLIST_BAD_USER, ssh, user); - logit("Invalid user %.100s from %.100s port %d", - user, ssh_remote_ipaddr(ssh), ssh_remote_port(ssh)); - #ifdef CUSTOM_FAILED_LOGIN ---- auth2.c.orig 2020-11-16 17:10:36.772062000 -0800 -+++ auth2.c 2020-11-16 17:12:04.852943000 -0800 -@@ -58,6 +58,7 @@ - #include "monitor_wrap.h" - #include "digest.h" - #include "kex.h" -+#include "blacklist_client.h" - - /* import */ - extern ServerOptions options; -@@ -295,6 +296,7 @@ input_userauth_request(int type, u_int32_t seq, struct - } else { - /* Invalid user, fake password information */ - authctxt->pw = fakepw(); -+ BLACKLIST_NOTIFY(BLACKLIST_BAD_USER, ssh, "ssh"); - #ifdef SSH_AUDIT_EVENTS - PRIVSEP(audit_event(ssh, SSH_INVALID_USER)); - #endif -@@ -448,8 +450,10 @@ userauth_finish(struct ssh *ssh, int authenticated, co - } else { - /* Allow initial try of "none" auth without failure penalty */ - if (!partial && !authctxt->server_caused_failure && -- (authctxt->attempt > 1 || strcmp(method, "none") != 0)) -+ (authctxt->attempt > 1 || strcmp(method, "none") != 0)) { - authctxt->failures++; -+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, ssh, "ssh"); -+ } - if (authctxt->failures >= options.max_authtries) { - #ifdef SSH_AUDIT_EVENTS - PRIVSEP(audit_event(ssh, SSH_LOGIN_EXCEED_MAXTRIES)); ---- packet.c.orig 2020-11-16 15:52:45.839070000 -0800 -+++ packet.c 2020-11-16 15:56:09.285418000 -0800 -@@ -96,6 +96,7 @@ - #include "packet.h" - #include "ssherr.h" - #include "sshbuf.h" -+#include "blacklist_client.h" - - #ifdef PACKET_DEBUG - #define DBG(x) x -@@ -1882,6 +1883,7 @@ sshpkt_vfatal(struct ssh *ssh, int r, const char *fmt, - case SSH_ERR_NO_KEX_ALG_MATCH: - case SSH_ERR_NO_HOSTKEY_ALG_MATCH: - if (ssh->kex && ssh->kex->failed_choice) { -+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, ssh, "ssh"); - ssh_packet_clear_keys(ssh); - errno = oerrno; - logdie("Unable to negotiate with %s: %s. " ---- sshd.c.orig 2021-08-19 21:03:49.000000000 -0700 -+++ sshd.c 2021-09-10 10:37:17.926747000 -0700 -@@ -123,6 +123,7 @@ - #include "version.h" - #include "ssherr.h" - #include "sk-api.h" -+#include "blacklist_client.h" - #include "srclimit.h" - #include "dh.h" - -@@ -2225,6 +2228,9 @@ main(int ac, char **av) - if ((loginmsg = sshbuf_new()) == NULL) - fatal_f("sshbuf_new failed"); - auth_debug_reset(); -+ -+ if (options.use_blacklist) -+ BLACKLIST_INIT(); - - if (use_privsep) { - if (privsep_preauth(ssh) == 1) ---- Makefile.in.orig 2022-10-03 07:51:42.000000000 -0700 -+++ Makefile.in 2022-10-09 10:50:06.401377000 -0700 -@@ -185,6 +185,8 @@ FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(S - FIXALGORITHMSCMD= $(SHELL) $(srcdir)/fixalgorithms $(SED) \ - @UNSUPPORTED_ALGORITHMS@ - -+LIBSSH_OBJS+= blacklist.o -+ - all: $(CONFIGFILES) $(MANPAGES) $(TARGETS) - - $(LIBSSH_OBJS): Makefile.in config.h ---- sshd_config.orig 2020-11-16 16:57:14.276036000 -0800 -+++ sshd_config 2020-11-16 16:57:42.183846000 -0800 -@@ -94,6 +94,7 @@ - #PrintLastLog yes - #TCPKeepAlive yes - #PermitUserEnvironment no -+#UseBlacklist no - #Compression delayed - #ClientAliveInterval 0 - #ClientAliveCountMax 3 ---- sshd_config.5.orig 2023-12-18 15:59:50.000000000 +0100 -+++ sshd_config.5 2024-01-06 16:36:17.025742000 +0100 -@@ -1855,6 +1855,20 @@ This option may be useful in conjunction with - is to never expire connections for having no open channels. - This option may be useful in conjunction with - .Cm ChannelTimeout . -+.It Cm UseBlacklist -+Specifies whether -+.Xr sshd 8 -+attempts to send authentication success and failure messages -+to the -+.Xr blacklistd 8 -+daemon. -+The default is -+.Cm no . -+For forward compatibility with an upcoming -+.Xr blacklistd -+rename, the -+.Cm UseBlocklist -+alias can be used instead. - .It Cm UseDNS - Specifies whether - .Xr sshd 8 ---- monitor.c.orig 2020-11-16 17:24:03.457283000 -0800 -+++ monitor.c 2020-11-16 17:25:57.642510000 -0800 -@@ -96,6 +96,7 @@ - #include "match.h" - #include "ssherr.h" - #include "sk-api.h" -+#include "blacklist_client.h" - - #ifdef GSSAPI - static Gssctxt *gsscontext = NULL; -@@ -342,8 +343,11 @@ monitor_child_preauth(struct ssh *ssh, struct monitor - if (ent->flags & (MON_AUTHDECIDE|MON_ALOG)) { - auth_log(ssh, authenticated, partial, - auth_method, auth_submethod); -- if (!partial && !authenticated) -+ if (!partial && !authenticated) { - authctxt->failures++; -+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, -+ ssh, "ssh"); -+ } - if (authenticated || partial) { - auth2_update_session_info(authctxt, - auth_method, auth_submethod); -@@ -1228,6 +1232,7 @@ mm_answer_keyallowed(struct ssh *ssh, int sock, struct - } else { - /* Log failed attempt */ - auth_log(ssh, 0, 0, auth_method, NULL); -+ BLACKLIST_NOTIFY(BLACKLIST_AUTH_FAIL, ssh, "ssh"); - free(cuser); - free(chost); - } diff --git a/security/openssh-portable/files/extra-patch-gssapi-kexgssc.c b/security/openssh-portable/files/extra-patch-gssapi-kexgssc.c deleted file mode 100644 index 40be181..0000000 --- a/security/openssh-portable/files/extra-patch-gssapi-kexgssc.c +++ /dev/null @@ -1,14 +0,0 @@ -Fix prototype for DH_get0_key() in kexgssgex_client(). - ---- kexgssc.c.orig 2020-11-24 12:26:37.222092000 -0800 -+++ kexgssc.c 2020-11-24 12:26:54.801490000 -0800 -@@ -31,6 +31,9 @@ - #include - #include - -+#include -+#include "openbsd-compat/openssl-compat.h" -+ - #include - - #include "xmalloc.h" diff --git a/security/openssh-portable/files/extra-patch-gssapi-kexgsss.c b/security/openssh-portable/files/extra-patch-gssapi-kexgsss.c deleted file mode 100644 index 073b30d..0000000 --- a/security/openssh-portable/files/extra-patch-gssapi-kexgsss.c +++ /dev/null @@ -1,14 +0,0 @@ -Fix prototype for DH_get0_key() in kexgssgex_server(). - ---- kexgsss.c.orig 2020-11-24 12:39:25.548427000 -0800 -+++ kexgsss.c 2020-11-24 12:39:47.591119000 -0800 -@@ -31,6 +31,9 @@ - #include - #include - -+#include -+#include "openbsd-compat/openssl-compat.h" -+ - #include "xmalloc.h" - #include "sshbuf.h" - #include "ssh2.h" diff --git a/security/openssh-portable/files/extra-patch-hpn b/security/openssh-portable/files/extra-patch-hpn deleted file mode 100644 index 6fec82f..0000000 --- a/security/openssh-portable/files/extra-patch-hpn +++ /dev/null @@ -1,1300 +0,0 @@ -diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/openssh-6.8p1/HPN-README work/openssh-6.8p1/HPN-README ---- work.clean/openssh-6.8p1/HPN-README 1969-12-31 18:00:00.000000000 -0600 -+++ work/openssh-6.8p1/HPN-README 2015-04-01 22:16:49.869215000 -0500 -@@ -0,0 +1,129 @@ -+Notes: -+ -+MULTI-THREADED CIPHER: -+The AES cipher in CTR mode has been multithreaded (MTR-AES-CTR). This will allow ssh installations -+on hosts with multiple cores to use more than one processing core during encryption. -+Tests have show significant throughput performance increases when using MTR-AES-CTR up -+to and including a full gigabit per second on quad core systems. It should be possible to -+achieve full line rate on dual core systems but OS and data management overhead makes this -+more difficult to achieve. The cipher stream from MTR-AES-CTR is entirely compatible with single -+thread AES-CTR (ST-AES-CTR) implementations and should be 100% backward compatible. Optimal -+performance requires the MTR-AES-CTR mode be enabled on both ends of the connection. -+The MTR-AES-CTR replaces ST-AES-CTR and is used in exactly the same way with the same -+nomenclature. -+Use examples: ssh -caes128-ctr you@host.com -+ scp -oCipher=aes256-ctr file you@host.com:~/file -+ -+NONE CIPHER: -+To use the NONE option you must have the NoneEnabled switch set on the server and -+you *must* have *both* NoneEnabled and NoneSwitch set to yes on the client. The NONE -+feature works with ALL ssh subsystems (as far as we can tell) *AS LONG AS* a tty is not -+spawned. If a user uses the -T switch to prevent a tty being created the NONE cipher will -+be disabled. -+ -+The performance increase will only be as good as the network and TCP stack tuning -+on the reciever side of the connection allows. As a rule of thumb a user will need -+at least 10Mb/s connection with a 100ms RTT to see a doubling of performance. The -+HPN-SSH home page describes this in greater detail. -+ -+http://www.psc.edu/networking/projects/hpn-ssh -+ -+BUFFER SIZES: -+ -+If HPN is disabled the receive buffer size will be set to the -+OpenSSH default of 64K. -+ -+If an HPN system connects to a nonHPN system the receive buffer will -+be set to the HPNBufferSize value. The default is 2MB but user adjustable. -+ -+If an HPN to HPN connection is established a number of different things might -+happen based on the user options and conditions. -+ -+Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll enabled, TCPRcvBuf NOT Set -+HPN Buffer Size = up to 64MB -+This is the default state. The HPN buffer size will grow to a maximum of 64MB -+as the TCP receive buffer grows. The maximum HPN Buffer size of 64MB is -+geared towards 10GigE transcontinental connections. -+ -+Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll disabled, TCPRcvBuf NOT Set -+HPN Buffer Size = TCP receive buffer value. -+Users on non-autotuning systesm should disable TCPRcvBufPoll in the -+ssh_cofig and sshd_config -+ -+Conditions: HPNBufferSize SET, TCPRcvBufPoll disabled, TCPRcvBuf NOT Set -+HPN Buffer Size = minmum of TCP receive buffer and HPNBufferSize. -+This would be the system defined TCP receive buffer (RWIN). -+ -+Conditions: HPNBufferSize SET, TCPRcvBufPoll disabled, TCPRcvBuf SET -+HPN Buffer Size = minmum of TCPRcvBuf and HPNBufferSize. -+Generally there is no need to set both. -+ -+Conditions: HPNBufferSize SET, TCPRcvBufPoll enabled, TCPRcvBuf NOT Set -+HPN Buffer Size = grows to HPNBufferSize -+The buffer will grow up to the maximum size specified here. -+ -+Conditions: HPNBufferSize SET, TCPRcvBufPoll enabled, TCPRcvBuf SET -+HPN Buffer Size = minmum of TCPRcvBuf and HPNBufferSize. -+Generally there is no need to set both of these, especially on autotuning -+systems. However, if the users wishes to override the autotuning this would be -+one way to do it. -+ -+Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll enabled, TCPRcvBuf SET -+HPN Buffer Size = TCPRcvBuf. -+This will override autotuning and set the TCP recieve buffer to the user defined -+value. -+ -+ -+HPN Specific Configuration options -+ -+TcpRcvBuf=[int]KB client -+ set the TCP socket receive buffer to n Kilobytes. It can be set up to the -+maximum socket size allowed by the system. This is useful in situations where -+the tcp receive window is set low but the maximum buffer size is set -+higher (as is typical). This works on a per TCP connection basis. You can also -+use this to artifically limit the transfer rate of the connection. In these -+cases the throughput will be no more than n/RTT. The minimum buffer size is 1KB. -+Default is the current system wide tcp receive buffer size. -+ -+TcpRcvBufPoll=[yes/no] client/server -+ enable of disable the polling of the tcp receive buffer through the life -+of the connection. You would want to make sure that this option is enabled -+for systems making use of autotuning kernels (linux 2.4.24+, 2.6, MS Vista) -+default is yes. -+ -+NoneEnabled=[yes/no] client/server -+ enable or disable the use of the None cipher. Care must always be used -+when enabling this as it will allow users to send data in the clear. However, -+it is important to note that authentication information remains encrypted -+even if this option is enabled. Set to no by default. -+ -+NoneSwitch=[yes/no] client -+ Switch the encryption cipher being used to the None cipher after -+authentication takes place. NoneEnabled must be enabled on both the client -+and server side of the connection. When the connection switches to the NONE -+cipher a warning is sent to STDERR. The connection attempt will fail with an -+error if a client requests a NoneSwitch from the server that does not explicitly -+have NoneEnabled set to yes. Note: The NONE cipher cannot be used in -+interactive (shell) sessions and it will fail silently. Set to no by default. -+ -+HPNDisabled=[yes/no] client/server -+ In some situations, such as transfers on a local area network, the impact -+of the HPN code produces a net decrease in performance. In these cases it is -+helpful to disable the HPN functionality. By default HPNDisabled is set to no. -+ -+HPNBufferSize=[int]KB client/server -+ This is the default buffer size the HPN functionality uses when interacting -+with nonHPN SSH installations. Conceptually this is similar to the TcpRcvBuf -+option as applied to the internal SSH flow control. This value can range from -+1KB to 64MB (1-65536). Use of oversized or undersized buffers can cause performance -+problems depending on the length of the network path. The default size of this buffer -+is 2MB. -+ -+ -+Credits: This patch was conceived, designed, and led by Chris Rapier (rapier@psc.edu) -+ The majority of the actual coding for versions up to HPN12v1 was performed -+ by Michael Stevens (mstevens@andrew.cmu.edu). The MT-AES-CTR cipher was -+ implemented by Ben Bennet (ben@psc.edu) and improved by Mike Tasota -+ (tasota@gmail.com) an NSF REU grant recipient for 2013. -+ This work was financed, in part, by Cisco System, Inc., the National -+ Library of Medicine, and the National Science Foundation. ---- channels.c.orig 2023-02-02 04:21:54.000000000 -0800 -+++ channels.c 2023-02-03 10:45:34.136793000 -0800 -@@ -229,6 +229,12 @@ static void channel_handler_init(struct ssh_channels * - /* Setup helper */ - static void channel_handler_init(struct ssh_channels *sc); - -+ -+#ifdef HPN_ENABLED -+static int hpn_disabled = 0; -+static int hpn_buffer_size = 2 * 1024 * 1024; -+#endif -+ - /* -- channel core */ - - void -@@ -495,6 +501,9 @@ channel_new(struct ssh *ssh, char *ctype, int type, in - c->local_window = window; - c->local_window_max = window; - c->local_maxpacket = maxpack; -+#ifdef HPN_ENABLED -+ c->dynamic_window = 0; -+#endif - c->remote_name = xstrdup(remote_name); - c->ctl_chan = -1; - c->delayed = 1; /* prevent call to channel_post handler */ -@@ -1190,6 +1199,30 @@ channel_set_fds(struct ssh *ssh, int id, int rfd, int - fatal_fr(r, "channel %i", c->self); - } - -+#ifdef HPN_ENABLED -+static int -+channel_tcpwinsz(struct ssh *ssh) -+{ -+ u_int32_t tcpwinsz = 0; -+ socklen_t optsz = sizeof(tcpwinsz); -+ int ret = -1; -+ -+ /* if we aren't on a socket return 128KB */ -+ if (!ssh_packet_connection_is_on_socket(ssh)) -+ return 128 * 1024; -+ -+ ret = getsockopt(ssh_packet_get_connection_in(ssh), -+ SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz); -+ /* return no more than SSHBUF_SIZE_MAX (currently 256MB) */ -+ if ((ret == 0) && tcpwinsz > SSHBUF_SIZE_MAX) -+ tcpwinsz = SSHBUF_SIZE_MAX; -+ -+ debug2("tcpwinsz: tcp connection %d, Receive window: %d", -+ ssh_packet_get_connection_in(ssh), tcpwinsz); -+ return tcpwinsz; -+} -+#endif -+ - static void - channel_pre_listener(struct ssh *ssh, Channel *c) - { -@@ -2301,18 +2334,29 @@ channel_check_window(struct ssh *ssh, Channel *c) - c->local_maxpacket*3) || - c->local_window < c->local_window_max/2) && - c->local_consumed > 0) { -+ u_int addition = 0; -+#ifdef HPN_ENABLED -+ u_int32_t tcpwinsz = channel_tcpwinsz(ssh); -+ /* adjust max window size if we are in a dynamic environment */ -+ if (c->dynamic_window && (tcpwinsz > c->local_window_max)) { -+ /* grow the window somewhat aggressively to maintain pressure */ -+ addition = 1.5 * (tcpwinsz - c->local_window_max); -+ c->local_window_max += addition; -+ debug("Channel: Window growth to %d by %d bytes", c->local_window_max, addition); -+ } -+#endif - if (!c->have_remote_id) - fatal_f("channel %d: no remote id", c->self); - if ((r = sshpkt_start(ssh, - SSH2_MSG_CHANNEL_WINDOW_ADJUST)) != 0 || - (r = sshpkt_put_u32(ssh, c->remote_id)) != 0 || -- (r = sshpkt_put_u32(ssh, c->local_consumed)) != 0 || -+ (r = sshpkt_put_u32(ssh, c->local_consumed + addition)) != 0 || - (r = sshpkt_send(ssh)) != 0) { - fatal_fr(r, "channel %i", c->self); - } - debug2("channel %d: window %d sent adjust %d", c->self, -- c->local_window, c->local_consumed); -- c->local_window += c->local_consumed; -+ c->local_window, c->local_consumed + addition); -+ c->local_window += c->local_consumed + addition; - c->local_consumed = 0; - } - return 1; -@@ -3709,6 +3753,17 @@ channel_fwd_bind_addr(struct ssh *ssh, const char *lis - return addr; - } - -+#ifdef HPN_ENABLED -+void -+channel_set_hpn(int external_hpn_disabled, int external_hpn_buffer_size) -+{ -+ hpn_disabled = external_hpn_disabled; -+ hpn_buffer_size = external_hpn_buffer_size; -+ debug("HPN Disabled: %d, HPN Buffer Size: %d", hpn_disabled, -+ hpn_buffer_size); -+} -+#endif -+ - static int - channel_setup_fwd_listener_tcpip(struct ssh *ssh, int type, - struct Forward *fwd, int *allocated_listen_port, -@@ -3848,6 +3903,17 @@ channel_setup_fwd_listener_tcpip(struct ssh *ssh, int - } - - /* Allocate a channel number for the socket. */ -+#ifdef HPN_ENABLED -+ /* -+ * explicitly test for hpn disabled option. if true use smaller -+ * window size. -+ */ -+ if (!hpn_disabled) -+ c = channel_new(ssh, "port listener", type, sock, sock, -+ -1, hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, -+ 0, "port listener", 1); -+ else -+#endif - c = channel_new(ssh, "port-listener", type, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, - 0, "port listener", 1); -@@ -5016,6 +5082,14 @@ x11_create_display_inet(struct ssh *ssh, int x11_displ - *chanids = xcalloc(num_socks + 1, sizeof(**chanids)); - for (n = 0; n < num_socks; n++) { - sock = socks[n]; -+#ifdef HPN_ENABLED -+ if (!hpn_disabled) -+ nc = channel_new(ssh, "x11 listener", -+ SSH_CHANNEL_X11_LISTENER, sock, sock, -1, -+ hpn_buffer_size, CHAN_X11_PACKET_DEFAULT, -+ 0, "X11 inet listener", 1); -+ else -+#endif - nc = channel_new(ssh, "x11-listener", - SSH_CHANNEL_X11_LISTENER, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, ---- work/openssh-7.7p1/channels.h.orig 2018-04-01 22:38:28.000000000 -0700 -+++ work/openssh-7.7p1/channels.h 2018-06-27 16:38:40.766588000 -0700 -@@ -143,6 +143,9 @@ struct Channel { - u_int local_maxpacket; - int extended_usage; - int single_connection; -+#ifdef HPN_ENABLED -+ int dynamic_window; -+#endif - - char *ctype; /* type */ - -@@ -335,5 +338,10 @@ void chan_ibuf_empty(struct ssh *, Channel *); - void chan_rcvd_ieof(struct ssh *, Channel *); - void chan_write_failed(struct ssh *, Channel *); - void chan_obuf_empty(struct ssh *, Channel *); -+ -+#ifdef HPN_ENABLED -+/* hpn handler */ -+void channel_set_hpn(int, int); -+#endif - - #endif ---- work/openssh-7.7p1/cipher.c.orig 2018-04-01 22:38:28.000000000 -0700 -+++ work/openssh-7.7p1/cipher.c 2018-06-27 16:55:43.165788000 -0700 -@@ -212,7 +212,12 @@ ciphers_valid(const char *names) - for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; - (p = strsep(&cp, CIPHER_SEP))) { - c = cipher_by_name(p); -+#ifdef NONE_CIPHER_ENABLED -+ if (c == NULL || ((c->flags & CFLAG_INTERNAL) != 0 && -+ (c->flags & CFLAG_NONE) != 0)) { -+#else - if (c == NULL || (c->flags & CFLAG_INTERNAL) != 0) { -+#endif - free(cipher_list); - return 0; - } ---- work/openssh/clientloop.c.orig 2023-12-18 06:59:50.000000000 -0800 -+++ work/openssh/clientloop.c 2024-01-08 16:27:47.806586000 -0800 -@@ -1813,6 +1813,15 @@ client_request_x11(struct ssh *ssh, const char *reques - sock = x11_connect_display(ssh); - if (sock < 0) - return NULL; -+#ifdef HPN_ENABLED -+ /* again is this really necessary for X11? */ -+ if (!options.hpn_disabled) -+ c = channel_new(ssh, "x11-connection", -+ SSH_CHANNEL_X11_OPEN, sock, sock, -1, -+ options.hpn_buffer_size, -+ CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); -+ else -+#endif - c = channel_new(ssh, "x11-connection", - SSH_CHANNEL_X11_OPEN, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); -@@ -1848,6 +1857,14 @@ client_request_agent(struct ssh *ssh, const char *requ - else - debug2_fr(r, "ssh_agent_bind_hostkey"); - -+#ifdef HPN_ENABLED -+ if (!options.hpn_disabled) -+ c = channel_new(ssh, "agent-connection", -+ SSH_CHANNEL_OPEN, sock, sock, -1, -+ options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, 0, -+ "authentication agent connection", 1); -+ else -+#endif - c = channel_new(ssh, "agent-connection", - SSH_CHANNEL_OPEN, sock, sock, -1, - CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, -@@ -1876,6 +1893,12 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode, - } - debug("Tunnel forwarding using interface %s", ifname); - -+#ifdef HPN_ENABLED -+ if (!options.hpn_disabled) -+ c = channel_new(ssh, "tun-connection", SSH_CHANNEL_OPENING, fd, fd, -1, -+ options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); -+ else -+#endif - c = channel_new(ssh, "tun-connection", SSH_CHANNEL_OPENING, fd, fd, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); - c->datagram = 1; ---- work/openssh/compat.c.orig 2021-04-15 20:55:25.000000000 -0700 -+++ work/openssh/compat.c 2021-04-28 14:37:33.129317000 -0700 -@@ -149,6 +149,14 @@ compat_banner(struct ssh *ssh, const char *version) - debug_f("match: %s pat %s compat 0x%08x", - version, check[i].pat, check[i].bugs); - ssh->compat = check[i].bugs; -+#ifdef HPN_ENABLED -+ /* Check to see if the remote side is OpenSSH and not HPN */ -+ if (strstr(version,"OpenSSH") != NULL && -+ strstr(version,"hpn") == NULL) { -+ ssh->compat |= SSH_BUG_LARGEWINDOW; -+ debug("Remote is NON-HPN aware"); -+ } -+#endif - return; - } - } ---- work/openssh/compat.h.orig 2015-05-29 03:27:21.000000000 -0500 -+++ work/openssh/compat.h 2015-06-02 09:55:04.208681000 -0500 -@@ -62,6 +62,9 @@ - #define SSH_BUG_CURVE25519PAD 0x10000000 - #define SSH_BUG_HOSTKEYS 0x20000000 - #define SSH_BUG_DHGEX_LARGE 0x40000000 -+#ifdef HPN_ENABLED -+#define SSH_BUG_LARGEWINDOW 0x80000000 -+#endif - - void enable_compat13(void); - void enable_compat20(void); ---- work/openssh/configure.ac.orig 2020-03-22 11:06:53.034550000 -0700 -+++ work/openssh/configure.ac 2020-03-22 11:07:10.017487000 -0700 -@@ -4778,6 +4778,25 @@ AC_ARG_WITH([maildir], - ] - ) # maildir - -+#check whether user wants HPN support -+HPN_MSG="no" -+AC_ARG_WITH(hpn, -+ [ --with-hpn Enable HPN support], -+ [ if test "x$withval" != "xno" ; then -+ AC_DEFINE(HPN_ENABLED,1,[Define if you want HPN support.]) -+ HPN_MSG="yes" -+ fi ] -+) -+#check whether user wants NONECIPHER support -+NONECIPHER_MSG="no" -+AC_ARG_WITH(nonecipher, -+ [ --with-nonecipher Enable NONECIPHER support], -+ [ if test "x$withval" != "xno" ; then -+ AC_DEFINE(NONE_CIPHER_ENABLED,1,[Define if you want NONECIPHER support.]) -+ NONECIPHER_MSG="yes" -+ fi ] -+) -+ - if test ! -z "$cross_compiling" && test "x$cross_compiling" = "xyes"; then - AC_MSG_WARN([cross compiling: Disabling /dev/ptmx test]) - disable_ptmx_check=yes -@@ -5459,6 +5478,8 @@ echo " Random number source: $RAND_MSG" - echo " Privsep sandbox style: $SANDBOX_STYLE" - echo " PKCS#11 support: $enable_pkcs11" - echo " U2F/FIDO support: $enable_sk" -+echo " HPN support: $HPN_MSG" -+echo " NONECIPHER support: $NONECIPHER_MSG" - - echo "" - ---- work/openssh/kex.c.orig 2023-12-18 06:59:50.000000000 -0800 -+++ work/openssh/kex.c 2024-01-08 16:24:07.547292000 -0800 -@@ -1252,6 +1252,20 @@ kex_choose_conf(struct ssh *ssh, uint32_t seq) - peer[ncomp] = NULL; - goto out; - } -+#ifdef NONE_CIPHER_ENABLED -+ debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); -+ if (strcmp(newkeys->enc.name, "none") == 0) { -+ int auth_flag; -+ -+ auth_flag = ssh_packet_authentication_state(ssh); -+ debug("Requesting NONE. Authflag is %d", auth_flag); -+ if (auth_flag == 1) { -+ debug("None requested post authentication."); -+ } else { -+ fatal("Pre-authentication none cipher requests are not allowed."); -+ } -+ } -+#endif - debug("kex: %s cipher: %s MAC: %s compression: %s", - ctos ? "client->server" : "server->client", - newkeys->enc.name, -@@ -1462,7 +1476,7 @@ kex_exchange_identification(struct ssh *ssh, int timeo - */ - int - kex_exchange_identification(struct ssh *ssh, int timeout_ms, -- const char *version_addendum) -+ const char *version_addendum, int hpn_disabled) - { - int remote_major, remote_minor, mismatch, oerrno = 0; - size_t len, n; -@@ -1479,8 +1493,13 @@ kex_exchange_identification(struct ssh *ssh, int timeo - sshbuf_reset(our_version); - if (version_addendum != NULL && *version_addendum == '\0') - version_addendum = NULL; -- if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s\r\n", -+ if ((r = sshbuf_putf(our_version, "SSH-%d.%d-%s%s%s%s\r\n", - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION, -+#ifdef HPN_ENABLED -+ hpn_disabled ? "" : SSH_HPN, -+#else -+ "", -+#endif - version_addendum == NULL ? "" : " ", - version_addendum == NULL ? "" : version_addendum)) != 0) { - oerrno = errno; ---- work/openssh-7.7p1/packet.c.orig 2018-04-01 22:38:28.000000000 -0700 -+++ work/openssh-7.7p1/packet.c 2018-06-27 16:42:42.739507000 -0700 -@@ -926,6 +926,24 @@ ssh_set_newkeys(struct ssh *ssh, int mode) - return 0; - } - -+#ifdef NONE_CIPHER_ENABLED -+/* this supports the forced rekeying required for the NONE cipher */ -+int rekey_requested = 0; -+void -+packet_request_rekeying(void) -+{ -+ rekey_requested = 1; -+} -+ -+int -+ssh_packet_authentication_state(struct ssh *ssh) -+{ -+ struct session_state *state = ssh->state; -+ -+ return(state->after_authentication); -+} -+#endif -+ - #define MAX_PACKETS (1U<<31) - static int - ssh_packet_need_rekeying(struct ssh *ssh, u_int outbound_packet_len) -@@ -944,6 +962,14 @@ ssh_packet_need_rekeying(struct ssh *ssh, u_int outbou - /* Peer can't rekey */ - if (ssh->compat & SSH_BUG_NOREKEY) - return 0; -+#ifdef NONE_CIPHER_ENABLED -+ /* used to force rekeying when called for by the none -+ * cipher switch methods -cjr */ -+ if (rekey_requested == 1) { -+ rekey_requested = 0; -+ return 1; -+ } -+#endif - - /* - * Permit one packet in or out per rekey - this allows us to ---- work.clean/openssh-6.8p1/packet.h 2015-03-17 00:49:20.000000000 -0500 -+++ work/openssh-6.8p1/packet.h 2015-04-03 16:10:34.728161000 -0500 -@@ -206,6 +206,11 @@ int sshpkt_get_end(struct ssh *ssh); - void sshpkt_fmt_connection_id(struct ssh *ssh, char *s, size_t l); - const u_char *sshpkt_ptr(struct ssh *, size_t *lenp); - -+#ifdef NONE_CIPHER_ENABLED -+void packet_request_rekeying(void); -+int ssh_packet_authentication_state(struct ssh *ssh); -+#endif -+ - #if !defined(WITH_OPENSSL) - # undef BIGNUM - # undef EC_KEY ---- work/openssh/readconf.c.orig 2025-04-09 00:02:43.000000000 -0700 -+++ work/openssh/readconf.c 2025-04-10 22:29:45.138038000 -0700 -@@ -71,6 +71,9 @@ - #include "myproposal.h" - #include "digest.h" - #include "version.h" -+#ifdef HPN_ENABLED -+#include "sshbuf.h" -+#endif - - /* Format of the configuration file: - -@@ -172,6 +175,12 @@ typedef enum { - oLocalCommand, oPermitLocalCommand, oRemoteCommand, - oVisualHostKey, - oKexAlgorithms, oIPQoS, oRequestTTY, oSessionType, oStdinNull, -+#ifdef HPN_ENABLED -+ oHPNDisabled, oHPNBufferSize, oTcpRcvBufPoll, oTcpRcvBuf, -+#endif -+#ifdef NONE_CIPHER_ENABLED -+ oNoneSwitch, oNoneEnabled, -+#endif - oForkAfterAuthentication, oIgnoreUnknown, oProxyUseFdpass, - oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, - oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, -@@ -323,6 +332,16 @@ static struct { - { "hostbasedkeytypes", oHostbasedAcceptedAlgorithms }, /* obsolete */ - { "pubkeyacceptedalgorithms", oPubkeyAcceptedAlgorithms }, - { "pubkeyacceptedkeytypes", oPubkeyAcceptedAlgorithms }, /* obsolete */ -+#ifdef NONE_CIPHER_ENABLED -+ { "noneenabled", oNoneEnabled }, -+ { "noneswitch", oNoneSwitch }, -+#endif -+#ifdef HPN_ENABLED -+ { "tcprcvbufpoll", oTcpRcvBufPoll }, -+ { "tcprcvbuf", oTcpRcvBuf }, -+ { "hpndisabled", oHPNDisabled }, -+ { "hpnbuffersize", oHPNBufferSize }, -+#endif - { "ignoreunknown", oIgnoreUnknown }, - { "proxyjump", oProxyJump }, - { "securitykeyprovider", oSecurityKeyProvider }, -@@ -1332,6 +1351,44 @@ parse_time: - intptr = &options->check_host_ip; - goto parse_flag; - -+#ifdef HPN_ENABLED -+ case oHPNDisabled: -+ intptr = &options->hpn_disabled; -+ goto parse_flag; -+ -+ case oHPNBufferSize: -+ intptr = &options->hpn_buffer_size; -+ goto parse_int; -+ -+ case oTcpRcvBufPoll: -+ intptr = &options->tcp_rcv_buf_poll; -+ goto parse_flag; -+ -+ case oTcpRcvBuf: -+ intptr = &options->tcp_rcv_buf; -+ goto parse_int; -+#endif -+ -+#ifdef NONE_CIPHER_ENABLED -+ case oNoneEnabled: -+ intptr = &options->none_enabled; -+ goto parse_flag; -+ -+ /* we check to see if the command comes from the */ -+ /* command line or not. If it does then enable it */ -+ /* otherwise fail. NONE should never be a default configuration */ -+ case oNoneSwitch: -+ if(strcmp(filename,"command-line") == 0) { -+ intptr = &options->none_switch; -+ goto parse_flag; -+ } else { -+ error("NoneSwitch is found in %.200s.\nYou may only use this configuration option from the command line", filename); -+ error("Continuing..."); -+ debug("NoneSwitch directive found in %.200s.", filename); -+ return 0; -+ } -+#endif -+ - case oVerifyHostKeyDNS: - intptr = &options->verify_host_key_dns; - multistate_ptr = multistate_yesnoask; -@@ -2742,6 +2799,16 @@ initialize_options(Options * options) - options->ip_qos_interactive = -1; - options->ip_qos_bulk = -1; - options->request_tty = -1; -+#ifdef NONE_CIPHER_ENABLED -+ options->none_switch = -1; -+ options->none_enabled = -1; -+#endif -+#ifdef HPN_ENABLED -+ options->hpn_disabled = -1; -+ options->hpn_buffer_size = -1; -+ options->tcp_rcv_buf_poll = -1; -+ options->tcp_rcv_buf = -1; -+#endif - options->session_type = -1; - options->stdin_null = -1; - options->fork_after_authentication = -1; -@@ -2916,6 +2983,34 @@ fill_default_options(Options * options) - options->server_alive_interval = 0; - if (options->server_alive_count_max == -1) - options->server_alive_count_max = 3; -+#ifdef NONE_CIPHER_ENABLED -+ if (options->none_switch == -1) -+ options->none_switch = 0; -+ if (options->none_enabled == -1) -+ options->none_enabled = 0; -+#endif -+#ifdef HPN_ENABLED -+ if (options->hpn_disabled == -1) -+ options->hpn_disabled = 0; -+ if (options->hpn_buffer_size > -1) { -+ /* if a user tries to set the size to 0 set it to 1KB */ -+ if (options->hpn_buffer_size == 0) -+ options->hpn_buffer_size = 1; -+ /* limit the buffer to SSHBUF_SIZE_MAX (currently 256MB) */ -+ if (options->hpn_buffer_size > (SSHBUF_SIZE_MAX / 1024)) { -+ options->hpn_buffer_size = SSHBUF_SIZE_MAX; -+ debug("User requested buffer larger than 256MB. Request reverted to 256MB"); -+ } else -+ options->hpn_buffer_size *= 1024; -+ debug("hpn_buffer_size set to %d", options->hpn_buffer_size); -+ } -+ if (options->tcp_rcv_buf == 0) -+ options->tcp_rcv_buf = 1; -+ if (options->tcp_rcv_buf > -1) -+ options->tcp_rcv_buf *=1024; -+ if (options->tcp_rcv_buf_poll == -1) -+ options->tcp_rcv_buf_poll = 1; -+#endif - if (options->control_master == -1) - options->control_master = 0; - if (options->control_persist == -1) { ---- work.clean/openssh-6.8p1/readconf.h 2015-03-17 00:49:20.000000000 -0500 -+++ work/openssh-6.8p1/readconf.h 2015-04-03 13:47:45.670125000 -0500 -@@ -105,6 +105,16 @@ - int clear_forwardings; - - int enable_ssh_keysign; -+#ifdef NONE_CIPHER_ENABLED -+ int none_switch; /* Use none cipher */ -+ int none_enabled; /* Allow none to be used */ -+#endif -+#ifdef HPN_ENABLED -+ int tcp_rcv_buf; /* user switch to set tcp recv buffer */ -+ int tcp_rcv_buf_poll; /* Option to poll recv buf every window transfer */ -+ int hpn_disabled; /* Switch to disable HPN buffer management */ -+ int hpn_buffer_size; /* User definable size for HPN buffer window */ -+#endif - int64_t rekey_limit; - int rekey_interval; - int no_host_authentication_for_localhost; ---- work/openssh/scp.c.orig 2020-09-27 00:25:01.000000000 -0700 -+++ work/openssh/scp.c 2020-11-10 10:31:03.060729000 -0800 -@@ -1246,7 +1246,7 @@ sink(int argc, char **argv, const char *src) - off_t size, statbytes; - unsigned long long ull; - int setimes, targisdir, wrerr; -- char ch, *cp, *np, *targ, *why, *vect[1], buf[2048], visbuf[2048]; -+ char ch, *cp, *np, *targ, *why, *vect[1], buf[COPY_BUFLEN], visbuf[COPY_BUFLEN]; - char **patterns = NULL; - size_t n, npatterns = 0; - struct timeval tv[2]; ---- work/openssh/servconf.c.orig 2025-04-09 00:02:43.000000000 -0700 -+++ work/openssh/servconf.c 2025-04-10 22:30:44.919047000 -0700 -@@ -69,6 +69,9 @@ - #include "myproposal.h" - #include "digest.h" - #include "version.h" -+#ifdef HPN_ENABLED -+#include "sshbuf.h" -+#endif - - #if !defined(SSHD_PAM_SERVICE) - # define SSHD_PAM_SERVICE "sshd" -@@ -204,6 +207,14 @@ initialize_server_options(ServerOptions *options) - options->authorized_principals_file = NULL; - options->authorized_principals_command = NULL; - options->authorized_principals_command_user = NULL; -+#ifdef NONE_CIPHER_ENABLED -+ options->none_enabled = -1; -+#endif -+#ifdef HPN_ENABLED -+ options->tcp_rcv_buf_poll = -1; -+ options->hpn_disabled = -1; -+ options->hpn_buffer_size = -1; -+#endif - options->ip_qos_interactive = -1; - options->ip_qos_bulk = -1; - options->version_addendum = NULL; -@@ -471,6 +482,57 @@ fill_default_server_options(ServerOptions *options) - } - if (options->permit_tun == -1) - options->permit_tun = SSH_TUNMODE_NO; -+#ifdef NONE_CIPHER_ENABLED -+ if (options->none_enabled == -1) -+ options->none_enabled = 0; -+#endif -+#ifdef HPN_ENABLED -+ if (options->hpn_disabled == -1) -+ options->hpn_disabled = 0; -+ -+ if (options->hpn_buffer_size == -1) { -+ /* -+ * option not explicitly set. Now we have to figure out -+ * what value to use. -+ */ -+ if (options->hpn_disabled == 1) { -+ options->hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT; -+ } else { -+ int sock, socksize; -+ socklen_t socksizelen = sizeof(socksize); -+ -+ /* -+ * get the current RCV size and set it to that -+ * create a socket but don't connect it -+ * we use that the get the rcv socket size -+ */ -+ sock = socket(AF_INET, SOCK_STREAM, 0); -+ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, -+ &socksize, &socksizelen); -+ close(sock); -+ options->hpn_buffer_size = socksize; -+ debug ("HPN Buffer Size: %d", options->hpn_buffer_size); -+ } -+ } else { -+ /* -+ * we have to do this incase the user sets both values in a -+ * contradictory manner. hpn_disabled overrrides -+ * hpn_buffer_size -+ */ -+ if (options->hpn_disabled <= 0) { -+ if (options->hpn_buffer_size == 0) -+ options->hpn_buffer_size = 1; -+ /* limit the maximum buffer to SSHBUF_SIZE_MAX (currently 256MB) */ -+ if (options->hpn_buffer_size > (SSHBUF_SIZE_MAX / 1024)) { -+ options->hpn_buffer_size = SSHBUF_SIZE_MAX; -+ } else { -+ options->hpn_buffer_size *= 1024; -+ } -+ } else -+ options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT; -+ } -+#endif -+ - if (options->ip_qos_interactive == -1) - options->ip_qos_interactive = IPTOS_DSCP_AF21; - if (options->ip_qos_bulk == -1) -@@ -573,6 +635,12 @@ typedef enum { - sUsePrivilegeSeparation, sAllowAgentForwarding, - sHostCertificate, sInclude, - sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, -+#ifdef NONE_CIPHER_ENABLED -+ sNoneEnabled, -+#endif -+#ifdef HPN_ENABLED -+ sTcpRcvBufPoll, sHPNDisabled, sHPNBufferSize, -+#endif - sAuthorizedPrincipalsCommand, sAuthorizedPrincipalsCommandUser, - sKexAlgorithms, sCASignatureAlgorithms, sIPQoS, sVersionAddendum, - sAuthorizedKeysCommand, sAuthorizedKeysCommandUser, -@@ -727,6 +795,14 @@ static struct { - { "revokedkeys", sRevokedKeys, SSHCFG_ALL }, - { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL }, - { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, -+#ifdef NONE_CIPHER_ENABLED -+ { "noneenabled", sNoneEnabled, SSHCFG_ALL }, -+#endif -+#ifdef HPN_ENABLED -+ { "hpndisabled", sHPNDisabled, SSHCFG_ALL }, -+ { "hpnbuffersize", sHPNBufferSize, SSHCFG_ALL }, -+ { "tcprcvbufpoll", sTcpRcvBufPoll, SSHCFG_ALL }, -+#endif - { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, - { "include", sInclude, SSHCFG_ALL }, - { "ipqos", sIPQoS, SSHCFG_ALL }, -@@ -1568,6 +1644,25 @@ process_server_config_line_depth(ServerOptions *option - intptr = &options->hostbased_authentication; - goto parse_flag; - -+#ifdef NONE_CIPHER_ENABLED -+ case sNoneEnabled: -+ intptr = &options->none_enabled; -+ goto parse_flag; -+#endif -+#ifdef HPN_ENABLED -+ case sTcpRcvBufPoll: -+ intptr = &options->tcp_rcv_buf_poll; -+ goto parse_flag; -+ -+ case sHPNDisabled: -+ intptr = &options->hpn_disabled; -+ goto parse_flag; -+ -+ case sHPNBufferSize: -+ intptr = &options->hpn_buffer_size; -+ goto parse_int; -+#endif -+ - case sHostbasedUsesNameFromPacketOnly: - intptr = &options->hostbased_uses_name_from_packet_only; - goto parse_flag; ---- work.clean/openssh-6.8p1/servconf.h 2015-03-17 00:49:20.000000000 -0500 -+++ work/openssh-6.8p1/servconf.h 2015-04-03 13:48:37.316827000 -0500 -@@ -169,6 +169,15 @@ - - int use_pam; /* Enable auth via PAM */ - -+#ifdef NONE_CIPHER_ENABLED -+ int none_enabled; /* enable NONE cipher switch */ -+#endif -+#ifdef HPN_ENABLED -+ int tcp_rcv_buf_poll; /* poll tcp rcv window in autotuning kernels*/ -+ int hpn_disabled; /* disable hpn functionality. false by default */ -+ int hpn_buffer_size; /* set the hpn buffer size - default 3MB */ -+#endif -+ - int permit_tun; - - int num_permitted_opens; ---- work/openssh-7.7p1/serverloop.c.orig 2018-04-01 22:38:28.000000000 -0700 -+++ work/openssh-7.7p1/serverloop.c 2018-06-27 16:53:02.246871000 -0700 -@@ -550,6 +550,12 @@ server_request_tun(struct ssh *ssh) - goto done; - debug("Tunnel forwarding using interface %s", ifname); - -+#ifdef HPN_ENABLED -+ if (!options.hpn_disabled) -+ c = channel_new(ssh, "tun", SSH_CHANNEL_OPEN, sock, sock, -1, -+ options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); -+ else -+#endif - c = channel_new(ssh, "tun", SSH_CHANNEL_OPEN, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); - c->datagram = 1; -@@ -600,6 +606,10 @@ server_request_session(struct ssh *ssh) - c = channel_new(ssh, "session", SSH_CHANNEL_LARVAL, - -1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT, - 0, "server-session", 1); -+#ifdef HPN_ENABLED -+ if (options.tcp_rcv_buf_poll && !options.hpn_disabled) -+ c->dynamic_window = 1; -+#endif - if (session_open(the_authctxt, c->self) != 1) { - debug("session open failed, free channel %d", c->self); - channel_free(ssh, c); ---- work/openssh-7.7p1/session.c.orig 2018-04-01 22:38:28.000000000 -0700 -+++ work/openssh-7.7p1/session.c 2018-06-27 17:01:40.730347000 -0700 -@@ -2116,6 +2116,14 @@ session_set_fds(struct ssh *ssh, Session *s, - */ - if (s->chanid == -1) - fatal("no channel for session %d", s->self); -+#ifdef HPN_ENABLED -+ if (!options.hpn_disabled) -+ channel_set_fds(ssh, s->chanid, -+ fdout, fdin, fderr, -+ ignore_fderr ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ, -+ 1, is_tty, options.hpn_buffer_size); -+ else -+#endif - channel_set_fds(ssh, s->chanid, - fdout, fdin, fderr, - ignore_fderr ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ, ---- work.clean/openssh-6.8p1/sftp.1 2015-03-17 00:49:20.000000000 -0500 -+++ work/openssh-6.8p1/sftp.1 2015-04-01 22:16:49.921688000 -0500 -@@ -263,7 +263,8 @@ - Specify how many requests may be outstanding at any one time. - Increasing this may slightly improve file transfer speed - but will increase memory usage. --The default is 64 outstanding requests. -+The default is 256 outstanding requests providing for 8MB -+of outstanding data with a 32KB buffer. - .It Fl r - Recursively copy entire directories when uploading and downloading. - Note that ---- work/openssh/ssh.c.orig 2024-06-30 21:36:28.000000000 -0700 -+++ work/openssh/ssh.c 2024-07-01 13:58:31.555859000 -0700 -@@ -1070,6 +1070,14 @@ main(int ac, char **av) - break; - case 'T': - options.request_tty = REQUEST_TTY_NO; -+#ifdef NONE_CIPHER_ENABLED -+ /* -+ * ensure that the user doesn't try to backdoor a -+ * null cipher switch on an interactive session -+ * so explicitly disable it no matter what. -+ */ -+ options.none_switch = 0; -+#endif - break; - case 'o': - line = xstrdup(optarg); -@@ -2159,6 +2167,78 @@ ssh_session2_setup(struct ssh *ssh, int id, int succes - NULL, fileno(stdin), command, environ); - } - -+static void -+hpn_options_init(struct ssh *ssh) -+{ -+ /* -+ * We need to check to see if what they want to do about buffer -+ * sizes here. In a hpn to nonhpn connection we want to limit -+ * the window size to something reasonable in case the far side -+ * has the large window bug. In hpn to hpn connection we want to -+ * use the max window size but allow the user to override it -+ * lastly if they disabled hpn then use the ssh std window size. -+ * -+ * So why don't we just do a getsockopt() here and set the -+ * ssh window to that? In the case of a autotuning receive -+ * window the window would get stuck at the initial buffer -+ * size generally less than 96k. Therefore we need to set the -+ * maximum ssh window size to the maximum hpn buffer size -+ * unless the user has specifically set the tcprcvbufpoll -+ * to no. In which case we *can* just set the window to the -+ * minimum of the hpn buffer size and tcp receive buffer size. -+ */ -+ -+ if (tty_flag) -+ options.hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT; -+ else -+ options.hpn_buffer_size = 2 * 1024 * 1024; -+ -+ if (ssh->compat & SSH_BUG_LARGEWINDOW) { -+ debug("HPN to Non-HPN Connection"); -+ } else { -+ int sock, socksize; -+ socklen_t socksizelen; -+ if (options.tcp_rcv_buf_poll <= 0) { -+ sock = socket(AF_INET, SOCK_STREAM, 0); -+ socksizelen = sizeof(socksize); -+ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, -+ &socksize, &socksizelen); -+ close(sock); -+ debug("socksize %d", socksize); -+ options.hpn_buffer_size = socksize; -+ debug("HPNBufferSize set to TCP RWIN: %d", options.hpn_buffer_size); -+ } else { -+ if (options.tcp_rcv_buf > 0) { -+ /* -+ * Create a socket but don't connect it: -+ * we use that the get the rcv socket size -+ */ -+ sock = socket(AF_INET, SOCK_STREAM, 0); -+ /* -+ * If they are using the tcp_rcv_buf option, -+ * attempt to set the buffer size to that. -+ */ -+ if (options.tcp_rcv_buf) { -+ socksizelen = sizeof(options.tcp_rcv_buf); -+ setsockopt(sock, SOL_SOCKET, SO_RCVBUF, -+ &options.tcp_rcv_buf, socksizelen); -+ } -+ socksizelen = sizeof(socksize); -+ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, -+ &socksize, &socksizelen); -+ close(sock); -+ debug("socksize %d", socksize); -+ options.hpn_buffer_size = socksize; -+ debug("HPNBufferSize set to user TCPRcvBuf: %d", options.hpn_buffer_size); -+ } -+ } -+ } -+ -+ debug("Final hpn_buffer_size = %d", options.hpn_buffer_size); -+ -+ channel_set_hpn(options.hpn_disabled, options.hpn_buffer_size); -+} -+ - /* open new channel for a session */ - static int - ssh_session2_open(struct ssh *ssh) -@@ -2177,9 +2257,17 @@ ssh_session2_open(struct ssh *ssh) - if (in == -1 || out == -1 || err == -1) - fatal("dup() in/out/err failed"); - -+#ifdef HPN_ENABLED -+ window = options.hpn_buffer_size; -+#else - window = CHAN_SES_WINDOW_DEFAULT; -+#endif -+ - packetmax = CHAN_SES_PACKET_DEFAULT; - if (tty_flag) { -+#ifdef HPN_ENABLED -+ window = CHAN_SES_WINDOW_DEFAULT; -+#endif - window >>= 1; - packetmax >>= 1; - } -@@ -2188,6 +2276,12 @@ ssh_session2_open(struct ssh *ssh) - window, packetmax, CHAN_EXTENDED_WRITE, - "client-session", CHANNEL_NONBLOCK_STDIO); - -+#ifdef HPN_ENABLED -+ if (options.tcp_rcv_buf_poll > 0 && !options.hpn_disabled) { -+ c->dynamic_window = 1; -+ debug ("Enabled Dynamic Window Scaling"); -+ } -+#endif - debug3_f("channel_new: %d", c->self); - - channel_send_open(ssh, c->self); -@@ -2203,6 +2297,15 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_in - { - int r, interactive, id = -1; - char *cp, *tun_fwd_ifname = NULL; -+ -+#ifdef HPN_ENABLED -+ /* -+ * We need to initialize this early because the forwarding logic below -+ * might open channels that use the hpn buffer sizes. We can't send a -+ * window of -1 (the default) to the server as it breaks things. -+ */ -+ hpn_options_init(ssh); -+#endif - - /* XXX should be pre-session */ - if (!options.control_persist) ---- work/openssh-7.7p1/sshbuf.h.orig 2018-06-27 16:11:24.503058000 -0700 -+++ work/openssh-7.7p1/sshbuf.h 2018-06-27 16:12:01.359375000 -0700 -@@ -28,7 +28,11 @@ - # endif /* OPENSSL_HAS_ECC */ - #endif /* WITH_OPENSSL */ - -+#ifdef HPN_ENABLED -+#define SSHBUF_SIZE_MAX 0xF000000 /* Hard maximum size 256MB */ -+#else - #define SSHBUF_SIZE_MAX 0x8000000 /* Hard maximum size */ -+#endif - #define SSHBUF_REFS_MAX 0x100000 /* Max child buffers */ - #define SSHBUF_MAX_BIGNUM (16384 / 8) /* Max bignum *bytes* */ - #define SSHBUF_MAX_ECPOINT ((528 * 2 / 8) + 1) /* Max EC point *bytes* */ ---- work/openssh/sshconnect.c.orig 2025-04-09 00:02:43.000000000 -0700 -+++ work/openssh/sshconnect.c 2025-04-10 22:32:59.573577000 -0700 -@@ -341,6 +341,31 @@ check_ifaddrs(const char *ifname, int af, const struct - } - } - return -1; -+} -+#endif -+ -+#ifdef HPN_ENABLED -+/* -+ * Set TCP receive buffer if requested. -+ * Note: tuning needs to happen after the socket is -+ * created but before the connection happens -+ * so winscale is negotiated properly -cjr -+ */ -+static void -+ssh_set_socket_recvbuf(int sock) -+{ -+ void *buf = (void *)&options.tcp_rcv_buf; -+ int sz = sizeof(options.tcp_rcv_buf); -+ int socksize; -+ socklen_t socksizelen = sizeof(socksize); -+ -+ debug("setsockopt Attempting to set SO_RCVBUF to %d", options.tcp_rcv_buf); -+ if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, buf, sz) >= 0) { -+ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, &socksize, &socksizelen); -+ debug("setsockopt SO_RCVBUF: %.100s %d", strerror(errno), socksize); -+ } else -+ error("Couldn't set socket receive buffer to %d: %.100s", -+ options.tcp_rcv_buf, strerror(errno)); - } - #endif - -@@ -370,6 +395,11 @@ ssh_create_socket(struct addrinfo *ai) - if (options.ip_qos_interactive != INT_MAX) - set_sock_tos(sock, options.ip_qos_interactive); - -+#ifdef HPN_ENABLED -+ if (options.tcp_rcv_buf > 0) -+ ssh_set_socket_recvbuf(sock); -+#endif -+ - /* Bind the socket to an alternative local IP address */ - if (options.bind_address == NULL && options.bind_interface == NULL) - return sock; -@@ -1605,7 +1635,7 @@ ssh_login(struct ssh *ssh, Sensitive *sensitive, const - - /* Exchange protocol version identification strings with the server. */ - if ((r = kex_exchange_identification(ssh, timeout_ms, -- options.version_addendum)) != 0) -+ options.version_addendum, options.hpn_disabled)) != 0) - sshpkt_fatal(ssh, r, "banner exchange"); - - /* Put the connection into non-blocking mode. */ ---- work/openssh/sshconnect2.c.orig 2023-03-15 14:28:19.000000000 -0700 -+++ work/openssh/sshconnect2.c 2023-05-19 14:20:01.965073000 -0700 -@@ -83,7 +83,13 @@ extern Options options; - extern char *client_version_string; - extern char *server_version_string; - extern Options options; -+#ifdef NONE_CIPHER_ENABLED -+/* tty_flag is set in ssh.c. use this in ssh_userauth2 */ -+/* if it is set then prevent the switch to the null cipher */ - -+extern int tty_flag; -+#endif -+ - /* - * SSH2 key exchange - */ -@@ -482,6 +488,34 @@ ssh_userauth2(struct ssh *ssh, const char *local_user, - - if (!authctxt.success) - fatal("Authentication failed."); -+#ifdef NONE_CIPHER_ENABLED -+ /* -+ * if the user wants to use the none cipher do it -+ * post authentication and only if the right conditions are met -+ * both of the NONE commands must be true and there must be no -+ * tty allocated. -+ */ -+ if ((options.none_switch == 1) && (options.none_enabled == 1)) { -+ char *myproposal[PROPOSAL_MAX]; -+ char *s = NULL; -+ const char *none_cipher = "none"; -+ -+ if (!tty_flag) { /* no null on tty sessions */ -+ debug("Requesting none rekeying..."); -+ kex_proposal_populate_entries(ssh, myproposal, s, none_cipher, -+ options.macs, -+ compression_alg_list(options.compression), -+ options.hostkeyalgorithms); -+ kex_prop2buf(ssh->kex->my, myproposal); -+ packet_request_rekeying(); -+ fprintf(stderr, "WARNING: ENABLED NONE CIPHER\n"); -+ } else { -+ /* requested NONE cipher when in a tty */ -+ debug("Cannot switch to NONE cipher with tty allocated"); -+ fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n"); -+ } -+ } -+#endif - if (ssh_packet_connection_is_on_socket(ssh)) { - verbose("Authenticated to %s ([%s]:%d) using \"%s\".", host, - ssh_remote_ipaddr(ssh), ssh_remote_port(ssh), ---- work/openssh/sshd.c.orig 2024-06-30 21:36:28.000000000 -0700 -+++ work/openssh/sshd.c 2024-07-01 14:03:40.471948000 -0700 -@@ -75,6 +75,9 @@ - #include "log.h" - #include "sshbuf.h" - #include "misc.h" -+#ifdef HPN_ENABLED -+#include "channels.h" -+#endif - #include "servconf.h" - #include "compat.h" - #include "digest.h" -@@ -742,6 +742,10 @@ listen_on_addrs(struct listenaddr *la) - int ret, listen_sock; - struct addrinfo *ai; - char ntop[NI_MAXHOST], strport[NI_MAXSERV]; -+#ifdef HPN_ENABLED -+ int socksize; -+ socklen_t socksizelen = sizeof(socksize); -+#endif - - for (ai = la->addrs; ai; ai = ai->ai_next) { - if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) -@@ -786,6 +790,13 @@ listen_on_addrs(struct listenaddr *la) - sock_set_v6only(listen_sock); - - debug("Bind to port %s on %s.", strport, ntop); -+ -+#ifdef HPN_ENABLED -+ getsockopt(listen_sock, SOL_SOCKET, SO_RCVBUF, -+ &socksize, &socksizelen); -+ debug("Server TCP RWIN socket size: %d", socksize); -+ debug("HPN Buffer Size: %d", options.hpn_buffer_size); -+#endif - - /* Bind the socket to the desired port. */ - if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) == -1) { -@@ -1409,6 +1420,15 @@ main(int ac, char **av) - /* Fill in default values for those options not explicitly set. */ - fill_default_server_options(&options); - -+#ifdef NONE_CIPHER_ENABLED -+ if (options.none_enabled == 1) { -+ char *old_ciphers = options.ciphers; -+ -+ xasprintf(&options.ciphers, "%s,none", old_ciphers); -+ free(old_ciphers); -+ } -+#endif -+ - /* Check that options are sensible */ - if (options.authorized_keys_command_user == NULL && - (options.authorized_keys_command != NULL && -@@ -1742,6 +1762,11 @@ main(int ac, char **av) - /* This is the child processing a new connection. */ - setproctitle("%s", "[accepted]"); - -+#ifdef HPN_ENABLED -+ /* set the HPN options for the child */ -+ channel_set_hpn(options.hpn_disabled, options.hpn_buffer_size); -+#endif -+ - /* - * Create a new session and process group since the 4.4BSD - * setlogin() affects the entire process group. We don't ---- work.clean/openssh-9.8p1/sshd-session.c.orig 2024-07-01 13:54:25.745441000 -0700 -+++ work/openssh-9.8p1/sshd-session.c 2024-07-01 13:54:57.335695000 -0700 -@@ -1305,7 +1305,7 @@ main(int ac, char **av) - alarm(options.login_grace_time); - - if ((r = kex_exchange_identification(ssh, -1, -- options.version_addendum)) != 0) -+ options.version_addendum, options.hpn_disabled)) != 0) - sshpkt_fatal(ssh, r, "banner exchange"); - - ssh_packet_set_nonblocking(ssh); ---- work.clean/openssh-6.8p1/sshd_config 2015-04-01 22:07:18.248858000 -0500 -+++ work/openssh-6.8p1/sshd_config 2015-04-01 22:16:49.932279000 -0500 -@@ -111,6 +111,20 @@ AuthorizedKeysFile .ssh/authorized_keys - # override default of no subsystems - Subsystem sftp /usr/libexec/sftp-server - -+# the following are HPN related configuration options -+# tcp receive buffer polling. disable in non autotuning kernels -+#TcpRcvBufPoll yes -+ -+# disable hpn performance boosts -+#HPNDisabled no -+ -+# buffer size for hpn to non-hpn connections -+#HPNBufferSize 2048 -+ -+ -+# allow the use of the none cipher -+#NoneEnabled no -+ - # Example of overriding settings on a per-user basis - #Match User anoncvs - # X11Forwarding no ---- work/openssh/version.h.orig 2025-02-18 00:15:08.000000000 -0800 -+++ work/openssh/version.h 2025-02-19 07:59:36.425254000 -0800 -@@ -4,3 +4,4 @@ - - #define SSH_PORTABLE "p2" - #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -+#define SSH_HPN "-hpn14v15" ---- work/openssh/kex.h.orig 2019-07-10 17:35:36.523216000 -0700 -+++ work/openssh/kex.h 2019-07-10 17:35:41.997522000 -0700 -@@ -178,7 +178,7 @@ char *kex_alg_list(char); - char *kex_names_cat(const char *, const char *); - int kex_assemble_names(char **, const char *, const char *); - --int kex_exchange_identification(struct ssh *, int, const char *); -+int kex_exchange_identification(struct ssh *, int, const char *, int); - - struct kex *kex_new(void); - int kex_ready(struct ssh *, char *[PROPOSAL_MAX]); ---- work/openssh/sshd-auth.c.orig 2025-04-10 22:36:29.699636000 -0700 -+++ work/openssh/sshd-auth.c 2025-04-10 22:36:33.770235000 -0700 -@@ -827,6 +827,10 @@ do_ssh2_kex(struct ssh *ssh) - struct kex *kex; - int r; - -+#ifdef NONE_CIPHER_ENABLED -+ if (options.none_enabled == 1) -+ debug ("WARNING: None cipher enabled"); -+#endif - if (options.rekey_limit || options.rekey_interval) - ssh_packet_set_rekey_limits(ssh, options.rekey_limit, - options.rekey_interval); diff --git a/security/openssh-portable/files/extra-patch-hpn-compat b/security/openssh-portable/files/extra-patch-hpn-compat deleted file mode 100644 index ef6542e..0000000 --- a/security/openssh-portable/files/extra-patch-hpn-compat +++ /dev/null @@ -1,46 +0,0 @@ ------------------------------------------------------------------------- -r294563 | des | 2016-01-22 05:13:46 -0800 (Fri, 22 Jan 2016) | 3 lines -Changed paths: - M /head/crypto/openssh/servconf.c - -Instead of removing the NoneEnabled option, mark it as unsupported. -(should have done this in r291198, but didn't think of it until now) - ------------------------------------------------------------------------- ------------------------------------------------------------------------- -r294564 | des | 2016-01-22 06:22:11 -0800 (Fri, 22 Jan 2016) | 2 lines -Changed paths: - M /head/crypto/openssh/readconf.c - -r294563 was incomplete; re-add the client-side options as well. - ------------------------------------------------------------------------- - ---- readconf.c.orig 2025-04-09 00:02:43.000000000 -0700 -+++ readconf.c 2025-04-10 21:55:30.974643000 -0700 -@@ -332,6 +332,12 @@ static struct { - { "obscurekeystroketiming", oObscureKeystrokeTiming }, - { "channeltimeout", oChannelTimeout }, - { "versionaddendum", oVersionAddendum }, -+ { "hpndisabled", oDeprecated }, -+ { "hpnbuffersize", oDeprecated }, -+ { "tcprcvbufpoll", oDeprecated }, -+ { "tcprcvbuf", oDeprecated }, -+ { "noneenabled", oUnsupported }, -+ { "noneswitch", oUnsupported }, - - { NULL, oBadOption } - }; ---- servconf.c.orig 2024-09-19 15:20:48.000000000 -0700 -+++ servconf.c 2024-10-07 20:18:18.259726000 -0700 -@@ -746,6 +746,10 @@ static struct { - { "unusedconnectiontimeout", sUnusedConnectionTimeout, SSHCFG_ALL }, - { "sshdsessionpath", sSshdSessionPath, SSHCFG_GLOBAL }, - { "refuseconnection", sRefuseConnection, SSHCFG_ALL }, -+ { "noneenabled", sUnsupported, SSHCFG_ALL }, -+ { "hpndisabled", sDeprecated, SSHCFG_ALL }, -+ { "hpnbuffersize", sDeprecated, SSHCFG_ALL }, -+ { "tcprcvbufpoll", sDeprecated, SSHCFG_ALL }, - { NULL, sBadOption, 0 } - }; - diff --git a/security/openssh-portable/files/extra-patch-hpn-gss-glue b/security/openssh-portable/files/extra-patch-hpn-gss-glue deleted file mode 100644 index 57b47e8..0000000 --- a/security/openssh-portable/files/extra-patch-hpn-gss-glue +++ /dev/null @@ -1,57 +0,0 @@ ---- sshconnect2.c.orig 2019-07-19 11:53:14.918867000 -0700 -+++ sshconnect2.c 2019-07-19 11:53:16.911086000 -0700 -@@ -159,11 +159,6 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr - char *s, *all_key; - int r; - --#if defined(GSSAPI) && defined(WITH_OPENSSL) -- char *orig = NULL, *gss = NULL; -- char *gss_host = NULL; --#endif -- - xxx_host = host; - xxx_hostaddr = hostaddr; - -@@ -197,6 +192,9 @@ ssh_kex2(struct ssh *ssh, char *host, struct sockaddr - } - - #if defined(GSSAPI) && defined(WITH_OPENSSL) -+ char *orig = NULL, *gss = NULL; -+ char *gss_host = NULL; -+ - if (options.gss_keyex) { - /* Add the GSSAPI mechanisms currently supported on this - * client to the key exchange algorithm proposal */ ---- readconf.c.orig 2019-07-19 12:13:18.000312000 -0700 -+++ readconf.c 2019-07-19 12:13:29.614552000 -0700 -@@ -63,11 +63,11 @@ - #include "readconf.h" - #include "match.h" - #include "kex.h" -+#include "ssh-gss.h" - #include "mac.h" - #include "uidswap.h" - #include "myproposal.h" - #include "digest.h" --#include "ssh-gss.h" - - /* Format of the configuration file: - ---- servconf.c.orig 2019-07-19 12:14:42.078398000 -0700 -+++ servconf.c 2019-07-19 12:14:43.543687000 -0700 -@@ -54,6 +54,7 @@ - #include "sshkey.h" - #include "kex.h" - #include "mac.h" -+#include "ssh-gss.h" - #include "match.h" - #include "channels.h" - #include "groupaccess.h" -@@ -64,7 +65,6 @@ - #include "auth.h" - #include "myproposal.h" - #include "digest.h" --#include "ssh-gss.h" - - static void add_listen_addr(ServerOptions *, const char *, - const char *, int); diff --git a/security/openssh-portable/files/extra-patch-pam-sshd_config b/security/openssh-portable/files/extra-patch-pam-sshd_config deleted file mode 100644 index aa80cee..0000000 --- a/security/openssh-portable/files/extra-patch-pam-sshd_config +++ /dev/null @@ -1,31 +0,0 @@ ---- sshd_config.orig 2025-04-09 00:02:43.000000000 -0700 -+++ sshd_config 2025-04-10 21:52:39.463528000 -0700 -@@ -53,8 +53,8 @@ AuthorizedKeysFile .ssh/authorized_keys - # Don't read the user's ~/.rhosts and ~/.shosts files - #IgnoreRhosts yes - --# To disable tunneled clear text passwords, change to "no" here! --#PasswordAuthentication yes -+# To enable tunneled clear text passwords, change to yes here! -+#PasswordAuthentication no - #PermitEmptyPasswords no - - # Change to "no" to disable keyboard-interactive authentication. Depending on -@@ -72,7 +72,7 @@ AuthorizedKeysFile .ssh/authorized_keys - #GSSAPIAuthentication no - #GSSAPICleanupCredentials yes - --# Set this to 'yes' to enable PAM authentication, account processing, -+# Set this to 'no' to disable PAM authentication, account processing, - # and session processing. If this is enabled, PAM authentication will - # be allowed through the KbdInteractiveAuthentication and - # PasswordAuthentication. Depending on your PAM configuration, -@@ -81,7 +81,7 @@ AuthorizedKeysFile .ssh/authorized_keys - # If you just want the PAM account and session checks to run without - # PAM authentication, then enable this but set PasswordAuthentication - # and KbdInteractiveAuthentication to 'no'. --#UsePAM no -+#UsePAM yes - - #AllowAgentForwarding yes - #AllowTcpForwarding yes diff --git a/security/openssh-portable/files/extra-patch-tcpwrappers b/security/openssh-portable/files/extra-patch-tcpwrappers deleted file mode 100644 index 5d9e8ac..0000000 --- a/security/openssh-portable/files/extra-patch-tcpwrappers +++ /dev/null @@ -1,151 +0,0 @@ -Revert TCPWRAPPER removal -bdrewery - -commit f2719b7c2b8a3b14d778d8a6d8dc729b5174b054 -Author: Damien Miller -Date: Sun Apr 20 13:22:18 2014 +1000 - - - tedu@cvs.openbsd.org 2014/03/26 19:58:37 - [sshd.8 sshd.c] - remove libwrap support. ok deraadt djm mfriedl - -diff --git sshd.8 sshd.8 -index 289e13d..e6a900b 100644 ---- sshd.8 -+++ sshd.8 -@@ -851,6 +851,12 @@ the user's home directory becomes accessible. - This file should be writable only by the user, and need not be - readable by anyone else. - .Pp -+.It Pa /etc/hosts.allow -+.It Pa /etc/hosts.deny -+Access controls that should be enforced by tcp-wrappers are defined here. -+Further details are described in -+.Xr hosts_access 5 . -+.Pp - .It Pa /etc/hosts.equiv - This file is for host-based authentication (see - .Xr ssh 1 ) . -@@ -954,6 +960,7 @@ The content of this file is not sensitive; it can be world-readable. - .Xr ssh-keygen 1 , - .Xr ssh-keyscan 1 , - .Xr chroot 2 , -+.Xr hosts_access 5 , - .Xr login.conf 5 , - .Xr moduli 5 , - .Xr sshd_config 5 , ---- sshd-session.c.orig 2024-07-01 13:26:10.677919000 -0700 -+++ sshd-session.c 2024-07-01 13:26:58.873906000 -0700 -@@ -110,6 +110,13 @@ - #include "srclimit.h" - #include "dh.h" - -+#ifdef LIBWRAP -+#include -+#include -+int allow_severity; -+int deny_severity; -+#endif /* LIBWRAP */ -+ - /* Re-exec fds */ - #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) - #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) -@@ -1256,7 +1263,26 @@ main(int ac, char **av) - #endif - - rdomain = ssh_packet_rdomain_in(ssh); -+ -+#ifdef LIBWRAP -+ allow_severity = options.log_facility|LOG_INFO; -+ deny_severity = options.log_facility|LOG_WARNING; -+ /* Check whether logins are denied from this host. */ -+ if (ssh_packet_connection_is_on_socket(ssh)) { -+ struct request_info req; - -+ request_init(&req, RQ_DAEMON, __progname, RQ_FILE, sock_in, 0); -+ fromhost(&req); -+ -+ if (!hosts_access(&req)) { -+ debug("Connection refused by tcp wrapper"); -+ refuse(&req); -+ /* NOTREACHED */ -+ fatal("libwrap refuse returns"); -+ } -+ } -+#endif /* LIBWRAP */ -+ - /* Log the connection. */ - laddr = get_local_ipaddr(sock_in); - verbose("Connection from %s port %d on %s port %d%s%s%s", ---- configure.ac.orig 2022-02-23 03:31:11.000000000 -0800 -+++ configure.ac 2022-03-02 12:47:49.958341000 -0800 -@@ -1599,6 +1599,62 @@ else - AC_MSG_RESULT([no]) - fi - -+# Check whether user wants TCP wrappers support -+TCPW_MSG="no" -+AC_ARG_WITH([tcp-wrappers], -+ [ --with-tcp-wrappers[[=PATH]] Enable tcpwrappers support (optionally in PATH)], -+ [ -+ if test "x$withval" != "xno" ; then -+ saved_LIBS="$LIBS" -+ saved_LDFLAGS="$LDFLAGS" -+ saved_CPPFLAGS="$CPPFLAGS" -+ if test -n "${withval}" && \ -+ test "x${withval}" != "xyes"; then -+ if test -d "${withval}/lib"; then -+ if test -n "${need_dash_r}"; then -+ LDFLAGS="-L${withval}/lib -R${withval}/lib ${LDFLAGS}" -+ else -+ LDFLAGS="-L${withval}/lib ${LDFLAGS}" -+ fi -+ else -+ if test -n "${need_dash_r}"; then -+ LDFLAGS="-L${withval} -R${withval} ${LDFLAGS}" -+ else -+ LDFLAGS="-L${withval} ${LDFLAGS}" -+ fi -+ fi -+ if test -d "${withval}/include"; then -+ CPPFLAGS="-I${withval}/include ${CPPFLAGS}" -+ else -+ CPPFLAGS="-I${withval} ${CPPFLAGS}" -+ fi -+ fi -+ LIBS="-lwrap $LIBS" -+ AC_MSG_CHECKING([for libwrap]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -+#include -+#include -+#include -+#include -+int deny_severity = 0, allow_severity = 0; -+ ]], [[ -+ hosts_access(0); -+ ]])], [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE([LIBWRAP], [1], -+ [Define if you want -+ TCP Wrappers support]) -+ SSHDLIBS="$SSHDLIBS -lwrap" -+ TCPW_MSG="yes" -+ ], [ -+ AC_MSG_ERROR([*** libwrap missing]) -+ -+ ]) -+ LIBS="$saved_LIBS" -+ fi -+ ] -+) -+ - # Check whether user wants to use ldns - LDNS_MSG="no" - AC_ARG_WITH(ldns, -@@ -5593,6 +5649,7 @@ echo " PAM support: $PAM_MSG" - echo " OSF SIA support: $SIA_MSG" - echo " KerberosV support: $KRB5_MSG" - echo " SELinux support: $SELINUX_MSG" -+echo " TCP Wrappers support: $TCPW_MSG" - echo " libedit support: $LIBEDIT_MSG" - echo " libldns support: $LDNS_MSG" - echo " Solaris process contract support: $SPC_MSG" diff --git a/security/openssh-portable/files/extra-patch-version-addendum b/security/openssh-portable/files/extra-patch-version-addendum deleted file mode 100644 index b10e1c6..0000000 --- a/security/openssh-portable/files/extra-patch-version-addendum +++ /dev/null @@ -1,5 +0,0 @@ ---- servconf.c.orig 2015-03-28 23:08:41.296700000 -0500 -+++ servconf.c 2015-03-28 23:08:54.016291000 -0500 -@@ -318 +318 @@ -- options->version_addendum = xstrdup(""); -+ options->version_addendum = xstrdup(SSH_VERSION_FREEBSD_PORT); diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in deleted file mode 100644 index 9526a70..0000000 --- a/security/openssh-portable/files/openssh.in +++ /dev/null @@ -1,179 +0,0 @@ -#!/bin/sh - -# PROVIDE: openssh -# REQUIRE: DAEMON -# KEYWORD: shutdown -# -# Add the following lines to /etc/rc.conf to enable openssh: -# -# openssh_enable (bool): Set it to "YES" to enable openssh. -# Default is "NO". -# openssh_flags (flags): Set extra flags to openssh. -# Default is "". see sshd(1). -# openssh_pidfile (file): Set full path to pid file. - -. /etc/rc.subr - -name="openssh" -rcvar=openssh_enable - -load_rc_config ${name} - -: ${openssh_enable:="NO"} -: ${openssh_skipportscheck="NO"} - -# These only control ssh-keygen automatically generating host keys. -: ${openssh_dsa_enable="YES"} -: ${openssh_dsa_flags=""} -: ${openssh_rsa_enable="YES"} -: ${openssh_rsa_flags=""} -: ${openssh_ecdsa_enable="YES"} -: ${openssh_ecdsa_flags=""} -: ${openssh_ed25519_enable="YES"} -: ${openssh_ed25519_flags=""} - -command=%%PREFIX%%/sbin/sshd -extra_commands="configtest reload keygen" -start_precmd="${name}_checks" -reload_precmd="${name}_checks" -restart_precmd="${name}_checks" -configtest_cmd="${name}_configtest" -keygen_cmd="${name}_keygen" -pidfile=${openssh_pidfile:="/var/run/sshd.pid"} - -openssh_keygen() -{ - local skip_dsa= skip_rsa= skip_ecdsa= skip_ed25519= - checkyesno openssh_dsa_enable || skip_dsa=y - checkyesno openssh_rsa_enable || skip_rsa=y - checkyesno openssh_ecdsa_enable || skip_ecdsa=y - checkyesno openssh_ed25519_enable || skip_ed25519=y - - if [ \( -n "$skip_dsa" -o -f %%ETCDIR%%/ssh_host_dsa_key \) -a \ - \( -n "$skip_rsa" -o -f %%ETCDIR%%/ssh_host_rsa_key \) -a \ - \( -n "$skip_ecdsa" -o -f %%ETCDIR%%/ssh_host_ecdsa_key \) -a \ - \( -n "$skip_ed25519" -o -f %%ETCDIR%%/ssh_host_ed25519_key \) ]; then - return 0 - fi - - umask 022 - - # Can't do anything if ssh is not installed - [ -x %%PREFIX%%/bin/ssh-keygen ] || - err 1 "%%PREFIX%%/bin/ssh-keygen does not exist." - - if [ -f %%ETCDIR%%/ssh_host_dsa_key ]; then - echo "You already have a DSA host key" \ - "in %%ETCDIR%%/ssh_host_dsa_key" - echo "Skipping protocol version 2 DSA Key Generation" - elif checkyesno openssh_dsa_enable; then - %%PREFIX%%/bin/ssh-keygen -t dsa $openssh_dsa_flags \ - -f %%ETCDIR%%/ssh_host_dsa_key -N '' - fi - - if [ -f %%ETCDIR%%/ssh_host_rsa_key ]; then - echo "You already have a RSA host key" \ - "in %%ETCDIR%%/ssh_host_rsa_key" - echo "Skipping protocol version 2 RSA Key Generation" - elif checkyesno openssh_rsa_enable; then - %%PREFIX%%/bin/ssh-keygen -t rsa $openssh_rsa_flags \ - -f %%ETCDIR%%/ssh_host_rsa_key -N '' - fi - - if [ -f %%ETCDIR%%/ssh_host_ecdsa_key ]; then - echo "You already have a Elliptic Curve DSA host key" \ - "in %%ETCDIR%%/ssh_host_ecdsa_key" - echo "Skipping protocol version 2 Elliptic Curve DSA Key Generation" - elif checkyesno openssh_ecdsa_enable; then - %%PREFIX%%/bin/ssh-keygen -t ecdsa $openssh_ecdsa_flags \ - -f %%ETCDIR%%/ssh_host_ecdsa_key -N '' - fi - - if [ -f %%ETCDIR%%/ssh_host_ed25519_key ]; then - echo "You already have a Elliptic Curve ED25519 host key" \ - "in %%ETCDIR%%/ssh_host_ed25519_key" - echo "Skipping protocol version 2 Elliptic Curve ED25519 Key Generation" - elif checkyesno openssh_ed25519_enable; then - %%PREFIX%%/bin/ssh-keygen -t ed25519 $openssh_ed22519_flags \ - -f %%ETCDIR%%/ssh_host_ed25519_key -N '' - fi -} - -openssh_check_same_ports(){ - # check if opensshd don't use base system sshd's port - # - # openssh binds ports in priority (lowest first): - # Port from sshd_config - # -p option from command line - # ListenAddress addr:port from sshd_config - - - #check if opensshd-portable installed in replacement of base sshd - if [ "%%ETCDIR%%" = "/etc/ssh" ]; then - return 1 - fi - - self_port=$(awk '$1~/^ListenAddress/ \ - {mlen=match($0,":[0-9]*$"); print \ - substr($0,mlen+1,length($0)-mlen)}' %%ETCDIR%%/sshd_config) - if [ -z "$self_port" ]; then - self_port=$(echo $openssh_flags | awk \ - '{for (i = 1; i <= NF; i++) if ($i == "-p") \ - {i++; printf "%s", $i; break; }; }') - if [ -z "$self_port" ]; then - self_port=$(awk '$1~/^Port/ {print $2}' \ - %%ETCDIR%%/sshd_config) - fi - fi - # assume default 22 port - if [ -z "$self_port" ]; then - self_port=22 - fi - - load_rc_config "sshd" - - base_sshd_port=$(awk '$1~/^ListenAddress/ \ - {mlen=match($0,":[0-9]*$"); print \ - substr($0,mlen+1,length($0)-mlen)}' /etc/ssh/sshd_config) - if [ -z "$base_sshd_port" ]; then - base_sshd_port=$(echo $sshd_flags | awk \ - '{for (i = 1; i <= NF; i++) if ($i == "-p") \ - {i++; printf "%s", $i; break; }; }') - if [ -z "$base_sshd_port" ]; then - base_sshd_port=$(awk '$1~/^Port/ {print $2}' \ - /etc/ssh/sshd_config) - fi - fi - if [ -z "$base_sshd_port" ]; then - base_sshd_port=22 - fi - - # self_port and base_sshd_port may have multiple values. Compare them all - for sport in ${self_port}; do - for bport in ${base_sshd_port}; do - [ ${sport} -eq ${bport} ] && return 0 - done - done - - return 1 -} - -openssh_configtest() -{ - echo "Performing sanity check on ${name} configuration." - eval ${command} ${openssh_flags} -t -} - -openssh_checks() -{ - if checkyesno sshd_enable ; then - if openssh_check_same_ports && ! checkyesno openssh_skipportscheck; then - err 1 "sshd_enable is set, but $name and /usr/sbin/sshd use the same port" - fi - fi - - openssh_keygen - openssh_configtest -} - -run_rc_command "$1" diff --git a/security/openssh-portable/files/patch-regress__test-exec.sh b/security/openssh-portable/files/patch-regress__test-exec.sh deleted file mode 100644 index 0213e8c..0000000 --- a/security/openssh-portable/files/patch-regress__test-exec.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- regress/test-exec.sh.orig 2015-04-03 18:20:32.256126000 UTC -+++ regress/test-exec.sh 2015-04-03 18:20:41.599903000 -0500 -@@ -408,6 +408,7 @@ cat << EOF > $OBJ/sshd_config - LogLevel DEBUG3 - AcceptEnv _XXX_TEST_* - AcceptEnv _XXX_TEST -+ PermitRootLogin yes - Subsystem sftp $SFTPSERVER - EOF - diff --git a/security/openssh-portable/files/patch-servconf.c b/security/openssh-portable/files/patch-servconf.c deleted file mode 100644 index 33ead18..0000000 --- a/security/openssh-portable/files/patch-servconf.c +++ /dev/null @@ -1,52 +0,0 @@ -r99048 | des | 2002-06-29 05:51:56 -0500 (Sat, 29 Jun 2002) | 4 lines -Changed paths: - M /head/crypto/openssh/myproposal.h - M /head/crypto/openssh/readconf.c - M /head/crypto/openssh/servconf.c - -Apply FreeBSD's configuration defaults. - ---- servconf.c.orig 2024-07-01 13:30:30.284417000 -0700 -+++ servconf.c 2024-07-01 13:31:20.040132000 -0700 -@@ -46,6 +46,7 @@ - # include "openbsd-compat/glob.h" - #endif - -+#include "version.h" - #include "openbsd-compat/sys-queue.h" - #include "xmalloc.h" - #include "ssh.h" -@@ -295,7 +296,11 @@ fill_default_server_options(ServerOptions *options) - - /* Portable-specific options */ - if (options->use_pam == -1) -- options->use_pam = 0; -+#ifdef USE_PAM -+ options->use_pam = 1; -+#else -+ options->use_pam = 0; -+#endif - if (options->pam_service_name == NULL) - options->pam_service_name = xstrdup(SSHD_PAM_SERVICE); - -@@ -339,7 +344,7 @@ fill_default_server_options(ServerOptions *options) - if (options->print_lastlog == -1) - options->print_lastlog = 1; - if (options->x11_forwarding == -1) -- options->x11_forwarding = 0; -+ options->x11_forwarding = 1; - if (options->x11_display_offset == -1) - options->x11_display_offset = 10; - if (options->x11_use_localhost == -1) -@@ -381,7 +386,11 @@ fill_default_server_options(ServerOptions *options) - if (options->gss_strict_acceptor == -1) - options->gss_strict_acceptor = 1; - if (options->password_authentication == -1) -+#ifdef USE_PAM -+ options->password_authentication = 0; -+#else - options->password_authentication = 1; -+#endif - if (options->kbd_interactive_authentication == -1) - options->kbd_interactive_authentication = 1; - if (options->permit_empty_passwd == -1) diff --git a/security/openssh-portable/files/patch-session.c b/security/openssh-portable/files/patch-session.c deleted file mode 100644 index b0b9e08..0000000 --- a/security/openssh-portable/files/patch-session.c +++ /dev/null @@ -1,78 +0,0 @@ -bdrewery: - - Refactor and simplify original commit. - - Stop setting TERM=su without a term. - ------------------------------------------------------------------------- -r99055 | des | 2002-06-29 04:21:58 -0700 (Sat, 29 Jun 2002) | 6 lines -Changed paths: - M /head/crypto/openssh/session.c - -Make sure the environment variables set by setusercontext() are passed on -to the child process. - -Reviewed by: ache -Sponsored by: DARPA, NAI Labs - ---- session.c.orig 2021-04-15 20:55:25.000000000 -0700 -+++ session.c 2021-04-27 13:11:13.515917000 -0700 -@@ -942,7 +942,7 @@ read_etc_default_login(char ***env, u_int *envsize, ui - } - #endif /* HAVE_ETC_DEFAULT_LOGIN */ - --#if defined(USE_PAM) || defined(HAVE_CYGWIN) -+#if defined(USE_PAM) || defined(HAVE_CYGWIN) || defined(HAVE_LOGIN_CAP) - static void - copy_environment_denylist(char **source, char ***env, u_int *envsize, - const char *denylist) -@@ -1052,7 +1052,8 @@ do_setup_env(struct ssh *ssh, Session *s, const char * - # endif /* HAVE_CYGWIN */ - #endif /* HAVE_LOGIN_CAP */ - -- if (!options.use_pam) { -+ /* FreeBSD PAM doesn't set default "MAIL" */ -+ if (1 || !options.use_pam) { - snprintf(buf, sizeof buf, "%.200s/%.50s", - _PATH_MAILDIR, pw->pw_name); - child_set_env(&env, &envsize, "MAIL", buf); -@@ -1063,6 +1064,23 @@ do_setup_env(struct ssh *ssh, Session *s, const char * - - if (getenv("TZ")) - child_set_env(&env, &envsize, "TZ", getenv("TZ")); -+#ifdef HAVE_LOGIN_CAP -+ /* Load environment from /etc/login.conf setenv directives. */ -+ { -+ extern char **environ; -+ char **senv, **var; -+ -+ senv = environ; -+ environ = xmalloc(sizeof(char *)); -+ *environ = NULL; -+ (void) setusercontext(lc, pw, pw->pw_uid, LOGIN_SETENV); -+ copy_environment_denylist(environ, &env, &envsize, NULL); -+ for (var = environ; *var != NULL; ++var) -+ free(*var); -+ free(environ); -+ environ = senv; -+ } -+#endif - if (s->term) - child_set_env(&env, &envsize, "TERM", s->term); - if (s->display) -@@ -1281,7 +1299,7 @@ do_nologin(struct passwd *pw) - #ifdef HAVE_LOGIN_CAP - if (login_getcapbool(lc, "ignorenologin", 0) || pw->pw_uid == 0) - return; -- nl = login_getcapstr(lc, "nologin", def_nl, def_nl); -+ nl = (char*)login_getcapstr(lc, "nologin", def_nl, def_nl); - #else - if (pw->pw_uid == 0) - return; -@@ -1365,7 +1383,7 @@ do_setusercontext(struct passwd *pw) - if (platform_privileged_uidswap()) { - #ifdef HAVE_LOGIN_CAP - if (setusercontext(lc, pw, pw->pw_uid, -- (LOGIN_SETALL & ~(LOGIN_SETPATH|LOGIN_SETUSER))) < 0) { -+ (LOGIN_SETALL & ~(LOGIN_SETENV|LOGIN_SETPATH|LOGIN_SETUSER))) < 0) { - perror("unable to set user context"); - exit(1); - } diff --git a/security/openssh-portable/files/patch-ssh-agent.1 b/security/openssh-portable/files/patch-ssh-agent.1 deleted file mode 100644 index 8e5a977..0000000 --- a/security/openssh-portable/files/patch-ssh-agent.1 +++ /dev/null @@ -1,26 +0,0 @@ ---- UTC -r226103 | des | 2011-10-07 08:10:16 -0500 (Fri, 07 Oct 2011) | 5 lines - -Add a -x option that causes ssh-agent(1) to exit when all clients have -disconnected. - ---- ssh-agent.1.orig 2020-02-13 16:40:54.000000000 -0800 -+++ ssh-agent.1 2020-03-21 17:03:22.952068000 -0700 -@@ -43,7 +43,7 @@ - .Sh SYNOPSIS - .Nm ssh-agent - .Op Fl c | s --.Op Fl \&Dd -+.Op Fl \&Ddx - .Op Fl a Ar bind_address - .Op Fl E Ar fingerprint_hash - .Op Fl P Ar provider_whitelist -@@ -125,6 +125,8 @@ A lifetime specified for an identity with - .Xr ssh-add 1 - overrides this value. - Without this option the default maximum lifetime is forever. -+.It Fl x -+Exit after the last client has disconnected. - .It Ar command Op Ar arg ... - If a command (and optional arguments) is given, - this is executed as a subprocess of the agent. diff --git a/security/openssh-portable/files/patch-ssh-agent.c b/security/openssh-portable/files/patch-ssh-agent.c deleted file mode 100644 index cd85012..0000000 --- a/security/openssh-portable/files/patch-ssh-agent.c +++ /dev/null @@ -1,97 +0,0 @@ ---- UTC -r110506 | des | 2003-02-07 09:48:27 -0600 (Fri, 07 Feb 2003) | 4 lines - -Set the ruid to the euid at startup as a workaround for a bug in pam_ssh. - -r226103 | des | 2011-10-07 08:10:16 -0500 (Fri, 07 Oct 2011) | 5 lines - -Add a -x option that causes ssh-agent(1) to exit when all clients have -disconnected. - ---- ssh-agent.c.orig 2023-12-18 06:59:50.000000000 -0800 -+++ ssh-agent.c 2023-12-19 17:16:22.128981000 -0800 -@@ -196,11 +196,28 @@ - /* Refuse signing of non-SSH messages for web-origin FIDO keys */ - static int restrict_websafe = 1; - -+/* -+ * Client connection count; incremented in new_socket() and decremented in -+ * close_socket(). When it reaches 0, ssh-agent will exit. Since it is -+ * normally initialized to 1, it will never reach 0. However, if the -x -+ * option is specified, it is initialized to 0 in main(); in that case, -+ * ssh-agent will exit as soon as it has had at least one client but no -+ * longer has any. -+ */ -+static int xcount = 1; -+ - static void - close_socket(SocketEntry *e) - { - size_t i; -+ int last = 0; - -+ if (e->type == AUTH_CONNECTION) { -+ debug("xcount %d -> %d", xcount, xcount - 1); -+ if (--xcount == 0) -+ last = 1; -+ } -+ - close(e->fd); - sshbuf_free(e->input); - sshbuf_free(e->output); -@@ -213,6 +230,8 @@ - memset(e, '\0', sizeof(*e)); - e->fd = -1; - e->type = AUTH_UNUSED; -+ if (last) -+ cleanup_exit(0); - } - - static void -@@ -1893,6 +1912,10 @@ - - debug_f("type = %s", type == AUTH_CONNECTION ? "CONNECTION" : - (type == AUTH_SOCKET ? "SOCKET" : "UNKNOWN")); -+ if (type == AUTH_CONNECTION) { -+ debug("xcount %d -> %d", xcount, xcount + 1); -+ ++xcount; -+ } - set_nonblock(fd); - - if (fd > max_fd) -@@ -2184,7 +2207,7 @@ - usage(void) - { - fprintf(stderr, -- "usage: ssh-agent [-c | -s] [-Dd] [-a bind_address] [-E fingerprint_hash]\n" -+ "usage: ssh-agent [-c | -s] [-Ddx] [-a bind_address] [-E fingerprint_hash]\n" - " [-O option] [-P allowed_providers] [-t life]\n" - " ssh-agent [-a bind_address] [-E fingerprint_hash] [-O option]\n" - " [-P allowed_providers] [-t life] command [arg ...]\n" -@@ -2218,6 +2241,7 @@ - /* drop */ - (void)setegid(getgid()); - (void)setgid(getgid()); -+ (void)setuid(geteuid()); - - platform_disable_tracing(0); /* strict=no */ - -@@ -2229,7 +2253,7 @@ - __progname = ssh_get_progname(av[0]); - seed_rng(); - -- while ((ch = getopt(ac, av, "cDdksE:a:O:P:t:")) != -1) { -+ while ((ch = getopt(ac, av, "cDdksE:a:O:P:t:x")) != -1) { - switch (ch) { - case 'E': - fingerprint_hash = ssh_digest_alg_by_name(optarg); -@@ -2280,6 +2304,9 @@ - fprintf(stderr, "Invalid lifetime\n"); - usage(); - } -+ break; -+ case 'x': -+ xcount = 0; - break; - default: - usage(); diff --git a/security/openssh-portable/files/patch-ssh.c b/security/openssh-portable/files/patch-ssh.c deleted file mode 100644 index c49535d..0000000 --- a/security/openssh-portable/files/patch-ssh.c +++ /dev/null @@ -1,33 +0,0 @@ ---- UTC -r99054 | des | 2002-06-29 05:57:53 -0500 (Sat, 29 Jun 2002) | 4 lines -Changed paths: - M /head/crypto/openssh/ssh.c - -Canonicize the host name before looking it up in the host file. - ---- ssh.c.orig 2018-04-02 05:38:28 UTC -+++ ssh.c -@@ -1281,6 +1281,23 @@ main(int ac, char **av) - ssh_digest_free(md); - conn_hash_hex = tohex(conn_hash, ssh_digest_bytes(SSH_DIGEST_SHA1)); - -+ /* Find canonic host name. */ -+ if (strchr(host, '.') == 0) { -+ struct addrinfo hints; -+ struct addrinfo *ai = NULL; -+ int errgai; -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = options.address_family; -+ hints.ai_flags = AI_CANONNAME; -+ hints.ai_socktype = SOCK_STREAM; -+ errgai = getaddrinfo(host, NULL, &hints, &ai); -+ if (errgai == 0) { -+ if (ai->ai_canonname != NULL) -+ host = xstrdup(ai->ai_canonname); -+ freeaddrinfo(ai); -+ } -+ } -+ - /* - * Expand tokens in arguments. NB. LocalCommand is expanded later, - * after port-forwarding is set up, so it may pick up any local diff --git a/security/openssh-portable/files/patch-ssh_config b/security/openssh-portable/files/patch-ssh_config deleted file mode 100644 index ea5fafa..0000000 --- a/security/openssh-portable/files/patch-ssh_config +++ /dev/null @@ -1,11 +0,0 @@ ---- ssh_config.orig 2024-09-19 15:20:48.000000000 -0700 -+++ ssh_config 2024-11-09 12:23:47.263548000 -0800 -@@ -17,6 +17,8 @@ - # list of available options, their meanings and defaults, please see the - # ssh_config(5) man page. - -+Include ssh_config.d/*.conf -+ - # Host * - # ForwardAgent no - # ForwardX11 no diff --git a/security/openssh-portable/files/patch-ssh_config.5 b/security/openssh-portable/files/patch-ssh_config.5 deleted file mode 100644 index 8c0e2bf..0000000 --- a/security/openssh-portable/files/patch-ssh_config.5 +++ /dev/null @@ -1,13 +0,0 @@ ---- UTC - ---- ssh_config.5.orig 2020-11-16 11:53:55.871161000 -0800 -+++ ssh_config.5 2020-11-16 12:43:41.763006000 -0800 -@@ -434,6 +433,8 @@ in the process, regardless of the setting of - If the option is set to - .Cm no , - the check will not be executed. -+The default is -+.Cm no . - .It Cm Ciphers - Specifies the ciphers allowed and their order of preference. - Multiple ciphers must be comma-separated. diff --git a/security/openssh-portable/files/patch-sshd.8 b/security/openssh-portable/files/patch-sshd.8 deleted file mode 100644 index 4d2a477..0000000 --- a/security/openssh-portable/files/patch-sshd.8 +++ /dev/null @@ -1,26 +0,0 @@ ---- UTC -Document FreeBSD/port-specific paths - ---- sshd.8.orig 2010-08-04 21:03:13.000000000 -0600 -+++ sshd.8 2010-09-14 16:14:14.000000000 -0600 -@@ -70,7 +70,7 @@ - .Nm - listens for connections from clients. - It is normally started at boot from --.Pa /etc/rc . -+.Pa /usr/local/etc/rc.d/openssh . - It forks a new - daemon for each incoming connection. - The forked daemons handle -@@ -384,8 +384,9 @@ - If the login is on a tty, records login time. - .It - Checks --.Pa /etc/nologin ; --if it exists, prints contents and quits -+.Pa /etc/nologin and -+.Pa /var/run/nologin ; -+if one exists, it prints the contents and quits - (unless root). - .It - Changes to run with normal user privileges. diff --git a/security/openssh-portable/files/patch-sshd.c b/security/openssh-portable/files/patch-sshd.c deleted file mode 100644 index 6d522d5..0000000 --- a/security/openssh-portable/files/patch-sshd.c +++ /dev/null @@ -1,101 +0,0 @@ ---- UTC -r109683 | des | 2003-01-22 08:12:59 -0600 (Wed, 22 Jan 2003) | 7 lines -Changed paths: - M /head/crypto/openssh/sshd.c - -Force early initialization of the resolver library, since the resolver -configuration files will no longer be available once sshd is chrooted. - -PR: 39953, 40894 -Submitted by: dinoex - -r199804 | attilio | 2009-11-25 09:12:24 -0600 (Wed, 25 Nov 2009) | 13 lines -Changed paths: - M /head/crypto/openssh/sshd.c - M /head/usr.sbin/cron/cron/cron.c - M /head/usr.sbin/inetd/inetd.c - M /head/usr.sbin/syslogd/syslogd.c - -Avoid sshd, cron, syslogd and inetd to be killed under high-pressure swap -environments. -Please note that this can't be done while such processes run in jails. - -Note: in future it would be interesting to find a way to do that -selectively for any desired proccess (choosen by user himself), probabilly -via a ptrace interface or whatever. - -r206397 | kib | 2010-04-08 07:07:40 -0500 (Thu, 08 Apr 2010) | 8 lines -Changed paths: - M /head/crypto/openssh/sshd.c - -Enhance r199804 by marking the daemonised child as immune to OOM instead -of short-living parent. Only mark the master process that accepts -connections, do not protect connection handlers spawned from inetd. - - ---- sshd.c.orig 2024-06-30 21:36:28.000000000 -0700 -+++ sshd.c 2024-07-01 13:44:05.739756000 -0700 -@@ -28,6 +28,7 @@ - - #include - #include -+#include - #include - #ifdef HAVE_SYS_STAT_H - # include -@@ -69,6 +70,13 @@ - #include - #endif - -+#ifdef __FreeBSD__ -+#include -+#ifdef GSSAPI -+#include "ssh-gss.h" -+#endif -+#endif -+ - #include "xmalloc.h" - #include "ssh.h" - #include "sshpty.h" -@@ -1671,7 +1679,30 @@ main(int ac, char **av) - for (i = 0; i < options.num_log_verbose; i++) - log_verbose_add(options.log_verbose[i]); - -+#ifdef __FreeBSD__ - /* -+ * Initialize the resolver. This may not happen automatically -+ * before privsep chroot(). -+ */ -+ if ((_res.options & RES_INIT) == 0) { -+ debug("res_init()"); -+ res_init(); -+ } -+#ifdef GSSAPI -+ /* -+ * Force GSS-API to parse its configuration and load any -+ * mechanism plugins. -+ */ -+ { -+ gss_OID_set mechs; -+ OM_uint32 minor_status; -+ gss_indicate_mechs(&minor_status, &mechs); -+ gss_release_oid_set(&minor_status, &mechs); -+ } -+#endif -+#endif -+ -+ /* - * If not in debugging mode, not started from inetd and not already - * daemonized (eg re-exec via SIGHUP), disconnect from the controlling - * terminal, and fork. The original process exits. -@@ -1687,6 +1718,10 @@ main(int ac, char **av) - /* Reinitialize the log (because of the fork above). */ - log_init(__progname, options.log_level, options.log_facility, log_stderr); - -+ /* Avoid killing the process in high-pressure swapping environments. */ -+ if (!inetd_flag && madvise(NULL, 0, MADV_PROTECT) != 0) -+ debug("madvise(): %.200s", strerror(errno)); -+ - /* - * Chdir to the root directory so that the current disk can be - * unmounted if desired. diff --git a/security/openssh-portable/files/patch-sshd_config b/security/openssh-portable/files/patch-sshd_config deleted file mode 100644 index 7b6bc14..0000000 --- a/security/openssh-portable/files/patch-sshd_config +++ /dev/null @@ -1,33 +0,0 @@ ---- sshd_config.orig 2024-11-09 12:22:03.414050000 -0800 -+++ sshd_config 2024-11-09 12:25:59.964286000 -0800 -@@ -10,6 +10,11 @@ - # possible, but leave them commented. Uncommented options override the - # default value. - -+# Note that some of FreeBSD's defaults differ from OpenBSD's, and -+# FreeBSD has a few additional options. -+ -+Include sshd_config.d/*.conf -+ - #Port 22 - #AddressFamily any - #ListenAddress 0.0.0.0 -@@ -37,8 +42,7 @@ - #PubkeyAuthentication yes - - # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 --# but this is overridden so installations will only check .ssh/authorized_keys --AuthorizedKeysFile .ssh/authorized_keys -+#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 - - #AuthorizedPrincipalsFile none - -@@ -84,7 +88,7 @@ AuthorizedKeysFile .ssh/authorized_keys - #AllowAgentForwarding yes - #AllowTcpForwarding yes - #GatewayPorts no --#X11Forwarding no -+#X11Forwarding yes - #X11DisplayOffset 10 - #X11UseLocalhost yes - #PermitTTY yes diff --git a/security/openssh-portable/files/patch-sshd_config.5 b/security/openssh-portable/files/patch-sshd_config.5 deleted file mode 100644 index f5297c2..0000000 --- a/security/openssh-portable/files/patch-sshd_config.5 +++ /dev/null @@ -1,59 +0,0 @@ ---- sshd_config.5.orig 2022-02-11 18:50:00.822679000 +0000 -+++ sshd_config.5 2022-02-11 19:09:05.162504000 +0000 -@@ -701,7 +701,9 @@ - .Qq ssh -Q HostbasedAcceptedAlgorithms . - This was formerly named HostbasedAcceptedKeyTypes. - .It Cm HostbasedAuthentication --Specifies whether rhosts or /etc/hosts.equiv authentication together -+Specifies whether rhosts or -+.Pa /etc/hosts.equiv -+authentication together - with successful public key client host authentication is allowed - (host-based authentication). - The default is -@@ -1416,6 +1434,15 @@ - .Cm ethernet . - The default is - .Cm no . -+Note that if -+.Cm ChallengeResponseAuthentication -+is -+.Cm yes , -+the root user may be allowed in with its password even if -+.Cm PermitRootLogin is set to -+.Cm prohibit-password -+or -+.Cm without-password . - .Pp - Independent of this setting, the permissions of the selected - .Xr tun 4 -@@ -1774,12 +1801,19 @@ - .Xr sshd 8 - as a non-root user. - The default is -+.Cm yes , -+unless -+.Nm sshd -+was built without PAM support, in which case the default is - .Cm no . - .It Cm VersionAddendum - Optionally specifies additional text to append to the SSH protocol banner - sent by the server upon connection. - The default is --.Cm none . -+.Cm %%SSH_VERSION_FREEBSD_PORT%% . -+The value -+.Cm none -+may be used to disable this. - .It Cm X11DisplayOffset - Specifies the first display number available for - .Xr sshd 8 Ns 's -@@ -1793,7 +1827,7 @@ - or - .Cm no . - The default is --.Cm no . -+.Cm yes . - .Pp - When X11 forwarding is enabled, there may be additional exposure to - the server and to client displays if the diff --git a/security/openssh-portable/pkg-descr b/security/openssh-portable/pkg-descr deleted file mode 100644 index d9dee49..0000000 --- a/security/openssh-portable/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -OpenBSD's OpenSSH portable version - -Normal OpenSSH development produces a very small, secure, and easy to maintain -version for the OpenBSD project. The OpenSSH Portability Team takes that pure -version and adds portability code so that OpenSSH can run on many other -operating systems (Unfortunately, in particular since OpenSSH does -authentication, it runs into a *lot* of differences between Unix operating -systems). - -The portable OpenSSH follows development of the official version, but releases -are not synchronized. Portable releases are marked with a 'p' (e.g. 3.1p1). -The official OpenBSD source will never use the 'p' suffix, but will instead -increment the version number when they hit 'stable spots' in their development. diff --git a/security/openssh-portable/pkg-message b/security/openssh-portable/pkg-message deleted file mode 100644 index 0349c92..0000000 --- a/security/openssh-portable/pkg-message +++ /dev/null @@ -1,22 +0,0 @@ -[ -{ type: install - message: <0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}markupsafe>0:textproc/py-markupsafe@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}distro>=1.5.0:sysutils/py-distro@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}looseversion>0:devel/py-looseversion@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}croniter>0:sysutils/py-croniter@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}setproctitle>0:devel/py-setproctitle@${PY_FLAVOR} - -USES= cpe python - -CPE_VENDOR= saltstack -CPE_PRODUCT= salt -USE_PYTHON= autoplist cryptography distutils -NO_ARCH= yes - -CONFLICTS= py[0-9]*-salt-2019* - -# we must pass these options before the target name, and python.mk has no -# early-arguments variable, so we have to manipulate the target -PYDISTUTILS_INSTALL_TARGET=\ - --salt-root-dir=/ \ - --salt-config-dir=${ETCDIR} \ - --salt-cache-dir=/var/cache/salt \ - --salt-sock-dir=/var/run/salt \ - --salt-srv-root-dir=${ETCDIR} \ - --salt-base-file-roots-dir=${ETCDIR}/states \ - --salt-base-pillar-roots-dir=${ETCDIR}/pillar \ - --salt-base-master-roots-dir=${ETCDIR}/salt-master \ - --salt-logs-dir=/var/log/salt \ - --salt-pidfile-dir=/var/run \ - install - -USE_RC_SUBR= salt_api \ - salt_master \ - salt_minion \ - salt_proxy \ - salt_syndic - -SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} - -SUB_FILES= pkg-message - -# Upstream archive contains files with UTF-8 names -EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar - -OPTIONS_DEFINE= AWS BASH FISH TCP ZEROMQ ZSH -OPTIONS_DEFAULT= BASH FISH ZEROMQ ZSH - -AWS_DESC= Install dependencies required for Amazon Web Services -TCP_DESC= Install dependencies required for TCP transport -ZEROMQ_DESC= Install dependencies required for ZeroMQ transport - -# AWS dependencies (Note: the devel/py-botocore port is updated very frequently) -AWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR} - -TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR} - -ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} -ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR} - -BASH_PLIST_FILES= share/bash-completion/completions/salt -FISH_PLIST_FILES= share/fish/completions/salt-call.fish \ - share/fish/completions/salt-cp.fish \ - share/fish/completions/salt-key.fish \ - share/fish/completions/salt-master.fish \ - share/fish/completions/salt-minion.fish \ - share/fish/completions/salt-run.fish \ - share/fish/completions/salt-syndic.fish \ - share/fish/completions/salt.fish \ - share/fish/completions/salt_common.fish -ZSH_PLIST_FILES= share/zsh/site-functions/_salt - -post-patch: -.for file in conf/minion conf/master doc/man/salt-key.1 \ - doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \ - doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \ - doc/man/salt-call.1 salt/modules/mysql.py salt/modules/tls.py salt/modules/postgres.py - @${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \ - -e 's|/srv/salt|${ETCDIR}/states|' \ - -e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file} -.endfor - @${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion - @${REINPLACE_CMD} -e 's|"/usr/bin/python3"|"${PYTHON_CMD}"|' ${WRKSRC}/salt/auth/pam.py - -do-install-BASH-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ - ${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.bash \ - ${STAGEDIR}${PREFIX}/share/bash-completion/completions/salt - -do-install-FISH-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/ - ${INSTALL_DATA} ${WRKSRC}/pkg/common/fish-completions/*.fish \ - ${STAGEDIR}${PREFIX}/share/fish/completions - -do-install-ZSH-on: - @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${WRKSRC}/pkg/common/salt.zsh \ - ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_salt - -post-install: - @${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample - ${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample - -.include diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo deleted file mode 100644 index 690dd1c..0000000 --- a/sysutils/py-salt/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1737023351 -SHA256 (salt-3006.9.tar.gz) = 7703c73a71c67327d48b2893ce9cf031ee52e2816df0daf78d6fe18a99b353e3 -SIZE (salt-3006.9.tar.gz) = 19691113 diff --git a/sysutils/py-salt/files/patch-requirements_base.txt b/sysutils/py-salt/files/patch-requirements_base.txt deleted file mode 100644 index 3b1985d..0000000 --- a/sysutils/py-salt/files/patch-requirements_base.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- requirements/base.txt.orig 2025-01-16 10:30:29 UTC -+++ requirements/base.txt -@@ -14,5 +14,3 @@ croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' - packaging>=21.3 - looseversion - croniter>=0.3.0,!=0.3.22; sys_platform != 'win32' --# We need contextvars for salt-ssh --contextvars diff --git a/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py b/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py deleted file mode 100644 index 4a163d2..0000000 --- a/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py +++ /dev/null @@ -1,10 +0,0 @@ ---- salt/ext/tornado/iostream.py.orig 2023-05-16 11:50:28 UTC -+++ salt/ext/tornado/iostream.py -@@ -1116,6 +1116,7 @@ class IOStream(BaseIOStream): - future = self._connect_future = TracebackFuture() - try: - self.socket.connect(address) -+ self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 524288) - except socket.error as e: - # In non-blocking mode we expect connect() to raise an - # exception with EINPROGRESS or EWOULDBLOCK. diff --git a/sysutils/py-salt/files/patch-salt_loader_lazy.py b/sysutils/py-salt/files/patch-salt_loader_lazy.py deleted file mode 100644 index f5d66af..0000000 --- a/sysutils/py-salt/files/patch-salt_loader_lazy.py +++ /dev/null @@ -1,11 +0,0 @@ ---- salt/loader/lazy.py.orig 2021-09-27 17:31:38 UTC -+++ salt/loader/lazy.py -@@ -447,7 +447,7 @@ class LazyLoader(salt.utils.lazy.LazyDict): - try: - pycache_files = [ - os.path.join("__pycache__", x) -- for x in sorted(os.listdir(os.path.join(mod_dir, "__pycache__"))) -+ for x in sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc') - ] - except OSError: - pass diff --git a/sysutils/py-salt/files/patch-salt_modules_config.py b/sysutils/py-salt/files/patch-salt_modules_config.py deleted file mode 100644 index 197f64d..0000000 --- a/sysutils/py-salt/files/patch-salt_modules_config.py +++ /dev/null @@ -1,17 +0,0 @@ ---- salt/modules/config.py.orig 2025-01-17 15:15:13 UTC -+++ salt/modules/config.py -@@ -17,13 +17,7 @@ from salt.loader.context import LoaderContext - import salt.utils.sdb as sdb - from salt.loader.context import LoaderContext - --try: -- # Gated for salt-ssh (salt.utils.cloud imports msgpack) -- import salt.utils.cloud -- -- HAS_CLOUD = True --except ImportError: -- HAS_CLOUD = False -+HAS_CLOUD = False - - - if salt.utils.platform.is_windows(): diff --git a/sysutils/py-salt/files/patch-salt_utils_process.py b/sysutils/py-salt/files/patch-salt_utils_process.py deleted file mode 100644 index b12e599..0000000 --- a/sysutils/py-salt/files/patch-salt_utils_process.py +++ /dev/null @@ -1,14 +0,0 @@ ---- salt/utils/process.py.orig 2024-07-29 07:51:58 UTC -+++ salt/utils/process.py -@@ -59,7 +59,10 @@ def appendproctitle(name): - current = setproctitle.getproctitle() - if current.strip().endswith("MainProcess"): - current, _ = current.rsplit("MainProcess", 1) -- setproctitle.setproctitle(f"{current.rstrip()} {name}") -+ if len(current) > 0: -+ setproctitle.setproctitle(f"{current.rstrip()} {name}") -+ else: -+ setproctitle.setproctitle(name) - - - def daemonize(redirect_out=True): diff --git a/sysutils/py-salt/files/pkg-message.in b/sysutils/py-salt/files/pkg-message.in deleted file mode 100644 index 49e8d12..0000000 --- a/sysutils/py-salt/files/pkg-message.in +++ /dev/null @@ -1,36 +0,0 @@ -[ -{ type: install - message: <