From 731c0c18beeee8c43fa475b9ec1e89f2a9a263b5 Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Sun, 9 Feb 2020 16:23:46 +0800 Subject: [PATCH] all: cleanup third party makefiles --- debian/.gitignore | 4 -- debian/changelog | 68 ------------------- debian/compat | 1 - debian/control | 33 --------- debian/copyright | 33 --------- debian/rules | 12 ---- debian/source/format | 1 - debian/ttyd.manpages | 1 - debian/watch | 4 -- msys2/README.md | 8 --- msys2/json-c/PKGBUILD | 27 -------- msys2/libwebsockets/PKGBUILD | 37 ---------- msys2/ttyd/PKGBUILD | 34 ---------- openwrt/README.md | 15 ---- openwrt/luci-app-terminal/Makefile | 17 ----- .../luasrc/controller/terminal.lua | 9 --- .../luasrc/view/terminal.htm | 9 --- .../luci-app-terminal/po/zh-cn/terminal.po | 5 -- .../luci-app-terminal/root/etc/init.d/ttyd | 26 ------- openwrt/ttyd/Makefile | 47 ------------- 20 files changed, 391 deletions(-) delete mode 100644 debian/.gitignore delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/ttyd.manpages delete mode 100644 debian/watch delete mode 100644 msys2/README.md delete mode 100644 msys2/json-c/PKGBUILD delete mode 100644 msys2/libwebsockets/PKGBUILD delete mode 100644 msys2/ttyd/PKGBUILD delete mode 100644 openwrt/README.md delete mode 100644 openwrt/luci-app-terminal/Makefile delete mode 100644 openwrt/luci-app-terminal/luasrc/controller/terminal.lua delete mode 100644 openwrt/luci-app-terminal/luasrc/view/terminal.htm delete mode 100644 openwrt/luci-app-terminal/po/zh-cn/terminal.po delete mode 100755 openwrt/luci-app-terminal/root/etc/init.d/ttyd delete mode 100644 openwrt/ttyd/Makefile diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 143abac..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -debhelper-build-stamp -files -*.substvars -install diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 1ae9ea7..0000000 --- a/debian/changelog +++ /dev/null @@ -1,68 +0,0 @@ -ttyd (1.5.2-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Mon, 5 Aug 2019 21:34:50 +0800 - -ttyd (1.5.1-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Sun, 12 Jul 2019 20:56:00 +0800 - -ttyd (1.5.0-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Sun, 23 Jun 2019 19:04:15 +0800 - -ttyd (1.4.4-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Sat, 21 Apr 2019 10:28:00 +0800 - -ttyd (1.4.3-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Sat, 20 Apr 2019 13:35:00 +0800 - -ttyd (1.4.2-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Tue, 12 Sep 2018 12:17:00 +0800 - -ttyd (1.4.1-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Tue, 4 Sep 2018 11:52:50 +0800 - -ttyd (1.4.0-1) unstable; urgency=medium - - * New upstream release. - - -- Shuanglei Tao Thu, 18 Jan 2018 20:32:20 +0800 - -ttyd (1.3.3-1) unstable; urgency=medium - - * New upstream release. - - -- Boyuan Yang <073plan@gmail.com> Mon, 24 Jul 2017 15:47:53 +0800 - -ttyd (1.3.2-1) unstable; urgency=medium - - * New upstream release. - + Add support for --max-clients option. - + Upgrade to use xterm.js 2.5.0. - + Add man page for ttyd(1). - - -- Boyuan Yang <073plan@gmail.com> Fri, 21 Apr 2017 18:12:43 +0800 - -ttyd (1.3.1-1) unstable; urgency=medium - - * Initial release. - - -- Boyuan Yang <073plan@gmail.com> Thu, 30 Mar 2017 12:10:50 +0800 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control deleted file mode 100644 index 049f002..0000000 --- a/debian/control +++ /dev/null @@ -1,33 +0,0 @@ -Source: ttyd -Section: utils -Priority: optional -Maintainer: Boyuan Yang <073plan@gmail.com> -Build-Depends: - debhelper (>= 9), - cmake, - pkg-config, - libwebsockets-dev, - libjson-c-dev, - libssl-dev, - xxd | vim-common, -Standards-Version: 3.9.8 -Homepage: https://tsl0922.github.io/ttyd/ -Vcs-Git: https://github.com/tsl0922/ttyd.git -Vcs-Browser: https://github.com/tsl0922/ttyd.git - -Package: ttyd -Architecture: any -Depends: - ${misc:Depends}, - ${shlibs:Depends}, -Description: Web terminal sharing tool - Ttyd is a simple command-line tool for sharing terminal over the web, inspired - by GoTTY. - . - Features include: - * Built on top of Libwebsockets with C for speed - * Fully-featured terminal based on Xterm.js with CJK and IME support - * SSL support based on OpenSSL - * Run any custom command with options - * Basic authentication support and many other custom options - * Cross platform: macOS, Linux, FreeBSD, OpenWrt/LEDE, Windows diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 4fd24b8..0000000 --- a/debian/copyright +++ /dev/null @@ -1,33 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: ttyd -Upstream-Contact: Shuanglei Tao -Source: https://github.com/tsl0922/ttyd - -Files: * -Copyright: 2016-2017 Shuanglei Tao -License: Expat - -Files: debian/* -Copyright: 2017 Boyuan Yang <073plan@gmail.com> -License: Expat - -License: Expat - Copyright (c) 2016 Shuanglei Tao - . - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 5e4886a..0000000 --- a/debian/rules +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. -#export DH_VERBOSE = 1 - -# see FEATURE AREAS in dpkg-buildflags(1) -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - -# main packaging script based on dh7 syntax -%: - dh $@ diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/ttyd.manpages b/debian/ttyd.manpages deleted file mode 100644 index 645fff1..0000000 --- a/debian/ttyd.manpages +++ /dev/null @@ -1 +0,0 @@ -man/ttyd.1 diff --git a/debian/watch b/debian/watch deleted file mode 100644 index c4855d2..0000000 --- a/debian/watch +++ /dev/null @@ -1,4 +0,0 @@ -version=4 -opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%ttyd-$1.tar.gz%" \ - https://github.com/tsl0922/ttyd/tags \ - (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate diff --git a/msys2/README.md b/msys2/README.md deleted file mode 100644 index 93561cd..0000000 --- a/msys2/README.md +++ /dev/null @@ -1,8 +0,0 @@ -# Building ttyd with [MSYS2][1] - -1. Download and install the **latest** version of [MSYS2][1], make sure you've updated the package database. -2. Install required dependencies: `pacman -S git binutils` and if you are using a 32bit Windows, also: `pacman -S mingw-w64-i686-cmake` -3. Build json-c and libwebsockets: cd to package dir and run `makepkg -s && pacman -U *.pkg.tar.xz`. -4. Build ttyd: cd to ttyd dir and run `makepkg --skipchecksums`. - - [1]: http://msys2.github.io diff --git a/msys2/json-c/PKGBUILD b/msys2/json-c/PKGBUILD deleted file mode 100644 index 29e4f5f..0000000 --- a/msys2/json-c/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# Maintainer: Shuanglei Tao - -pkgname=json-c -pkgver=0.13.1 -pkgrel=1 -pkgdesc="A JSON implementation in C" -arch=('i686' 'x86_64') -url="https://github.com/json-c/json-c" -license=('MIT') -makedepends=('gcc' 'make' 'autoconf') -source=("https://s3.amazonaws.com/json-c_releases/releases/${pkgname}-${pkgver}.tar.gz") -sha256sums=('b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure \ - --prefix=/usr \ - --enable-shared \ - --enable-static - make -} - -package() { - options=('staticlibs') - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR="$pkgdir" install -} \ No newline at end of file diff --git a/msys2/libwebsockets/PKGBUILD b/msys2/libwebsockets/PKGBUILD deleted file mode 100644 index 090766e..0000000 --- a/msys2/libwebsockets/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Shuanglei Tao - -pkgname="libwebsockets" -pkgver=2.4.2 -pkgrel=1 -pkgdesc="A lightweight pure C library for websockets (msys)" -arch=('i686' 'x86_64') -url="http://libwebsockets.org" -license=('LGPL 2.1') -makedepends=('gcc' 'cmake' 'zlib-devel' 'openssl-devel') -source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/warmcat/${pkgname}/archive/v${pkgver}.tar.gz") -sha256sums=('73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" -} - -build() { - mkdir -p "${srcdir}/build-${CARCH}" - cd "${srcdir}/build-${CARCH}" - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLWS_USE_BUNDLED_ZLIB=OFF \ - -DLWS_WITHOUT_TESTAPPS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - ../${pkgname}-${pkgver} - - make -} - -package() { - depends=('zlib-devel' 'openssl-devel') - options=('staticlibs') - cd "${srcdir}/build-${CARCH}" - make DESTDIR=${pkgdir} install -} \ No newline at end of file diff --git a/msys2/ttyd/PKGBUILD b/msys2/ttyd/PKGBUILD deleted file mode 100644 index 2bad0dc..0000000 --- a/msys2/ttyd/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Shuanglei Tao - -pkgname="ttyd" -pkgver=1.5.2 -pkgrel=1 -pkgdesc="A command-line tool for sharing terminal over the web" -arch=('i686' 'x86_64') -url="https://github.com/tsl0922/ttyd" -license=('MIT') -makedepends=('gcc' 'cmake' 'json-c' 'libwebsockets' 'vim') -source=(${pkgname}-${pkgver}.tar.gz::"https://github.com/tsl0922/${pkgname}/archive/${pkgver}.tar.gz") -sha256sums=('757a9b5b5dd3de801d7db8fab6035d97ea144b02a51c78bdab28a8e07bcf05d6') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" -} - -build() { - mkdir -p "${srcdir}/build-${CARCH}" - cd "${srcdir}/build-${CARCH}" - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - ../${pkgname}-${pkgver} - - make -} - -package() { - options=('staticlibs' 'strip') - cd "${srcdir}/build-${CARCH}" - make DESTDIR=${pkgdir} install -} diff --git a/openwrt/README.md b/openwrt/README.md deleted file mode 100644 index 2eac22b..0000000 --- a/openwrt/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Building with OpenWrt/LEDE SDK - -Ubuntu 64bit and LEDE `ar71xx` as example: - -```bash -sudo apt-get install build-essential subversion libncurses5-dev zlib1g-dev gawk gcc-multilib flex git-core gettext libssl-dev -curl -sLo- https://downloads.lede-project.org/snapshots/targets/ar71xx/generic/lede-sdk-ar71xx-generic_gcc-5.4.0_musl-1.1.15.Linux-x86_64.tar.xz | tar Jx -cd lede-sdk-ar71xx-generic_gcc-5.4.0_musl-1.1.15.Linux-x86_64 -./scripts/feeds update -a -./scripts/feeds install -a -make defconfig -make package/feeds/packages/ttyd/compile V=99 -``` - -The compiled `.ipk` package will be in the `bin/packages` folder. \ No newline at end of file diff --git a/openwrt/luci-app-terminal/Makefile b/openwrt/luci-app-terminal/Makefile deleted file mode 100644 index 301a3b8..0000000 --- a/openwrt/luci-app-terminal/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2016 Openwrt.org -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=LuCI support for ttyd -LUCI_DEPENDS:=+ttyd -LUCI_PKGARCH:=all -PKG_VERSION:=1.0 -PKG_RELEASE:=1 - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature - diff --git a/openwrt/luci-app-terminal/luasrc/controller/terminal.lua b/openwrt/luci-app-terminal/luasrc/controller/terminal.lua deleted file mode 100644 index ab95f46..0000000 --- a/openwrt/luci-app-terminal/luasrc/controller/terminal.lua +++ /dev/null @@ -1,9 +0,0 @@ -module("luci.controller.terminal", package.seeall) - -function index() - if not (luci.sys.call("pidof ttyd > /dev/null") == 0) then - return - end - - entry({"admin", "system", "terminal"}, template("terminal"), _("Terminal"), 10).leaf = true -end \ No newline at end of file diff --git a/openwrt/luci-app-terminal/luasrc/view/terminal.htm b/openwrt/luci-app-terminal/luasrc/view/terminal.htm deleted file mode 100644 index db9b46c..0000000 --- a/openwrt/luci-app-terminal/luasrc/view/terminal.htm +++ /dev/null @@ -1,9 +0,0 @@ -<%+header%> -
-

<%=translate("Terminal")%>

- -
- -<%+footer%> \ No newline at end of file diff --git a/openwrt/luci-app-terminal/po/zh-cn/terminal.po b/openwrt/luci-app-terminal/po/zh-cn/terminal.po deleted file mode 100644 index 9fb0596..0000000 --- a/openwrt/luci-app-terminal/po/zh-cn/terminal.po +++ /dev/null @@ -1,5 +0,0 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - -msgid "Terminal" -msgstr "终端" diff --git a/openwrt/luci-app-terminal/root/etc/init.d/ttyd b/openwrt/luci-app-terminal/root/etc/init.d/ttyd deleted file mode 100755 index 8721665..0000000 --- a/openwrt/luci-app-terminal/root/etc/init.d/ttyd +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -SERVICE_WRITE_PID=1 -SERVICE_DAEMONIZE=1 - -start() { - logger -t TTYD 'Starting ttyd service' - service_start /usr/bin/ttyd -i br-lan /bin/login - return 0 -} - -stop() { - if [ -n "`pidof ttyd`" ]; then - logger -t TTYD 'Shutting down ttyd service' - service_stop /usr/bin/ttyd - fi - return 0 -} - -restart() { - logger -t TTYD 'Restarting ttyd service' - stop - sleep 2 - start -} diff --git a/openwrt/ttyd/Makefile b/openwrt/ttyd/Makefile deleted file mode 100644 index 201b0f3..0000000 --- a/openwrt/ttyd/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2016 Shuanglei Tao -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ttyd -PKG_VERSION:=1.5.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_URL:=https://github.com/tsl0922/ttyd.git -PKG_SOURCE_VERSION:=$(PKG_VERSION) - -PKG_LICENSE:=MIT -PKG_LICENSE_FILES:=LICENSE - -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/ttyd - SECTION:=utils - CATEGORY:=Utilities - TITLE:=Command-line tool for sharing terminal over the web - DEPENDS:=+libopenssl +libjson-c +libpthread +libwebsockets-openssl - URL:=https://github.com/tsl0922/ttyd - SUBMENU:=Terminal - MAINTAINER:=Shuanglei Tao -endef - -define Package/ttyd/description -ttyd is a command-line tool for sharing terminal over the web. -endef - -define Package/ttyd/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ttyd $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,ttyd)) -- 2.43.4