Skip to content

Commit

Permalink
release: 0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
joshstoik1 committed Feb 16, 2024
2 parents d8dfda5 + e11287b commit 498d5a3
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 20 deletions.
20 changes: 10 additions & 10 deletions CREDITS.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
# Project Dependencies
Package: adbyss
Version: 0.9.5
Generated: 2024-02-08 19:07:24 UTC
Version: 0.10.0
Generated: 2024-02-16 03:20:08 UTC

| Package | Version | Author(s) | License |
| ---- | ---- | ---- | ---- |
| [adbyss_core](https://github.com/Blobfolio/adbyss) | 0.9.5 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.9.5 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.7 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
| [adbyss_core](https://github.com/Blobfolio/adbyss) | 0.10.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [adbyss_psl](https://github.com/Blobfolio/adbyss) | 0.10.0 | [Josh Stoik](mailto:[email protected]) | WTFPL |
| [ahash](https://github.com/tkaitchuck/ahash) | 0.8.8 | [Tom Kaitchuck](mailto:[email protected]) | Apache-2.0 or MIT |
| [aho-corasick](https://github.com/BurntSushi/aho-corasick) | 1.1.2 | [Andrew Gallant](mailto:[email protected]) | MIT or Unlicense |
| [argyle](https://github.com/Blobfolio/argyle) | 0.7.1 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
| [argyle](https://github.com/Blobfolio/argyle) | 0.7.2 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
| [cfg-if](https://github.com/alexcrichton/cfg-if) | 1.0.0 | [Alex Crichton](mailto:[email protected]) | Apache-2.0 or MIT |
| [crossbeam-deque](https://github.com/crossbeam-rs/crossbeam) | 0.8.5 | | Apache-2.0 or MIT |
| [crossbeam-epoch](https://github.com/crossbeam-rs/crossbeam) | 0.9.18 | | Apache-2.0 or MIT |
| [crossbeam-utils](https://github.com/crossbeam-rs/crossbeam) | 0.8.19 | | Apache-2.0 or MIT |
| [dactyl](https://github.com/Blobfolio/dactyl) | 0.7.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
| [either](https://github.com/bluss/either) | 1.9.0 | bluss | Apache-2.0 or MIT |
| [either](https://github.com/rayon-rs/either) | 1.10.0 | bluss | Apache-2.0 or MIT |
| [equivalent](https://github.com/cuviper/equivalent) | 1.0.1 | | Apache-2.0 or MIT |
| [fastrand](https://github.com/smol-rs/fastrand) | 2.0.1 | [Stjepan Glavina](mailto:[email protected]) | Apache-2.0 or MIT |
| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.12.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
| [fyi_msg](https://github.com/Blobfolio/fyi) | 0.13.0 | [Blobfolio, LLC.](mailto:[email protected]) | WTFPL |
| [getrandom](https://github.com/rust-random/getrandom) | 0.2.12 | The Rand Project Developers | Apache-2.0 or MIT |
| [hashbrown](https://github.com/rust-lang/hashbrown) | 0.14.3 | [Amanieu d'Antras](mailto:[email protected]) | Apache-2.0 or MIT |
| [indexmap](https://github.com/indexmap-rs/indexmap) | 2.2.2 | | Apache-2.0 or MIT |
| [indexmap](https://github.com/indexmap-rs/indexmap) | 2.2.3 | | Apache-2.0 or MIT |
| [itoa](https://github.com/dtolnay/itoa) | 1.0.10 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
| [libc](https://github.com/rust-lang/libc) | 0.2.153 | The Rust Project Developers | Apache-2.0 or MIT |
| [log](https://github.com/rust-lang/log) | 0.4.20 | The Rust Project Developers | Apache-2.0 or MIT |
Expand All @@ -43,7 +43,7 @@
| [serde](https://github.com/serde-rs/serde) | 1.0.196 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
| [serde_derive](https://github.com/serde-rs/serde) | 1.0.196 | [Erick Tryzelaar](mailto:[email protected]) and [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
| [serde_yaml](https://github.com/dtolnay/serde-yaml) | 0.9.31 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
| [syn](https://github.com/dtolnay/syn) | 2.0.48 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
| [syn](https://github.com/dtolnay/syn) | 2.0.49 | [David Tolnay](mailto:[email protected]) | Apache-2.0 or MIT |
| [tempfile](https://github.com/Stebalien/tempfile) | 3.10.0 | [Steven Allen](mailto:[email protected]), The Rust Project Developers, [Ashley Mannix](mailto:[email protected]), and [Jason White](mailto:[email protected]) | Apache-2.0 or MIT |
| [tinyvec](https://github.com/Lokathor/tinyvec) | 1.6.0 | [Lokathor](mailto:[email protected]) | Apache-2.0, MIT, or Zlib |
| [tinyvec_macros](https://github.com/Soveu/tinyvec_macros) | 0.1.1 | [Soveu](mailto:[email protected]) | Apache-2.0, MIT, or Zlib |
Expand Down
6 changes: 3 additions & 3 deletions adbyss/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "adbyss"
version = "0.9.5"
version = "0.10.0"
license = "WTFPL"
authors = ["Josh Stoik <[email protected]>"]
edition = "2021"
Expand Down Expand Up @@ -90,9 +90,9 @@ items = [
]

[dependencies]
argyle = "0.7.*"
argyle = "0.7.2"
dactyl = "0.7.*"
fyi_msg = "0.12.*"
fyi_msg = "0.13.*"
libc = "0.2.*"
serde_yaml = "0.9.*"

Expand Down
17 changes: 17 additions & 0 deletions adbyss/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,23 @@ fn _main() -> Result<(), AdbyssError> {
// Parse CLI arguments.
let args = Argue::new(FLAG_VERSION | FLAG_HELP)?;

// Check for invalid CLI options.
if let Some(boo) = args.check_keys(
&[
b"--disable",
b"--quiet",
b"--show",
b"--stdout",
b"--systemd",
b"--yes",
b"-q",
b"-y",
],
&[b"--config", b"-c"],
) {
return Err(AdbyssError::InvalidCli(String::from_utf8_lossy(boo).into()));
}

// Load configuration. If the user specified one, go with that and print an
// error if the path is invalid. Otherwise look for a config at the default
// path and go with that if it exists. Otherwise just use the internal
Expand Down
4 changes: 2 additions & 2 deletions adbyss_core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "adbyss_core"
version = "0.9.5"
version = "0.10.0"
license = "WTFPL"
authors = ["Josh Stoik <[email protected]>"]
edition = "2021"
Expand All @@ -12,7 +12,7 @@ publish = false
[dependencies]
argyle = "0.7.*"
dactyl = "0.7.*"
fyi_msg = "0.12.*"
fyi_msg = "0.13.*"
rayon = "1.8.*"
regex = "1.10.*"
utc2k = "0.8.*"
Expand Down
3 changes: 3 additions & 0 deletions adbyss_core/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ pub enum AdbyssError {
HostsRead(Box<Path>),
/// # Write error.
HostsWrite(Box<Path>),
/// # Uknown CLI option.
InvalidCli(Box<str>),
/// # No Internet.
NoInternet,
/// # Root required.
Expand All @@ -50,6 +52,7 @@ impl fmt::Display for AdbyssError {
Self::HostsInvalid(path) => f.write_fmt(format_args!("Invalid hostfile: {path:?}")),
Self::HostsRead(path) => f.write_fmt(format_args!("Unable to read hostfile: {path:?}")),
Self::HostsWrite(path) => f.write_fmt(format_args!("Unable to write hostfile: {path:?}")),
Self::InvalidCli(s) => f.write_fmt(format_args!("Invalid/unknown option: {s}")),
Self::NoInternet => f.write_str("No internet connection was available."),
Self::Root => f.write_str("Adbyss requires root privileges."),
Self::SourceFetch(src) => f.write_fmt(format_args!("Unable to fetch source: {}", src.as_str())),
Expand Down
9 changes: 9 additions & 0 deletions adbyss_psl/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Changelog


## [0.10.0](https://github.com/Blobfolio/adbyss/releases/tag/v0.10.0) - 2024-02-15

### Changed

* Bump MSRV to `1.72`
* Update suffix database



## [0.9.5](https://github.com/Blobfolio/adbyss/releases/tag/v0.9.5) - 2024-02-08

### Changed
Expand Down
4 changes: 2 additions & 2 deletions adbyss_psl/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "adbyss_psl"
version = "0.9.5"
version = "0.10.0"
license = "WTFPL"
authors = ["Josh Stoik <[email protected]>"]
edition = "2021"
rust-version = "1.65"
rust-version = "1.72"
description = "A minimal Public Suffix List hostname validator."
repository = "https://github.com/Blobfolio/adbyss"
keywords = [ "hostname", "validation", "publicsuffix", "idna", "punycode" ]
Expand Down
2 changes: 1 addition & 1 deletion adbyss_psl/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Add `adbyss_psl` to your `dependencies` in `Cargo.toml`, like:

```
[dependencies]
adbyss_psl = "0.8.*"
adbyss_psl = "0.10.*"
```


Expand Down
4 changes: 4 additions & 0 deletions adbyss_psl/skel/raw/public_suffix_list.dat
Original file line number Diff line number Diff line change
Expand Up @@ -12426,6 +12426,10 @@ feste-ip.net
knx-server.net
static-access.net

// cPanel L.L.C. : https://www.cpanel.net/
// Submitted by Dustin Scherer <[email protected]>
*.cprapid.com

// Craynic, s.r.o. : http://www.craynic.com/
// Submitted by Ales Krajnik <[email protected]>
realm.cz
Expand Down
4 changes: 2 additions & 2 deletions release/man/adbyss.1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.TH "ADBYSS" "1" "February 2024" "Adbyss v0.9.5" "User Commands"
.TH "ADBYSS" "1" "February 2024" "Adbyss v0.10.0" "User Commands"
.SH NAME
Adbyss \- Manual page for adbyss v0.9.5.
Adbyss \- Manual page for adbyss v0.10.0.
.SH DESCRIPTION
Adbyss is a DNS blacklist manager for Linux.
.SS USAGE:
Expand Down

0 comments on commit 498d5a3

Please sign in to comment.