Browse Source

Merge pull request #2587 from stweil/master

net: Fix typos (found by codespell)
lilik-openwrt-22.03
Hannu Nyman 9 years ago
parent
commit
f9f3a364b9
17 changed files with 34 additions and 34 deletions
  1. +3
    -3
      net/apcupsd/files/apcupsd.conf
  2. +1
    -1
      net/etherwake/files/etherwake.config
  3. +6
    -6
      net/iotivity/patches/004-use-env.patch
  4. +4
    -4
      net/kismet/files/kismet.conf
  5. +1
    -1
      net/lispmob/Makefile
  6. +2
    -2
      net/luci-app-e2guardian/files/e2guardian-cbi.lua
  7. +4
    -4
      net/net-snmp/patches/750-ieee802dot11.patch
  8. +1
    -1
      net/polipo/files/polipo.config
  9. +1
    -1
      net/pppossh/README.md
  10. +1
    -1
      net/privoxy/Makefile
  11. +1
    -1
      net/radicale/Makefile
  12. +3
    -3
      net/siit/src/siit.c
  13. +1
    -1
      net/strongswan/Makefile
  14. +1
    -1
      net/tgt/files/etc/config/tgt
  15. +1
    -1
      net/tinyproxy/files/tinyproxy.config
  16. +1
    -1
      net/uanytun/Makefile
  17. +2
    -2
      net/znc/patches/102-restore_droproot.patch

+ 3
- 3
net/apcupsd/files/apcupsd.conf View File

@ -10,7 +10,7 @@
# UPSNAME xxx
# Use this to give your UPS a name in log files and such. This
# is particulary useful if you have multiple UPSes. This does not
# is particularly useful if you have multiple UPSes. This does not
# set the EEPROM. It should be 8 characters or less.
UPSNAME ups1
@ -114,7 +114,7 @@ NOLOGINDIR /etc
#
# Note: BATTERYLEVEL, MINUTES, and TIMEOUT work in conjunction, so
# the first that occurs will cause the initation of a shutdown.
# the first that occurs will cause the initiation of a shutdown.
#
# If during a power failure, the remaining battery percentage
@ -133,7 +133,7 @@ MINUTES 3
#
# Note, if you have a Smart UPS, you will most likely want to disable
# this timer by setting it to zero. That way, you UPS will continue
# on batteries until either the % charge remaing drops to or below BATTERYLEVEL,
# on batteries until either the % charge remaining drops to or below BATTERYLEVEL,
# or the remaining battery runtime drops to or below MINUTES. Of course,
# if you are testing, setting this to 60 causes a quick system shutdown
# if you pull the power plug.


+ 1
- 1
net/etherwake/files/etherwake.config View File

@ -1,5 +1,5 @@
config 'etherwake' 'setup'
# possible program pathes
# possible program paths
option 'pathes' '/usr/bin/etherwake /usr/bin/ether-wake'
# use sudo, defaults to off
option 'sudo' 'off'


+ 6
- 6
net/iotivity/patches/004-use-env.patch View File

@ -16,22 +16,22 @@ Subject: [PATCH 3/4] 004-use-env.patch
+env['ENV'] = os.environ
+if 'CC' in os.environ:
+ env['CC'] = Split(os.environ['CC'])
+ print "using CC from enviroment: %s" % env['CC']
+ print "using CC from environment: %s" % env['CC']
+if 'CXX' in os.environ:
+ env['CXX'] = Split(os.environ['CXX'])
+ print "using CXX from enviroment: %s" % env['CXX']
+ print "using CXX from environment: %s" % env['CXX']
+if 'CFLAGS' in os.environ:
+ env['CFLAGS'] = Split(os.environ['CFLAGS'])
+ print "using CFLAGS from enviroment: %s" % env['CFLAGS']
+ print "using CFLAGS from environment: %s" % env['CFLAGS']
+if 'CXXFLAGS' in os.environ:
+ env['CXXFLAGS'] = Split(os.environ['CXXFLAGS'])
+ print "using CXXFLAGS from enviroment: %s" % env['CXXFLAGS']
+ print "using CXXFLAGS from environment: %s" % env['CXXFLAGS']
+if 'CPPFLAGS' in os.environ:
+ env['CPPFLAGS'] = Split(os.environ['CPPFLAGS'])
+ print "using CPPFLAGS from enviroment: %s" % env['CPPFLAGS']
+ print "using CPPFLAGS from environment: %s" % env['CPPFLAGS']
+if 'LDFLAGS' in os.environ:
+ env['LINKFLAGS'] = Split(os.environ['LDFLAGS'])
+ print "using LDFLAGS/LINKFLAGS from enviroment: %s" % env['LINKFLAGS']
+ print "using LDFLAGS/LINKFLAGS from environment: %s" % env['LINKFLAGS']
+
if env.get('VERBOSE') == False:
env['CCCOMSTR'] = "Compiling $TARGET"


+ 4
- 4
net/kismet/files/kismet.conf View File

@ -92,7 +92,7 @@ channelvelocity=3
# These channel lists MUST BE PRESENT for Kismet to work properly. While it is
# possible to change these, it is not recommended. These are used when the supported
# channel list can not be found for the source; to force using these instead of
# the detected supported channels, override with channellist= in the source defintion
# the detected supported channels, override with channellist= in the source definition
#
# IN GENERAL, if you think you want to modify these, what you REALLY want to do is
# copy them and use channellist= in the packet source.
@ -104,7 +104,7 @@ channellist=IEEE80211ab:1:3,6:3,11:3,2,7,3,8,4,9,5,10,36,40,44,48,52,56,60,64,14
listen=tcp://127.0.0.1:2501
#listen=tcp://0.0.0.0:2501
# People allowed to connect, comma seperated IP addresses or network/mask
# People allowed to connect, comma separated IP addresses or network/mask
# blocks. Netmasks can be expressed as dotted quad (/255.255.255.0) or as
# numbers (/24)
allowedhosts=127.0.0.1
@ -267,7 +267,7 @@ speech=gpslock,"G.P.S. signal O.K."
# memory system and a huge number of alert conditions.
alertbacklog=50
# File types to log, comma seperated. Built-in log file types:
# File types to log, comma separated. Built-in log file types:
# alert Text file of alerts
# gpsxml XML per-packet GPS log
# nettxt Networks in text format
@ -298,7 +298,7 @@ logdefault=Kismet
logtemplate=%p%n-%D-%t-%i.%l
# Where state info, etc, is stored. You shouldnt ever need to change this.
# Where state info, etc, is stored. You shouldn't ever need to change this.
# This is a directory.
configdir=%h/.kismet/

+ 1
- 1
net/lispmob/Makefile View File

@ -38,7 +38,7 @@ define Package/lispd
endef
define Package/lispd/description
This packet provides support for the Locator-ID Seperation Protocol.
This packet provides support for the Locator-ID Separation Protocol.
endef
MAKE_FLAGS += \


+ 2
- 2
net/luci-app-e2guardian/files/e2guardian-cbi.lua View File

@ -64,7 +64,7 @@ loglevel.default = "2"
logexceptionhits = s:taboption("tab_general", ListValue, "logexceptionhits", translate("Log Exception Hits"))
logexceptionhits:value("0", translate("never"))
logexceptionhits:value("1", translate("log, but dont mark as exceptions"))
logexceptionhits:value("1", translate("log, but don't mark as exceptions"))
logexceptionhits:value("2", translate("log and mark"))
logexceptionhits.default = "2"
@ -153,7 +153,7 @@ phrasefiltermode.default = "2"
preservecase = s:taboption("tab_general", ListValue, "perservecase", translate("Lower caseing options"))
preservecase:value("0", translate("force lower case"))
preservecase:value("1", translate("dont change"))
preservecase:value("1", translate("don't change"))
preservecase:value("2", translate("scan fist in lower, then in original"))
preservecase.default = "0"


+ 4
- 4
net/net-snmp/patches/750-ieee802dot11.patch View File

@ -4702,7 +4702,7 @@
+ char uid[256];
+ LIST_HEAD ( , avNode ) *list;
+
+ // NOTE: this assumes the UID is at the begining of the
+ // NOTE: this assumes the UID is at the beginning of the
+ // data structure and that UIDs are strings
+
+ list = ( LIST_HEAD ( , avNode ) * ) l; // NOTE: don't know how to get
@ -5802,7 +5802,7 @@
+#define PROC_NET_WIRELESS "/proc/net/wireless"
+#define PROC_NET_DEV "/proc/net/dev"
+
+/* Some usefull constants */
+/* Some useful constants */
+#define KILO 1e3
+#define MEGA 1e6
+#define GIGA 1e9
@ -6110,7 +6110,7 @@
+}
+
+/*------------------------------------------------------------------*/
+/* Backwards compatability
+/* Backwards compatibility
+ * Actually, those form are much easier to use when dealing with
+ * struct sockaddr... */
+static inline char*
@ -6119,7 +6119,7 @@
+ iw_ether_ntop((const struct ether_addr *) addr, bufp);
+ return bufp;
+}
+/* Backwards compatability */
+/* Backwards compatibility */
+static inline int
+iw_in_ether(const char *bufp, struct sockaddr *sap)
+{


+ 1
- 1
net/polipo/files/polipo.config View File

@ -7,7 +7,7 @@ config 'polipo' 'daemon'
config 'polipo' 'general'
option 'enabled' '1'
# adress on which polipo will listen, 0.0.0.0 means all addresses
# address on which polipo will listen, 0.0.0.0 means all addresses
option 'proxyAddress' '0.0.0.0'
# port on which polipo will listen, default is 8123
#option 'proxyPort' '8123'


+ 1
- 1
net/pppossh/README.md View File

@ -61,7 +61,7 @@ It's possible that pppd may output protocol negotiation incompatibilities issues
Sun Oct 25 09:45:14 2015 daemon.err pppd[22188]: Received bad configure-rej: 12 06 00 00 00 00
To debug such problems, we can try adding `option pppd_optinos debug` to the interface config. In the above case, it's a LCP CCP configure rej (the CCP options struct is exactly 6 octets in size as indicated in source code `pppd/ccp.h`) and since the internet fee is not charged on the bytes transfered, I will just use `noccp` to disable the negotiation altogether.
To debug such problems, we can try adding `option pppd_optinos debug` to the interface config. In the above case, it's a LCP CCP configure rej (the CCP options struct is exactly 6 octets in size as indicated in source code `pppd/ccp.h`) and since the internet fee is not charged on the bytes transferred, I will just use `noccp` to disable the negotiation altogether.
Also to optimize bulk transfer performance, you can try tweaking the ciphers. OpenSSH client does not support `none` cipher by default and you have to patch and install it for by yourself. Another option is to try ciphers like `arcfour` and `blowfish-cbc`. In my case, `arcfour` has the best throughput.


+ 1
- 1
net/privoxy/Makefile View File

@ -124,7 +124,7 @@ define Package/$(PKG_NAME)/preinst
# stop service if PKG_UPGRADE
[ "$${PKG_UPGRADE}" = "1" ] && /etc/init.d/privoxy stop >/dev/null 2>&1
exit 0 # supress errors from stop command
exit 0 # suppress errors from stop command
endef
define Package/$(PKG_NAME)/install


+ 1
- 1
net/radicale/Makefile View File

@ -91,7 +91,7 @@ define Package/$(PKG_NAME)-py2/preinst
# stop service if PKG_UPGRADE
[ "$${PKG_UPGRADE}" = "1" ] && /etc/init.d/$(PKG_NAME) stop >/dev/null 2>&1
exit 0 # supress errors from stop command
exit 0 # suppress errors from stop command
endef
define Package/$(PKG_NAME)-py3/preinst
$(call Package/$(PKG_NAME)-py2/preinst)


+ 3
- 3
net/siit/src/siit.c View File

@ -690,7 +690,7 @@ static int ip6_ip4(char *src, int len, char *dst, int include_flag)
}
else if (next_hdr == NEXTHDR_ESP || next_hdr == NEXTHDR_AUTH)
{
PDEBUG("ip6_ip4(): cannot translate AUTH or ESP extention header, packet dropped\n");
PDEBUG("ip6_ip4(): cannot translate AUTH or ESP extension header, packet dropped\n");
return -1;
}
else if (next_hdr == NEXTHDR_IPV6)
@ -707,12 +707,12 @@ static int ip6_ip4(char *src, int len, char *dst, int include_flag)
value within the original packet
*/
/* NOT IMPLEMENTED */
PDEBUG("ip6_ip4(): NEXTHDR in extention header = 0, packet dropped\n");
PDEBUG("ip6_ip4(): NEXTHDR in extension header = 0, packet dropped\n");
return -1;
}
else
{
PDEBUG("ip6_ip4(): cannot translate extention header = %d, packet dropped\n", next_hdr);
PDEBUG("ip6_ip4(): cannot translate extension header = %d, packet dropped\n", next_hdr);
return -1;
}
}


+ 1
- 1
net/strongswan/Makefile View File

@ -211,7 +211,7 @@ define Package/strongswan-full/description
$(call Package/strongswan/description/Default)
This meta-package contains dependencies for all of the strongswan plugins
except kernel-libipsec,
socket-dynamic and which are ommitted in favor of the kernel-netlink and
socket-dynamic and which are omitted in favor of the kernel-netlink and
socket-default plugins.
endef


+ 1
- 1
net/tgt/files/etc/config/tgt View File

@ -42,7 +42,7 @@ config target 1
# option 'readonly' '0'
# Disk devices default to non-removable, cd - to removable
# option 'removable' '0'
# 0 = Clasic sense format, 1 = Support descriptor format.
# 0 = Classic sense format, 1 = Support descriptor format.
# option 'sense_format' '0'
#config lun 2_1


+ 1
- 1
net/tinyproxy/files/tinyproxy.config View File

@ -52,7 +52,7 @@ option Timeout 600
#
# DefaultErrorFile: The HTML file that gets sent if there is no
# HTML file defined with an ErrorFile keyword for the HTTP error
# that has occured.
# that has occurred.
#
option DefaultErrorFile "/usr/share/tinyproxy/default.html"


+ 1
- 1
net/uanytun/Makefile View File

@ -53,7 +53,7 @@ uAnytun is a tiny implementation of SATP the secure anycast tunneling protocol.
IPSec in Tunnel mode and allows tunneling of every ETHER TYPE protocol (e.g.
ethernet, ip, arp ...). SATP directly includes cryptography and message
authentication based on the methods used by SRTP. It is intended to deliver
a generic, scaleable and secure solution for tunneling and relaying of packets
a generic, scalable and secure solution for tunneling and relaying of packets
of any protocol.
Unlike Anytun which is a full featured implementation uAnytun has no support
for multiple connections or synchronisation. It is a small single threaded


+ 2
- 2
net/znc/patches/102-restore_droproot.patch View File

@ -75,7 +75,7 @@
+
+ if (m_user == 0) {
+ sMessage
+ = "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot <uid> <gid>";
+ = "Error: Cannot run as root, check your config file | Usage: LoadModule = Droproot <uid> <gid>";
+ return false;
+ }
+
@ -83,7 +83,7 @@
+
+ if (m_group == 0) {
+ sMessage
+ = "Error: Cannot run as root, check your config file | Useage: LoadModule = Droproot <uid> <gid>";
+ = "Error: Cannot run as root, check your config file | Usage: LoadModule = Droproot <uid> <gid>";
+ return false;
+ }
+


Loading…
Cancel
Save