From 2e668b8a7befac97a4fd4c1d928fc55a4f3eefc3 Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Sun, 30 Jun 2019 11:07:59 -0400 Subject: switch license to MIT/Expat --- Codec/Encryption/OpenPGP/ASCIIArmor.hs | 2 +- Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs | 2 +- Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs | 2 +- Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs | 2 +- Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs | 2 +- Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs | 2 +- Data/Digest/CRC24.hs | 2 +- LICENSE | 31 ++++++++------ bench/mark.hs | 2 +- dist/build/autogen/Paths_openpgp_asciiarmor.hs | 50 ++++++++++++++++++++++ .../benchmark/autogen/Paths_openpgp_asciiarmor.hs | 50 ++++++++++++++++++++++ .../tests/autogen/Paths_openpgp_asciiarmor.hs | 50 ++++++++++++++++++++++ openpgp-asciiarmor.cabal | 4 +- 13 files changed, 178 insertions(+), 23 deletions(-) create mode 100644 dist/build/autogen/Paths_openpgp_asciiarmor.hs create mode 100644 dist/build/benchmark/autogen/Paths_openpgp_asciiarmor.hs create mode 100644 dist/build/tests/autogen/Paths_openpgp_asciiarmor.hs diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor.hs b/Codec/Encryption/OpenPGP/ASCIIArmor.hs index e38738a..e37fdd6 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor.hs @@ -1,6 +1,6 @@ -- ASCIIArmor.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs index 5d28e46..bd5941e 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Decode.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} -- ASCIIArmor/Decode.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012-2018 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Decode ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs index cb5b16d..a72914b 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Encode.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Encode.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012-2018 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Encode ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs index 0334c7e..b4cb2e6 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Multipart.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Multipart.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Multipart ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs index bcc74a2..7f6cf7b 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Types.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Decode.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Types ( diff --git a/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs b/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs index 8dacc70..f1068fe 100644 --- a/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs +++ b/Codec/Encryption/OpenPGP/ASCIIArmor/Utils.hs @@ -1,6 +1,6 @@ -- ASCIIArmor/Utils.hs: OpenPGP (RFC4880) ASCII armor implementation -- Copyright © 2012 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.ASCIIArmor.Utils ( diff --git a/Data/Digest/CRC24.hs b/Data/Digest/CRC24.hs index 4fbb9b1..379820e 100644 --- a/Data/Digest/CRC24.hs +++ b/Data/Digest/CRC24.hs @@ -1,6 +1,6 @@ -- CRC24.hs: OpenPGP (RFC4880) CRC24 implementation -- Copyright © 2012-2019 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Data.Digest.CRC24 ( diff --git a/LICENSE b/LICENSE index f37d724..0f7d7ad 100644 --- a/LICENSE +++ b/LICENSE @@ -1,15 +1,20 @@ -Copyright © 2012 Clint Adams +Copyright © 2012-2019 Clint Adams -Permission to use, copy, modify, and/or distribute this software -for any purpose with or without fee is hereby granted, provided -that the above copyright notice and this permission notice appear -in all copies. +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL -WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM -LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/bench/mark.hs b/bench/mark.hs index cf1f20f..607b9ee 100644 --- a/bench/mark.hs +++ b/bench/mark.hs @@ -1,6 +1,6 @@ -- mark.hs: openpgp-asciiarmor benchmark suite -- Copyright © 2018-2019 Clint Adams --- This software is released under the terms of the ISC license. +-- This software is released under the terms of the Expat license. -- (See the LICENSE file). {-# LANGUAGE FlexibleContexts, OverloadedStrings #-} diff --git a/dist/build/autogen/Paths_openpgp_asciiarmor.hs b/dist/build/autogen/Paths_openpgp_asciiarmor.hs new file mode 100644 index 0000000..9fb1a00 --- /dev/null +++ b/dist/build/autogen/Paths_openpgp_asciiarmor.hs @@ -0,0 +1,50 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE NoRebindableSyntax #-} +{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} +module Paths_openpgp_asciiarmor ( + version, + getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, + getDataFileName, getSysconfDir + ) where + +import qualified Control.Exception as Exception +import Data.Version (Version(..)) +import System.Environment (getEnv) +import Prelude + +#if defined(VERSION_base) + +#if MIN_VERSION_base(4,0,0) +catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a +#else +catchIO :: IO a -> (Exception.Exception -> IO a) -> IO a +#endif + +#else +catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a +#endif +catchIO = Exception.catch + +version :: Version +version = Version [0,1,1] [] +bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath + +bindir = "/home/clint/tmp/temp-tardbus/bin" +libdir = "/home/clint/tmp/temp-tardbus/lib/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1-KE0XG6usiGJ3OyLbw5mHNs" +dynlibdir = "/home/clint/tmp/temp-tardbus/lib/x86_64-linux-ghc-8.4.4" +datadir = "/home/clint/tmp/temp-tardbus/share/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1" +libexecdir = "/home/clint/tmp/temp-tardbus/libexec/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1" +sysconfdir = "/home/clint/tmp/temp-tardbus/etc" + +getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath +getBinDir = catchIO (getEnv "openpgp_asciiarmor_bindir") (\_ -> return bindir) +getLibDir = catchIO (getEnv "openpgp_asciiarmor_libdir") (\_ -> return libdir) +getDynLibDir = catchIO (getEnv "openpgp_asciiarmor_dynlibdir") (\_ -> return dynlibdir) +getDataDir = catchIO (getEnv "openpgp_asciiarmor_datadir") (\_ -> return datadir) +getLibexecDir = catchIO (getEnv "openpgp_asciiarmor_libexecdir") (\_ -> return libexecdir) +getSysconfDir = catchIO (getEnv "openpgp_asciiarmor_sysconfdir") (\_ -> return sysconfdir) + +getDataFileName :: FilePath -> IO FilePath +getDataFileName name = do + dir <- getDataDir + return (dir ++ "/" ++ name) diff --git a/dist/build/benchmark/autogen/Paths_openpgp_asciiarmor.hs b/dist/build/benchmark/autogen/Paths_openpgp_asciiarmor.hs new file mode 100644 index 0000000..52173b0 --- /dev/null +++ b/dist/build/benchmark/autogen/Paths_openpgp_asciiarmor.hs @@ -0,0 +1,50 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE NoRebindableSyntax #-} +{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} +module Paths_openpgp_asciiarmor ( + version, + getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, + getDataFileName, getSysconfDir + ) where + +import qualified Control.Exception as Exception +import Data.Version (Version(..)) +import System.Environment (getEnv) +import Prelude + +#if defined(VERSION_base) + +#if MIN_VERSION_base(4,0,0) +catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a +#else +catchIO :: IO a -> (Exception.Exception -> IO a) -> IO a +#endif + +#else +catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a +#endif +catchIO = Exception.catch + +version :: Version +version = Version [0,1,1] [] +bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath + +bindir = "/home/clint/tmp/temp-tardbus/bin" +libdir = "/home/clint/tmp/temp-tardbus/lib/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1-KE0XG6usiGJ3OyLbw5mHNs-benchmark" +dynlibdir = "/home/clint/tmp/temp-tardbus/lib/x86_64-linux-ghc-8.4.4" +datadir = "/home/clint/tmp/temp-tardbus/share/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1" +libexecdir = "/home/clint/tmp/temp-tardbus/libexec/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1" +sysconfdir = "/home/clint/tmp/temp-tardbus/etc" + +getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath +getBinDir = catchIO (getEnv "openpgp_asciiarmor_bindir") (\_ -> return bindir) +getLibDir = catchIO (getEnv "openpgp_asciiarmor_libdir") (\_ -> return libdir) +getDynLibDir = catchIO (getEnv "openpgp_asciiarmor_dynlibdir") (\_ -> return dynlibdir) +getDataDir = catchIO (getEnv "openpgp_asciiarmor_datadir") (\_ -> return datadir) +getLibexecDir = catchIO (getEnv "openpgp_asciiarmor_libexecdir") (\_ -> return libexecdir) +getSysconfDir = catchIO (getEnv "openpgp_asciiarmor_sysconfdir") (\_ -> return sysconfdir) + +getDataFileName :: FilePath -> IO FilePath +getDataFileName name = do + dir <- getDataDir + return (dir ++ "/" ++ name) diff --git a/dist/build/tests/autogen/Paths_openpgp_asciiarmor.hs b/dist/build/tests/autogen/Paths_openpgp_asciiarmor.hs new file mode 100644 index 0000000..ff78bf7 --- /dev/null +++ b/dist/build/tests/autogen/Paths_openpgp_asciiarmor.hs @@ -0,0 +1,50 @@ +{-# LANGUAGE CPP #-} +{-# LANGUAGE NoRebindableSyntax #-} +{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} +module Paths_openpgp_asciiarmor ( + version, + getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, + getDataFileName, getSysconfDir + ) where + +import qualified Control.Exception as Exception +import Data.Version (Version(..)) +import System.Environment (getEnv) +import Prelude + +#if defined(VERSION_base) + +#if MIN_VERSION_base(4,0,0) +catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a +#else +catchIO :: IO a -> (Exception.Exception -> IO a) -> IO a +#endif + +#else +catchIO :: IO a -> (Exception.IOException -> IO a) -> IO a +#endif +catchIO = Exception.catch + +version :: Version +version = Version [0,1,1] [] +bindir, libdir, dynlibdir, datadir, libexecdir, sysconfdir :: FilePath + +bindir = "/home/clint/tmp/temp-tardbus/bin" +libdir = "/home/clint/tmp/temp-tardbus/lib/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1-KE0XG6usiGJ3OyLbw5mHNs-tests" +dynlibdir = "/home/clint/tmp/temp-tardbus/lib/x86_64-linux-ghc-8.4.4" +datadir = "/home/clint/tmp/temp-tardbus/share/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1" +libexecdir = "/home/clint/tmp/temp-tardbus/libexec/x86_64-linux-ghc-8.4.4/openpgp-asciiarmor-0.1.1" +sysconfdir = "/home/clint/tmp/temp-tardbus/etc" + +getBinDir, getLibDir, getDynLibDir, getDataDir, getLibexecDir, getSysconfDir :: IO FilePath +getBinDir = catchIO (getEnv "openpgp_asciiarmor_bindir") (\_ -> return bindir) +getLibDir = catchIO (getEnv "openpgp_asciiarmor_libdir") (\_ -> return libdir) +getDynLibDir = catchIO (getEnv "openpgp_asciiarmor_dynlibdir") (\_ -> return dynlibdir) +getDataDir = catchIO (getEnv "openpgp_asciiarmor_datadir") (\_ -> return datadir) +getLibexecDir = catchIO (getEnv "openpgp_asciiarmor_libexecdir") (\_ -> return libexecdir) +getSysconfDir = catchIO (getEnv "openpgp_asciiarmor_sysconfdir") (\_ -> return sysconfdir) + +getDataFileName :: FilePath -> IO FilePath +getDataFileName name = do + dir <- getDataDir + return (dir ++ "/" ++ name) diff --git a/openpgp-asciiarmor.cabal b/openpgp-asciiarmor.cabal index ba39e8f..4a7f31d 100644 --- a/openpgp-asciiarmor.cabal +++ b/openpgp-asciiarmor.cabal @@ -3,11 +3,11 @@ Version: 0.1.1 Synopsis: OpenPGP (RFC4880) ASCII Armor codec Description: OpenPGP (RFC4880) ASCII Armor codec Homepage: http://floss.scru.org/openpgp-asciiarmor -License: ISC +License: MIT License-file: LICENSE Author: Clint Adams Maintainer: Clint Adams -Copyright: 2012-2018 Clint Adams +Copyright: 2012-2019 Clint Adams Category: Codec, Data Build-type: Simple Extra-source-files: tests/suite.hs -- cgit v1.2.3