LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #11721 from jefferyto/python2-remove-programs 

treewide: Remove programs that will not be updated to Python 3
lilik-openwrt-22.03
Hannu Nyman 5 years ago
committed by GitHub
parent
c083581503 d50f961f06
commit
f0264eea08
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 0 additions and 1484 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -129
      mail/mailman/Makefile
  2. +0
    -22
      mail/mailman/files/mailman.init
  3. +0
    -11
      mail/mailman/patches/100-postfix.patch
  4. +0
    -67
      mail/mailman/patches/200-nohostdnspython.patch
  5. +0
    -11
      mail/mailman/patches/300-targetpython.patch
  6. +0
    -33
      mail/mailman/patches/400-modules.patch
  7. +0
    -55
      net/danish/Makefile
  8. +0
    -63
      net/obfsproxy/Makefile
  9. +0
    -57
      net/obfsproxy/files/obfsproxy.conf
  10. +0
    -158
      net/obfsproxy/files/obfsproxy.init
  11. +0
    -13
      net/obfsproxy/patches/001-exclude-tests.patch
  12. +0
    -16
      net/obfsproxy/patches/002-fix-python-path.patch
  13. +0
    -12
      net/obfsproxy/patches/003-remove-argparse-dependency-test.patch
  14. +0
    -51
      net/obfsproxy/patches/004-add-syslog-support.patch
  15. +0
    -46
      utils/yunbridge/Makefile
  16. +0
    -6
      utils/yunbridge/files/etc/config/yunbridge
  17. +0
    -22
      utils/yunbridge/files/etc/init.d/yunbridge
  18. +0
    -6
      utils/yunbridge/files/sbin/yunbridge
  19. +0
    -75
      utils/yunbridge/files/usr/bin/pretty-wifi-info.lua
  20. +0
    -414
      utils/yunbridge/files/usr/lib/lua/luci/controller/arduino/index.lua
  21. +0
    -199
      utils/yunbridge/files/usr/lib/lua/luci/sha256.lua
  22. +0
    -18
      utils/yunbridge/patches/000-scripts.patch

+ 0
- 129
mail/mailman/Makefile View File

@ -1,129 +0,0 @@
#
# Copyright (C) 2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=mailman
PKG_VERSION:=2.1.29
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
PKG_HASH:=838872713601e8a124146e550f53709482c1ef168f1e16d201465c651cbf0d2c
PKG_MAINTAINER:=Denis Shulyaka <Shulyaka@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=gnu-COPYING-GPL
PKG_CPE_ID:=cpe:2.3:a:gnu:mailman
include $(INCLUDE_DIR)/package.mk
define Package/mailman
SECTION:=mail
CATEGORY:=Mail
TITLE:=The GNU Mailing List Manager
URL:=https://www.gnu.org/software/mailman/
DEPENDS:=+postfix +python +uhttpd +python-dns
endef
define Package/mailman/description
Mailman is free software for managing electronic mail discussion and e-newsletter lists.
endef
prefix=/usr/local/mailman
define Package/mailman/conffiles
$(prefix)/Mailman/mm_cfg.py
endef
CONFIGURE_ARGS += \
--prefix="$(prefix)" \
--exec-prefix="$(prefix)" \
--with-username="root" \
--with-groupname="root" \
--with-mail-gid="nogroup" \
--with-cgi-gid="root" \
--without-permcheck \
define Build/Compile
endef
define Package/mailman/install
$(INSTALL_DIR) $(1)$(prefix)
cd $(PKG_BUILD_DIR); $(MAKE) DESTDIR=$(1) install
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/mailman.init $(1)/etc/init.d/mailman
$(INSTALL_DIR) $(1)/usr/www
ln -s $(prefix)/cgi-bin/ $(1)/usr/www/mailman
ln -s $(prefix)/archives/public/ $(1)/usr/www/pipermail
ln -s $(prefix)/icons $(1)/usr/www/icons
endef
define Package/mailman/postinst
#!/bin/sh
# check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then
if [ `postconf alias_maps | grep -ci mailman` -eq 0 ]
then
postconf -e "`postconf alias_maps`, cdb:$(prefix)/data/aliases"
fi
cd $(prefix)
hostname=`cat /proc/sys/kernel/hostname`
if [ ! -f data/aliases ]
then
./bin/genaliases
fi
newaliases
if [ `grep -c DEFAULT_URL_HOST Mailman/mm_cfg.py` -eq 0 ]
then
echo "DEFAULT_EMAIL_HOST = '$$hostname'" >> Mailman/mm_cfg.py
echo "DEFAULT_URL_HOST = '$$hostname'" >> Mailman/mm_cfg.py
echo "add_virtualhost(DEFAULT_URL_HOST, DEFAULT_EMAIL_HOST)" >> Mailman/mm_cfg.py
echo "QRUNNERS.remove(('NewsRunner',1))" >> Mailman/mm_cfg.py
fi
if [ `./bin/list_lists | grep -ci mailman` -eq 0 ]
then
./bin/newlist --urlhost=$$hostname --emailhost=$$hostname --quiet mailman root@$$hostname mailman
./bin/config_list -i data/sitelist.cfg mailman
echo "NOTE: A default site-wide mailing list Mailman with password 'mailman' has been created. Please review it and change the password."
./bin/mmsitepass mailman
echo "NOTE: The default site password 'mailman' has been created."
fi
# /etc/init.d/mailman enable
if [ `ps | grep "mailman/bin/qrunner" | grep -cv grep` -gt 0 ]
then
$(prefix)/bin/mailmanctl -q restart
fi
if [ `grep -c mailman /etc/config/uhttpd` -eq 0 ]
then #we assume that the server is not configured yet, thus print out some help for the first time:
echo "NOTE: Please set the site password using $(prefix)/bin/mmsitepass <your-site-password>"
echo "Please add uhttpd config section to your /etc/config/uhttpd like this:"
echo "config uhttpd mailman"
echo " list listen_http 0.0.0.0:80"
echo " option home /usr/www"
echo " option cgi_prefix /mailman"
echo " no_symlinks 0"
echo "Don't forget to setup firewall for accessing this website!"
echo "To add a mailing list go to http://$$hostname/mailman/create."
fi
fi
endef
define Package/mailman/prerm
#!/bin/sh
# check if we are on real system
if [ -z "$${IPKG_INSTROOT}" ]; then
if [ `ps | grep "mailman/bin/qrunner" | grep -cv grep` -gt 0 ]
then
$(prefix)/bin/mailmanctl stop
fi
fi
endef
$(eval $(call BuildPackage,mailman))

+ 0
- 22
mail/mailman/files/mailman.init View File

@ -1,22 +0,0 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2014 OpenWrt.org
START=50
STOP=50
PYTHON=/usr/bin/python
MAILMANHOME=/usr/local/mailman
MAILMANCTL=$MAILMANHOME/bin/mailmanctl
start() {
#rm -f $MAILMANHOME/locks/*
$PYTHON $MAILMANCTL -s -q start
}
stop() {
$PYTHON $MAILMANCTL -q stop
}
restart() {
$PYTHON $MAILMANCTL -q restart
}

+ 0
- 11
mail/mailman/patches/100-postfix.patch View File

@ -1,11 +0,0 @@
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -506,7 +506,7 @@ SMTPLIB_DEBUG_LEVEL = 0
# standard out (or send an email to the site list owner) for manual twiddling
# of an /etc/aliases style file. Use 'Postfix' if you are using the Postfix
# MTA -- but then also see POSTFIX_STYLE_VIRTUAL_DOMAINS.
-MTA = 'Manual'
+MTA = 'Postfix'
# If you set MTA='Postfix', then you also want to set the following variable,
# depending on whether you're using virtual domains in Postfix, and which

+ 0
- 67
mail/mailman/patches/200-nohostdnspython.patch View File

@ -1,67 +0,0 @@
--- a/configure
+++ b/configure
@@ -2255,35 +2255,35 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $version" >&5
$as_echo "$version" >&6; }
-# See if dnspython is installed.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dnspython" >&5
-$as_echo_n "checking dnspython... " >&6; }
-
-cat > conftest.py <<EOF
-try:
- import dns.resolver
- res = 'ok'
-except ImportError:
- res = 'no'
-fp = open("conftest.out", "w")
-fp.write("%s\n" % res)
-fp.close()
-EOF
-
-$PYTHON conftest.py
-havednspython=`cat conftest.out`
-rm -f conftest.out conftest.py
-if test "$havednspython" = "no"
-then
- as_fn_error $? "
-
-***** dnspython not found. It is required for the new
-***** dmarc_moderation_action featurer. Get it from
-***** <http://www.dnspython.org/> or
-***** <https://pypi.python.org/pypi/dnspython/>" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $havednspython" >&5
-$as_echo "$havednspython" >&6; }
+## See if dnspython is installed.
+#{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dnspython" >&5
+#$as_echo_n "checking dnspython... " >&6; }
+#
+#cat > conftest.py <<EOF
+#try:
+# import dns.resolver
+# res = 'ok'
+#except ImportError:
+# res = 'no'
+#fp = open("conftest.out", "w")
+#fp.write("%s\n" % res)
+#fp.close()
+#EOF
+#
+#$PYTHON conftest.py
+#havednspython=`cat conftest.out`
+#rm -f conftest.out conftest.py
+#if test "$havednspython" = "no"
+#then
+# as_fn_error $? "
+#
+#***** dnspython not found. It is required for the new
+#***** dmarc_moderation_action featurer. Get it from
+#***** <http://www.dnspython.org/> or
+#***** <https://pypi.python.org/pypi/dnspython/>" "$LINENO" 5
+#fi
+#{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $havednspython" >&5
+#$as_echo "$havednspython" >&6; }
# Check the email package version.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's email package" >&5

+ 0
- 11
mail/mailman/patches/300-targetpython.patch View File

@ -1,11 +0,0 @@
--- a/configure
+++ b/configure
@@ -3957,6 +3957,8 @@ fi
$as_echo "$URLHOST" >&6; }
rm -f conftest.out conftest.py
+PYTHON=/usr/bin/python
+
# Checks for libraries.
for ac_func in strerror setregid syslog

+ 0
- 33
mail/mailman/patches/400-modules.patch View File

@ -1,33 +0,0 @@
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -30,7 +30,7 @@ import re
import shutil
import socket
import urllib
-import cPickle
+import pickle as cPickle
from cStringIO import StringIO
from UserDict import UserDict
--- a/misc/paths.py.in
+++ b/misc/paths.py.in
@@ -71,14 +71,14 @@ sys.path.append(distdir)
# In a normal interactive Python environment, the japanese.pth and korean.pth
# files would be imported automatically. But because we inhibit the importing
# of the site module, we need to be explicit about importing these codecs.
-if not jaok:
- import japanese
+#if not jaok:
+# import japanese
# As of KoreanCodecs 2.0.5, you had to do the second import to get the Korean
# codecs installed, however leave the first import in there in case an upgrade
# changes this.
-if not kook:
- import korean
- import korean.aliases
+#if not kook:
+# import korean
+# import korean.aliases
# Arabic and Hebrew (RFC-1556) encoding aliases. (temporary solution)
import encodings.aliases
encodings.aliases.aliases.update({

+ 0
- 55
net/danish/Makefile View File

@ -1,55 +0,0 @@
#
# Copyright (C) 2017 Andrew McConachie
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=danish
PKG_VERSION:=0.1
PKG_RELEASE:=2
PKG_MAINTAINER:=Andrew McConachie <andrew@depht.com>
PKG_LICENSE:=GPL-3.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/smutt/danish.git
PKG_SOURCE_VERSION:=f726656a4e37c46c037f61334ac48b35b7de25be
PKG_MIRROR_HASH:=cb0b4bb7a210091d807ee8e4a2876865f32a9bf195836eb2e1edf6c5975d1130
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python-package.mk
define Package/danish
SECTION:=net
CATEGORY:=Network
SUBMENU:=IP Addresses and Names
TITLE:=A middle box implementation of RFC 6698 for HTTPS.
URL:=https://github.com/smutt/danish
DEPENDS:=+python +python-dns +python-pcapy +python-dpkt +kmod-ipt-filter +iptables-mod-filter
endef
define Package/danish/description
Danish is an experiment in middle-box DANE (RFC 6698) for HTTPS.
https://www.middlebox-dane.org/
endef
define Build/Compile
$(call Build/Compile/PyMod,,\
install --prefix=/usr --root="$(PKG_INSTALL_DIR)", \
)
endef
define Package/danish/install
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_BUILD_DIR)/danish.py $(1)/usr/sbin/danish
$(INSTALL_DIR) $(1)/etc/config
$(CP) $(PKG_BUILD_DIR)/danish.conf $(1)/etc/config/danish
$(INSTALL_DIR) $(1)/etc/init.d
$(CP) $(PKG_BUILD_DIR)/danish.init $(1)/etc/init.d/danish
endef
$(eval $(call BuildPackage,danish))

+ 0
- 63
net/obfsproxy/Makefile View File

@ -1,63 +0,0 @@
#
# Copyright (C) 2006-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=obfsproxy
PKG_VERSION:=0.2.13
PKG_RELEASE:=3
PYPI_NAME:=$(PKG_NAME)
PKG_HASH:=1e26c2faef1cfcf856ddf60e9647058a7c78fb0d47f05b58a0f847ed7cc41a66
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
include ../../lang/python/pypi.mk
include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python-package.mk
define Package/obfsproxy
SECTION:=net
CATEGORY:=Network
TITLE:=A pluggable transport proxy written in Python
URL:=https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/
DEPENDS:= \
+python-light \
+python-crypto \
+python-pyptlib \
+python-setuptools \
+python-twisted \
+python-yaml
VARIANT:=python
endef
define Package/obfsproxy/description
obfsproxy is a tool that attempts to circumvent censorship, by
transforming the Tor traffic between the client and the bridge. This
way, censors, who usually monitor traffic between the client and the
bridge, will see innocent-looking transformed traffic instead of the
actual Tor traffic.
endef
define Package/obfsproxy/conffiles
/etc/config/obfsproxy
endef
define PyPackage/obfsproxy/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/obfsproxy $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/obfsproxy.conf $(1)/etc/config/obfsproxy
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/obfsproxy.init $(1)/etc/init.d/obfsproxy
endef
$(eval $(call PyPackage,obfsproxy))
$(eval $(call BuildPackage,obfsproxy))
$(eval $(call BuildPackage,obfsproxy-src))

+ 0
- 57
net/obfsproxy/files/obfsproxy.conf View File

@ -1,57 +0,0 @@
# To use Obfsproxy with Tor, follow the instructions at:
#
# https://www.torproject.org/projects/obfsproxy-instructions.html.en
#
# instead of setting up a separate instance of Obfsproxy.
config obfsproxy 'obfsproxy'
# Set to 1 to enable this instance
option enabled 0
# One of: managed, dummy, b64, obfs2, obfs3, scramblesuit
option transport 'scramblesuit'
# Shared secret / password
# For obfs2 (as the shared secret parameter) and scramblesuit only
option password 'EXAMPLEPASSWORDNOTREAL'
# One of: server, ext_server, client, socks
option mode 'socks'
# Destination address
# Required for all modes except 'socks'
#option dest_host '0.0.0.0'
#option dest_port '80'
# Extended ORPort authentication cookie file location
# Required for 'ext_server' mode
#option ext_cookie_file ''
# Listener address
option listen_host '127.0.0.1'
option listen_port '8080'
# Set to log to a file instead of syslog
#option log_file '/var/log/obfsproxy.log'
# Minimum logging severity
# One of: error, warning, info, debug
#option log_min_severity 'info'
# Set to 1 to disable logging
#option no_log 0
# Set to 1 to disable safe (scrubbed address) logging
#option no_safe_logging 0
# Run as a different user
#option user 'nobody'
# Outgoing proxy
# proxy_scheme is one of: socks4a, socks5, http
# txsocksx is required for socks4a or socks5
#option proxy_scheme ''
#option proxy_username ''
#option proxy_password ''
#option proxy_host ''
#option proxy_port ''

+ 0
- 158
net/obfsproxy/files/obfsproxy.init View File

@ -1,158 +0,0 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2016 OpenWrt.org
START=80
STOP=20
USE_PROCD=1
PROG=/usr/bin/obfsproxy
append_arg() {
local cfg="$1"
local var="$2"
local opt="$3"
local def="$4"
local val
config_get val "$cfg" "$var"
[ -n "$val" -o -n "$def" ] && procd_append_param command "$opt" "${val:-$def}"
}
append_bool() {
local cfg="$1"
local var="$2"
local opt="$3"
local def="$4"
local val
config_get_bool val "$cfg" "$var" "$def"
[ "$val" = 1 ] && procd_append_param command "$opt"
}
append_plain() {
procd_append_param command "$1"
}
append_param() {
local cfg="$1"
local var="$2"
local opt="$3"
local def="$4"
local val
config_get val "$cfg" "$var"
[ -n "$val" -o -n "$def" ] && procd_append_param "$opt" "${val:-$def}"
}
append_proxy_spec() {
local cfg="$1"
local scheme_var="$2"
local username_var="$3"
local password_var="$4"
local host_var="$5"
local port_var="$6"
local opt="$7"
local def="$8"
local scheme
local username
local password
local host
local port
local login
local val
config_get scheme "$cfg" "$scheme_var"
config_get username "$cfg" "$username_var"
config_get password "$cfg" "$password_var"
config_get host "$cfg" "$host_var"
config_get port "$cfg" "$port_var"
[ "$username" ] && login="$username${password:+:$password}@"
[ -n "$scheme" -a -n "$host" -a -n "$port" ] && val="$scheme://$login$host:$port"
[ -n "$val" -o -n "$def" ] && procd_append_param command "$opt" "${val:-$def}"
}
append_host_port() {
local cfg="$1"
local host_var="$2"
local port_var="$3"
local opt="$4"
local def="$5"
local host
local port
local val
config_get host "$cfg" "$host_var"
config_get port "$cfg" "$port_var"
[ -n "$host" -a -n "$port" ] && val="$host:$port"
[ -n "$val" -o -n "$def" ] && {
[ "$opt" ] && procd_append_param command "$opt"
procd_append_param command "${val:-$def}"
}
}
start_instance() {
local cfg="$1"
local lib_dir="/var/lib/obfsproxy/$cfg"
local redirect=0
local enabled
local user
local transport
local password
local log_min_severity
config_get_bool enabled "$cfg" 'enabled' '0'
[ "$enabled" = 0 ] && return 1
config_get user "$cfg" 'user' 'root'
config_get transport "$cfg" 'transport'
[ "$transport" = "scramblesuit" ] && config_get password "$cfg" 'password'
[ -d "$lib_dir" ] || {
mkdir -m 0755 -p "$lib_dir/data"
chmod -R 0700 "$lib_dir"
}
[ "$password" ] && {
echo "$password" > "$lib_dir/secret"
chmod 0600 "$lib_dir/secret"
}
chown -R "$user:" "$lib_dir"
config_get log_min_severity "$cfg" 'log_min_severity'
[ "$log_min_severity" = "debug" ] && redirect=1
procd_open_instance
procd_set_param command "$PROG" --data-dir "$lib_dir/data" --syslog "obfsproxy($cfg)"
append_arg "$cfg" log_file "--log-file"
append_arg "$cfg" log_min_severity "--log-min-severity"
append_bool "$cfg" no_log "--no-log"
append_bool "$cfg" no_safe_logging "--no-safe-logging"
append_proxy_spec "$cfg" proxy_scheme proxy_username proxy_password proxy_host proxy_port "--proxy"
append_param "$cfg" transport command
[ "$transport" = "obfs2" ] && append_arg "$cfg" password "--shared-secret"
[ "$password" ] && procd_append_param command "--password-file" "$lib_dir/secret"
append_param "$cfg" mode command
append_host_port "$cfg" dest_host dest_port "--dest"
append_arg "$cfg" ext_cookie_file "--ext-cookie-file"
append_host_port "$cfg" listen_host listen_port
procd_set_param respawn
procd_set_param stdout $redirect
procd_set_param stderr $redirect
append_param "$cfg" user user
procd_close_instance
}
service_triggers() {
procd_add_reload_trigger obfsproxy
}
start_service() {
config_load obfsproxy
config_foreach start_instance obfsproxy
}

+ 0
- 13
net/obfsproxy/patches/001-exclude-tests.patch View File

@ -1,13 +0,0 @@
diff --git a/setup.py b/setup.py
index 2353a29..9d2a9a9 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ setup(
version=versioneer.get_version(),
cmdclass=versioneer.get_cmdclass(),
- packages = find_packages(),
+ packages = find_packages(exclude=['*.test', '*.test.*']),
entry_points = {
'console_scripts': [
'obfsproxy = obfsproxy.pyobfsproxy:run'

+ 0
- 16
net/obfsproxy/patches/002-fix-python-path.patch View File

@ -1,16 +0,0 @@
diff --git a/setup.py b/setup.py
index 2353a29..8d3d56d 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,11 @@ setup(
'obfsproxy = obfsproxy.pyobfsproxy:run'
]
},
+ options = {
+ 'build_scripts': {
+ 'executable': '/usr/bin/python'
+ },
+ },
install_requires = [
'setuptools',

+ 0
- 12
net/obfsproxy/patches/003-remove-argparse-dependency-test.patch View File

@ -1,12 +0,0 @@
diff --git a/setup.py b/setup.py
index 2353a29..e04c5f5 100644
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,6 @@ setup(
'setuptools',
'PyCrypto',
'Twisted',
- 'argparse',
'pyptlib >= 0.0.6',
'pyyaml'
],

+ 0
- 51
net/obfsproxy/patches/004-add-syslog-support.patch View File

@ -1,51 +0,0 @@
diff --git a/obfsproxy/common/log.py b/obfsproxy/common/log.py
index bb30296..79193d2 100644
--- a/obfsproxy/common/log.py
+++ b/obfsproxy/common/log.py
@@ -1,5 +1,6 @@
"""obfsproxy logging code"""
import logging
+import logging.handlers
import sys
from twisted.python import log
@@ -50,6 +51,18 @@ class ObfsLogger(object):
self.obfslogger.addHandler(log_handler)
+ def set_syslog(self, progname):
+ """Set up our logger so that it starts logging to syslog instead."""
+
+ # remove the default handler, and add the SysLogHandler:
+ self.obfslogger.removeHandler(self.default_handler)
+
+ log_handler = logging.handlers.SysLogHandler(address='/dev/log')
+ formatter = logging.Formatter(progname + "[%(process)d]: %(message)s")
+ log_handler.setFormatter(formatter)
+
+ self.obfslogger.addHandler(log_handler)
+
def set_log_severity(self, sev_string):
"""Update our minimum logging severity to 'sev_string'."""
diff --git a/obfsproxy/pyobfsproxy.py b/obfsproxy/pyobfsproxy.py
index 4a2faf6..eaf8a44 100755
--- a/obfsproxy/pyobfsproxy.py
+++ b/obfsproxy/pyobfsproxy.py
@@ -42,6 +42,7 @@ def set_up_cli_parsing():
parser.add_argument('-v', '--version', action='version', version=__version__)
parser.add_argument('--log-file', help='set logfile')
+ parser.add_argument('--syslog', metavar='PROGNAME', help='use syslog')
parser.add_argument('--log-min-severity',
choices=['error', 'warning', 'info', 'debug'],
help='set minimum logging severity (default: %(default)s)')
@@ -110,6 +111,8 @@ def consider_cli_args(args):
if args.log_file:
log.set_log_file(args.log_file)
+ elif args.syslog:
+ log.set_syslog(args.syslog)
if args.log_min_severity:
log.set_log_severity(args.log_min_severity)
if args.no_log:

+ 0
- 46
utils/yunbridge/Makefile View File

@ -1,46 +0,0 @@
#
# Copyright (C) 2006-2011 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
PKG_NAME:=yunbridge
PKG_VERSION:=1.6.0
PKG_RELEASE:=1
PKG_SOURCE_URL:=https://codeload.github.com/arduino/YunBridge/tar.gz/$(PKG_VERSION)?
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=9e5ffc7a0d0cc2c92e972e425adcc49b77cf39da075d31728e7755d316d910d8
PKG_BUILD_DIR:=$(BUILD_DIR)/YunBridge-$(PKG_VERSION)
PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
define Package/yunbridge
SECTION:=utils
CATEGORY:=Utilities
TITLE:=Arduino YUN bridge library
URL:=http://arduino.cc/
DEPENDS:=+python
endef
define Package/yunbridge/description
Arduino YUN bridge library
endef
define Build/Compile
true
endef
define Package/yunbridge/install
mkdir -p $(1)/usr/lib/python2.7/bridge
$(CP) $(PKG_BUILD_DIR)/bridge/*.py $(1)/usr/lib/python2.7/bridge/
$(CP) ./files/* $(1)
endef
$(eval $(call BuildPackage,yunbridge))

+ 0
- 6
utils/yunbridge/files/etc/config/yunbridge View File

@ -1,6 +0,0 @@
config bridge config
option socket_timeout 5
option secure_rest_api false
# remove this line to activae the yunbridge
option disabled 1

+ 0
- 22
utils/yunbridge/files/etc/init.d/yunbridge View File

@ -1,22 +0,0 @@
#!/bin/sh /etc/rc.common
# Copyright (C) 2013 OpenWrt.org
# start after and stop before networking
START=20
STOP=89
USE_PROCD=1
service_triggers()
{
procd_add_reload_trigger "yunbridge"
}
start_service()
{
[ "$(uci -q get yunbridge.config.disabled)" = "1" ] && return 0
procd_open_instance
procd_set_param command "/sbin/yunbridge"
procd_set_param respawn
procd_close_instance
}

+ 0
- 6
utils/yunbridge/files/sbin/yunbridge View File

@ -1,6 +0,0 @@
#!/bin/sh
stty -F /dev/ttyS0 2500000 clocal cread cs8 -cstopb -parenb
exec < /dev/ttyS0
exec > /dev/ttyS0
exec 2> /dev/ttyS0
askfirst bin/ash --login

+ 0
- 75
utils/yunbridge/files/usr/bin/pretty-wifi-info.lua View File

@ -1,75 +0,0 @@
#!/usr/bin/lua
local function get_basic_net_info(network, iface, accumulator)
local net = network:get_network(iface)
local device = net and net:get_interface()
if device then
accumulator["uptime"] = net:uptime()
accumulator["iface"] = device:name()
accumulator["mac"] = device:mac()
accumulator["rx_bytes"] = device:rx_bytes()
accumulator["tx_bytes"] = device:tx_bytes()
accumulator["ipaddrs"] = {}
for _, ipaddr in ipairs(device:ipaddrs()) do
accumulator.ipaddrs[#accumulator.ipaddrs + 1] = {
addr = ipaddr:host():string(),
netmask = ipaddr:mask():string()
}
end
end
end
local function get_wifi_info(network, iface, accumulator)
local net = network:get_wifinet(iface)
if net then
local dev = net:get_device()
if dev then
accumulator["mode"] = net:active_mode()
accumulator["ssid"] = net:active_ssid()
accumulator["encryption"] = net:active_encryption()
accumulator["quality"] = net:signal_percent()
end
end
end
local function collect_wifi_info()
local network = require"luci.model.network".init()
local accumulator = {}
get_basic_net_info(network, "lan", accumulator)
get_wifi_info(network, "wlan0", accumulator)
return accumulator
end
local info = collect_wifi_info()
print("Current WiFi configuration")
if info.ssid then
print("SSID: " .. info.ssid)
end
if info.mode then
print("Mode: " .. info.mode)
end
if info.quality then
print("Signal: " .. info.quality .. "%")
end
if info.encryption then
print("Encryption method: " .. info.encryption)
end
if info.iface then
print("Interface name: " .. info.iface)
end
if info.uptime then
print("Active for: " .. math.floor(info.uptime / 60) .. " minutes")
end
if #info.ipaddrs > 0 then
print("IP address: " .. info.ipaddrs[1].addr .. "/" .. info.ipaddrs[1].netmask)
end
if info.mac then
print("MAC address: " .. info.mac)
end
if info.rx_bytes and info.tx_bytes then
print("RX/TX: " .. math.floor(info.rx_bytes / 1024) .. "/" .. math.floor(info.tx_bytes / 1024) .. " KBs")
end

+ 0
- 414
utils/yunbridge/files/usr/lib/lua/luci/controller/arduino/index.lua View File

@ -1,414 +0,0 @@
--[[
This file is part of YunWebUI.
YunWebUI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
As a special exception, you may use this file as part of a free software
library without restriction. Specifically, if other files instantiate
templates or use macros or inline functions from this file, or you compile
this file and link it with other files to produce an executable, this
file does not by itself cause the resulting executable to be covered by
the GNU General Public License. This exception does not however
invalidate any other reasons why the executable file might be covered by
the GNU General Public License.
Copyright 2013 Arduino LLC (http://www.arduino.cc/)
]]
module("luci.controller.arduino.index", package.seeall)
local function not_nil_or_empty(value)
return value and value ~= ""
end
local function get_first(cursor, config, type, option)
return cursor:get_first(config, type, option)
end
local function set_first(cursor, config, type, option, value)
cursor:foreach(config, type, function(s)
if s[".type"] == type then
cursor:set(config, s[".name"], option, value)
end
end)
end
local function to_key_value(s)
local parts = luci.util.split(s, ":")
parts[1] = luci.util.trim(parts[1])
parts[2] = luci.util.trim(parts[2])
return parts[1], parts[2]
end
function http_error(code, text)
luci.http.prepare_content("text/plain")
luci.http.status(code)
if text then
luci.http.write(text)
end
end
function index()
function luci.dispatcher.authenticator.arduinoauth(validator, accs, default)
require("luci.controller.arduino.index")
local user = luci.http.formvalue("username")
local pass = luci.http.formvalue("password")
local basic_auth = luci.http.getenv("HTTP_AUTHORIZATION")
if user and validator(user, pass) then
return user
end
if basic_auth and basic_auth ~= "" then
local decoded_basic_auth = nixio.bin.b64decode(string.sub(basic_auth, 7))
user = string.sub(decoded_basic_auth, 0, string.find(decoded_basic_auth, ":") - 1)
pass = string.sub(decoded_basic_auth, string.find(decoded_basic_auth, ":") + 1)
end
if user then
if #pass ~= 64 and validator(user, pass) then
return user
elseif #pass == 64 then
local uci = luci.model.uci.cursor()
uci:load("yunbridge")
local stored_encrypted_pass = uci:get_first("yunbridge", "bridge", "password")
if pass == stored_encrypted_pass then
return user
end
end
end
luci.http.header("WWW-Authenticate", "Basic realm=\"yunbridge\"")
luci.http.status(401)
return false
end
local function make_entry(path, target, title, order)
local page = entry(path, target, title, order)
page.leaf = true
return page
end
-- web panel
local webpanel = entry({ "webpanel" }, alias("webpanel", "go_to_homepage"), _("%s Web Panel") % luci.sys.hostname(), 10)
webpanel.sysauth = "root"
webpanel.sysauth_authenticator = "arduinoauth"
make_entry({ "webpanel", "go_to_homepage" }, call("go_to_homepage"), nil)
--api security level
local uci = luci.model.uci.cursor()
uci:load("yunbridge")
local secure_rest_api = uci:get_first("yunbridge", "bridge", "secure_rest_api")
local rest_api_sysauth = false
if secure_rest_api == "true" then
rest_api_sysauth = webpanel.sysauth
end
--storage api
local data_api = node("data")
data_api.sysauth = rest_api_sysauth
data_api.sysauth_authenticator = webpanel.sysauth_authenticator
make_entry({ "data", "get" }, call("storage_send_request"), nil).sysauth = rest_api_sysauth
make_entry({ "data", "put" }, call("storage_send_request"), nil).sysauth = rest_api_sysauth
make_entry({ "data", "delete" }, call("storage_send_request"), nil).sysauth = rest_api_sysauth
local mailbox_api = node("mailbox")
mailbox_api.sysauth = rest_api_sysauth
mailbox_api.sysauth_authenticator = webpanel.sysauth_authenticator
make_entry({ "mailbox" }, call("build_bridge_mailbox_request"), nil).sysauth = rest_api_sysauth
--plain socket endpoint
local plain_socket_endpoint = make_entry({ "arduino" }, call("board_plain_socket"), nil)
plain_socket_endpoint.sysauth = rest_api_sysauth
plain_socket_endpoint.sysauth_authenticator = webpanel.sysauth_authenticator
end
function go_to_homepage()
luci.http.redirect("/index.html")
end
local function build_bridge_request(command, params)
local bridge_request = {
command = command
}
if command == "raw" then
params = table.concat(params, "/")
if not_nil_or_empty(params) then
bridge_request["data"] = params
end
return bridge_request
end
if command == "get" then
if not_nil_or_empty(params[1]) then
bridge_request["key"] = params[1]
end
return bridge_request
end
if command == "put" and not_nil_or_empty(params[1]) and params[2] then
bridge_request["key"] = params[1]
bridge_request["value"] = params[2]
return bridge_request
end
if command == "delete" and not_nil_or_empty(params[1]) then
bridge_request["key"] = params[1]
return bridge_request
end
return nil
end
local function extract_jsonp_param(query_string)
if not not_nil_or_empty(query_string) then
return nil
end
local qs_parts = string.split(query_string, "&")
for idx, value in ipairs(qs_parts) do
if string.find(value, "jsonp") == 1 or string.find(value, "callback") == 1 then
return string.sub(value, string.find(value, "=") + 1)
end
end
end
local function parts_after(url_part)
local url = luci.http.getenv("PATH_INFO")
local url_after_part = string.find(url, "/", string.find(url, url_part) + 1)
if not url_after_part then
return {}
end
return luci.util.split(string.sub(url, url_after_part + 1), "/")
end
function storage_send_request()
local method = luci.http.getenv("REQUEST_METHOD")
local jsonp_callback = extract_jsonp_param(luci.http.getenv("QUERY_STRING"))
local parts = parts_after("data")
local command = parts[1]
if not command or command == "" then
luci.http.status(404)
return
end
local params = {}
for idx, param in ipairs(parts) do
if idx > 1 and not_nil_or_empty(param) then
table.insert(params, param)
end
end
-- TODO check method?
local bridge_request = build_bridge_request(command, params)
if not bridge_request then
luci.http.status(403)
return
end
local uci = luci.model.uci.cursor()
uci:load("yunbridge")
local socket_timeout = uci:get_first("yunbridge", "bridge", "socket_timeout", 5)
local sock, code, msg = nixio.connect("127.0.0.1", 5700)
if not sock then
code = code or ""
msg = msg or ""
http_error(500, "nil socket, " .. code .. " " .. msg)
return
end
sock:setopt("socket", "sndtimeo", socket_timeout)
sock:setopt("socket", "rcvtimeo", socket_timeout)
sock:setopt("tcp", "nodelay", 1)
local json = require("luci.json")
sock:write(json.encode(bridge_request))
sock:writeall("\n")
local response_text = {}
while true do
local bytes = sock:recv(4096)
if bytes and #bytes > 0 then
table.insert(response_text, bytes)
end
local json_response = json.decode(table.concat(response_text))
if json_response then
sock:close()
luci.http.status(200)
if jsonp_callback then
luci.http.prepare_content("application/javascript")
luci.http.write(jsonp_callback)
luci.http.write("(")
luci.http.write_json(json_response)
luci.http.write(");")
else
luci.http.prepare_content("application/json")
luci.http.write(json.encode(json_response))
end
return
end
if not bytes or #response_text == 0 then
sock:close()
http_error(500, "Empty response")
return
end
end
sock:close()
end
function board_plain_socket()
local function send_response(response_text, jsonp_callback)
if not response_text then
luci.http.status(500)
return
end
local rows = luci.util.split(response_text, "\r\n")
if #rows == 1 or string.find(rows[1], "Status") ~= 1 then
luci.http.prepare_content("text/plain")
luci.http.status(200)
luci.http.write(response_text)
return
end
local body_start_at_idx = -1
local content_type = "text/plain"
for idx, row in ipairs(rows) do
if row == "" then
body_start_at_idx = idx
break
end
local key, value = to_key_value(row)
if string.lower(key) == "status" then
luci.http.status(tonumber(value))
elseif string.lower(key) == "content-type" then
content_type = value
else
luci.http.header(key, value)
end
end
local response_body = table.concat(rows, "\r\n", body_start_at_idx + 1)
if content_type == "application/json" and jsonp_callback then
local json = require("luci.json")
luci.http.prepare_content("application/javascript")
luci.http.write(jsonp_callback)
luci.http.write("(")
luci.http.write_json(json.decode(response_body))
luci.http.write(");")
else
luci.http.prepare_content(content_type)
luci.http.write(response_body)
end
end
local method = luci.http.getenv("REQUEST_METHOD")
local jsonp_callback = extract_jsonp_param(luci.http.getenv("QUERY_STRING"))
local parts = parts_after("arduino")
local params = {}
for idx, param in ipairs(parts) do
if not_nil_or_empty(param) then
table.insert(params, param)
end
end
if #params == 0 then
luci.http.status(404)
return
end
params = table.concat(params, "/")
local uci = luci.model.uci.cursor()
uci:load("yunbridge")
local socket_timeout = uci:get_first("yunbridge", "bridge", "socket_timeout", 5)
local sock, code, msg = nixio.connect("127.0.0.1", 5555)
if not sock then
code = code or ""
msg = msg or ""
http_error(500, "Could not connect to YunServer " .. code .. " " .. msg)
return
end
sock:setopt("socket", "sndtimeo", socket_timeout)
sock:setopt("socket", "rcvtimeo", socket_timeout)
sock:setopt("tcp", "nodelay", 1)
sock:write(params)
sock:writeall("\r\n")
local response_text = sock:readall()
sock:close()
send_response(response_text, jsonp_callback)
end
function build_bridge_mailbox_request()
local method = luci.http.getenv("REQUEST_METHOD")
local jsonp_callback = extract_jsonp_param(luci.http.getenv("QUERY_STRING"))
local parts = parts_after("mailbox")
local params = {}
for idx, param in ipairs(parts) do
if not_nil_or_empty(param) then
table.insert(params, param)
end
end
if #params == 0 then
luci.http.status(400)
return
end
local bridge_request = build_bridge_request("raw", params)
if not bridge_request then
luci.http.status(403)
return
end
local uci = luci.model.uci.cursor()
uci:load("yunbridge")
local socket_timeout = uci:get_first("yunbridge", "bridge", "socket_timeout", 5)
local sock, code, msg = nixio.connect("127.0.0.1", 5700)
if not sock then
code = code or ""
msg = msg or ""
http_error(500, "nil socket, " .. code .. " " .. msg)
return
end
sock:setopt("socket", "sndtimeo", socket_timeout)
sock:setopt("socket", "rcvtimeo", socket_timeout)
sock:setopt("tcp", "nodelay", 1)
local json = require("luci.json")
sock:write(json.encode(bridge_request))
sock:writeall("\n")
sock:close()
luci.http.status(200)
end

+ 0
- 199
utils/yunbridge/files/usr/lib/lua/luci/sha256.lua View File

@ -1,199 +0,0 @@
--
-- Code merged by gravityscore at http://pastebin.com/gsFrNjbt
--
-- Adaptation of the Secure Hashing Algorithm (SHA-244/256)
-- Found Here: http://lua-users.org/wiki/SecureHashAlgorithm
--
-- Using an adapted version of the bit library
-- Found Here: https://bitbucket.org/Boolsheet/bslf/src/1ee664885805/bit.lua
--
module("luci.sha256", package.seeall)
local MOD = 2 ^ 32
local MODM = MOD - 1
local function memoize(f)
local mt = {}
local t = setmetatable({}, mt)
function mt:__index(k)
local v = f(k)
t[k] = v
return v
end
return t
end
local function make_bitop_uncached(t, m)
local function bitop(a, b)
local res, p = 0, 1
while a ~= 0 and b ~= 0 do
local am, bm = a % m, b % m
res = res + t[am][bm] * p
a = (a - am) / m
b = (b - bm) / m
p = p * m
end
res = res + (a + b) * p
return res
end
return bitop
end
local function make_bitop(t)
local op1 = make_bitop_uncached(t, 2 ^ 1)
local op2 = memoize(function(a) return memoize(function(b) return op1(a, b) end) end)
return make_bitop_uncached(op2, 2 ^ (t.n or 1))
end
local bxor1 = make_bitop({ [0] = { [0] = 0, [1] = 1 }, [1] = { [0] = 1, [1] = 0 }, n = 4 })
local function bxor(a, b, c, ...)
local z = nil
if b then
a = a % MOD
b = b % MOD
z = bxor1(a, b)
if c then z = bxor(z, c, ...) end
return z
elseif a then return a % MOD
else return 0
end
end
local function band(a, b, c, ...)
local z
if b then
a = a % MOD
b = b % MOD
z = ((a + b) - bxor1(a, b)) / 2
if c then z = bit32_band(z, c, ...) end
return z
elseif a then return a % MOD
else return MODM
end
end
local function bnot(x) return (-1 - x) % MOD end
local function rshift1(a, disp)
if disp < 0 then return lshift(a, -disp) end
return math.floor(a % 2 ^ 32 / 2 ^ disp)
end
local function rshift(x, disp)
if disp > 31 or disp < -31 then return 0 end
return rshift1(x % MOD, disp)
end
local function lshift(a, disp)
if disp < 0 then return rshift(a, -disp) end
return (a * 2 ^ disp) % 2 ^ 32
end
local function rrotate(x, disp)
x = x % MOD
disp = disp % 32
local low = band(x, 2 ^ disp - 1)
return rshift(x, disp) + lshift(low, 32 - disp)
end
local k = {
0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc,
0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7,
0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3,
0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5,
0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
}
local function str2hexa(s)
return (string.gsub(s, ".", function(c) return string.format("%02x", string.byte(c)) end))
end
local function num2s(l, n)
local s = ""
for i = 1, n do
local rem = l % 256
s = string.char(rem) .. s
l = (l - rem) / 256
end
return s
end
local function s232num(s, i)
local n = 0
for i = i, i + 3 do n = n * 256 + string.byte(s, i) end
return n
end
local function preproc(msg, len)
local extra = 64 - ((len + 9) % 64)
len = num2s(8 * len, 8)
msg = msg .. "\128" .. string.rep("\0", extra) .. len
assert(#msg % 64 == 0)
return msg
end
local function initH256(H)
H[1] = 0x6a09e667
H[2] = 0xbb67ae85
H[3] = 0x3c6ef372
H[4] = 0xa54ff53a
H[5] = 0x510e527f
H[6] = 0x9b05688c
H[7] = 0x1f83d9ab
H[8] = 0x5be0cd19
return H
end
local function digestblock(msg, i, H)
local w = {}
for j = 1, 16 do w[j] = s232num(msg, i + (j - 1) * 4) end
for j = 17, 64 do
local v = w[j - 15]
local s0 = bxor(rrotate(v, 7), rrotate(v, 18), rshift(v, 3))
v = w[j - 2]
w[j] = w[j - 16] + s0 + w[j - 7] + bxor(rrotate(v, 17), rrotate(v, 19), rshift(v, 10))
end
local a, b, c, d, e, f, g, h = H[1], H[2], H[3], H[4], H[5], H[6], H[7], H[8]
for i = 1, 64 do
local s0 = bxor(rrotate(a, 2), rrotate(a, 13), rrotate(a, 22))
local maj = bxor(band(a, b), band(a, c), band(b, c))
local t2 = s0 + maj
local s1 = bxor(rrotate(e, 6), rrotate(e, 11), rrotate(e, 25))
local ch = bxor(band(e, f), band(bnot(e), g))
local t1 = h + s1 + ch + k[i] + w[i]
h, g, f, e, d, c, b, a = g, f, e, d + t1, c, b, a, t1 + t2
end
H[1] = band(H[1] + a)
H[2] = band(H[2] + b)
H[3] = band(H[3] + c)
H[4] = band(H[4] + d)
H[5] = band(H[5] + e)
H[6] = band(H[6] + f)
H[7] = band(H[7] + g)
H[8] = band(H[8] + h)
end
function sha256(msg)
msg = preproc(msg, #msg)
local H = initH256({})
for i = 1, #msg, 64 do digestblock(msg, i, H) end
return str2hexa(num2s(H[1], 4) .. num2s(H[2], 4) .. num2s(H[3], 4) .. num2s(H[4], 4) ..
num2s(H[5], 4) .. num2s(H[6], 4) .. num2s(H[7], 4) .. num2s(H[8], 4))
end

+ 0
- 18
utils/yunbridge/patches/000-scripts.patch View File

@ -1,18 +0,0 @@
--- a/bridge/packet.py
+++ b/bridge/packet.py
@@ -93,12 +93,12 @@
def run(self, data):
if data[0] != 'X':
- call(['/usr/bin/blink-start', '100'])
+ #call(['/usr/bin/blink-start', '100'])
return chr(1)
if data[1:4] != '100':
- call(['/usr/bin/blink-start', '100'])
+ #call(['/usr/bin/blink-start', '100'])
return chr(2)
- call(['/usr/bin/blink-stop'])
+ #call(['/usr/bin/blink-stop'])
return chr(0) + '160' # send the actual bridge version
class PacketReader:

Write Preview
Loading…
Cancel
Save