diff --git a/.gitignore b/.gitignore index 49e960b..b817cae 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /sshguard-2.4.0.tar.gz +bodhi.template.last +/sshguard-2.4.1.tar.gz diff --git a/.tito/packages/sshguard b/.tito/packages/sshguard index 1e774e8..27ac437 100644 --- a/.tito/packages/sshguard +++ b/.tito/packages/sshguard @@ -1 +1 @@ -2.4.0-11 ./ +2.4.1-1 ./ diff --git a/README.md b/README.md index 5f7ec15..d0252b9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,26 @@ -# sshguard +### Installation & setup -The sshguard package \ No newline at end of file +This package ships with three subpackages that configure the different firewall backends SSHGuard supports. If dnf is configured to also install weak dependencies (the default), it will automatically install the one corresponding to your installed firewall. Otherwise, you have to install one manually: + + For firewalld + $ dnf install sshguard-firewalld + For iptables-services + $ dnf install sshguard-iptables + For nftables + $ dnf install sshguard-nftables + +or use the example config file `/usr/share/doc/sshguard/examples/sshguard.conf.sample`. + +After installation, SSHGuard can be enabled via systemctl: + + $ systemctl enable --now sshguard.service + +Please refer to the config files or upstream's [setup documentation](https://bitbucket.org/sshguard/sshguard/src/master/doc/sshguard-setup.7.rst "SSHGuard setup documentation") for details. + +### CentOS/RHEL + +Due to older/different software versions in CentOS/RHEL, some functionality of the Fedora packages has been changed: + + * CentOS/RHEL 7 or older: No backend subpackages `sshguard-`. User must manually configure `/etc/sshguard.conf`, + an example config file is contained in the package's doc directory. + * CentOS/RHEL 6 or older: Uses SysV Init instead of systemd. Sshguard logs to `/var/log/sshguard.log` instead of the system journal. diff --git a/gating.yml b/gating.yml new file mode 100644 index 0000000..dfb0041 --- /dev/null +++ b/gating.yml @@ -0,0 +1,9 @@ +--- !Policy +product_versions: + - fedora-* + decision_context: + - bodhi_update_push_testing + - bodhi_update_push_stable + subject_type: koji_build + rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/sources b/sources index 6fee323..be6dfb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sshguard-2.4.0.tar.gz) = 64293700ef85f0843c333c3a27b04c5b2f69bf8dddf46353a371d4178915deb931362b3641ded0eeb5365f30cb63ce6ce17256d8d094383d1cfe661065b9c1c6 +SHA512 (sshguard-2.4.1.tar.gz) = bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8 diff --git a/sshguard.rpmlintrc b/sshguard.rpmlintrc new file mode 100644 index 0000000..298577f --- /dev/null +++ b/sshguard.rpmlintrc @@ -0,0 +1,2 @@ +# missing documentation from subpackages +addFilter(r'^sshguard-(firewalld|nftables|iptables)\.[^:]+: (E|W): no-documentation') diff --git a/sshguard.spec b/sshguard.spec index 34fdf8c..ae84be8 100644 --- a/sshguard.spec +++ b/sshguard.spec @@ -4,8 +4,8 @@ %endif Name: sshguard -Version: 2.4.0 -Release: 11%{?dist} +Version: 2.4.1 +Release: 1%{?dist} # The entire source code is BSD # except src/parser/* which is GPLv2+ # except src/blocker/hash_32a.c & src/blocker/fnv.h which are Public Domain @@ -82,7 +82,7 @@ Sshguard-iptables provides a configuration file for SSHGuard to use iptables as the firewall backend. %package firewalld -Requires: firewalld %{name} +Requires: firewalld ipset %{name} Conflicts: %{name}-iptables %{name}-nftables Summary: Configuration for firewalld backend of SSHGuard RemovePathPostfixes: .firewalld @@ -239,6 +239,19 @@ fi #-- CHANGELOG -----------------------------------------------------------------# %changelog +* Sat Aug 01 2020 Christopher Engelhard 2.4.1-1 +- Update to 2.4.1 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.4.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.4.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sun Nov 17 2019 Christopher Engelhard 2.4.0-12 +- include patch to fully whitelist localhost in IPv6/v4 (PR #56) +- add explicit Requires: ipset to firewalld backend + * Mon Oct 21 2019 Christopher Engelhard 2.4.0-11 - replace systemd with systemd-rpm-macros in f30+ BuildRequires - remove %%systemd_requires macro