Sync from SUSE:SLFO:1.1 apache-commons-vfs2 revision a3bb4f9cde453333b46438b671a47b13

apache-commons-vfs2.changes

@@ -1,19 +1,3 @@
--------------------------------------------------------------------
-Tue Mar 25 11:15:55 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to upstream version 2.10.0
-  * Fixes bsc#1239973, CVE-2025-27553: Possible path traversal
-    issue when using NameScope.DESCENDENT
-  * Fixes bsc#1239974, CVE-2025-30474: Failing to find an FTP file
-    can reveal the URI's password in an error message
-  * For detailed list of all changes, see RELEASE-NOTES.txt file
-    distributed with the package
-
--------------------------------------------------------------------
-Wed Oct  2 15:33:47 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Spec file cleanup
-
 -------------------------------------------------------------------
 Wed Oct 25 15:51:45 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

apache-commons-vfs2.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package apache-commons-vfs2
+# spec file
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,40 +18,41 @@
 
 %global base_name vfs2
 %global short_name commons-%{base_name}
-%bcond_with cifs
+%bcond_with tests
-%bcond_with mina
+%bcond_with hadoop
+%bcond_without ftp
 %bcond_without ssh
 Name:           apache-%{short_name}
-Version:        2.10.0
+Version:        2.2
 Release:        0
 Summary:        Commons Virtual File System
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            https://commons.apache.org/vfs/
+URL:            http://commons.apache.org/vfs/
-Source0:        https://archive.apache.org/dist/commons/vfs/source/commons-vfs-%{version}-src.tar.gz
+Source0:        http://www.apache.org/dist/commons/vfs/source/%{short_name}-distribution-%{version}-src.tar.gz
 Source1:        %{short_name}-build.tar.xz
 BuildRequires:  ant
 BuildRequires:  apache-commons-collections4
 BuildRequires:  apache-commons-compress
 BuildRequires:  apache-commons-httpclient
-BuildRequires:  apache-commons-io
-BuildRequires:  apache-commons-lang3
 BuildRequires:  apache-commons-logging
 BuildRequires:  apache-commons-net > 2
 BuildRequires:  fdupes
-BuildRequires:  httpcomponents-client
+BuildRequires:  javapackages-local
-BuildRequires:  httpcomponents-core
+Requires:       mvn(commons-logging:commons-logging)
-BuildRequires:  javapackages-local >= 6
 BuildArch:      noarch
-%if %{with cifs}
+%if %{with hadoop}
-BuildRequires:  jcifs
+BuildRequires:  mvn(org.apache.hadoop:hadoop-common)
-%endif
+BuildRequires:  mvn(org.apache.hadoop:hadoop-hdfs)
-%if %{with mina}
-BuildRequires:  mvn(org.apache.mina:mina-core)
 %endif
 %if %{with ssh}
 BuildRequires:  jsch
 %endif
+%if %{with ftp}
+%if %{with tests}
+BuildRequires:  mvn(org.apache.ftpserver:ftpserver-core)
+%endif
+%endif
 
 %description
 Commons VFS provides a single API for accessing various
@@ -98,58 +99,68 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q -n commons-vfs-%{version} -a1
 
+%pom_remove_plugin :apache-rat-plugin
+
+# Convert from dos to unix line ending
+for file in LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt; do
+ sed -i.orig 's|\r||g' $file
+ touch -r $file.orig $file
+ rm $file.orig
+done
+
 # Disable unwanted module
 %pom_disable_module commons-vfs2-distribution
 
 # Fix ant gId
 %pom_change_dep -r :ant org.apache.ant:
+# Upadate bouncycastle aId
+%pom_change_dep -r :bcprov-jdk16 :bcprov-jdk15on
 
-# Remove webdav client
+# Remove unwanted dependency jackrabbit-{standalone,webdav}
 %pom_remove_dep -r org.apache.jackrabbit:
-%pom_disable_module commons-vfs2-jackrabbit1
-%pom_disable_module commons-vfs2-jackrabbit2
 
-# Remove http5 client
+rm -rf commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/webdav
-%pom_remove_dep -r org.apache.httpcomponents.client5:httpclient5
+
-rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/http5
+# Use old version of sshd-core
-rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/http5s
+%pom_remove_dep -r :sshd-core
+
+# hadoop has been retired
+%if %{without hadoop}
+%pom_remove_dep -r org.apache.hadoop
+rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/hdfs
+%endif
+
+# not really needed
+%pom_remove_plugin :maven-checkstyle-plugin
+%pom_remove_plugin :findbugs-maven-plugin
+
+%if %{without ssh}
+%pom_remove_dep -r :jsch
+rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/sftp
+rm commons-vfs2-examples/src/main/java/org/apache/commons/vfs2/libcheck/SftpCheck.java
+%endif
 
-# ftpserver is not available
 %if %{without ftp}
 %pom_remove_dep -r :ftpserver-core
 rm -r commons-vfs2/src/{main,test}/java/org/apache/commons/vfs2/provider/ftps
 %endif
 
-# jcifs not packaged and also export controlled in the US
+%pom_remove_parent commons-vfs2 commons-vfs2-examples
-%if %{without cifs}
-%pom_remove_dep :jcifs
-%endif
-
-# mina is not available
-%if %{without mina}
-%pom_remove_dep :mina-core
-%endif
 
 %build
 mkdir -p lib
-build-jar-repository -s lib \
+build-jar-repository -s lib ant commons-httpclient commons-logging commons-compress commons-collections4 commons-net
-  ant \
+%if %{with hadoop}
-  commons-collections4 \
+build-jar-repository -s lib hadoop/common hadoop/hdfs
-  commons-compress \
+%endif
-  commons-httpclient \
-  commons-io \
-  commons-lang3 \
-  commons-logging \
-  commons-net \
-  httpcomponents/httpclient \
-  httpcomponents/httpcore
 %if %{with ssh}
-build-jar-repository -s lib \
+build-jar-repository -s lib jsch
-  jsch
 %endif
 
-ant \
+%{ant} \
+%if %{without tests}
   -Dtest.skip=true \
+%endif
   package javadoc
 
 %install
@@ -161,9 +172,9 @@ install -pm 0644 %{short_name}-examples/target/%{short_name}-examples-%{version}
 ln -sf %{short_name}-examples.jar %{buildroot}%{_javadir}/%{name}-examples.jar
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-%{mvn_install_pom} %{short_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+install -pm 0644 %{short_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 %add_maven_depmap %{short_name}.pom %{short_name}.jar
-%{mvn_install_pom} %{short_name}-examples/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}-examples.pom
+install -pm 0644 %{short_name}-examples/pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}-examples.pom
 %add_maven_depmap %{short_name}-examples.pom %{short_name}-examples.jar -f examples
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{short_name}-examples
@@ -176,7 +187,7 @@ echo "ant commons-logging commons-vfs" > commons-vfs
 install -p -m 644 commons-vfs %{buildroot}%{_sysconfdir}/ant.d/commons-vfs
 
 %files -f .mfiles
-%doc README.md RELEASE-NOTES.txt
+%doc README.txt RELEASE-NOTES.txt
 %license LICENSE.txt NOTICE.txt
 %{_javadir}/%{name}.jar