Skip to content

Commit 941ae6b

Browse files
github-actions[bot]github-actions[bot]
committed
update 2024-05-05 13:37:58
1 parent b6a94e6 commit 941ae6b

9 files changed

+138
-108
lines changed

‎general/nano/Makefile

+27-26
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=nano
11-
PKG_VERSION:=6.2
12-
PKG_RELEASE:=$(AUTORELEASE)
11+
PKG_VERSION:=8.0
12+
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
1515
PKG_SOURCE_URL:=@GNU/nano
16-
PKG_HASH:=2bca1804bead6aaf4ad791f756e4749bb55ed860eec105a97fba864bc6a77cb3
16+
PKG_HASH:=c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4
1717

1818
PKG_LICENSE:=GPL-3.0-or-later
1919
PKG_LICENSE_FILES:=COPYING
@@ -48,7 +48,7 @@ endef
4848

4949
define Package/nano-full
5050
$(call Package/nano/Default)
51-
TITLE:=GNU nano text editor (most features, Unicode)
51+
TITLE:=GNU nano text editor (all features, Unicode)
5252
VARIANT:=full
5353
endef
5454

@@ -70,37 +70,26 @@ define Package/nano-plus/description
7070
endef
7171

7272
define Package/nano-full/description
73-
nano-full - most features enabled, including syntax highlighting,
74-
multibuffer, Unicode/UTF-8, help, justify, nanorc, some key bindings)
73+
nano-full - all features, including syntax highlighting (also uci),
74+
multibuffer, Unicode/UTF-8, nanorc, some key bindings.
75+
(libmagic-based file type detection is disabled)
76+
77+
Example /etc/nanorc is included. nanorc documentation at
78+
https://www.nano-editor.org/dist/latest/nanorc.5.html
7579

7680
$(call Package/nano/description)
7781
endef
7882

7983
ifeq ($(BUILD_VARIANT),full)
80-
# full variant with most features included
84+
# full variant with almost all features included
8185
CONFIGURE_ARGS += \
82-
--enable-help \
83-
--enable-justify \
84-
--enable-linenumbers \
85-
--enable-multibuffer \
86-
--enable-nanorc \
87-
--enable-utf8 \
88-
--enable-browser \
89-
--enable-color \
90-
--enable-comment \
9186
--disable-extra \
92-
--disable-histories \
9387
--disable-libmagic \
94-
--disable-mouse \
95-
--disable-operatingdir \
96-
--disable-speller \
97-
--disable-tabcomp \
98-
--disable-wordcomp
88+
--enable-utf8
9989
else ifeq ($(BUILD_VARIANT),plus)
100-
# plus variant with more features included
90+
# plus variant with some features included
10191
CONFIGURE_ARGS += \
10292
--enable-help \
103-
--enable-justify \
10493
--enable-linenumbers \
10594
--enable-multibuffer \
10695
--enable-nanorc \
@@ -110,6 +99,7 @@ else ifeq ($(BUILD_VARIANT),plus)
11099
--disable-comment \
111100
--disable-extra \
112101
--disable-histories \
102+
--disable-justify \
113103
--disable-libmagic \
114104
--disable-mouse \
115105
--disable-operatingdir \
@@ -128,6 +118,14 @@ endif
128118
CONFIGURE_VARS += \
129119
ac_cv_header_regex_h=no \
130120

121+
define Package/nano-plus/conffiles
122+
/etc/nanorc
123+
endef
124+
125+
define Package/nano-full/conffiles
126+
/etc/nanorc
127+
endef
128+
131129
define Package/nano/install
132130
$(INSTALL_DIR) $(1)/usr/bin
133131
$(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/
@@ -140,10 +138,13 @@ endef
140138
define Package/nano-full/install
141139
$(call Package/nano/install,$1)
142140
$(INSTALL_DIR) $(1)/etc $(1)/usr/share/nano
143-
$(INSTALL_CONF) ./files/nanorc $(1)/etc/nanorc
144-
$(CP) $(PKG_INSTALL_DIR)/usr/share/nano/*.nanorc $(1)/usr/share/nano/
141+
$(INSTALL_DATA) ./files/nanorc $(1)/etc/nanorc
142+
$(INSTALL_DATA) ./files/uci.nanorc $(1)/usr/share/nano
143+
$(INSTALL_DATA) ./files/ucode.nanorc $(1)/usr/share/nano
144+
$(CP) $(PKG_INSTALL_DIR)/usr/share/nano/* $(1)/usr/share/nano
145145
endef
146146

147147
$(eval $(call BuildPackage,nano))
148148
$(eval $(call BuildPackage,nano-plus))
149149
$(eval $(call BuildPackage,nano-full))
150+

‎general/nano/files/nanorc

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1-
## === Syntax coloring ===
2-
include "/usr/share/nano/*.nanorc"
1+
## General Settings ##
2+
set multibuffer # Open multiple files
3+
set linenumbers # show line numbers Alt+N to toggle
4+
5+
## Syntax highlighting ##
6+
include /usr/share/nano/*.nanorc
7+
include /usr/share/nano/extra/*.nanorc
8+

‎general/nano/files/uci.nanorc

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
## Syntax highlighting for OpenWrt uci config files.
2+
3+
syntax uci "/etc/config/*"
4+
comment "#"
5+
6+
# Keywords
7+
color green "\<(package|config|option|list)\>"
8+
9+
# Comments.
10+
color cyan "(^|[[:blank:]])#.*"
11+
12+
# Strings.
13+
color yellow ""([^"\]|\\.)*"|'([^'\]|\\.)*'"
14+
15+
# Trailing whitespace.
16+
color ,green "[[:space:]]+$"
17+

‎general/nano/files/ucode.nanorc

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
## Syntax highlighting for OpenWrt ucode scripts.
2+
3+
syntax ucode "/ucode/|\.u[ct]$"
4+
header "^#!.*\<ucode\>"
5+
comment "//"
6+
7+
# Declarations
8+
color green "\<(let|const|function|this)\>"
9+
10+
# Arrow functions
11+
color green "(\<\w+\>|\([[:alnum:][:space:]_,.]*\))[[:space:]]*=>"
12+
13+
# Flow control and keywords
14+
color brightyellow "\<(while|if|else|elif|switch|case|default|for|in|endif|endfor|endwhile|endfunction)\>"
15+
color brightyellow "\<(export|import|try|catch|delete)\>"
16+
17+
# Exit points
18+
color magenta "\<(break|continue|return)\>"
19+
20+
# Numeric literals
21+
color cyan "\<([0-9]+\.[0-9]+([eE][+-]?[0-9]+)?|[0-9]+[eE][+-]?[0-9]+)\>"
22+
color cyan "\<0[xX][[:xdigit:]]+(\.[[:xdigit:]]+)?\>"
23+
color cyan "\<(0[oO][0-7]+|0[bB][01]+|[0-9]+)\>"
24+
25+
# Special values
26+
color cyan "\<(true|false|null|NaN|Infinity)\>"
27+
28+
# Strings
29+
color brightmagenta ""([^"\{%#}]|\\.|\{[^"\{%#]|[%#}][^"\}]|[{%#}]\\.)*[{%#}]?""
30+
color brightmagenta "'([^'\{%#}]|\\.|\{[^'\{%#]|[%#}][^'\}]|[{%#}]\\.)*[{%#}]?'"
31+
color brightmagenta "`([^`\{%#}]|\\.|\{[^`\{%#]|[%#}][^`\}]|[{%#}]\\.)*[{%#}]?`"
32+
33+
# Template string expressions
34+
color normal start="\$\{" end="}"
35+
36+
# Comments
37+
color brightblue "(^|[[:blank:]])//.*"
38+
color brightblue start="(^|[[:space:]])/\*" end="\*/"
39+
color brightblue start="\{#" end="#\}"
40+
41+
# Trailing whitespace.
42+
color ,green "[[:space:]]+$"
43+
44+
# Text outside template directives
45+
color slate start="[}%#]\}" end="\{[{%#]"
46+
color slate start="^#!.*(\<utpl\>|[[:space:]]-[[:alnum:]]*T[[:alnum:]]*\>)" end="\{[{%#]"
47+
color slate "^([^{%#}]|\{[^{%#]|[%#}][^}])+\{[{%#]"
48+
49+
# Template tags
50+
color white "\{[{%][+-]?|-?[%}]\}"
51+
color brightblue "\{#[+-]?|-?#\}"

‎general/nano/patches/0001-post80-fix-minibar-do-not-falsely-report.patch

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From e9c7dfa99221935ffa38b5b9dbf294933e0aa7c0 Mon Sep 17 00:00:00 2001
2+
From: Benno Schulenberg <[email protected]>
3+
Date: Fri, 3 May 2024 12:12:09 +0200
4+
Subject: minibar: do not falsely report that a new, empty file is in Mac
5+
format
6+
7+
The 'openfile->fmt' element gets initialized to 'UNSPECIFIED',
8+
so the code has to take that possibility into account.
9+
10+
This fixes https://savannah.gnu.org/bugs/?65676.
11+
12+
Bug existed since version 8.0, commit fe4f74f6.
13+
---
14+
src/winio.c | 2 +-
15+
1 file changed, 1 insertion(+), 1 deletion(-)
16+
17+
--- a/src/winio.c
18+
+++ b/src/winio.c
19+
@@ -2213,7 +2213,7 @@ void minibar(void)
20+
size_t count = openfile->filebot->lineno - (openfile->filebot->data[0] == '\0');
21+
22+
number_of_lines = nmalloc(49);
23+
- if (openfile->fmt == NIX_FILE)
24+
+ if (openfile->fmt == NIX_FILE || openfile->fmt == UNSPECIFIED)
25+
sprintf(number_of_lines, P_(" (%zu line)", " (%zu lines)", count), count);
26+
else
27+
sprintf(number_of_lines, P_(" (%zu line, %s)", " (%zu lines, %s)", count),

‎general/zerotier/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
include $(TOPDIR)/rules.mk
77

88
PKG_NAME:=zerotier
9-
PKG_VERSION:=1.12.2
9+
PKG_VERSION:=1.14.0
1010
PKG_RELEASE:=1
1111

1212
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1313
PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
14-
PKG_HASH:=7c6512cfc208374ea9dc9931110e35f71800c34890e0f35991ea485aae66e31c
14+
PKG_HASH:=7191623a81b0d1b552b9431e8864dd3420783ee518394ac1376cee6aaf033291
1515
PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)
1616

1717
PKG_MAINTAINER:=Moritz Warning <[email protected]>

‎general/zerotier/patches/0001-fix-miniupnpc-natpmp-include-paths.patch

-32
This file was deleted.

‎general/zerotier/patches/0002-remove-PIE-options.patch

-41
This file was deleted.

‎sh/breakings_diy-part2.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,8 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f8
547547
#sed -i 's/PKG_HASH:=.*/PKG_HASH:=507eb7b8d1015fbec5b935f34ebed15bf346bed04a11ab82b8eee848c4205aea/g' feeds/packages/libs/libev/Makefile
548548

549549
# zerotier
550-
sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.12.2/g' feeds/packages/net/zerotier/Makefile
551-
sed -i 's/PKG_HASH:=.*/PKG_HASH:=7c6512cfc208374ea9dc9931110e35f71800c34890e0f35991ea485aae66e31c/g' feeds/packages/net/zerotier/Makefile
550+
#sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=1.12.2/g' feeds/packages/net/zerotier/Makefile
551+
#sed -i 's/PKG_HASH:=.*/PKG_HASH:=7c6512cfc208374ea9dc9931110e35f71800c34890e0f35991ea485aae66e31c/g' feeds/packages/net/zerotier/Makefile
552552
#rm -rf feeds/packages/net/zerotier
553553
#cp -rf $GITHUB_WORKSPACE/general/zerotier feeds/packages/net
554554

@@ -663,11 +663,12 @@ sed -i 's/PKG_HASH:=.*/PKG_HASH:=eb872b4f0e1f0ebe59c9f7bd8c506c4204893ba6a8492de
663663
# nano
664664
#sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=7.2/g' feeds/packages/utils/nano/Makefile
665665
#sed -i 's/PKG_HASH:=.*/PKG_HASH:=86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526/g' feeds/packages/utils/nano/Makefile
666-
#cp -rf $GITHUB_WORKSPACE/general/nano feeds/packages/utils
666+
rm -rf feeds/packages/utils/nano
667+
cp -rf $GITHUB_WORKSPACE/general/nano feeds/packages/utils
667668

668669
# dnsproxy
669-
sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.71.0/g' feeds/packages/net/dnsproxy/Makefile
670-
sed -i 's/PKG_HASH:=.*/PKG_HASH:=a3b604974ccd4dd7ae7c22fe53e9b49bae9ca7e2130d9b07446bce1fd1de4519/g' feeds/packages/net/dnsproxy/Makefile
670+
sed -i 's/PKG_VERSION:=.*/PKG_VERSION:=0.71.1/g' feeds/packages/net/dnsproxy/Makefile
671+
sed -i 's/PKG_HASH:=.*/PKG_HASH:=9c55c83ce3521c5197293a7618ed3ff103d236344aabf73ba37055e3964d2087/g' feeds/packages/net/dnsproxy/Makefile
671672

672673
# libnl-tiny
673674
#sed -i 's/PKG_RELEASE:=.*/PKG_RELEASE:=1/g' package/libs/libnl-tiny/Makefile

0 commit comments

Comments
 (0)