From b95943598c295766155cb5272041b3fb677a9ba6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 27 Sep 2022 23:37:04 +0100 Subject: [PATCH] Apply OpenSSL exception to Hippotat files Signed-off-by: Ian Jackson --- Cargo.toml | 2 +- Makefile | 2 +- client/client.rs | 2 +- macros/Cargo.toml | 2 +- macros/macros.rs | 2 +- server/daemon.rs | 2 +- server/server.rs | 2 +- server/slocal.rs | 2 +- server/suser.rs | 2 +- server/sweb.rs | 2 +- src/config.rs | 2 +- src/ipif.rs | 2 +- src/lib.rs | 2 +- src/multipart.rs | 2 +- src/prelude.rs | 2 +- src/queue.rs | 2 +- src/rope.rs | 2 +- src/slip.rs | 2 +- src/types.rs | 2 +- src/utils.rs | 2 +- test/capture-log | 2 +- test/common | 2 +- test/go-with-unshare | 2 +- test/netns-setup | 2 +- test/t-basic | 2 +- test/test.cfg | 2 +- test/with-unshare | 2 +- uml/psusan-uml-run | 2 +- uml/psusan-uml-setup | 2 +- uml/run-test | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 849d8da..639aa11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. [package] diff --git a/Makefile b/Makefile index 2fee95b..ffb76d8 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # Copyright 2020-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. SHELL=/bin/bash diff --git a/client/client.rs b/client/client.rs index f623771..17dee6b 100644 --- a/client/client.rs +++ b/client/client.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use hippotat::prelude::*; diff --git a/macros/Cargo.toml b/macros/Cargo.toml index 4da04be..73b7469 100644 --- a/macros/Cargo.toml +++ b/macros/Cargo.toml @@ -1,5 +1,5 @@ # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. [package] diff --git a/macros/macros.rs b/macros/macros.rs index 22b778d..060fe70 100644 --- a/macros/macros.rs +++ b/macros/macros.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use syn::{parse_macro_input, parse_quote}; diff --git a/server/daemon.rs b/server/daemon.rs index c5f6155..3d87a68 100644 --- a/server/daemon.rs +++ b/server/daemon.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use std::convert::TryInto; diff --git a/server/server.rs b/server/server.rs index 3fd58a4..b30e2da 100644 --- a/server/server.rs +++ b/server/server.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use hippotat::prelude::*; diff --git a/server/slocal.rs b/server/slocal.rs index ab2f2fc..32d769d 100644 --- a/server/slocal.rs +++ b/server/slocal.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use super::*; diff --git a/server/suser.rs b/server/suser.rs index b51ea76..68cb4a4 100644 --- a/server/suser.rs +++ b/server/suser.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use super::*; diff --git a/server/sweb.rs b/server/sweb.rs index bd9316a..ecdcc57 100644 --- a/server/sweb.rs +++ b/server/sweb.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use super::*; diff --git a/src/config.rs b/src/config.rs index beedd5f..a668c06 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/src/ipif.rs b/src/ipif.rs index 3b4da9c..27432a7 100644 --- a/src/ipif.rs +++ b/src/ipif.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/src/lib.rs b/src/lib.rs index fc641d2..16ef74f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. pub mod prelude; diff --git a/src/multipart.rs b/src/multipart.rs index c2f0ff4..d66342b 100644 --- a/src/multipart.rs +++ b/src/multipart.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/src/prelude.rs b/src/prelude.rs index a692d06..9f461c7 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. pub use std::array; diff --git a/src/queue.rs b/src/queue.rs index 49fd3c4..c78413c 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/src/rope.rs b/src/rope.rs index 12054ab..8aad943 100644 --- a/src/rope.rs +++ b/src/rope.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/src/slip.rs b/src/slip.rs index 6476014..c70d658 100644 --- a/src/slip.rs +++ b/src/slip.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/src/types.rs b/src/types.rs index c5b4737..162b61e 100644 --- a/src/types.rs +++ b/src/types.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/src/utils.rs b/src/utils.rs index e005d68..7911976 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,5 +1,5 @@ // Copyright 2021-2022 Ian Jackson and contributors to Hippotat -// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception // There is NO WARRANTY. use crate::prelude::*; diff --git a/test/capture-log b/test/capture-log index 3b4c841..7eb0bab 100755 --- a/test/capture-log +++ b/test/capture-log @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2020-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -e diff --git a/test/common b/test/common index 4bbd1fd..14b8d1e 100644 --- a/test/common +++ b/test/common @@ -1,6 +1,6 @@ # -*- shell-script -*- # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -x diff --git a/test/go-with-unshare b/test/go-with-unshare index 96f983f..ac77a98 100755 --- a/test/go-with-unshare +++ b/test/go-with-unshare @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -e diff --git a/test/netns-setup b/test/netns-setup index d91e0f9..38ec098 100755 --- a/test/netns-setup +++ b/test/netns-setup @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -ex diff --git a/test/t-basic b/test/t-basic index 046e17e..ab03423 100755 --- a/test/t-basic +++ b/test/t-basic @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -e diff --git a/test/test.cfg b/test/test.cfg index d74e8d3..423643f 100644 --- a/test/test.cfg +++ b/test/test.cfg @@ -1,5 +1,5 @@ # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. [SERVER] diff --git a/test/with-unshare b/test/with-unshare index 5d29c87..ba16bf7 100755 --- a/test/with-unshare +++ b/test/with-unshare @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -e diff --git a/uml/psusan-uml-run b/uml/psusan-uml-run index 36a4b53..e6c879a 100755 --- a/uml/psusan-uml-run +++ b/uml/psusan-uml-run @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -e diff --git a/uml/psusan-uml-setup b/uml/psusan-uml-setup index 5f4afe7..136403a 100755 --- a/uml/psusan-uml-setup +++ b/uml/psusan-uml-setup @@ -1,6 +1,6 @@ #!/bin/bash # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. set -e diff --git a/uml/run-test b/uml/run-test index 07932d4..b8c4e60 100755 --- a/uml/run-test +++ b/uml/run-test @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2021-2022 Ian Jackson and contributors to Hippotat -# SPDX-License-Identifier: GPL-3.0-or-later +# SPDX-License-Identifier: GPL-3.0-or-later WITH LicenseRef-Hippotat-OpenSSL-Exception # There is NO WARRANTY. # *** This does not work. *** -- 2.30.2