Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6955] branches/1.0
|
From: <abe...@us...> - 2015-01-30 00:12:43
|
Revision: 6955
http://sourceforge.net/p/astlinux/code/6955
Author: abelbeck
Date: 2015-01-30 00:12:41 +0000 (Fri, 30 Jan 2015)
Log Message:
-----------
dropbear, version bump to 2015.67 for RUNNUX use
Modified Paths:
--------------
branches/1.0/package/dropbear/Config.in
branches/1.0/package/dropbear/dropbear.mk
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/project/runnix/target_skeleton/runnix
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Removed Paths:
-------------
branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch
Modified: branches/1.0/package/dropbear/Config.in
===================================================================
--- branches/1.0/package/dropbear/Config.in 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/package/dropbear/Config.in 2015-01-30 00:12:41 UTC (rev 6955)
@@ -6,9 +6,10 @@
http://matt.ucc.asn.au/dropbear/dropbear.html
+if BR2_PACKAGE_DROPBEAR
+
config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS
bool "disable reverse DNS lookups"
- depends on BR2_PACKAGE_DROPBEAR
help
Disable reverse DNS lookups on connection. This can be handy
on systems without working DNS, as connections otherwise
@@ -17,9 +18,10 @@
config BR2_PACKAGE_DROPBEAR_SMALL
bool "optimize for size"
default y
- depends on BR2_PACKAGE_DROPBEAR
help
Compile dropbear for the smallest possible binary size.
Tradeoffs are slower hashes and ciphers, and disabling of the
blowfish cipher and zlib.
+
+endif
Deleted: branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch
===================================================================
--- branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/package/dropbear/dropbear-fix-missing-TIMEVAL_TO_TIMESPEC.patch 2015-01-30 00:12:41 UTC (rev 6955)
@@ -1,11 +0,0 @@
-diff -ur dropbear-0.48/includes.h dropbear-0.48-patched/includes.h
---- dropbear-0.48/includes.h 2006-03-09 09:06:02.000000000 -0600
-+++ dropbear-0.48-patched/includes.h 2006-03-15 22:36:12.000000000 -0600
-@@ -35,6 +35,7 @@
- #include <sys/param.h> /* required for BSD4_4 define */
- #include <sys/socket.h>
- #include <sys/stat.h>
-+#define _GNU_SOURCE
- #include <sys/time.h>
- #include <sys/un.h>
- #include <sys/wait.h>
Modified: branches/1.0/package/dropbear/dropbear.mk
===================================================================
--- branches/1.0/package/dropbear/dropbear.mk 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/package/dropbear/dropbear.mk 2015-01-30 00:12:41 UTC (rev 6955)
@@ -4,12 +4,13 @@
#
#############################################################
-DROPBEAR_VERSION = 2012.55
-DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.gz
+DROPBEAR_VERSION = 2015.67
DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases
+DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
DROPBEAR_TARGET_BINS = dbclient dropbearkey dropbearconvert scp ssh
-DROPBEAR_MAKE = $(MAKE) MULTI=1 SCPPROGRESS=1 \
- PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
+DROPBEAR_MAKE = \
+ $(MAKE) MULTI=1 SCPPROGRESS=1 \
+ PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"
ifeq ($(BR2_PREFER_STATIC_LIB),y)
DROPBEAR_MAKE += STATIC=1
@@ -21,21 +22,23 @@
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH
-define DROPBEAR_DISABLE_REVERSE_DNS
- $(SED) 's,^#define DO_HOST_LOOKUP.*,/* #define DO_HOST_LOOKUP */,' $(@D)/options.h
+define DROPBEAR_ENABLE_REVERSE_DNS
+ $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h
endef
define DROPBEAR_BUILD_SMALL
- echo "#define DROPBEAR_SMALL_CODE" >>$(@D)/options.h
- echo "#define NO_FAST_EXPTMOD" >>$(@D)/options.h
+ $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
endef
define DROPBEAR_BUILD_FEATURED
- echo "#define DROPBEAR_BLOWFISH" >>$(@D)/options.h
+ $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
+ $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
+ $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
+ $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
endef
-ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),y)
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_REVERSE_DNS
+ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),)
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
endif
ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
@@ -55,12 +58,13 @@
for f in $(DROPBEAR_TARGET_BINS); do \
ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \
done
+ ln -snf /tmp/etc/dropbear $(TARGET_DIR)/etc/dropbear
endef
define DROPBEAR_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/sbin/dropbear
+ rm -f $(TARGET_DIR)/etc/dropbear
rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(DROPBEAR_TARGET_BINS))
- rm -f $(TARGET_DIR)/etc/init.d/S50dropbear
endef
$(eval $(call AUTOTARGETS,package,dropbear))
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/project/runnix/geni586/linux.config 2015-01-30 00:12:41 UTC (rev 6955)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.62 Kernel Configuration
+# Linux/i386 3.2.66 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -312,6 +312,7 @@
# CONFIG_X86_ANCIENT_MCE is not set
# CONFIG_X86_MCE_INJECT is not set
CONFIG_VM86=y
+# CONFIG_X86_16BIT is not set
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
CONFIG_X86_REBOOTFIXUPS=y
Modified: branches/1.0/project/runnix/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix/target_skeleton/runnix 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/project/runnix/target_skeleton/runnix 2015-01-30 00:12:41 UTC (rev 6955)
@@ -62,15 +62,18 @@
if [ -n "$SSHPORT" ]; then
mount -t devpts devpts /dev/pts
+ mkdir /tmp/etc/dropbear
+
echo "Generating keys..."
- dropbearkey -t rsa -f /tmp/rsa_key -s 1024
- dropbearkey -t dss -f /tmp/dss_key -s 1024
+ dropbearkey -t rsa -f /tmp/etc/dropbear/dropbear_rsa_host_key -s 1024
+ dropbearkey -t dss -f /tmp/etc/dropbear/dropbear_dss_host_key -s 1024
+ dropbearkey -t ecdsa -f /tmp/etc/dropbear/dropbear_ecdsa_host_key
touch /var/log/lastlog
touch /var/log/wtmp
echo "Starting SSH..."
- dropbear -d /tmp/dss_key -r /tmp/rsa_key -E -P /tmp/dropbear.pid -p $SSHPORT
+ dropbear -E -P /tmp/dropbear.pid -p $SSHPORT
myipv4="$(ip -o addr show dev "$NDEV" 2>/dev/null | awk '$3 == "inet" { split($4, field, "/"); print field[1]; }')"
if [ -n "$myipv4" ]; then
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/runnix-uclibc.config 2015-01-30 00:12:41 UTC (rev 6955)
@@ -855,7 +855,7 @@
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
+BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
BR2_PACKAGE_DROPBEAR_SMALL=y
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-01-29 18:22:59 UTC (rev 6954)
+++ branches/1.0/runnix.config 2015-01-30 00:12:41 UTC (rev 6955)
@@ -603,7 +603,7 @@
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
-# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
+BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS=y
BR2_PACKAGE_DROPBEAR_SMALL=y
# BR2_PACKAGE_EBTABLES is not set
# BR2_PACKAGE_ETHTOOL is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
