From 4d4839c9ed18cc411e4a6cc8fdb364b58bc962391ede79a5573785e6006ff9aa Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Sun, 29 Nov 2020 18:12:30 +0000
Subject: [PATCH] Accepting request 849450 from home:dimstar:Factory

update to 1.3.6e

OBS-URL: https://build.opensuse.org/request/show/849450
OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=80
---
 proftpd-1.3.6d.tar.gz      |  3 ---
 proftpd-1.3.6d.tar.gz.asc  |  7 -------
 proftpd-1.3.6e.tar.gz      |  3 +++
 proftpd-1.3.6e.tar.gz.asc  |  7 +++++++
 proftpd-no_BuildDate.patch |  4 ++--
 proftpd.changes            | 11 ++++++++++-
 proftpd.spec               |  4 ++--
 7 files changed, 24 insertions(+), 15 deletions(-)
 delete mode 100644 proftpd-1.3.6d.tar.gz
 delete mode 100644 proftpd-1.3.6d.tar.gz.asc
 create mode 100644 proftpd-1.3.6e.tar.gz
 create mode 100644 proftpd-1.3.6e.tar.gz.asc

diff --git a/proftpd-1.3.6d.tar.gz b/proftpd-1.3.6d.tar.gz
deleted file mode 100644
index bebb43d..0000000
--- a/proftpd-1.3.6d.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c338e2e25d1b6f51d397af154a0124fc42eee6b7ff99a2d976777d6b2f97c096
-size 20277407
diff --git a/proftpd-1.3.6d.tar.gz.asc b/proftpd-1.3.6d.tar.gz.asc
deleted file mode 100644
index 13c50a5..0000000
--- a/proftpd-1.3.6d.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - https://gpgtools.org
-
-iEYEABECAAYFAl7S1woACgkQt46JP6URl2rRGACfXHB/BIWLmzQN+DKMiqIWYjFQ
-iUAAoMzew8rPEryN15UlKqQUWSgmEOtd
-=DdlT
------END PGP SIGNATURE-----
diff --git a/proftpd-1.3.6e.tar.gz b/proftpd-1.3.6e.tar.gz
new file mode 100644
index 0000000..fd94d61
--- /dev/null
+++ b/proftpd-1.3.6e.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2dbe684034ab592742ebdb778a8a234b70f959efeb30feedee3ea77f26f74fbb
+size 20277501
diff --git a/proftpd-1.3.6e.tar.gz.asc b/proftpd-1.3.6e.tar.gz.asc
new file mode 100644
index 0000000..aa3ebb2
--- /dev/null
+++ b/proftpd-1.3.6e.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAl8Wc4kACgkQt46JP6URl2r4iACgxK61LzkVQ5xRHKHMl43D1ixd
+zYQAoJXt14fj66DMBwU+JBDqQ+nm2tsj
+=F9Rz
+-----END PGP SIGNATURE-----
diff --git a/proftpd-no_BuildDate.patch b/proftpd-no_BuildDate.patch
index 8373f10..857ed5a 100644
--- a/proftpd-no_BuildDate.patch
+++ b/proftpd-no_BuildDate.patch
@@ -65,8 +65,8 @@ Index: include/version.h
 -#include "buildstamp.h"
 -
  /* Application version (in various forms) */
- #define PROFTPD_VERSION_NUMBER		0x0001030609
- #define PROFTPD_VERSION_TEXT		"1.3.6d"
+ #define PROFTPD_VERSION_NUMBER		0x0001030610
+ #define PROFTPD_VERSION_TEXT		"1.3.6e"
 Index: src/main.c
 ===================================================================
 --- src/main.c.orig
diff --git a/proftpd.changes b/proftpd.changes
index aedecb9..da0d80a 100644
--- a/proftpd.changes
+++ b/proftpd.changes
@@ -1,9 +1,18 @@
+-------------------------------------------------------------------
+Thu Nov 19 14:16:47 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Update to version 1.3.6e:
+  + Invalid SCP command leads to null pointer dereference.
+- Do not limit to openSSL < 1.1: proftpd has had support for
+  openSSL 1.1 sice version 1.3.6a.
+- Rebase proftpd-no_BuildDate.patch.
+
 -------------------------------------------------------------------
 Fri Jun  5 11:02:29 UTC 2020 - chris@computersalat.de
 
 - update to 1.3.6d
   * Issue 857 - Fixed regression in the handling of `%{env:...}` configuration
-    variables when the environment variable is not present. 
+    variables when the environment variable is not present.
   * Issue 940 - Second LIST of the same symlink shows different results.
   * Issue 959 - FTPS uploads using TLSv1.3 are likely to fail unexpectedly.
   * Issue 980 - mod_sftp sends broken response when CREATETIME attribute is
diff --git a/proftpd.spec b/proftpd.spec
index f8ece7b..30cc62c 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -22,7 +22,7 @@ Summary:        Configurable GPL-licensed FTP server software
 # We only accept updates for "STABLE" Versions
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Ftp/Servers
-Version:        1.3.6d
+Version:        1.3.6e
 Release:        0
 URL:            http://www.proftpd.org/
 Source0:        ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz
@@ -63,7 +63,7 @@ BuildRequires:  pkg-config
 BuildRequires:  postgresql-devel
 BuildRequires:  sqlite3-devel
 BuildRequires:  unixODBC-devel
-BuildRequires:  pkgconfig(libssl) < 1.1
+BuildRequires:  pkgconfig(libssl)
 Requires:       logrotate
 %if 0%{?lang_package:1} > 0
 Recommends:     %{name}-lang