diff --git a/.gitignore b/.gitignore index 28c361d..3ca534e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,41 +1,6 @@ -/znc-0.096.tar.gz -/znc-0.097.svn2196.tar.bz2 -/znc-0.097.svn2197.tar.bz2 -/znc-0.097.svn2202.tar.bz2 -/znc-0.097.svn2213.tar.bz2 -/znc-0.097.svn2214.tar.bz2 -/znc-0.097.svn2255.tar.bz2 -/znc-0.097.svn2269.tar.bz2 -/znc-0.097.svn2272.tar.xz -/znc-0.097.svn2277.tar.xz -/znc-0.097.tar.xz -/znc-0.098-alpha1.tar.gz -/znc-0.098-beta.tar.gz -/znc-0.098-rc1.tar.gz -/znc-0.098.tar.gz -/znc-0.099.tar.xz -/znc-0.2-alpha1.tar.gz -/znc-0.2-beta1.tar.gz -/znc-0.200-rc1.tar.gz -/znc-0.200.tar.gz -/znc-0.202.tar.gz -/znc-0.204.tar.gz -/znc-0.206.tar.gz -/znc-1.0-alpha1.tar.gz -/znc-1.0-beta1.tar.gz -/znc-1.0.tar.gz -/znc-1.2-alpha1.tar.gz -/znc-1.2-beta1.tar.gz -/znc-1.2-rc2.tar.gz -/znc-1.2.tar.gz -/znc-1.4.tar.gz -/znc-1.6.0.tar.gz -/znc-1.6.1.tar.gz -/znc-1.6.2.tar.gz -/znc-1.6.3.tar.gz -/znc-1.6.4-rc2.tar.gz -/znc-1.6.4.tar.gz -/znc-1.6.5.tar.gz -/znc-1.6.6.tar.gz -/znc-1.7.0.tar.gz -/znc-1.7.1.tar.gz +/*.rpm +/gpgkey-*.gpg +/results_*/ +/znc-*/ +/znc-*.tar.gz +/znc-*.tar.gz.sig diff --git a/0001-Use-system-wide-crypto-policy.patch b/0001-Use-system-wide-crypto-policy.patch new file mode 100644 index 0000000..04b4cfa --- /dev/null +++ b/0001-Use-system-wide-crypto-policy.patch @@ -0,0 +1,42 @@ +From f0f51d75c160baeb212090940ec1dc35af9bd565 Mon Sep 17 00:00:00 2001 +From: Todd Zullinger +Date: Sun, 26 Aug 2018 01:31:13 -0400 +Subject: [PATCH] Use system-wide crypto policy + +Reference: https://fedoraproject.org/wiki/Packaging:CryptoPolicies +--- + src/Socket.cpp | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +diff --git a/src/Socket.cpp b/src/Socket.cpp +index fa510462..e40c76ea 100644 +--- a/src/Socket.cpp ++++ b/src/Socket.cpp +@@ -28,21 +28,10 @@ + #endif + + #ifdef HAVE_LIBSSL +-// Copypasted from +-// https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29 +-// at 2018-04-01 ++// Use system-wide crypto policy ++// https://fedoraproject.org/wiki/Packaging:CryptoPolicies + static CString ZNC_DefaultCipher() { +- return "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-" +- "ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-" +- "AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-" +- "SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-" +- "RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:" +- "ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-" +- "SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:" +- "DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:" +- "ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:" +- "AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-" +- "SHA:DES-CBC3-SHA:!DSS"; ++ return "PROFILE=SYSTEM"; + } + #endif + +-- +2.19.0.rc0 + diff --git a/gpgkey-5AE420CC0209989E.asc b/gpgkey-5AE420CC0209989E.asc new file mode 100644 index 0000000..bc8a0f5 --- /dev/null +++ b/gpgkey-5AE420CC0209989E.asc @@ -0,0 +1,89 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +yyIpbKrNT4ugmrTrkOXU85APrub821Rp+g== +=HB3n +-----END PGP PUBLIC KEY BLOCK----- diff --git a/znc.rpmlintrc b/znc.rpmlintrc new file mode 100644 index 0000000..8f14c39 --- /dev/null +++ b/znc.rpmlintrc @@ -0,0 +1,13 @@ +from Config import * + +# Ignore dangling symlinks in .build-id dirs +addFilter("znc\..*: W: dangling-relative-symlink /usr/lib/.build-id/.*") + +# No documentation is expected in these packages +addFilter("znc-(devel|modperl|modpython|modtcl)\..*: W: no-documentation") + +# /var/lib/znc is expected to be owned by the znc user/group +addFilter("znc\..*: W: non-standard-[gu]id /var/lib/znc znc") + +# Some template files are expected to be empty +addFilter("znc\..*: E: zero-length /usr/share/znc/webskins/.*/tmpl/.*\.tmpl") diff --git a/znc.spec b/znc.spec index 2192917..3bbd41c 100644 --- a/znc.spec +++ b/znc.spec @@ -17,26 +17,31 @@ Name: znc Version: 1.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An advanced IRC bouncer -Group: System Environment/Daemons License: ASL 2.0 -URL: http://znc.in +URL: https://znc.in Source0: %{url}/releases/%{name}-%{version}.tar.gz +Source1: %{url}/releases/%{name}-%{version}.tar.gz.sig +Source2: gpgkey-5AE420CC0209989E.asc +# Use system-wide crypto policy +# https://fedoraproject.org/wiki/Packaging:CryptoPolicies +Patch0: 0001-Use-system-wide-crypto-policy.patch BuildRequires: automake BuildRequires: c-ares-devel BuildRequires: cyrus-sasl-devel BuildRequires: gcc-c++ BuildRequires: gettext-devel +BuildRequires: gnupg2 BuildRequires: libicu-devel BuildRequires: openssl-devel >= 0.9.8 BuildRequires: perl(ExtUtils::Embed) -%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) +%if 0%{?rhel} && 0%{?rhel} <= 9 Obsoletes: znc-extra <= %{version}-%{release} -%endif # (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) +%endif # 0%{?rhel} && 0%{?rhel} <= 9 Requires(pre): shadow-utils BuildRequires: systemd @@ -49,7 +54,6 @@ DCC bouncing, Perl and C++ module support to name a few. %package devel Summary: Development files needed to compile ZNC modules -Group: Development/Libraries Requires: %{name} = %{version}-%{release} pkgconfig Requires: openssl-devel c-ares-devel glibc-devel libicu-devel%{?_isa} BuildRequires: pkgconfig @@ -61,7 +65,6 @@ modules. %package modtcl Summary: TCL module for ZNC -Group: Development/Libraries BuildRequires: tcl-devel @@ -69,12 +72,11 @@ Requires: %{name} = %{version}-%{release} Requires: tcl %description modtcl -TCL module for ZNC +%{summary}. %if 0%{?with_modperl} %package modperl -Summary: perl module for ZNC -Group: Development/Libraries +Summary: Perl module for ZNC BuildRequires: perl-devel BuildRequires: perl-generators @@ -86,14 +88,13 @@ Requires: perl-interpreter Provides: perl(ZNC::Module) = %{version}-%{release} %description modperl -perl module for ZNC +%{summary}. %endif # 0%{?with_modperl} %if 0%{?with_modpython} %package modpython -Summary: python3 module for ZNC -Group: Development/Libraries +Summary: Python3 module for ZNC %if 0%{?rhel} BuildRequires: python34-devel @@ -110,14 +111,19 @@ Requires: python3 %endif # 0%{?rhel} %description modpython -python3 module for ZNC +%{summary}. %endif # 0%{?with_modpython} %prep -%setup -q -%__perl -pi.add_release -e 's|(?<="ZNC \%1\.3f)|-%{release}|' znc.cpp -chmod -x modules/q.cpp +# Verify GPG signature +gpghome="$(mktemp -qd)" # Ensure we don't use any existing gpg keyrings +key="%{SOURCE2}" +gpg2 --dearmor --quiet --batch --yes $key >/dev/null +gpgv2 --homedir "$gpghome" --quiet --keyring $key.gpg %{SOURCE1} %{SOURCE0} +rm -rf "$gpghome" $key.gpg # Cleanup tmp gpg home dir and dearmored key + +%autosetup -p1 %build @@ -134,26 +140,15 @@ chmod -x modules/q.cpp %else # 0%{?with_modpython} --disable-python \ %endif # 0%{?with_modpython} - --enable-ipv6 --enable-cyrus --enable-tcl -%__make %{?_smp_mflags} + --enable-ipv6 --enable-cyrus --enable-tcl --with-tcl=%{_libdir} +%make_build V=1 %install -%if 0%{?rhel} && 0%{?rhel} <= 5 -%__rm -Rf "%{buildroot}" -%endif # 0%{?rhel} && 0%{?rhel} <= 5 -%__make install DESTDIR="%{buildroot}" -mkdir -p %buildroot%{_unitdir} -#install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service +%make_install install -d "%{buildroot}%{_sharedstatedir}/znc" -%if 0%{?rhel} && 0%{?rhel} <= 5 -%clean -%__rm -Rf "%{buildroot}" -%endif # 0%{?rhel} && 0%{?rhel} <= 5 - - %pre getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ @@ -174,67 +169,25 @@ getent passwd znc >/dev/null || \ %files -%doc LICENSE README.md +%doc ChangeLog.md NOTICE README.md +%license LICENSE %{_bindir}/znc -%{_mandir}/man1/* -%dir %{_libdir}/znc -%{_libdir}/znc/admindebug.so -%{_libdir}/znc/adminlog.so -%{_libdir}/znc/alias.so -%{_libdir}/znc/autoattach.so -%{_libdir}/znc/autocycle.so -%{_libdir}/znc/autoop.so -%{_libdir}/znc/autoreply.so -%{_libdir}/znc/autovoice.so -%{_libdir}/znc/awaynick.so -%{_libdir}/znc/awaystore.so -%{_libdir}/znc/block_motd.so -%{_libdir}/znc/blockuser.so -%{_libdir}/znc/bouncedcc.so -%{_libdir}/znc/buffextras.so -%{_libdir}/znc/cert.so -%{_libdir}/znc/certauth.so -%{_libdir}/znc/chansaver.so -%{_libdir}/znc/clearbufferonmsg.so -%{_libdir}/znc/clientnotify.so -%{_libdir}/znc/controlpanel.so -%{_libdir}/znc/crypt.so -%{_libdir}/znc/ctcpflood.so -%{_libdir}/znc/cyrusauth.so -%{_libdir}/znc/dcc.so -%{_libdir}/znc/disconkick.so -%{_libdir}/znc/fail2ban.so -%{_libdir}/znc/flooddetach.so -%{_libdir}/znc/identfile.so -%{_libdir}/znc/imapauth.so -%{_libdir}/znc/keepnick.so -%{_libdir}/znc/kickrejoin.so -%{_libdir}/znc/lastseen.so -%{_libdir}/znc/listsockets.so -%{_libdir}/znc/log.so -%{_libdir}/znc/missingmotd.so -%{_libdir}/znc/modules_online.so -%{_libdir}/znc/nickserv.so -%{_libdir}/znc/notes.so -%{_libdir}/znc/notify_connect.so -%{_libdir}/znc/partyline.so -%{_libdir}/znc/perform.so -%{_libdir}/znc/q.so -%{_libdir}/znc/raw.so -%{_libdir}/znc/route_replies.so -%{_libdir}/znc/sample.so -%{_libdir}/znc/samplewebapi.so -%{_libdir}/znc/sasl.so -%{_libdir}/znc/savebuff.so -%{_libdir}/znc/schat.so -%{_libdir}/znc/send_raw.so -%{_libdir}/znc/shell.so -%{_libdir}/znc/simple_away.so -%{_libdir}/znc/stickychan.so -%{_libdir}/znc/stripcontrols.so -%{_libdir}/znc/watch.so -%{_libdir}/znc/webadmin.so +%{_mandir}/man1/znc.1* +%{_libdir}/znc +# exclude modperl, modpython, and modtcl files +%exclude %{_libdir}/znc/modperl/ +%exclude %{_libdir}/znc/modperl.so +%exclude %{_libdir}/znc/perleval.pm +%if 0%{?with_modpython} +%exclude %{_libdir}/znc/__pycache__/ +%exclude %{_libdir}/znc/modpython/ +%exclude %{_libdir}/znc/modpython.so +%exclude %{_libdir}/znc/pyeval.py +%endif # 0%{?with_modpython} +%exclude %{_libdir}/znc/modtcl.so %{_datadir}/znc/ +# exclude modtcl files +%exclude %{_datadir}/znc/modtcl/ %{_unitdir}/znc.service %attr(-,znc,znc) %{_sharedstatedir}/znc/ @@ -242,9 +195,11 @@ getent passwd znc >/dev/null || \ %{_bindir}/znc-buildmod %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/znc/ +%{_mandir}/man1/znc-buildmod.1* %files modtcl %{_libdir}/znc/modtcl.so +%{_datadir}/znc/modtcl/ %if 0%{?with_modperl} %files modperl @@ -263,6 +218,21 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Aug 24 2018 Todd Zullinger - 1.7.1-3 +- Clean up ancient Fedora and RHEL conditionals +- Remove cruft from %%prep +- Use %%autosetup, %%make_build, and %%make_install macros +- Use https for URL and SOURCE tags +- Check upstream GPG signature in %%prep +- Simplify %%{_libdir}/znc/ file list +- Enable verbose make +- Pass --with-tcl to ensure tclConfig.sh is found +- Remove Group tag +- Use system-wide crypto policy +- Use %%license tag for LICENSE file +- Add ChangeLog.md and NOTICE files to %%doc +- Move znc-buildmod.1 to znc-devel + * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies