From 3eecc63a4de686c7ee5afcf3b8dee2fa605f488116b4d649821d272fea58e804 Mon Sep 17 00:00:00 2001
From: Christian Wittmer <chris@computersalat.de>
Date: Wed, 27 Dec 2023 22:02:44 +0000
Subject: [PATCH] Accepting request 1135388 from
 home:computersalat:devel:network

Update to 1.3.8b, fix for CVE-2023-48795

OBS-URL: https://build.opensuse.org/request/show/1135388
OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=97
---
 proftpd-1.3.8a.tar.gz      | 3 ---
 proftpd-1.3.8a.tar.gz.asc  | 7 -------
 proftpd-1.3.8b.tar.gz      | 3 +++
 proftpd-1.3.8b.tar.gz.asc  | 7 +++++++
 proftpd-no_BuildDate.patch | 4 ++--
 proftpd.changes            | 9 +++++++++
 proftpd.spec               | 2 +-
 7 files changed, 22 insertions(+), 13 deletions(-)
 delete mode 100644 proftpd-1.3.8a.tar.gz
 delete mode 100644 proftpd-1.3.8a.tar.gz.asc
 create mode 100644 proftpd-1.3.8b.tar.gz
 create mode 100644 proftpd-1.3.8b.tar.gz.asc

diff --git a/proftpd-1.3.8a.tar.gz b/proftpd-1.3.8a.tar.gz
deleted file mode 100644
index 1d9e715..0000000
--- a/proftpd-1.3.8a.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:56093b890a712220b09b98e29de2974a590e8fae6b36ed78c698a90945466aaf
-size 19749900
diff --git a/proftpd-1.3.8a.tar.gz.asc b/proftpd-1.3.8a.tar.gz.asc
deleted file mode 100644
index b4750cb..0000000
--- a/proftpd-1.3.8a.tar.gz.asc
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - https://gpgtools.org
-
-iEYEABECAAYFAmUjQZQACgkQt46JP6URl2qpFwCggqITzFB6fkGfBU5z0+AX3aGn
-EVgAnRC//qyIouovEZcf/STTg6CDAbMn
-=sgjA
------END PGP SIGNATURE-----
diff --git a/proftpd-1.3.8b.tar.gz b/proftpd-1.3.8b.tar.gz
new file mode 100644
index 0000000..01afd3f
--- /dev/null
+++ b/proftpd-1.3.8b.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:183ab7c6107de271a2959ff268f55c9b6c76b2cf0029e6584fccc019686601e0
+size 19752808
diff --git a/proftpd-1.3.8b.tar.gz.asc b/proftpd-1.3.8b.tar.gz.asc
new file mode 100644
index 0000000..baa3083
--- /dev/null
+++ b/proftpd-1.3.8b.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iEYEABECAAYFAmWCcGMACgkQt46JP6URl2rOOACgqd6poiniUeOej3gVoE4ZHA1Z
+PKgAoKgsyi9zqoilnOtZJKfzWw4BJ546
+=GIJC
+-----END PGP SIGNATURE-----
diff --git a/proftpd-no_BuildDate.patch b/proftpd-no_BuildDate.patch
index 8deb853..f92b99e 100644
--- a/proftpd-no_BuildDate.patch
+++ b/proftpd-no_BuildDate.patch
@@ -99,5 +99,5 @@ Index: include/version.h
 -#include "buildstamp.h"
 -
  /* Application version (in various forms) */
- #define PROFTPD_VERSION_NUMBER		0x0001030806
- #define PROFTPD_VERSION_TEXT		"1.3.8a"
+ #define PROFTPD_VERSION_NUMBER		0x0001030807
+ #define PROFTPD_VERSION_TEXT		"1.3.8b"
diff --git a/proftpd.changes b/proftpd.changes
index 2219a2b..73dd5e1 100644
--- a/proftpd.changes
+++ b/proftpd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Dec 27 21:52:11 UTC 2023 - chris@computersalat.de
+
+- 1.3.8a - Released 19-Dec-2023
+  * http://proftpd.org/docs/NEWS-1.3.8b
+  * Implemented mitigations for "Terrapin" SSH attack (CVE-2023-48795).
+- rebase patch
+  * proftpd-no_BuildDate.patch
+
 -------------------------------------------------------------------
 Thu Nov  2 16:24:34 UTC 2023 - chris@computersalat.de
 
diff --git a/proftpd.spec b/proftpd.spec
index 60b2ae7..b55a439 100644
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -33,7 +33,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.8a
+Version:        1.3.8b
 Release:        0
 URL:            http://www.proftpd.org/
 Source0:        ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz