Hi, this updates NaCl to version 20110221 and Quicktun to 2.1.6. Also I improved the Quicktun init script so it doesn't fail when Quicktun takes more than 1 second to start.
Signed-off-by: Matthias Schiffer <[email protected]> -- Index: net/quicktun/files/quicktun.init =================================================================== --- net/quicktun/files/quicktun.init (revision 26388) +++ net/quicktun/files/quicktun.init (working copy) @@ -60,12 +60,14 @@ eval env $OPTS "$SSD" -q -b -p "$PID" -m -x "$BIN" -S - sleep 1 + while ! ifconfig "$interface" >/dev/null 2>&1; do + if ! $SSD -t -q -p $PID -x $BIN -K; then + echo "$s: daemon startup failed" + return 1 + fi - if ! ifconfig "$interface" >/dev/null 2>&1; then - echo "$s: daemon startup failed" - return 1 - fi + sleep 1 + done config_get up "$s" up [ -n "$up" ] && sh -c "$up" - "$interface" Index: net/quicktun/Makefile =================================================================== --- net/quicktun/Makefile (revision 26388) +++ net/quicktun/Makefile (working copy) @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quicktun -PKG_VERSION:=2.1.3 +PKG_VERSION:=2.1.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://oss.ucis.nl/quicktun/src -PKG_MD5SUM:=f8449162c08954e1bbb2f3353ce43a5a +PKG_MD5SUM:=04e322b431235b18a091438d9a880a9b PKG_BUILD_DEPENDS:=nacl @@ -36,13 +36,12 @@ export CPATH=$(STAGING_DIR)/usr/include/nacl; \ \ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DCOMBINED_BINARY src/proto.raw.c -o obj/proto.raw.o; \ - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DCOMBINED_BINARY src/crypto_scalarmult_curve25519.c -o obj/crypto_scalarmult_curve25519.o; \ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DCOMBINED_BINARY src/proto.nacl0.c -o obj/proto.nacl0.o; \ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DCOMBINED_BINARY src/proto.nacltai.c -o obj/proto.nacltai.o; \ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c -DCOMBINED_BINARY src/run.combined.c -o obj/run.combined.o; \ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -c src/common.c -o obj/common.o; \ $(TARGET_CC) $(TARGET_LDFLAGS) -o out/quicktun.combined obj/common.o obj/run.combined.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o \ - obj/crypto_scalarmult_curve25519.o -lnacl; \ + -lnacl; \ \ $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(TARGET_LDFLAGS) -o out/quicktun.keypair src/keypair.c -lnacl \ ) Index: libs/nacl/Makefile =================================================================== --- libs/nacl/Makefile (revision 26388) +++ libs/nacl/Makefile (working copy) @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nacl -PKG_VERSION:=20100830 +PKG_VERSION:=20110221 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://hyperelliptic.org/nacl -PKG_MD5SUM:=3f3cfd76d223068856fd987e3e6732a5 +PKG_MD5SUM:=7efb5715561c3d10dafd3fa97b4f2d20 include $(INCLUDE_DIR)/package.mk
signature.asc
Description: OpenPGP digital signature
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
