diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fcdd0f6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/org.eclipse.tm.terminal-*.tar.xz +/*.src.rpm +/org.eclipse.tm-6b04c544d33c31b1f3da168d0e606d8d20ed541d.tar.xz +/org.eclipse.tm-3ba744c9c82dcd8df82263254431180b7db6e93a.tar.xz diff --git a/0001-Fix-feature-includes.patch b/0001-Fix-feature-includes.patch new file mode 100644 index 0000000..5a78b2c --- /dev/null +++ b/0001-Fix-feature-includes.patch @@ -0,0 +1,90 @@ +From 92ce1ecdedfeb73eb3c995dc01733fea299b55fb Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Thu, 14 Mar 2019 17:08:53 +0000 +Subject: [PATCH] Fix feature includes + +--- + rse/features/org.eclipse.rse.ftp-feature/feature.xml | 9 +-------- + rse/features/org.eclipse.rse.telnet-feature/feature.xml | 8 +------- + .../org.eclipse.tm.terminal.view.feature/feature.xml | 2 -- + .../org.eclipse.tm.terminal.view.rse.feature/feature.xml | 3 --- + 4 files changed, 2 insertions(+), 20 deletions(-) + +diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml +index 4db815c..9a779f5 100644 +--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml ++++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml +@@ -37,19 +37,12 @@ + + + +- ++ + + + + + +- +- + + + ++ + + +- +- + + + +- +- + + + +diff --git a/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml b/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml +index 35a974a..c4f43ba 100644 +--- a/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml ++++ b/terminal/features/org.eclipse.tm.terminal.view.rse.feature/feature.xml +@@ -36,11 +36,8 @@ + + + +- +- + + +- + + + pam_set_item(PAM_TTY(), $tty_name); ++ $res = $pamh->pam_authenticate; + $classpath=$ENV{CLASSPATH}; + $suOptions="-"; + +- if ($passwd eq $encryptedPWD) ++ if ($res == PAM_SUCCESS()) + { + print("success\n"); + diff --git a/eclipse-rse-server-scripts.patch b/eclipse-rse-server-scripts.patch new file mode 100644 index 0000000..4335b88 --- /dev/null +++ b/eclipse-rse-server-scripts.patch @@ -0,0 +1,74 @@ +--- rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/ssl.properties.fix 2011-12-14 17:55:18.000000000 -0500 ++++ rse/plugins/org.eclipse.rse.services.dstore/serverruntime/data/ssl.properties 2011-12-14 17:59:39.000000000 -0500 +@@ -40,7 +40,12 @@ disable_server_ssl=false + ################################### + # The keystore file and password need to be specified for the + # server to use. If none is specified, the server falls back +-# to use the same keystore and password as the daemon ++# to use the same keystore and password as the daemon. Note ++# that the server uses the home directory of the userid as its ++# working directory so a relative path will only work for both ++# daemon and server if the keystore file is copied. A full path ++# is required to share a single keystore file between server and ++# daemon. + # + #server_keystore_file= +-#server_keystore_password= +\ No newline at end of file ++#server_keystore_password= +--- rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl.fix 2011-12-05 18:58:17.000000000 -0500 ++++ rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/daemon.pl 2011-12-13 19:02:13.000000000 -0500 +@@ -45,16 +45,17 @@ else + $trace = $ENV{DSTORE_TRACING_ON}; + } + +- $dir= $ENV{PWD}; +- $plugins_dir=$dir; ++ $dir= "$ENV{PWD}"; ++ $configdir= "/etc/sysconfig/rseserver/"; ++ $plugins_dir="/usr/share/java/eclipse-rse-server"; + +- $ENV{A_PLUGIN_PATH}="$plugins_dir/"; ++ $ENV{A_PLUGIN_PATH}="$dir/"; + + + $oldClasspath = $ENV{CLASSPATH}; + + +- $ENV{CLASSPATH}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar"; ++ $ENV{CLASSPATH}="$dir:$configdir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar"; + if (defined ($oldClasspath)) + { + $ENV{CLASSPATH}="$ENV{CLASSPATH}:$oldClasspath"; +--- rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl.fix 2011-12-05 18:58:21.000000000 -0500 ++++ rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/linux/server.pl 2011-12-06 18:16:23.000000000 -0500 +@@ -17,18 +17,17 @@ $port = $ARGV[0]; + $timeout = $ARGV[1]; + $clientUserID = $ARGV[2]; + +-$dir= $ENV{PWD}; +-#print("path $dir"); ++$dir="$ENV{PWD}"; ++$configdir="/etc/sysconfig/rseserver"; + +-#$plugins_dir=substr($dir,0,rindex($dir,"/")); +-$plugins_dir=$dir; ++$plugins_dir="/usr/share/java/eclipse-rse-server"; + + $ENV{A_PLUGIN_PATH}="$plugins_dir/"; + + $oldClasspath = $ENV{CLASSPATH}; + + +-$ENV{"CLASSPATH"}="$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath"; ++$ENV{"CLASSPATH"}="$dir:$configdir:$plugins_dir:$plugins_dir/dstore_extra_server.jar:$plugins_dir/dstore_core.jar:$plugins_dir/dstore_miners.jar:$plugins_dir/clientserver.jar:$oldClasspath"; + + if (!defined($timeout)) + { +@@ -46,4 +45,4 @@ else + } + } + +-$ENV{CLASSPATH}=$oldClasspath; +\ No newline at end of file ++$ENV{CLASSPATH}=$oldClasspath; diff --git a/eclipse-tm-terminal.spec b/eclipse-tm-terminal.spec new file mode 100644 index 0000000..9477edc --- /dev/null +++ b/eclipse-tm-terminal.spec @@ -0,0 +1,232 @@ +%global git_tag 3ba744c9c82dcd8df82263254431180b7db6e93a + +# Set this to avoid building CDT and remotes bundles to eliminate +# a circular dep on CDT->tm-terminal->remote->CDT +%bcond_with bootstrap + +Name: eclipse-tm-terminal +Version: 4.5.102 +Release: 1%{?dist} +Summary: Terminal plug-in for Eclipse + +License: EPL-2.0 +URL: https://www.eclipse.org/tm/ +Source0: https://git.eclipse.org/c/tm/org.eclipse.tm.git/snapshot/org.eclipse.tm-%{git_tag}.tar.xz + +Patch0: 0001-Fix-feature-includes.patch + +BuildArch: noarch + +# Upstream Eclipse no longer supports non-64bit arches +ExcludeArch: s390 %{arm} %{ix86} + +BuildRequires: tycho +BuildRequires: tycho-extras +BuildRequires: apache-commons-net +BuildRequires: eclipse-egit +BuildRequires: eclipse-license2 +%if %{without bootstrap} +# Needed for additional terminal connectors +BuildRequires: eclipse-cdt +BuildRequires: eclipse-remote +BuildRequires: rxtx >= 2.2-0.15 +%endif + +# Obsoletes/Provides added in F30 +Obsoletes: eclipse-rse < %{version}-%{release} +Obsoletes: eclipse-rse-server < %{version}-%{release} +Obsoletes: %{name}-rse < %{version}-%{release} + +%description +An integrated Eclipse View for the local command prompt (console) or +remote hosts (SSH, Telnet, Serial). + +%if %{without bootstrap} +%package connectors +Summary: Additional connectors for Terminal plug-in for Eclipse + +%description connectors +Additional connectors for Terminal plug-in for Eclipse. +%endif + +%package sdk +Summary: Terminal SDK plug-in for Eclipse +Requires: %{name} = %{version}-%{release} +%if %{without bootstrap} +Requires: %{name}-connectors = %{version}-%{release} +%endif + +%description sdk +Sources and developer resources for the Terminal plug-in for Eclipse. + +%prep +%setup -q -n org.eclipse.tm-%{git_tag} +%patch0 -p1 + +# Don't need to build repo for RPM builds +%pom_disable_module site +%pom_remove_plugin :target-platform-configuration +%pom_remove_plugin :tycho-packaging-plugin + +# Fixup erroneous license info, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=538094 +sed -i -e '/license-feature-version/s/1\.0\.1\.qualifier/0.0.0/' \ + $(find -name feature.xml) + +# Don't ship tests, examples, etc +%pom_disable_module org.eclipse.tm.terminal.test terminal/plugins + +# Don't build and ship obsolete RSE plugins +%pom_disable_module rse +%pom_disable_module org.eclipse.tm.terminal.view.ui.rse terminal/plugins +%pom_disable_module org.eclipse.tm.terminal.view.rse.feature terminal/features +%pom_disable_module org.eclipse.tm.terminal.view.rse.sdk.feature terminal/features + +# When bootstrapping, disable the plugins and features that +# create cyclical dependencies +%if %{with bootstrap} +%pom_disable_module org.eclipse.tm.terminal.connector.process terminal/plugins +%pom_disable_module org.eclipse.tm.terminal.connector.local terminal/plugins +%pom_disable_module org.eclipse.tm.terminal.connector.local.feature terminal/features +%pom_disable_module org.eclipse.tm.terminal.connector.local.sdk.feature terminal/features +%pom_disable_module org.eclipse.tm.terminal.connector.remote terminal/plugins +%pom_disable_module org.eclipse.tm.terminal.connector.remote.feature terminal/features +%pom_disable_module org.eclipse.tm.terminal.connector.remote.sdk.feature terminal/features +%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.sdk.feature']" \ + terminal/features/org.eclipse.tm.terminal.sdk.feature/feature.xml +%endif + +# Remove cycles between subpackages +%pom_xpath_remove "import[@feature='org.eclipse.tm.terminal.connector.local.feature']" \ + terminal/features/org.eclipse.tm.terminal.feature/feature.xml + +# Fix trying to include non-existent files +sed -i -e "s|feature.properties,\\\|feature.properties|g" terminal/features/org.eclipse.tm.terminal.view.feature/build.properties +sed -i -e "s|p2.inf||g" terminal/features/org.eclipse.tm.terminal.view.feature/build.properties + +# Enable serial connector +sed -i -e '//s///' \ + terminal/{plugins,features}/pom.xml + +# No need to install poms +%mvn_package "::pom::" __noinstall +%mvn_package "::jar:sources{,-feature}:" sdk +%mvn_package ":*.sdk.feature" sdk +%mvn_package ":*.sdk" sdk +%mvn_package ":org.eclipse.tm.terminal.connector.{local,process,remote,cdtserial,serial}*" connectors +%mvn_package ":" + +%build +%if %{without bootstrap} +%mvn_build -j -- -Pcdtserial,rxtxserial +%else +%mvn_build -j -- -P"!cdtserial,!rxtxserial" +%endif + +%install +%mvn_install + +%files -f .mfiles + +%if %{without bootstrap} +%files connectors -f .mfiles-connectors +%endif + +%files sdk -f .mfiles-sdk + +%changelog +* Mon Sep 16 2019 Mat Booth - 4.5.102-1 +- Update to latest upstream release +- Retire obsolete RSE plugins + +* Wed Jul 24 2019 Fedora Release Engineering - 4.5.100-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Mar 14 2019 Mat Booth - 4.5.100-1 +- Update to 2019-03 release +- Update license tag +- Add RSE subpackage and obsolete the old one since the projects + were merged +- Restrict to same architectures as Eclipse itself + +* Thu Jan 31 2019 Fedora Release Engineering - 4.4.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Aug 22 2018 Mat Booth - 4.4.0-4 +- Actually update license tag + +* Wed Aug 22 2018 Mat Booth - 4.4.0-3 +- Update license tag + +* Thu Jul 12 2018 Fedora Release Engineering - 4.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 11 2018 Mat Booth - 4.4.0-1 +- Update to photon release + +* Wed Mar 21 2018 Mat Booth - 4.3.0-1 +- Add patch to add API to read TextCanvas content + +* Wed Feb 07 2018 Fedora Release Engineering - 4.3.0-0.4.gitfa298da +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 4.3.0-0.3.gitfa298da +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jun 19 2017 Mat Booth - 4.3.0-0.2.gitfa298da +- Allow conditionally building against cdt and remote + +* Sun Jun 18 2017 Mat Booth - 4.3.0-0.1.gitfa298da +- Update to Oxygen snapshot + +* Fri Mar 31 2017 Mat Booth - 4.2.0-2 +- Build serial port bundles, resolves rhbz#1272785 + +* Wed Mar 29 2017 Mat Booth - 4.2.0-1 +- Update to latest upstream release + +* Fri Feb 10 2017 Fedora Release Engineering - 4.1.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Aug 12 2016 Mat Booth - 4.1.0-3 +- Split out remote connecter, which requires CDT via PTP Remote + +* Fri Aug 12 2016 Mat Booth - 4.1.0-2 +- Improve bootstrapping mode +- Split out local connecter, which requires CDT +- Add a SDK package for source bundles + +* Fri Jul 01 2016 Mat Booth - 4.1.0-1 +- Update to Neon release + +* Thu Mar 03 2016 Sopot Cela - 4.0.0-6.gitcf7ef3f +- Update for Mars.2 release + +* Wed Feb 03 2016 Fedora Release Engineering - 4.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Sep 14 2015 Roland Grunberg - 4.0.0-4 +- Rebuild as an Eclipse p2 Droplet. + +* Thu Aug 27 2015 Mat Booth - 4.0.0-3 +- Add bootstrap mode to allow breaking of cyclic dependencies + +* Thu Jun 25 2015 Roland Grunberg - 4.0.0-2 +- Rebuild to correct auto-generated requires. + +* Wed Jun 24 2015 Alexander Kurtakov 4.0.0-1 +- Update to 4.0 final. + +* Wed Jun 17 2015 Alexander Kurtakov 4.0.0-0.5.gite58c5d3 +- Fix FTBFS - pom/manifest/feature qualifier misalignments. + +* Wed Jun 17 2015 Fedora Release Engineering - 4.0.0-0.4.gite58c5d3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jun 3 2015 Alexander Kurtakov 4.0.0-0.3.gite58c5d3 +- New git snapshot. + +* Tue Jun 2 2015 Alexander Kurtakov 4.0.0-0.2.git4ea71eb +- Fix review comments. + +* Tue Jun 2 2015 Alexander Kurtakov 4.0.0-0.1.git4ea71eb +- Initial packaging diff --git a/sources b/sources new file mode 100644 index 0000000..4791908 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (org.eclipse.tm-3ba744c9c82dcd8df82263254431180b7db6e93a.tar.xz) = 209d2464fe9459119f033f0789abfe6b7d72c4f82c3af5c30f232cb8ddb07f186a0984e3eeb307b6cb8d58a80f4112c9c2bc3107f3cb16743a1acb2c5b0834ca