Skip to content
Commits on Source (123)
{
"image": "docker.io/openwrt/sdk",
"features": {
}
}
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=iotop
PKG_VERSION:=0.6
PKG_RELEASE:=1
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://guichaz.free.fr/iotop/files/$(PKG_SOURCE)?
PKG_HASH:=3adea2a24eda49bbbaeb4e6ed2042355b441dbd7161e883067a02bfc8dcef75b
PKG_LICENSE:=GPL
include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python3-package.mk
PYTHON3_PKG_SETUP_ARGS:="--optimize=1"
define Package/iotop
SECTION:=admin
CATEGORY:=Administration
URL:=http://guichaz.free.fr/iotop/
TITLE:=iotop
DEPENDS:=+python3-light
VARIANT:=python3
endef
define Package/iotop/description
Python program with a top like UI used to show of behalf of which process is the I/O going on
endef
$(eval $(call Py3Package,iotop))
$(eval $(call BuildPackage,iotop))
$(eval $(call BuildPackage,iotop-src))
--- ./iotop.py-orig 2013-05-27 00:44:18.000000000 +0200
+++ ./iotop.py 2019-11-26 13:32:22.383729370 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# iotop: Display I/O usage of processes in a top like UI
# Copyright (c) 2007, 2008 Guillaume Chazarain <guichaz@gmail.com>
# GPL version 2 or later
--- ./setup.py-orig 2013-05-27 00:44:18.000000000 +0200
+++ ./setup.py 2019-11-23 02:30:27.237162616 +0100
@@ -7,7 +7,7 @@ from iotop.version import VERSION
# Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
# while still honoring the choice of installing into local/ or not.
if hasattr(distutils_install, 'INSTALL_SCHEMES'):
- for d in distutils_install.INSTALL_SCHEMES.itervalues():
+ for d in distutils_install.INSTALL_SCHEMES.values():
if d.get('scripts', '').endswith('/bin'):
d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
--- ./setup.py-orig 2019-11-26 10:14:27.000000000 +0100
+++ ./setup.py 2019-11-26 13:30:00.403150112 +0100
@@ -4,13 +4,6 @@ from distutils.core import setup
from distutils.command import install as distutils_install
from iotop.version import VERSION
-# Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
-# while still honoring the choice of installing into local/ or not.
-if hasattr(distutils_install, 'INSTALL_SCHEMES'):
- for d in distutils_install.INSTALL_SCHEMES.values():
- if d.get('scripts', '').endswith('/bin'):
- d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
-
setup(name='iotop',
version=VERSION,
description='Per process I/O bandwidth monitor',
--- ./iotop/data.py-orig 2020-01-16 11:21:12.827874630 +0100
+++ ./iotop/data.py 2020-01-16 11:43:56.467458186 +0100
@@ -285,8 +285,8 @@ class ProcessInfo(DumpableObject):
def get_cmdline(self):
# A process may exec, so we must always reread its cmdline
try:
- proc_cmdline = open('/proc/%d/cmdline' % self.pid)
- cmdline = proc_cmdline.read(4096)
+ proc_cmdline = open('/proc/%d/cmdline' % self.pid, 'rb')
+ cmdline = proc_cmdline.read(4096).decode('utf-8', errors='replace')
except IOError:
return '{no such process}'
proc_status = parse_proc_pid_status(self.pid)
#!/bin/sh /etc/rc.common
# Copyright (C) 2014 OpenWrt.org
START=60
START=99
USE_PROCD=1
PROG=/usr/bin/monit
......
......@@ -44,7 +44,7 @@ source kernel {
};
destination messages {
file("/var/log/messages");
file("/var/log/messages" template("${C_DATE} ${HOST} ${MSGHDR}${MESSAGE}\n") );
};
log {
......
include $(TOPDIR)/rules.mk
PKG_NAME:=luaffi
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/jmckaskill/luaffi
PKG_SOURCE_DATE:=2013-11-08
PKG_SOURCE_VERSION=abc638c9341025580099dcf77795c4b320ba0e63
PKG_MIRROR_HASH:=f92d5f36fc54c36f292ec994ce34f6153685050f54405bdb838a29f959068c21
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=README.md
PKG_BUILD_DEPENDS:=lua/host
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/luaffi
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
TITLE:=Library for calling C function and manipulating C types from lua
URL:=https://github.com/jmckaskill/luaffi
DEPENDS:= +lua
endef
define Package/luaffi/description
Library for calling C function and manipulating C types from lua. Designed to be interface compatible with the FFI library in luajit.
endef
define Package/luaffi/install
$(INSTALL_DIR) $(1)/usr/lib/lua/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/ffi.so $(1)/usr/lib/lua/
endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,luaffi))
--- ./Makefile-orig 2013-11-08 23:01:32.000000000 +0100
+++ ./Makefile 2021-10-18 22:45:50.342744216 +0200
@@ -3,10 +3,10 @@
PKG_CONFIG=pkg-config
LUA=lua
-LUA_CFLAGS=`$(PKG_CONFIG) --cflags lua5.2 2>/dev/null || $(PKG_CONFIG) --cflags lua`
+LUA_CFLAGS=`$(PKG_CONFIG) --cflags lua5.1 2>/dev/null || $(PKG_CONFIG) --cflags lua`
SOCFLAGS=-fPIC
SOCC=$(CC) -shared $(SOCFLAGS)
-CFLAGS=-fPIC -g -Wall -Werror $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99
+CFLAGS=-fPIC -g -Wall -Werror $(LUA_CFLAGS) -fvisibility=hidden -Wno-unused-function --std=gnu99 -Wno-error=misleading-indentation
MODNAME=ffi
MODSO=$(MODNAME).so
include $(TOPDIR)/rules.mk
PKG_NAME:=lualogging
PKG_VERSION:=1.8.2
PKG_RELEASE:=1
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYRIGHT
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/lunarmodules/lualogging/archive/refs/tags/v${PKG_VERSION}.tar.gz?
PKG_HASH:=30655889db14104f1509d20ba423a43ea8ce85f4289acdcf6b62477159482c60
PKG_BUILD_DEPENDS:=lua/host luarocks/host
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/lualogging
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
TITLE:=Simple API to use logging features in Lua
URL:=https://github.com/lunarmodules/lualogging
DEPENDS:= +lua +luasocket
endef
define Package/lualogging/description
LuaLogging provides a simple API to use logging features in Lua. Its design was based on log4j.
endef
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include
# Note: the duplicate environment exports are not a typo!
# First is for luarocks, then the second is for the compilation
# invoked by luarocks
# (Same setup as luaposix)
define Build/Compile
cd $(PKG_BUILD_DIR) && \
LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \
LUA_PKGNAME=lua5.1 \
CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC)" LD="$(TARGET_CC)" \
luarocks make --pack-binary-rock rockspecs/lualogging-${PKG_VERSION}-1.rockspec \
LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \
YAML_DIR=$(STAGING_DIR)/usr \
LUA_INCDIR=$(STAGING_DIR)/usr/include \
LUA_PKGNAME=lua5.1 \
CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC)" LD="$(TARGET_CC)"
endef
define Package/lualogging/install
$(INSTALL_DIR) $(1)/usr/lib/lua/logging
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/logging/* $(1)/usr/lib/lua/logging/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/logging.lua $(1)/usr/lib/lua/
endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,lualogging))
include $(TOPDIR)/rules.mk
PKG_NAME:=nginx-lua-prometheus
PKG_VERSION:=0.20230607
PKG_RELEASE:=1
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE
PKG_SOURCE:=$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/knyar/nginx-lua-prometheus/archive/refs/tags
PKG_HASH:=4e5be322a24d4de2b5e8e5c54c43b02a77d9b6ea525347078531c5517b93d9dc
HOST_BUILD_DEPENDS:=lua/host luarocks/host
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
define Package/nginx-lua-prometheus
SUBMENU:=Lua
SECTION:=lang
CATEGORY:=Languages
TITLE:=Prometheus metric library for Nginx
URL:=https://github.com/knyar/nginx-lua-prometheus
DEPENDS:= +lua
endef
define Package/ngina-lua-prometheus/description
Lua library that can be used with Nginx to keep track of metrics and expose them to be pulled by Prometheus.
endef
TARGET_CFLAGS += \
-I$(STAGING_DIR)/usr/include
# Note: the duplicate environment exports are not a typo!
# First is for luarocks, then the second is for the compilation
# invoked by luarocks
# (Same setup as luaposix)
define Build/Compile
cd $(PKG_BUILD_DIR) && \
LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \
LUA_PKGNAME=lua5.1 \
CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC)" LD="$(TARGET_CC)" \
luarocks make --pack-binary-rock nginx-lua-prometheus-${PKG_VERSION}-1.rockspec \
LUA_LIBDIR=$(STAGING_DIR)/usr/lib/lua \
YAML_DIR=$(STAGING_DIR)/usr \
LUA_INCDIR=$(STAGING_DIR)/usr/include \
LUA_PKGNAME=lua5.1 \
CFLAGS="$(TARGET_CFLAGS) $(FPIC)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
CC="$(TARGET_CC)" LD="$(TARGET_CC)"
endef
define Package/nginx-lua-prometheus/install
$(INSTALL_DIR) $(1)/usr/lib/lua/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/prometheus{,_keys,_resty_counter}.lua $(1)/usr/lib/lua/
endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,nginx-lua-prometheus))
......@@ -24,6 +24,7 @@ HOST_BUILD_DEPENDS:=python3/host
HOST_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=python3/host
PKG_BUILD_FLAGS:=no-lto
PKG_BUILD_PARALLEL:=1
PKG_INSTALL:=1
PKG_ASLR_PIE:=0
......
......@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=perl-cgi
PKG_VERSION:=4.57
PKG_VERSION:=4.64
PKG_RELEASE:=1
PKG_SOURCE_URL:=https://www.cpan.org/authors/id/L/LE/LEEJO
PKG_SOURCE:=CGI-$(PKG_VERSION).tar.gz
PKG_HASH:=4e6ca634fe0d5621bb55b0fce5c1d08e6f643c65eecdfffbb4b344fd51b963ac
PKG_HASH:=39bd8e40ce00cdab39e0a2bc71abd2bbe451d1d97bc7e54e41a2e199eb6226e7
PKG_BUILD_DIR:=$(BUILD_DIR)/perl/CGI-$(PKG_VERSION)
PKG_MAINTAINER:=Marcel Denia <naoir@gmx.net>, \
......
From 34d914c931c6c7a1d67b0b8da0790cd9a9f2b10f Mon Sep 17 00:00:00 2001
From: Javier Marcet <javier@marcet.info>
Date: Fri, 21 Oct 2022 23:35:26 +0200
Subject: [PATCH] Revert "Replace setup.py with build"
This reverts commit fc50845c4af02fcee0c5218894b2b07a8a8940f8.
---
Makefile | 6 +++---
pyproject.toml | 3 ---
setup.py | 17 +++++++++++++++++
3 files changed, 23 insertions(+), 3 deletions(-)
delete mode 100644 pyproject.toml
create mode 100644 setup.py
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ clean:
.PHONY: build
build:
- python -m build
+ python setup.py sdist bdist_wheel
.PHONY: publish
publish:
@@ -72,12 +72,12 @@ dev: instdev test
.PHONY: instdev
instdev:
pip install -r dev-requirements.txt
- pip install -e .
+ python setup.py develop
@echo "$@ done."
.PHONY: install
install:
- pip install .
+ python setup.py install
@echo "$@ done."
.PHONY: clobber
--- a/pyproject.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,17 @@
+# Copyright 2015-2020 Nir Cohen
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from setuptools import setup
+
+setup()
include $(TOPDIR)/rules.mk
PKG_NAME:=python-paramiko
PKG_VERSION:=2.12.0
PKG_RELEASE:=2
PKG_VERSION:=3.4.0
PKG_RELEASE:=1
PYPI_NAME:=paramiko
PKG_HASH:=376885c05c5d6aa6e1f4608aac2a6b5b0548b1add40274477324605903d9cd49
PKG_HASH:=aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3
PKG_MAINTAINER:=Javier Marcet <javier@marcet.info>
PKG_LICENSE:=LGPL-2.1-or-later
......@@ -27,10 +27,11 @@ define Package/python3-paramiko
endef
define Package/python3-paramiko/description
Paramiko is a Python (2.7, 3.4+) implementation of the SSHv2 protocol,
providing both client and server functionality. While it leverages a Python
C extension for low level cryptography (Cryptography), Paramiko itself is a
pure Python interface around SSH networking concepts.
Paramiko is a pure-Python (3.6+) implementation of the SSHv2 protocol,
providing both client and server functionality. It provides the foundation
for the high-level SSH library Fabric, which is what we recommend you use
for common client use-cases such as running remote shell commands or
transferring files.
endef
$(eval $(call Py3Package,python3-paramiko))
......
......@@ -60,7 +60,7 @@ define Python3/Run
endef
define Python3/FixShebang
$(SED) "1"'!'"b;s,^#"'!'".*python.*,#"'!'"/usr/bin/python3," -i --follow-symlinks $(1)
$(SED) "1"'!'"b;s,^#"'!'".*python.*,#"'!'"/usr/bin/python3," $(1)
endef
# default max recursion is 10
......
......@@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=rust
PKG_VERSION:=1.76.0
PKG_VERSION:=1.77.0
PKG_RELEASE:=1
PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.xz
PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
PKG_HASH:=805482b436442a6786d270cacbab8f00529e06141b27b7fb01909b97ce4f3464
PKG_HASH:=66126989782cbf77fa3aff121bbb108429f2d46fe19328c3de231553de711b90
HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src
PKG_MAINTAINER:=Luca Barbato <lu_zero@luminem.org>
......@@ -71,7 +71,6 @@ HOST_CONFIGURE_ARGS = \
--datadir=$(STAGING_DIR)/host/share \
--mandir=$(STAGING_DIR)/host/man \
--dist-compression-formats=gz \
--enable-missing-tools \
--disable-sanitizers \
--release-channel=stable \
--enable-cargo-native-static \
......
......@@ -4,45 +4,17 @@ Date: Sun, 4 Jun 2023 19:32:28 +0000
Subject: [PATCH] Update xz2 and use it static
---
Cargo.lock | 8 ++++----
src/bootstrap/Cargo.lock | 8 ++++----
src/bootstrap/Cargo.toml | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
--- a/src/bootstrap/Cargo.lock
+++ b/src/bootstrap/Cargo.lock
@@ -384,9 +384,9 @@ dependencies = [
[[package]]
name = "lzma-sys"
-version = "0.1.17"
+version = "0.1.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bdb4b7c3eddad11d3af9e86c487607d2d2442d185d848575365c4856ba96d619"
+checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27"
dependencies = [
"cc",
"libc",
@@ -827,9 +827,9 @@ dependencies = [
[[package]]
name = "xz2"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c179869f34fc7c01830d3ce7ea2086bc3a07e0d35289b667d0a8bf910258926c"
+checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2"
dependencies = [
"lzma-sys",
]
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -56,7 +56,7 @@ tar = "0.4"
termcolor = "1.2.0"
@@ -61,7 +61,7 @@ tar = "0.4"
termcolor = "1.4"
toml = "0.5"
walkdir = "2"
walkdir = "2.4"
-xz2 = "0.1"
+xz2 = { version = "0.1", features = ["static"] }
# Dependencies needed by the build-metrics feature
sysinfo = { version = "0.26.0", optional = true }
sysinfo = { version = "0.30", optional = true }
......@@ -41,3 +41,15 @@
let cache_dir = cache_dst.join(key);
if !cache_dir.exists() {
t!(fs::create_dir_all(&cache_dir));
@@ -704,7 +710,10 @@ download-rustc = false
let llvm_assertions = self.llvm_assertions;
let cache_prefix = format!("llvm-{llvm_sha}-{llvm_assertions}");
- let cache_dst = self.out.join("cache");
+ let cache_dst = match env::var_os("OPENWRT_RUSTC_BOOTSTRAP_CACHE") {
+ Some(v) => PathBuf::from(v),
+ None => self.out.join("cache"),
+ };
let rustc_cache = cache_dst.join(cache_prefix);
if !rustc_cache.exists() {
t!(fs::create_dir_all(&rustc_cache));
This patch bumps all libc dependencies and checksums to 0.2.147, which includes the fix for musl 1.2.4.
--- a/vendor/addr2line-0.19.0/Cargo.lock
+++ b/vendor/addr2line-0.19.0/Cargo.lock
@@ -235,9 +235,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
[[package]]
name = "libc"
-version = "0.2.126"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "memchr"
--- a/vendor/backtrace-0.3.67/Cargo.lock
+++ b/vendor/backtrace-0.3.67/Cargo.lock
@@ -64,9 +64,9 @@ checksum = "dec7af912d60cdbd3677c1af9352
[[package]]
name = "libc"
-version = "0.2.138"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "libloading"
--- a/vendor/crossbeam-channel/Cargo.lock
+++ b/vendor/crossbeam-channel/Cargo.lock
@@ -50,9 +50,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.141"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "num_cpus"
--- a/vendor/elasticlunr-rs/Cargo.lock
+++ b/vendor/elasticlunr-rs/Cargo.lock
@@ -555,9 +555,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
......@@ -56,20 +14,6 @@ This patch bumps all libc dependencies and checksums to 0.2.147, which includes
[[package]]
name = "lindera"
--- a/vendor/handlebars/Cargo.lock
+++ b/vendor/handlebars/Cargo.lock
@@ -550,9 +550,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
[[package]]
name = "libc"
-version = "0.2.140"
+version = "0.2.147"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
[[package]]
name = "lock_api"
--- a/vendor/libffi/Cargo.lock
+++ b/vendor/libffi/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b
......