!17 Update to 1.1.4
From: @wk333 Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot
Gitee
commit
74c4587b4f
BIN
apache-ftpserver-1.1.4-src.tar.gz
Normal file
BIN
apache-ftpserver-1.1.4-src.tar.gz
Normal file
Binary file not shown.
@ -1,49 +0,0 @@
|
||||
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
|
||||
|
||||
34
fix-xml-invalid.patch
Normal file
34
fix-xml-invalid.patch
Normal file
@ -0,0 +1,34 @@
|
||||
diff --git a/src/core/src/test/resources/spring-config/config-property-placeholder.xml b/src/core/src/test/resources/spring-config/config-property-placeholder.xml
|
||||
index e32682d..e3a4aa2 100644
|
||||
--- a/src/core/src/test/resources/spring-config/config-property-placeholder.xml
|
||||
+++ b/src/core/src/test/resources/spring-config/config-property-placeholder.xml
|
||||
@@ -24,7 +24,7 @@
|
||||
xsi:schemaLocation="
|
||||
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
|
||||
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
|
||||
- http://mina.apache.org/ftpserver/spring/v1 https://mina.apache.org/ftpserver-project/ftpserver-1.0.xsd
|
||||
+ http://mina.apache.org/ftpserver/spring/v1 http://mina.apache.org/ftpserver/ftpserver-1.0.xsd
|
||||
">
|
||||
<context:property-placeholder location="src/test/resources/spring-config/placeholder.properties"/>
|
||||
|
||||
diff --git a/src/core/src/test/resources/spring-config/config-spring-1.xml b/src/core/src/test/resources/spring-config/config-spring-1.xml
|
||||
index d5bf7f9..b836cf6 100644
|
||||
--- a/src/core/src/test/resources/spring-config/config-spring-1.xml
|
||||
+++ b/src/core/src/test/resources/spring-config/config-spring-1.xml
|
||||
@@ -21,10 +21,9 @@
|
||||
xmlns:beans="http://www.springframework.org/schema/beans"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="
|
||||
- http://www.springframework.org/schema/beans
|
||||
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
|
||||
- http://mina.apache.org/ftpserver/spring/v1
|
||||
- https://mina.apache.org/ftpserver-project/ftpserver-1.0.xsd"
|
||||
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
|
||||
+ http://mina.apache.org/ftpserver/spring/v1 http://mina.apache.org/ftpserver/ftpserver-1.0.xsd
|
||||
+ "
|
||||
max-logins="500"
|
||||
anon-enabled="false"
|
||||
max-anon-logins="123"
|
||||
--
|
||||
2.27.0
|
||||
|
||||
Binary file not shown.
@ -1,54 +0,0 @@
|
||||
From 4c28da4d8a8d84823854b2cf19a22f692fad43e9 Mon Sep 17 00:00:00 2001
|
||||
Date: Mon, 21 Sep 2020 20:55:58 +0800
|
||||
|
||||
---
|
||||
.../org/apache/ftpserver/impl/FtpIoSession.java | 15 +++++++++++++++
|
||||
.../ftpserver/listener/nio/FtpHandlerAdapter.java | 3 +++
|
||||
2 files changed, 18 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 9f79c3a..4b8ae06 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
|
||||
@@ -37,6 +37,7 @@ import org.apache.ftpserver.ftplet.FtpSession;
|
||||
import org.apache.ftpserver.ftplet.Structure;
|
||||
import org.apache.ftpserver.ftplet.User;
|
||||
import org.apache.ftpserver.listener.Listener;
|
||||
+import org.apache.mina.core.filterchain.IoFilter;
|
||||
import org.apache.mina.core.filterchain.IoFilterChain;
|
||||
import org.apache.mina.core.future.CloseFuture;
|
||||
import org.apache.mina.core.future.ReadFuture;
|
||||
@@ -876,4 +877,18 @@ public class FtpIoSession implements IoSession {
|
||||
public void updateThroughput(long currentTime, boolean force) {
|
||||
wrappedSession.updateThroughput(currentTime, force);
|
||||
}
|
||||
+
|
||||
+ public boolean isSecured() {
|
||||
+ // If the session does not have a SslFilter, we can return false
|
||||
+ IoFilterChain chain = getFilterChain();
|
||||
+
|
||||
+ IoFilter sslFilter = chain.get(SslFilter.class);
|
||||
+
|
||||
+ if (sslFilter != null) {
|
||||
+ // Get the SslHandler from the SslFilter
|
||||
+ return ((SslFilter)sslFilter).isSslStarted(this);
|
||||
+ } else {
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
diff --git a/src/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java b/src/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java
|
||||
index 5899784..776a78e 100644
|
||||
--- a/src/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java
|
||||
+++ b/src/core/src/main/java/org/apache/ftpserver/listener/nio/FtpHandlerAdapter.java
|
||||
@@ -99,4 +99,7 @@ public class FtpHandlerAdapter implements IoHandler {
|
||||
|
||||
}
|
||||
|
||||
+ public void inputClosed(IoSession session) throws Exception {
|
||||
+ session.close(true);
|
||||
+ }
|
||||
}
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
Name: mina-ftpserver
|
||||
Version: 1.0.6
|
||||
Release: 4
|
||||
Version: 1.1.4
|
||||
Release: 1
|
||||
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
|
||||
Source0: https://archive.apache.org/dist/mina/ftpserver/%{version}/apache-ftpserver-%{version}-src.tar.gz
|
||||
Patch0: fix-xml-invalid.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)
|
||||
@ -15,7 +14,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
|
||||
BuildRequires: mvn(org.apache.mina:mina-core) mvn(org.osgi:org.osgi.core)
|
||||
BuildRequires: mvn(org.slf4j:jcl-over-slf4j) mvn(org.slf4j:slf4j-api)
|
||||
BuildRequires: mvn(org.slf4j:slf4j-log4j12) mvn(org.springframework:spring-beans)
|
||||
BuildRequires: mvn(org.springframework:spring-context)
|
||||
BuildRequires: mvn(org.springframework:spring-context) log4j
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -56,19 +55,19 @@ 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
|
||||
%pom_remove_plugin -r :rat-maven-plugin
|
||||
%pom_remove_plugin -r :apache-rat-plugin
|
||||
%pom_remove_plugin -r :properties-maven-plugin
|
||||
%pom_remove_plugin :jxr-maven-plugin ftplet-api
|
||||
%pom_xpath_set "pom:Bundle-SymbolicName" '${project.artifactId}' ftplet-api
|
||||
%pom_xpath_set "pom:Bundle-SymbolicName" '${project.artifactId}' core
|
||||
%pom_xpath_set "pom:Bundle-SymbolicName" '${project.artifactId}' examples/ftpserver-osgi-ftplet-service
|
||||
%pom_xpath_set "pom:Bundle-SymbolicName" '${project.artifactId}' examples/ftpserver-osgi-spring-service
|
||||
%pom_xpath_remove "pom:Private-Package" core
|
||||
%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']/pom:configuration/pom:instructions" "
|
||||
<Private-Package>org.apache.ftpserver.command.impl,
|
||||
org.apache.ftpserver.command.impl.listing,
|
||||
@ -80,7 +79,6 @@ org.apache.ftpserver.usermanager.impl,
|
||||
org.apache.ftpserver.util</Private-Package>" core
|
||||
%pom_change_dep org.osgi:osgi_R4_core org.osgi:org.osgi.core examples/ftpserver-osgi-ftplet-service
|
||||
%pom_change_dep -r :hsqldb :hsqldb:1
|
||||
%pom_change_dep -r :log4j :log4j:1.2.17
|
||||
%mvn_package :ftpserver-examples examples
|
||||
%mvn_package :ftpserver-osgi-*-service examples
|
||||
rm core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java \
|
||||
@ -90,7 +88,7 @@ rm core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java \
|
||||
core/src/test/java/org/apache/ftpserver/clienttests/PasvUsedPortTest.java
|
||||
|
||||
%build
|
||||
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
|
||||
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Denforcer.fail=false
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
@ -106,6 +104,9 @@ rm core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java \
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Sat Nov 05 2022 wangkai <wangkai385@h-partners.com> - 1.1.4-1
|
||||
- Update to 1.1.4
|
||||
|
||||
* Tue Feb 9 2021 baizhonggui <baizhonggui@huawei.com> - 1.0.6-4
|
||||
- Remove unused model
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user