From: Wayne Davison <wayne@opencoder.net>
Date: Mon, 8 Apr 2024 20:14:59 +0000 (-0700)
Subject: Changes for 3.3.1dev.
X-Git-Tag: v3.4.0~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=56a039b04a186678e8e150a95529f23d93e2ca56;p=thirdparty%2Frsync.git

Changes for 3.3.1dev.
---

diff --git a/NEWS.md b/NEWS.md
index 846ed0ac..1a88a70d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,17 @@
+# NEWS for rsync 3.3.1 (UNRELEASED)
+
+## Changes in this version:
+
+### BUG FIXES:
+
+- Fixed the included popt to avoid a memory error on modern gcc versions.
+
+### INTERNAL:
+
+ - Updated included popt to version 1.19.
+
+------------------------------------------------------------------------------
+
 # NEWS for rsync 3.3.0 (6 Apr 2024)
 
 ## Changes in this version:
@@ -4762,6 +4776,7 @@
 
 | RELEASE DATE | VER.   | DATE OF COMMIT\* | PROTOCOL    |
 |--------------|--------|------------------|-------------|
+| ?? Apr 2024  | 3.3.1  |                  | 31          |
 | 06 Apr 2024  | 3.3.0  |                  | 31          |
 | 20 Oct 2022  | 3.2.7  |                  | 31          |
 | 09 Sep 2022  | 3.2.6  |                  | 31          |
diff --git a/version.h b/version.h
index b162146e..47d5dbe1 100644
--- a/version.h
+++ b/version.h
@@ -1,2 +1,2 @@
-#define RSYNC_VERSION "3.3.0"
+#define RSYNC_VERSION "3.3.1pre"
 #define MAINTAINER_TZ_OFFSET -7.0