Hello community, here is the log from the commit of package hiawatha for openSUSE:Factory checked in at 2018-03-31 15:36:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hiawatha (Old) and /work/SRC/openSUSE:Factory/.hiawatha.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hiawatha" Sat Mar 31 15:36:57 2018 rev:22 rq:592256 version:10.8 Changes: -------- --- /work/SRC/openSUSE:Factory/hiawatha/hiawatha.changes 2018-02-20 17:55:45.448990560 +0100 +++ /work/SRC/openSUSE:Factory/.hiawatha.new/hiawatha.changes 2018-03-31 15:37:01.957372864 +0200 @@ -1,0 +2,25 @@ +Mon Mar 26 21:47:26 UTC 2018 - fisiu@opensuse.org + +- Ship Let's Encrypt script within subpackage. + +------------------------------------------------------------------- +Mon Mar 26 20:46:56 UTC 2018 - fisiu@opensuse.org + +- Add firewalld config files for Leap/SLE >= 15 and TW. + +------------------------------------------------------------------- +Mon Mar 26 19:59:45 UTC 2018 - fisiu@opensuse.org + +- Update to version 10.8: + * New Let's Encrypt script that supports ACME v2. + * Added Syslog option. + * Added GZipExtensions option. + * AllowDotFiles now used to show hidden files in directory listings. + * Removed support for static RSA ciphers. + * Hiawatha log format changed. + * Small improvements. + * Bugfix: certain characters in filenames disrupted directory index output. + * Bugfix: requesting non-regular files now results in a 403 instead of + blocking that thread. + +------------------------------------------------------------------- Old: ---- hiawatha-10.7.tar.gz New: ---- hiawatha-10.8.tar.gz hiawatha-ssl.firewalld hiawatha.firewalld ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hiawatha.spec ++++++ --- /var/tmp/diff_new_pack.nVsp9N/_old 2018-03-31 15:37:02.877339507 +0200 +++ /var/tmp/diff_new_pack.nVsp9N/_new 2018-03-31 15:37:02.877339507 +0200 @@ -20,11 +20,17 @@ %define webroot /srv/www %define mbedtls_version %(rpm -q mbedtls-devel --qf "%%{VERSION}") +%if 0%{?suse_version} >= 1500 +%define use_firewalld 1 +%else +%define use_firewalld 0 +%endif + Name: hiawatha -Version: 10.7 +Version: 10.8 Release: 0 Summary: A secure and advanced webserver -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Networking/Web/Servers Url: http://www.hiawatha-webserver.org Source0: http://www.hiawatha-webserver.org/files/%{name}-%{version}.tar.gz @@ -32,6 +38,10 @@ Source2: %{name}.service Source100: %{name}.firewall Source101: %{name}-ssl.firewall +%if %{use_firewalld} +Source102: %{name}.firewalld +Source103: %{name}-ssl.firewalld +%endif BuildRequires: cmake >= 3.0 BuildRequires: gcc-c++ BuildRequires: mbedtls-devel >= 2.3 @@ -40,6 +50,9 @@ BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) +%if %{use_firewalld} +BuildRequires: firewall-macros +%endif Requires: logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} @@ -56,6 +69,18 @@ such as CGI/FastCGI, HTTP authentication, virtual host support, request pipelining, keep alive connections, URL rewriting and many more. +%package letsencrypt +Summary: Let's Encrypt script for the Hiawatha webserver +Group: Productivity/Networking/Web/Servers +Requires: %{name} +Requires: php-cli + +%description letsencrypt +This is the Let's Encrypt script for the Hiawatha webserver. It can be used to +request, renew and revoke certificated as provided by Let's Encrypt in a very +easy way. It requires the PHP command line interface and uses version 2 of the +ACME protocol to communicate with the Let's Encrypt server. + %prep %setup -q # Remove bundled source for mbedtls, we use system version @@ -99,6 +124,18 @@ install -D -m 0644 %{SOURCE101} \ %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl +# firewalld config files +%if %{use_firewalld} +install -D -m 0644 %{SOURCE102} \ + %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml +install -D -m 0644 %{SOURCE103} \ + %{buildroot}%{_libexecdir}/firewalld/services/%{name}-ssl.xml +%endif + +# letsencrypt stuff +mkdir -p %{buildroot}%{_datadir}/%{name} +cp -r extra/letsencrypt %{buildroot}%{_datadir}/%{name} + %pre %service_add_pre %{name}.service @@ -129,6 +166,12 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}-ssl +%if %{use_firewalld} +%dir %{_libexecdir}/firewalld +%dir %{_libexecdir}/firewalld/services +%{_libexecdir}/firewalld/services/%{name}.xml +%{_libexecdir}/firewalld/services/%{name}-ssl.xml +%endif %{_mandir}/man1/*.1%{ext_man} %dir %{webroot}/%{name} %dir %{webroot}/%{name}/htdocs @@ -136,4 +179,9 @@ %dir %attr(-,wwwrun,www) %{_localstatedir}/lib/%{name}/ %dir %attr(750,wwwrun,www) %{_localstatedir}/log/%{name}/ +%files letsencrypt +%defattr(-,root,root) +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/letsencrypt + %changelog ++++++ hiawatha-10.7.tar.gz -> hiawatha-10.8.tar.gz ++++++ ++++ 25583 lines of diff (skipped) ++++++ hiawatha-ssl.firewalld ++++++ <?xml version="1.0" encoding="utf-8"?> <service> <short>Hiawatha Webserver (HTTPS)</short> <description>An advanced and secure webserver.</description> <port protocol="tcp" port="443"/> </service> ++++++ hiawatha.firewalld ++++++ <?xml version="1.0" encoding="utf-8"?> <service> <short>Hiawatha Webserver (HTTP)</short> <description>An advanced and secure webserver.</description> <port protocol="tcp" port="80"/> </service>