From 7ed49126a4be7922dce272ce5d48147347d3761e Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 26 Jun 2021 12:25:24 +0200 Subject: [PATCH 1/4] security policy --- .github/ISSUE_TEMPLATE/security.md | 23 +++++++++++++++++++++++ SECURITY.md | 11 +++++++++++ 2 files changed, 34 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/security.md create mode 100644 SECURITY.md diff --git a/.github/ISSUE_TEMPLATE/security.md b/.github/ISSUE_TEMPLATE/security.md new file mode 100644 index 0000000..6c00db8 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/security.md @@ -0,0 +1,23 @@ +--- +name: Security report +about: Create a report of a security vulnerability +title: "[SECURITY] - ISSUE_TITLE" +labels: security +assignees: veeso + +--- + +## Description + +Severity: + +- [ ] **critical** +- [ ] high +- [ ] medium +- [ ] low + +A clear and concise description of the security vulnerability. + +## Additional information + +Add any other context about the problem here. diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..9dcbbbd --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,11 @@ +# Security Policy + +## Supported Versions + +Only latst version of termscp has the latest security updates. +Because of that, **you should always consider updating termscp to the latest version**. + +## Reporting a Vulnerability + +If you have any security vulnerability or concern to report, please open an issue using the `Security report` template. +w \ No newline at end of file From 97a62def113073ce1322e3fbdb9f7927634d5a3e Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 26 Jun 2021 12:32:11 +0200 Subject: [PATCH 2/4] Brought all extern crate to top level --- src/config/mod.rs | 3 --- src/filetransfer/ftp_transfer.rs | 7 ------ src/filetransfer/mod.rs | 2 -- src/filetransfer/scp_transfer.rs | 6 ----- src/filetransfer/sftp_transfer.rs | 3 --- src/fs/explorer/formatter.rs | 5 ---- src/fs/explorer/mod.rs | 2 -- src/host/mod.rs | 2 -- src/lib.rs | 24 +++++++++++++++++++ src/system/bookmarks_client.rs | 2 -- src/system/config_client.rs | 2 -- src/system/environment.rs | 3 --- src/system/keys/keyringstorage.rs | 4 ---- src/ui/activities/auth/bookmarks.rs | 3 --- src/ui/activities/auth/mod.rs | 4 ---- .../activities/filetransfer/actions/copy.rs | 1 - .../activities/filetransfer/actions/open.rs | 2 -- src/ui/activities/filetransfer/mod.rs | 6 ----- src/ui/activities/filetransfer/session.rs | 6 ----- src/ui/activities/filetransfer/update.rs | 2 -- src/ui/activities/filetransfer/view.rs | 5 ---- src/ui/activities/setup/mod.rs | 4 ---- src/ui/components/msgbox.rs | 3 --- src/ui/context.rs | 4 ---- src/ui/input.rs | 2 -- src/utils/crypto.rs | 3 --- src/utils/fmt.rs | 3 --- src/utils/git.rs | 2 -- src/utils/parser.rs | 5 ---- src/utils/random.rs | 2 -- 30 files changed, 24 insertions(+), 98 deletions(-) diff --git a/src/config/mod.rs b/src/config/mod.rs index 06bcb44..7220843 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -28,9 +28,6 @@ // Modules pub mod serializer; -// Deps -extern crate edit; - // Locals use crate::filetransfer::FileTransferProtocol; diff --git a/src/filetransfer/ftp_transfer.rs b/src/filetransfer/ftp_transfer.rs index 9cb6199..20088c7 100644 --- a/src/filetransfer/ftp_transfer.rs +++ b/src/filetransfer/ftp_transfer.rs @@ -25,13 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Dependencies -extern crate chrono; -extern crate ftp4; -#[cfg(os_target = "windows")] -extern crate path_slash; -extern crate regex; - use super::{FileTransfer, FileTransferError, FileTransferErrorType}; use crate::fs::{FsDirectory, FsEntry, FsFile}; use crate::utils::fmt::{fmt_time, shadow_password}; diff --git a/src/filetransfer/mod.rs b/src/filetransfer/mod.rs index 0158e10..a58a191 100644 --- a/src/filetransfer/mod.rs +++ b/src/filetransfer/mod.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// dependencies -extern crate wildmatch; // locals use crate::fs::{FsEntry, FsFile}; // ext diff --git a/src/filetransfer/scp_transfer.rs b/src/filetransfer/scp_transfer.rs index 34907a0..dbeeca1 100644 --- a/src/filetransfer/scp_transfer.rs +++ b/src/filetransfer/scp_transfer.rs @@ -25,12 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Dependencies -#[cfg(os_target = "windows")] -extern crate path_slash; -extern crate regex; -extern crate ssh2; - // Locals use super::{FileTransfer, FileTransferError, FileTransferErrorType}; use crate::fs::{FsDirectory, FsEntry, FsFile}; diff --git a/src/filetransfer/sftp_transfer.rs b/src/filetransfer/sftp_transfer.rs index 5f353f0..54dcf51 100644 --- a/src/filetransfer/sftp_transfer.rs +++ b/src/filetransfer/sftp_transfer.rs @@ -25,9 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Dependencies -extern crate ssh2; - // Locals use super::{FileTransfer, FileTransferError, FileTransferErrorType}; use crate::fs::{FsDirectory, FsEntry, FsFile}; diff --git a/src/fs/explorer/formatter.rs b/src/fs/explorer/formatter.rs index 96bdbba..d3448fb 100644 --- a/src/fs/explorer/formatter.rs +++ b/src/fs/explorer/formatter.rs @@ -25,11 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate bytesize; -extern crate regex; -#[cfg(target_family = "unix")] -extern crate users; // Locals use super::FsEntry; use crate::utils::fmt::{fmt_path_elide, fmt_pex, fmt_time}; diff --git a/src/fs/explorer/mod.rs b/src/fs/explorer/mod.rs index 320867b..3d33421 100644 --- a/src/fs/explorer/mod.rs +++ b/src/fs/explorer/mod.rs @@ -28,8 +28,6 @@ // Mods pub(crate) mod builder; mod formatter; -// Deps -extern crate bitflags; // Locals use super::FsEntry; use formatter::Formatter; diff --git a/src/host/mod.rs b/src/host/mod.rs index f832f6e..f9913de 100644 --- a/src/host/mod.rs +++ b/src/host/mod.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// dependencies -extern crate wildmatch; // ext use std::fs::{self, File, Metadata, OpenOptions}; use std::path::{Path, PathBuf}; diff --git a/src/lib.rs b/src/lib.rs index 3847ecd..ba2e3d9 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -32,12 +32,36 @@ #[macro_use] extern crate bitflags; +extern crate bytesize; +extern crate chrono; +extern crate content_inspector; +extern crate crossterm; +extern crate dirs; +extern crate edit; +extern crate ftp4; +extern crate hostname; +#[cfg(feature = "with-keyring")] +extern crate keyring; #[macro_use] extern crate lazy_static; #[macro_use] extern crate log; #[macro_use] extern crate magic_crypt; +extern crate open; +#[cfg(target_os = "windows")] +extern crate path_slash; +extern crate rand; +extern crate regex; +extern crate ssh2; +extern crate tempfile; +extern crate textwrap; +extern crate tuirealm; +extern crate ureq; +#[cfg(target_family = "unix")] +extern crate users; +extern crate whoami; +extern crate wildmatch; pub mod activity_manager; pub mod bookmarks; diff --git a/src/system/bookmarks_client.rs b/src/system/bookmarks_client.rs index f17680f..e9afd48 100644 --- a/src/system/bookmarks_client.rs +++ b/src/system/bookmarks_client.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate whoami; // Crate #[cfg(any(target_os = "windows", target_os = "macos"))] use super::keys::keyringstorage::KeyringStorage; diff --git a/src/system/config_client.rs b/src/system/config_client.rs index 9caaa0b..babc379 100644 --- a/src/system/config_client.rs +++ b/src/system/config_client.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate rand; // Locals use crate::config::serializer::ConfigSerializer; use crate::config::{SerializerError, SerializerErrorKind, UserConfig}; diff --git a/src/system/environment.rs b/src/system/environment.rs index c17cc99..ce1db6e 100644 --- a/src/system/environment.rs +++ b/src/system/environment.rs @@ -25,9 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate dirs; - // Ext use std::path::{Path, PathBuf}; diff --git a/src/system/keys/keyringstorage.rs b/src/system/keys/keyringstorage.rs index 5fae681..349357f 100644 --- a/src/system/keys/keyringstorage.rs +++ b/src/system/keys/keyringstorage.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate keyring; // Local use super::{KeyStorage, KeyStorageError}; // Ext @@ -100,8 +98,6 @@ impl KeyStorage for KeyringStorage { #[cfg(test)] mod tests { - - extern crate whoami; use super::*; use pretty_assertions::assert_eq; diff --git a/src/ui/activities/auth/bookmarks.rs b/src/ui/activities/auth/bookmarks.rs index 7bf4534..44c4499 100644 --- a/src/ui/activities/auth/bookmarks.rs +++ b/src/ui/activities/auth/bookmarks.rs @@ -25,9 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Dependencies -extern crate dirs; - // Locals use super::{AuthActivity, FileTransferProtocol}; use crate::system::bookmarks_client::BookmarksClient; diff --git a/src/ui/activities/auth/mod.rs b/src/ui/activities/auth/mod.rs index 76be0e0..a88ca79 100644 --- a/src/ui/activities/auth/mod.rs +++ b/src/ui/activities/auth/mod.rs @@ -31,10 +31,6 @@ mod misc; mod update; mod view; -// Dependencies -extern crate crossterm; -extern crate tuirealm; - // locals use super::{Activity, Context, ExitReason}; use crate::filetransfer::FileTransferProtocol; diff --git a/src/ui/activities/filetransfer/actions/copy.rs b/src/ui/activities/filetransfer/actions/copy.rs index 27e43a6..1d28fe1 100644 --- a/src/ui/activities/filetransfer/actions/copy.rs +++ b/src/ui/activities/filetransfer/actions/copy.rs @@ -25,7 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -extern crate tempfile; // locals use super::{FileTransferActivity, FsEntry, LogLevel, SelectedEntry, TransferPayload}; use crate::filetransfer::FileTransferErrorType; diff --git a/src/ui/activities/filetransfer/actions/open.rs b/src/ui/activities/filetransfer/actions/open.rs index d2536cc..c3de73a 100644 --- a/src/ui/activities/filetransfer/actions/open.rs +++ b/src/ui/activities/filetransfer/actions/open.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// deps -extern crate open; // locals use super::{FileTransferActivity, FsEntry, LogLevel, SelectedEntry, TransferPayload}; // ext diff --git a/src/ui/activities/filetransfer/mod.rs b/src/ui/activities/filetransfer/mod.rs index da53142..2c8be22 100644 --- a/src/ui/activities/filetransfer/mod.rs +++ b/src/ui/activities/filetransfer/mod.rs @@ -33,12 +33,6 @@ pub(self) mod session; pub(self) mod update; pub(self) mod view; -// Dependencies -extern crate chrono; -extern crate crossterm; -extern crate textwrap; -extern crate tuirealm; - // locals use super::{Activity, Context, ExitReason}; use crate::filetransfer::ftp_transfer::FtpFileTransfer; diff --git a/src/ui/activities/filetransfer/session.rs b/src/ui/activities/filetransfer/session.rs index 8a55b83..6607a06 100644 --- a/src/ui/activities/filetransfer/session.rs +++ b/src/ui/activities/filetransfer/session.rs @@ -25,12 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate bytesize; -extern crate content_inspector; -extern crate crossterm; -extern crate tempfile; - // Locals use super::{FileTransferActivity, LogLevel}; use crate::filetransfer::FileTransferError; diff --git a/src/ui/activities/filetransfer/update.rs b/src/ui/activities/filetransfer/update.rs index 272163d..55834ee 100644 --- a/src/ui/activities/filetransfer/update.rs +++ b/src/ui/activities/filetransfer/update.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// deps -extern crate bytesize; // locals use super::{ actions::SelectedEntry, browser::FileExplorerTab, FileTransferActivity, LogLevel, diff --git a/src/ui/activities/filetransfer/view.rs b/src/ui/activities/filetransfer/view.rs index ffc78a4..534173a 100644 --- a/src/ui/activities/filetransfer/view.rs +++ b/src/ui/activities/filetransfer/view.rs @@ -25,11 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate bytesize; -extern crate hostname; -#[cfg(target_family = "unix")] -extern crate users; // locals use super::{browser::FileExplorerTab, Context, FileTransferActivity}; use crate::fs::explorer::FileSorting; diff --git a/src/ui/activities/setup/mod.rs b/src/ui/activities/setup/mod.rs index 1040914..dc99cc8 100644 --- a/src/ui/activities/setup/mod.rs +++ b/src/ui/activities/setup/mod.rs @@ -32,10 +32,6 @@ mod config; mod update; mod view; -// Deps -extern crate crossterm; -extern crate tuirealm; - // Locals use super::{Activity, Context, ExitReason}; // Ext diff --git a/src/ui/components/msgbox.rs b/src/ui/components/msgbox.rs index 8b21152..aae1120 100644 --- a/src/ui/components/msgbox.rs +++ b/src/ui/components/msgbox.rs @@ -25,9 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// deps -extern crate textwrap; -extern crate tuirealm; // locals use crate::utils::fmt::align_text_center; // ext diff --git a/src/ui/context.rs b/src/ui/context.rs index d9affa6..e790eb7 100644 --- a/src/ui/context.rs +++ b/src/ui/context.rs @@ -25,10 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Dependencies -extern crate crossterm; -extern crate tuirealm; - // Locals use super::input::InputHandler; use super::store::Store; diff --git a/src/ui/input.rs b/src/ui/input.rs index 13026d6..083d488 100644 --- a/src/ui/input.rs +++ b/src/ui/input.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -extern crate crossterm; - use crossterm::event::{poll, read, Event}; use std::time::Duration; diff --git a/src/utils/crypto.rs b/src/utils/crypto.rs index a7a54e6..b90ffa2 100644 --- a/src/utils/crypto.rs +++ b/src/utils/crypto.rs @@ -25,9 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate magic_crypt; - // Ext use magic_crypt::MagicCryptTrait; diff --git a/src/utils/fmt.rs b/src/utils/fmt.rs index 1957ab1..a7921e3 100644 --- a/src/utils/fmt.rs +++ b/src/utils/fmt.rs @@ -25,9 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -extern crate chrono; -extern crate textwrap; - use chrono::prelude::*; use std::path::{Path, PathBuf}; use std::time::{Duration, SystemTime}; diff --git a/src/utils/git.rs b/src/utils/git.rs index cab9070..c888b6e 100644 --- a/src/utils/git.rs +++ b/src/utils/git.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate ureq; // Locals use super::parser::parse_semver; // Others diff --git a/src/utils/parser.rs b/src/utils/parser.rs index 9ac603d..86c0286 100644 --- a/src/utils/parser.rs +++ b/src/utils/parser.rs @@ -25,11 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Dependencies -extern crate chrono; -extern crate regex; -extern crate whoami; - // Locals use crate::filetransfer::FileTransferProtocol; #[cfg(not(test))] // NOTE: don't use configuration during tests diff --git a/src/utils/random.rs b/src/utils/random.rs index 0cc2ad5..8afa1b0 100644 --- a/src/utils/random.rs +++ b/src/utils/random.rs @@ -25,8 +25,6 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -// Deps -extern crate rand; // Ext use rand::{distributions::Alphanumeric, thread_rng, Rng}; From 398f518b2fe81effa154754726c4cbf5d67dedb6 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 26 Jun 2021 14:39:09 +0200 Subject: [PATCH 3/4] test_utils_git_check_for_updates not when github and mac and bsd --- src/utils/git.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/utils/git.rs b/src/utils/git.rs index c888b6e..6aae409 100644 --- a/src/utils/git.rs +++ b/src/utils/git.rs @@ -78,7 +78,15 @@ mod tests { use super::*; #[test] - #[cfg(not(all(target_os = "macos", feature = "github-actions")))] + #[cfg(not(all( + any( + target_os = "macos", + target_os = "freebsd", + target_os = "netbsd", + target_os = "netbsd" + ), + feature = "github-actions" + )))] fn test_utils_git_check_for_updates() { assert!(check_for_updates("100.0.0").ok().unwrap().is_none()); assert!(check_for_updates("0.0.1").ok().unwrap().is_some()); From 3cbd2ed0132f01125990c5fcf5484d081eb25643 Mon Sep 17 00:00:00 2001 From: veeso Date: Sat, 26 Jun 2021 14:40:23 +0200 Subject: [PATCH 4/4] Removed archlinux build stuff --- .github/workflows/aur-pub.yml | 21 ---------------- dist/build/deploy.sh | 15 ------------ dist/build/x86_64_archlinux/Dockerfile | 33 -------------------------- dist/pkgs/arch/.SRCINFO | 14 ----------- dist/pkgs/arch/PKGBUILD | 16 ------------- 5 files changed, 99 deletions(-) delete mode 100644 .github/workflows/aur-pub.yml delete mode 100644 dist/build/x86_64_archlinux/Dockerfile delete mode 100644 dist/pkgs/arch/.SRCINFO delete mode 100644 dist/pkgs/arch/PKGBUILD diff --git a/.github/workflows/aur-pub.yml b/.github/workflows/aur-pub.yml deleted file mode 100644 index d7727eb..0000000 --- a/.github/workflows/aur-pub.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: aur-pub -on: - push: - tags: - - "*" -jobs: - aur-publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Publish AUR package - uses: KSXGitHub/github-actions-deploy-aur@v2.2.4 - with: - pkgname: termscp - pkgbuild: ./dist/pkgs/arch/PKGBUILD - commit_username: ${{ secrets.AUR_USERNAME }} - commit_email: ${{ secrets.AUR_EMAIL }} - ssh_private_key: ${{ secrets.AUR_KEY }} - commit_message: Update AUR package - ssh_keyscan_types: rsa,dsa,ecdsa,ed25519 diff --git a/dist/build/deploy.sh b/dist/build/deploy.sh index 10b520e..89f836d 100755 --- a/dist/build/deploy.sh +++ b/dist/build/deploy.sh @@ -28,20 +28,5 @@ cd - mkdir -p ${PKGS_DIR}/rpm/ CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_centos7 termscp-${VERSION}-x86_64_centos7) docker cp ${CONTAINER_NAME}:/usr/src/termscp/target/release/rpmbuild/RPMS/x86_64/termscp-${VERSION}-1.el7.x86_64.rpm ${PKGS_DIR}/rpm/termscp-${VERSION}-1.x86_64.rpm -# Build x86_64_archlinux - -##################### TEMP REMOVED ################################### -# cd x86_64_archlinux/ -# docker build --tag termscp-${VERSION}-x86_64_archlinux . -# # Create container and get AUR pkg -# cd - -# mkdir -p ${PKGS_DIR}/arch/ -# CONTAINER_NAME=$(docker create termscp-${VERSION}-x86_64_archlinux termscp-${VERSION}-x86_64_archlinux) -# docker cp ${CONTAINER_NAME}:/usr/src/termscp/termscp-${VERSION}-x86_64.tar.gz ${PKGS_DIR}/arch/ -# docker cp ${CONTAINER_NAME}:/usr/src/termscp/PKGBUILD ${PKGS_DIR}/arch/ -# docker cp ${CONTAINER_NAME}:/usr/src/termscp/.SRCINFO ${PKGS_DIR}/arch/ -# # Replace termscp-bin with termscp in PKGBUILD -# sed -i 's/termscp-bin/termscp/g' ${PKGS_DIR}/arch/PKGBUILD -##################### TEMP REMOVED ################################### exit $? diff --git a/dist/build/x86_64_archlinux/Dockerfile b/dist/build/x86_64_archlinux/Dockerfile deleted file mode 100644 index f9a1cc8..0000000 --- a/dist/build/x86_64_archlinux/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM archlinux:latest as builder - -WORKDIR /usr/src/ -# Install dependencies -RUN pacman -Syu --noconfirm \ - git \ - gcc \ - openssl \ - pkg-config \ - sudo -# Install rust -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rust.sh && \ - chmod +x /tmp/rust.sh && \ - /tmp/rust.sh -y -# Create build user -RUN useradd build -m && \ - passwd -d build && \ - mkdir -p termscp && \ - chown -R build.build termscp/ -# Clone repository -RUN git clone https://github.com/veeso/termscp.git -# Set workdir to termscp -WORKDIR /usr/src/termscp/ -# Install cargo arxch -RUN source $HOME/.cargo/env && cargo install cargo-aur -# Build for x86_64 -RUN source $HOME/.cargo/env && cargo build --release -# Build pkgs -RUN source $HOME/.cargo/env && cargo aur -# Create SRCINFO -RUN chown -R build.build ../termscp/ && sudo -u build bash -c 'makepkg --printsrcinfo > .SRCINFO' - -CMD ["sh"] diff --git a/dist/pkgs/arch/.SRCINFO b/dist/pkgs/arch/.SRCINFO deleted file mode 100644 index fbbb60d..0000000 --- a/dist/pkgs/arch/.SRCINFO +++ /dev/null @@ -1,14 +0,0 @@ -pkgbase = termscp - pkgdesc = termscp is a SCP/SFTP/FTPS client for command line with an integrated UI to explore the remote file system. Basically WinSCP on a terminal. - pkgver = 0.6.0 - pkgrel = 1 - url = https://github.com/veeso/termscp - arch = x86_64 - license = MIT - provides = termscp - options = strip - source = https://github.com/veeso/termscp/releases/download/v0.6.0/termscp-0.6.0-x86_64.tar.gz - sha256sums = 279b4cab7da68c6db0efc054ddf72e36de85910110721b66d5cdc55833c99ccf - -pkgname = termscp - diff --git a/dist/pkgs/arch/PKGBUILD b/dist/pkgs/arch/PKGBUILD deleted file mode 100644 index ce950fb..0000000 --- a/dist/pkgs/arch/PKGBUILD +++ /dev/null @@ -1,16 +0,0 @@ -# Maintainer: Christian Visintin -pkgname=termscp -pkgver=0.6.0 -pkgrel=1 -pkgdesc="termscp is a SCP/SFTP/FTPS client for command line with an integrated UI to explore the remote file system. Basically WinSCP on a terminal." -url="https://github.com/veeso/termscp" -license=("MIT") -arch=("x86_64") -provides=("termscp") -options=("strip") -source=("https://github.com/veeso/termscp/releases/download/v$pkgver/termscp-$pkgver-x86_64.tar.gz") -sha256sums=("f66a1d1602dc8ea336ba4a42bfbe818edc9c20722e1761b471b76109c272094c") - -package() { - install -Dm755 termscp -t "$pkgdir/usr/bin/" -}