From f225e0f89819060f8a16f6dd83b6dee461a10e7a Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 6 Dec 2024 14:47:16 +0100 Subject: [PATCH] Fix packages version for apk compatibility --- dsvpn/Makefile | 2 +- glorytun-udp/Makefile | 4 ++-- glorytun/Makefile | 4 ++-- libmbim/Makefile | 1 + libqmi/Makefile | 2 +- luci-app-firewall/Makefile | 2 +- luci-app-shadowsocks-libev/Makefile | 1 - luci-app-shadowsocks-rust/Makefile | 3 +-- luci-theme-alpha/Makefile | 2 +- mlvpn/Makefile | 2 +- modemmanager/Makefile | 1 + shadowsocks-libev/Makefile | 2 +- simple-obfs/Makefile | 2 +- tcptraceroute/Makefile | 5 +++-- 14 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dsvpn/Makefile b/dsvpn/Makefile index 8bfae704f..c025e7ad9 100644 --- a/dsvpn/Makefile +++ b/dsvpn/Makefile @@ -13,7 +13,7 @@ PKG_SOURCE_URL:=https://github.com/Ysurac/dsvpn.git #PKG_SOURCE_VERSION:=3b99d2ef6c02b2ef68b5784bec8adfdd55b29b1a PKG_SOURCE_VERSION:=4333aa705efd9c86c76809614d20dc5ebf43da7f PKG_NAME:=dsvpn -PKG_VERSION:=0.1.5-$(PKG_SOURCE_VERSION) +PKG_VERSION:=0.1.5 PKG_RELEASE:=1 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/glorytun-udp/Makefile b/glorytun-udp/Makefile index 27fa65c17..f2520df5d 100644 --- a/glorytun-udp/Makefile +++ b/glorytun-udp/Makefile @@ -12,8 +12,8 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/angt/glorytun.git PKG_SOURCE_VERSION:=32267e86a6da05b285bb3bf2b136c105dc0af4bb PKG_NAME:=glorytun-udp -PKG_VERSION:=0.3.4-$(PKG_SOURCE_VERSION) -PKG_RELEASE:=23 +PKG_VERSION:=0.3.4 +PKG_RELEASE:=24 PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE diff --git a/glorytun/Makefile b/glorytun/Makefile index 63a8fe52c..10297ff4d 100644 --- a/glorytun/Makefile +++ b/glorytun/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glorytun -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=0c3b03cf0215e0896fd8e7e91be92efa77f6a2d1 PKG_SOURCE:=glorytun-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/Ysurac/glorytun.git -PKG_VERSION:=0.0.35-$(PKG_SOURCE_VERSION) +PKG_VERSION:=0.0.35 PKG_LICENSE:=BSD-2-Clause PKG_LICENSE_FILES:=LICENSE PKG_FIXUP:=autoreconf diff --git a/libmbim/Makefile b/libmbim/Makefile index 02016021c..5482a3cfb 100644 --- a/libmbim/Makefile +++ b/libmbim/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmbim +PKG_VERSION:=1.31.6 PKG_SOURCE_VERSION:=1.31.6-dev #PKG_SOURCE_VERSION:=1866ed53c05916c66c5d52682778a6078e5221d3 PKG_RELEASE:=1 diff --git a/libqmi/Makefile b/libqmi/Makefile index fc43b9048..ca7122ad5 100644 --- a/libqmi/Makefile +++ b/libqmi/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libqmi -#PKG_SOURCE_VERSION:=1.34.0 +PKG_VERSION:=1.35.6 PKG_SOURCE_VERSION:=1.35.6-dev PKG_RELEASE:=1 diff --git a/luci-app-firewall/Makefile b/luci-app-firewall/Makefile index a9e47df9b..30a55a9b2 100644 --- a/luci-app-firewall/Makefile +++ b/luci-app-firewall/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=Firewall and Portforwarding application LUCI_DEPENDS:=+@LINUX_5_4:firewall +@(LINUX_5_15||LINUX_6_1||LINUX_6_6||LINUX_6_7):uci-firewall PKG_LICENSE:=Apache-2.0 -PKG_VERSION:=omr-202103 +#PKG_VERSION:=omr-202103 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-shadowsocks-libev/Makefile b/luci-app-shadowsocks-libev/Makefile index 6a19308fb..29955e933 100644 --- a/luci-app-shadowsocks-libev/Makefile +++ b/luci-app-shadowsocks-libev/Makefile @@ -11,7 +11,6 @@ LUCI_TITLE:=LuCI Support for shadowsocks-libev LUCI_DEPENDS:=+luci-compat PKG_LICENSE:=Apache-2.0 -PKG_VERSION:=omr-202103 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-shadowsocks-rust/Makefile b/luci-app-shadowsocks-rust/Makefile index 2a9bc5180..1604936e6 100644 --- a/luci-app-shadowsocks-rust/Makefile +++ b/luci-app-shadowsocks-rust/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2017 Yousong Zhou -# Copyright (C) 2019-2023 Ycarus (Yannick Chabanois) for OpenMPTCProuter +# Copyright (C) 2019-2024 Ycarus (Yannick Chabanois) for OpenMPTCProuter # # This is free software, licensed under the Apache License, Version 2.0 . # @@ -11,7 +11,6 @@ LUCI_TITLE:=LuCI Support for shadowsocks-rust LUCI_DEPENDS:=+luci-compat PKG_LICENSE:=Apache-2.0 -PKG_VERSION:=omr-202309 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-theme-alpha/Makefile b/luci-theme-alpha/Makefile index 44174974a..af247d7e0 100644 --- a/luci-theme-alpha/Makefile +++ b/luci-theme-alpha/Makefile @@ -10,7 +10,7 @@ THEME_NAME:=alpha THEME_TITLE:=Alpha PKG_NAME:=luci-theme-$(THEME_NAME) -PKG_VERSION:=3.9.4-beta +PKG_VERSION:=3.9.4_beta PKG_RELEASE:=9 include $(INCLUDE_DIR)/package.mk diff --git a/mlvpn/Makefile b/mlvpn/Makefile index 455efe415..a38835c5c 100644 --- a/mlvpn/Makefile +++ b/mlvpn/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mlvpn -PKG_VERSION:=8aa1b16 +PKG_VERSION:=2.6.5.20211028 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git diff --git a/modemmanager/Makefile b/modemmanager/Makefile index dbb91f50e..d4592bd97 100644 --- a/modemmanager/Makefile +++ b/modemmanager/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=modemmanager +PKG_VERSION:=1.23.12 PKG_SOURCE_VERSION:=1.23.12-dev #PKG_SOURCE_VERSION:=df8287bf6c2febd068d06f0f45194bc622118bd4 PKG_RELEASE:=21 diff --git a/shadowsocks-libev/Makefile b/shadowsocks-libev/Makefile index c52a13e7e..986cb5cc3 100644 --- a/shadowsocks-libev/Makefile +++ b/shadowsocks-libev/Makefile @@ -18,7 +18,7 @@ PKG_RELEASE:=11 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Ysurac/shadowsocks-libev.git PKG_SOURCE_VERSION:=410950d87d8cdf8502d8f59a79dc0ff4c7677543 -PKG_VERSION:=3.3.5-$(PKG_SOURCE_VERSION) +PKG_VERSION:=3.3.5 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) diff --git a/simple-obfs/Makefile b/simple-obfs/Makefile index 5c418444b..7ee9c6960 100644 --- a/simple-obfs/Makefile +++ b/simple-obfs/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simple-obfs -PKG_VERSION:=486bebd9 +PKG_VERSION:=0.0.6 PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git diff --git a/tcptraceroute/Makefile b/tcptraceroute/Makefile index 5d51e0f8f..dad0bf8ff 100644 --- a/tcptraceroute/Makefile +++ b/tcptraceroute/Makefile @@ -8,11 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcptraceroute -PKG_VERSION:=1.5beta7 +PKG_REALVERSION:=1.5beta7 +PKG_VERSION:=1.5_beta7 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=tcptraceroute-$(PKG_VERSION) +PKG_SOURCE_VERSION:=tcptraceroute-$(PKG_REALVERSION) PKG_SOURCE_URL:=https://github.com/mct/tcptraceroute.git include $(INCLUDE_DIR)/package.mk