Fix changelog date

.gitignore

@@ -7,3 +7,5 @@
 /quassel-0.11.0.tar.bz2
 /quassel-0.12.2.tar.bz2
 /quassel-0.12.3.tar.bz2
+/quassel-0.12.4.tar.bz2
+/quassel-0.12.5.tar.bz2

quassel.spec

@@ -1,13 +1,15 @@
 Name:    quassel
 Summary: A modern distributed IRC system
-Version: 0.12.3
-Release: 1%{?dist}
+Version: 0.12.5
+Release: 2%{?dist}
 
 License: GPLv2 or GPLv3
 Group:   Applications/Internet
 URL:     http://quassel-irc.org/
 Source0: http://quassel-irc.org/pub/quassel-%{version}.tar.bz2
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Patch0: quassel_0.12.5_CVE-2021-34825.patch
 
 Buildrequires: cmake
 BuildRequires: desktop-file-utils
@@ -23,6 +25,7 @@ Provides: %{name}-gui = %{version}-%{release}
 
 Requires: %{name}-common = %{version}-%{release}
 
+
 %description
 Quassel IRC is a modern, distributed IRC client, 
 meaning that one (or multiple) client(s) can attach 
@@ -62,6 +65,7 @@ Quassel client
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 mkdir build
@@ -101,14 +105,14 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 %files common
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README.md
 %doc gpl-2.0.txt gpl-3.0.txt
 %{_kde4_appsdir}/quassel/
 %{_kde4_iconsdir}/hicolor/*/*/*
 
 %files core
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README.md
 %doc gpl-2.0.txt gpl-3.0.txt
 %{_kde4_bindir}/quasselcore
 
@@ -119,6 +123,15 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Tue Jun 22 2021 Chris Egeland <chris@chrisegeland.com> - 0.12.5-2
+- Added security fix for CVE-2021-34825
+
+* Tue May 01 2018 Christian Dersch <lupinix@mailbox.org> - 0.12.5-1
+- new version
+
+* Mon Apr 25 2016 Christian Dersch <lupinix@mailbox.org> - 0.12.4-1
+- new version
+
 * Tue Feb 09 2016 Ben Rosser <rosser.bjr@gmail.com> 0.12.3-1
 - Update to latest upstream quassel release
 - The CVE patch is not necessary for 0.12.3 or greater
@@ -156,15 +169,9 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 * Wed Sep 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.11.0-1
 - Update to latest upstream
 
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
 * Wed Jul 09 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.10.0-1
 - Update to latest upstream release
 
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
 * Fri Jan 24 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.9.2-1
 - Update to latest upstream release
 
@@ -232,7 +239,7 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 * Fri Apr 24 2009 Steven M. Parrish <tuxbrewr@fedoraproject.org> - 0.4.1-1
 - New upstream release
 
-* Tue Apr 13 2009 Steven M. Parrish <tuxbrewr@fedoraproject.org> - 0.4.0-2
+* Tue Apr 14 2009 Steven M. Parrish <tuxbrewr@fedoraproject.org> - 0.4.0-2
 - Enabled KDE integration
 
 * Fri Feb 20 2009 Steven M. Parirsh <tuxbrewr@fedoraproject.org> 0.4.0-1

quassel_0.11.1_CVE-2015-8547.diff

@@ -1,12 +0,0 @@
-diff -Naur quassel-0.11.1/src/core/coreuserinputhandler.cpp quassel-0.11.1.patched/src/core/coreuserinputhandler.cpp
---- quassel-0.11.1/src/core/coreuserinputhandler.cpp	2015-04-23 23:00:06.000000000 +0200
-+++ quassel-0.11.1.patched/src/core/coreuserinputhandler.cpp	2015-12-15 20:21:56.170741238 +0100
-@@ -232,7 +232,7 @@
-     if (!isNumber || maxModes == 0) maxModes = 1;
- 
-     QStringList nickList;
--    if (nicks == "*") { // All users in channel
-+    if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel
-         const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
-         foreach(IrcUser *user, users) {
-             if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))

quassel_0.12.5_CVE-2021-34825.patch

@@ -0,0 +1,20 @@
+diff -ruN a/src/core/sslserver.cpp b/src/core/sslserver.cpp
+--- a/src/core/sslserver.cpp	2018-04-23 21:44:48.000000000 +0000
++++ b/src/core/sslserver.cpp	2021-06-22 04:27:39.596212479 +0000
+@@ -52,6 +52,16 @@
+ 
+     // Initialize the certificates for first-time usage
+     if (!loadCerts()) {
++        // If the core is unable to load a certificate, and "--require-ssl" is specified,
++        // do not proceed, throw an exception and quit. This prevents the core from falling
++        // back to a plaintext-only core when they should be expecting SSL/TLS only.
++        if (Quassel::isOptionSet("require-ssl")) {
++            quWarning()
++            << "--require-ssl is set, but no SSL certificate is available. "
++            << "Exiting.\nPlease see https://quassel-irc.org/faq/cert to learn"
++            << "how to enable SSL support.";
++            exit(EXIT_FAILURE);
++        }
+         if (!sslWarningShown) {
+             quWarning()
+             << "SslServer: Unable to set certificate file\n"

sources

@@ -1,2 +1 @@
-f5473a9c5927a0e8cb3a204ced887aa8  quassel-0.12.2.tar.bz2
-a1eec91b56df7d538dfc7cafa8dfabae  quassel-0.12.3.tar.bz2
+SHA512 (quassel-0.12.5.tar.bz2) = 3a0263d7bec9ef4b0d8ef6ea53784f95e0efbadc0f03b49005908411b0b53543ebc66189fb4100c117d87264b648f2a1b01be48c371f926b9f326b1ffc870685