From 32d08112cbdc77273e1a159864c2519a1821750d Mon Sep 17 00:00:00 2001
From: wang_yue111 <648774160@qq.com>
Date: Tue, 22 Sep 2020 10:16:54 +0800
Subject: [PATCH] Fix build errors for apache-mina upgrade

---
 fix-build-error-for-apache-mina-upgrade.patch | 49 +++++++++++++++++++
 mina-ftpserver.spec                           | 10 +++-
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 fix-build-error-for-apache-mina-upgrade.patch

diff --git a/fix-build-error-for-apache-mina-upgrade.patch b/fix-build-error-for-apache-mina-upgrade.patch
new file mode 100644
index 0000000..39e2de6
--- /dev/null
+++ b/fix-build-error-for-apache-mina-upgrade.patch
@@ -0,0 +1,49 @@
+From 3493bb746c97ed9a1b122060c577da68ad70fc0e Mon Sep 17 00:00:00 2001
+Subject: [PATCH] fix build errors for apache-mina upgrade
+
+---
+ .../apache/ftpserver/impl/FtpIoSession.java   | 21 +++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/src/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java b/src/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
+index 4b8ae06..dee60ca 100644
+--- a/src/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
++++ b/src/core/src/main/java/org/apache/ftpserver/impl/FtpIoSession.java
+@@ -138,6 +138,21 @@ public class FtpIoSession implements IoSession {
+ 		return wrappedSession.close(immediately);
+ 	}
+ 
++	/**
++	 * @see IoSession#closeNow()
++	 */
++	public CloseFuture closeNow()
++	{
++		return wrappedSession.closeNow();
++	}
++
++	/**
++	 * @see IoSession#closeOnFlush()
++	 */
++	public CloseFuture closeOnFlush()
++	{
++		return wrappedSession.closeOnFlush();
++	}
+ 	/**
+ 	 * @see IoSession#containsAttribute(Object)
+ 	 */
+@@ -422,6 +437,12 @@ public class FtpIoSession implements IoSession {
+ 		return wrappedSession.isConnected();
+ 	}
+ 
++	/**
++	 * @see IoSession#isActive()
++	 */
++	public boolean isActive() {
++		return wrappedSession.isActive();
++	}
+ 	/**
+ 	 * @see IoSession#isIdle(IdleStatus)
+ 	 */
+-- 
+2.23.0
+
diff --git a/mina-ftpserver.spec b/mina-ftpserver.spec
index 917cc18..d0c20dd 100644
--- a/mina-ftpserver.spec
+++ b/mina-ftpserver.spec
@@ -1,11 +1,12 @@
 Name:                mina-ftpserver
 Version:             1.0.6
-Release:             1
+Release:             2
 Summary:             A 100% pure Java FTP server
 License:             ASL 2.0
 URL:                 http://mina.apache.org/ftpserver-project/
 Source0:             https://archive.apache.org/dist/mina/ftpserver/%{version}/ftpserver-%{version}-src.tar.gz
 Patch0:              mina-ftpserver-1.0.6-mina2.0.9.patch
+Patch1:              fix-build-error-for-apache-mina-upgrade.patch
 
 BuildRequires:       maven-local mvn(commons-codec:commons-codec) mvn(commons-net:commons-net)
 BuildRequires:       mvn(hsqldb:hsqldb:1) mvn(junit:junit) mvn(log4j:log4j:1.2.17)
@@ -51,12 +52,14 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n apache-ftpserver-%{version}
-mv src/* .
 find . -name "*.bat" -delete
 find . -name "*.class" -delete
 find . -name "*.exe" -delete
 find . -name "*.jar" -delete
 %patch0 -p1
+%patch1 -p1
+mv src/* ./
+
 %pom_disable_module distribution
 %pom_disable_module ftpserver-example-spring-war examples
 %pom_remove_plugin :maven-source-plugin
@@ -104,5 +107,8 @@ rm core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java  \
 %license LICENSE NOTICE
 
 %changelog
+* Mon 21 Sep 2020 wangyue <wangyue92@huawei.com> - 1.0.6-2
+- Fix build errors for apache-mina upgrade
+
 * Tue Jul 28 2020 leiju <leiju4@huawei.com> - 1.0.6-1
 - Package init
-- 
Gitee