Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2015-05-16 17:37:00
|
Revision: 7068
http://sourceforge.net/p/astlinux/code/7068
Author: abelbeck
Date: 2015-05-16 17:36:58 +0000 (Sat, 16 May 2015)
Log Message:
-----------
Disable asterisk-gui for all default builds, Asterisk 13 was already disabled
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-05-16 17:32:46 UTC (rev 7067)
+++ branches/1.0/astlinux-ast11.config 2015-05-16 17:36:58 UTC (rev 7068)
@@ -171,7 +171,7 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-BR2_PACKAGE_ASTERISK_GUI=y
+# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-05-16 17:32:46 UTC (rev 7067)
+++ branches/1.0/astlinux18.config 2015-05-16 17:36:58 UTC (rev 7068)
@@ -171,7 +171,7 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
BR2_PACKAGE_ASTERISK_FOP2=y
-BR2_PACKAGE_ASTERISK_GUI=y
+# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-05-20 00:34:49
|
Revision: 7071
http://sourceforge.net/p/astlinux/code/7071
Author: abelbeck
Date: 2015-05-20 00:34:46 +0000 (Wed, 20 May 2015)
Log Message:
-----------
php, version bump to 5.5.25, add a 'timezonedb' build option to use a custom zoneinfo database file that is much smaller then the new default 32/64-bit version
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/php/Config.ext
branches/1.0/package/php/php.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/astlinux-ast11.config 2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6998-dirty Configuration
-# Sun Mar 8 11:46:55 2015
+# Buildroot 2011.08-svn7070-dirty Configuration
+# Tue May 19 19:11:47 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -463,6 +463,7 @@
#
# PHP Extensions
#
+BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
BR2_PACKAGE_PHP_EXT_POSIX=y
BR2_PACKAGE_PHP_EXT_SESSION=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/astlinux-ast13.config 2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6998-dirty Configuration
-# Sun Mar 8 11:46:55 2015
+# Buildroot 2011.08-svn7070-dirty Configuration
+# Tue May 19 19:11:54 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -463,6 +463,7 @@
#
# PHP Extensions
#
+BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
BR2_PACKAGE_PHP_EXT_POSIX=y
BR2_PACKAGE_PHP_EXT_SESSION=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/astlinux18.config 2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6998-dirty Configuration
-# Sun Mar 8 11:46:55 2015
+# Buildroot 2011.08-svn7070-dirty Configuration
+# Tue May 19 19:11:42 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -463,6 +463,7 @@
#
# PHP Extensions
#
+BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
BR2_PACKAGE_PHP_EXT_POSIX=y
BR2_PACKAGE_PHP_EXT_SESSION=y
Modified: branches/1.0/package/php/Config.ext
===================================================================
--- branches/1.0/package/php/Config.ext 2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/package/php/Config.ext 2015-05-20 00:34:46 UTC (rev 7071)
@@ -1,5 +1,16 @@
menu "PHP Extensions"
+config BR2_PACKAGE_PHP_EXT_TIMEZONEDB
+ bool "timezonedb"
+ default y
+ help
+ Custom TimeZone Database (AstLinux Feature)
+ Allows the PHP and system Zoneinfo to track each other
+ and uses the much smaller 32-bit only tzdata
+
+ Use: ./scripts/php-timezonedb/makearchive.sh
+ to generate a new database tracking the target's zoneinfo
+
config BR2_PACKAGE_PHP_EXT_SOCKETS
bool "socket"
help
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2015-05-17 21:41:50 UTC (rev 7070)
+++ branches/1.0/package/php/php.mk 2015-05-20 00:34:46 UTC (rev 7071)
@@ -4,13 +4,33 @@
#
#############################################################
-PHP_VERSION = 5.5.24
+PHP_VERSION = 5.5.25
PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
PHP_INSTALL_STAGING_OPT = INSTALL_ROOT=$(STAGING_DIR) install
PHP_INSTALL_TARGET_OPT = INSTALL_ROOT=$(TARGET_DIR) install
PHP_DEPENDENCIES = host-pkg-config
+
+ifeq ($(BR2_PACKAGE_PHP_EXT_TIMEZONEDB),y)
+PHP_TIMEZONEDB_VERSION = 2015.3
+PHP_TIMEZONEDB_SITE = http://files.astlinux.org
+PHP_TIMEZONEDB_SOURCE = timezonedb-$(PHP_TIMEZONEDB_VERSION).tar.gz
+
+define PHP_TIMEZONEDB_DOWNLOAD
+ $(call DOWNLOAD,$(PHP_TIMEZONEDB_SITE),$(PHP_TIMEZONEDB_SOURCE))
+endef
+PHP_POST_DOWNLOAD_HOOKS += PHP_TIMEZONEDB_DOWNLOAD
+
+define PHP_TIMEZONEDB_EXTRACT
+ mkdir -p $(@D)/timezonedb
+ $(INFLATE$(suffix $(PHP_TIMEZONEDB_SOURCE))) $(DL_DIR)/$(PHP_TIMEZONEDB_SOURCE) | \
+ $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D)/timezonedb $(TAR_OPTIONS) -
+ cp $(@D)/timezonedb/timezonedb.h $(@D)/ext/date/lib/timezonedb.h
+endef
+PHP_POST_EXTRACT_HOOKS += PHP_TIMEZONEDB_EXTRACT
+endif
+
PHP_CONF_OPT = \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-05-26 23:31:58
|
Revision: 7081
http://sourceforge.net/p/astlinux/code/7081
Author: abelbeck
Date: 2015-05-26 23:31:54 +0000 (Tue, 26 May 2015)
Log Message:
-----------
miniupnpd, version bump to 1.9.20150430, no longer requires the 'libnfnetlink' library
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/miniupnpd/Config.in
branches/1.0/package/miniupnpd/miniupnpd.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-05-26 21:23:53 UTC (rev 7080)
+++ branches/1.0/astlinux-ast11.config 2015-05-26 23:31:54 UTC (rev 7081)
@@ -604,7 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
-BR2_PACKAGE_LIBNFNETLINK=y
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-05-26 21:23:53 UTC (rev 7080)
+++ branches/1.0/astlinux-ast13.config 2015-05-26 23:31:54 UTC (rev 7081)
@@ -604,7 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
-BR2_PACKAGE_LIBNFNETLINK=y
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
BR2_PACKAGE_PJSIP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-05-26 21:23:53 UTC (rev 7080)
+++ branches/1.0/astlinux18.config 2015-05-26 23:31:54 UTC (rev 7081)
@@ -604,7 +604,7 @@
BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
-BR2_PACKAGE_LIBNFNETLINK=y
+# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
BR2_PACKAGE_LIBPCAP=y
# BR2_PACKAGE_PJSIP is not set
Modified: branches/1.0/package/miniupnpd/Config.in
===================================================================
--- branches/1.0/package/miniupnpd/Config.in 2015-05-26 21:23:53 UTC (rev 7080)
+++ branches/1.0/package/miniupnpd/Config.in 2015-05-26 23:31:54 UTC (rev 7081)
@@ -2,7 +2,6 @@
bool "miniupnpd"
depends on BR2_LINUX_KERNEL
select BR2_PACKAGE_IPTABLES
- select BR2_PACKAGE_LIBNFNETLINK
help
Implements UPnP and NAT-PMP/PCP protocols.
Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk 2015-05-26 21:23:53 UTC (rev 7080)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk 2015-05-26 23:31:54 UTC (rev 7081)
@@ -4,10 +4,10 @@
#
#############################################################
-MINIUPNPD_VERSION = 1.9.20141209
+MINIUPNPD_VERSION = 1.9.20150430
MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz
MINIUPNPD_SITE = http://miniupnp.free.fr/files
-MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables libnfnetlink
+MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables
define MINIUPNPD_IPTABLES_PATH_FIX
$(SED) 's:/sbin/iptables:/usr/sbin/iptables:g' \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-05-29 15:03:13
|
Revision: 7084
http://sourceforge.net/p/astlinux/code/7084
Author: abelbeck
Date: 2015-05-29 15:03:10 +0000 (Fri, 29 May 2015)
Log Message:
-----------
/etc/ssl/default_https.pem file, is now auto-generated and ultimately stored in /mnt/kd/ssl/default_https.pem, a symlink for /etc/ssl/mini_httpd.pem to default_https.pem is also provided for backward compatibility
Modified Paths:
--------------
branches/1.0/package/lighttpd/lighttpd.init
branches/1.0/package/stunnel/stunnel.init
branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/etc/ssl/default_https.pem
branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem
Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init 2015-05-28 16:56:19 UTC (rev 7083)
+++ branches/1.0/package/lighttpd/lighttpd.init 2015-05-29 15:03:10 UTC (rev 7084)
@@ -54,7 +54,7 @@
else
httpdir="/dev/null"
fi
- httpscert="${HTTPSCERT:-/etc/ssl/mini_httpd.pem}"
+ httpscert="${HTTPSCERT:-/etc/ssl/default_https.pem}"
if [ "$HTTP_LISTING" = "no" ]; then
http_listing="disable"
else
Modified: branches/1.0/package/stunnel/stunnel.init
===================================================================
--- branches/1.0/package/stunnel/stunnel.init 2015-05-28 16:56:19 UTC (rev 7083)
+++ branches/1.0/package/stunnel/stunnel.init 2015-05-29 15:03:10 UTC (rev 7084)
@@ -71,7 +71,7 @@
elif [ -n "$HTTPSCERT" ]; then
SCERT="$HTTPSCERT"
else
- SCERT="/etc/ssl/mini_httpd.pem"
+ SCERT="/etc/ssl/default_https.pem"
fi
gen_stunnel_config server "$STUNNEL_SERVERS" > /tmp/etc/stunnel/server.conf
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc 2015-05-28 16:56:19 UTC (rev 7083)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc 2015-05-29 15:03:10 UTC (rev 7084)
@@ -5,11 +5,88 @@
. /etc/rc.conf
+gen_httpd_cert()
+{
+ local fname="$1"
+
+ openssl req \
+ -new -batch \
+ -newkey rsa:1024 \
+ -days 36500 \
+ -nodes \
+ -x509 \
+ -subj '/C=US/ST=Nebraska/L=Omaha/O=AstLinux Management/OU=Web Interface/CN=*/emailAddress=in...@as...' \
+ -keyout "$fname" \
+ -out "$fname"
+
+ chmod 600 "$fname"
+}
+
+fat16_file()
+{
+ local cmd="$1" src="$2" dst="$3"
+
+ if ! mount | grep -q "/oldroot/cdrom"; then
+ return 1
+ fi
+ if ! mount -o rw,remount /oldroot/cdrom >/dev/null; then
+ return 1
+ fi
+
+ case $cmd in
+ remove)
+ rm "$src"
+ ;;
+ copy)
+ cp "$src" "$dst"
+ ;;
+ esac
+
+ mount -o ro,remount /oldroot/cdrom >/dev/null
+ return 0
+}
+
+install_httpd_cert()
+{
+ local perm="$1" save="$2"
+ local fat16="/oldroot/cdrom/os/default_https.pem"
+
+ if [ $perm -eq 1 ]; then
+ if [ -f "$fat16" ]; then
+ cp "$fat16" "$save"
+ chmod 600 "$save"
+ fat16_file remove "$fat16"
+ else
+ gen_httpd_cert "$save"
+ fi
+ else
+ if [ -f "$fat16" ]; then
+ cp "$fat16" "$save"
+ chmod 600 "$save"
+ else
+ gen_httpd_cert "$save"
+ fat16_file copy "$save" "$fat16"
+ fi
+ fi
+}
+
init () {
# Setup Hostname
hostname "$HOSTNAME"
+ # Setup /etc/ssl/default_https.pem
+ mkdir -p /tmp/etc/ssl
+ if [ -f /mnt/kd/ssl/default_https.pem ]; then
+ ln -sf /mnt/kd/ssl/default_https.pem /tmp/etc/ssl/default_https.pem
+ elif [ -d /mnt/kd/rc.conf.d -o -f /mnt/kd/rc.conf ]; then
+ mkdir -p /mnt/kd/ssl
+ install_httpd_cert 1 /mnt/kd/ssl/default_https.pem
+ ln -sf /mnt/kd/ssl/default_https.pem /tmp/etc/ssl/default_https.pem
+ else
+ install_httpd_cert 0 /tmp/etc/ssl/default_https.pem
+ fi
+
if [ -n "$VI_EDITOR_OPTIONS" ]; then
echo -e "$VI_EDITOR_OPTIONS" > /root/.exrc
fi
Added: branches/1.0/project/astlinux/target_skeleton/etc/ssl/default_https.pem
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ssl/default_https.pem (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ssl/default_https.pem 2015-05-29 15:03:10 UTC (rev 7084)
@@ -0,0 +1 @@
+link /tmp/etc/ssl/default_https.pem
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/ssl/default_https.pem
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem 2015-05-28 16:56:19 UTC (rev 7083)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem 2015-05-29 15:03:10 UTC (rev 7084)
@@ -1,37 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDHQWuGVMfK/+OIik1ekOxMVzGFBBoBkVXxR+kJv16kXpeLsCjI
-1mk6MtzHVwv8mG9Z23/a5SeIveIkVRnHqAyudVv4+3D23AeHiCJl/l1pJd9Bl4BG
-CsHBtF69IpuKoWZmF6B30NSvxL+2wFMTHyrTjk37AhTUjlb2erdHcYsWXwIDAQAB
-AoGAepDSTGIwN72pv56bMvVgdSEZc+HvAVHeFLoQLg/Kbr9E5wcoP0oslkEdL31r
-ASjfLd3oSsS0yddLmN/EKN1FVp+Yib8l50SujrV1cSW7rrCLw80V69VCd5eUl54F
-g7e6obJB1xNq2dQMOjGYO/7lyLXPCN6eaOt/vrRIGT88n/ECQQD7yAwX/zYxaM1m
-cC32OzxgPGsIxuqNvuo9oTxsb/SHmU/5YHk0ZW1MthSkaItwqTmPBIVhD7i82/7u
-cUlxV5HpAkEAypgThpYEPiUpH0nXYqOhLZZ3K6RWn3JpQqDhdGSWnrX7NM2I1Ivh
-AUe3+wtRuoW+k9xC+Yqe2EO8r8+c26SxBwJANAuPDGrR3fbG9pTbu1lVSqNSkLbl
-hzVeoCyzG8sspdb4JBlgFIeex0ugCrgdksU4Q6rwkza3vjpPgSRjxQ0P+QJATclE
-PfmdmWrVNjE45KOlAAb0rKoFpGTea3mv9uukNT30PNrpvYoTk1VBG7/F2pL9kHIS
-uRNzV9/yM6LIPEEowwJAEgsFDktqE7ldGr5DUdYXWq5PO4I5weLJ+Wxh37OHcv01
-YQ2eIF3siE12+d3QoP1xzSsojrwjsEBi9dVYzibymg==
------END RSA PRIVATE KEY-----
------BEGIN CERTIFICATE-----
-MIIDmDCCAwGgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBlTELMAkGA1UEBhMCVVMx
-EDAOBgNVBAgTB0Zsb3JpZGExETAPBgNVBAcTCFNhcmFzb3RhMSEwHwYDVQQKExhT
-dGFyMlN0YXIgQ29tbXVuaWNhdGlvbnMxDDAKBgNVBAsTA0VuZzEKMAgGA1UEAxQB
-KjEkMCIGCSqGSIb3DQEJARYVc2VydmljZUBzdGFyMnN0YXIuY29tMB4XDTA3MDgx
-NjIxMDI1MVoXDTE3MDgxMzIxMDI1MVowgZUxCzAJBgNVBAYTAlVTMRAwDgYDVQQI
-EwdGbG9yaWRhMREwDwYDVQQHEwhTYXJhc290YTEhMB8GA1UEChMYU3RhcjJTdGFy
-IENvbW11bmljYXRpb25zMQwwCgYDVQQLEwNFbmcxCjAIBgNVBAMUASoxJDAiBgkq
-hkiG9w0BCQEWFXNlcnZpY2VAc3RhcjJzdGFyLmNvbTCBnzANBgkqhkiG9w0BAQEF
-AAOBjQAwgYkCgYEAx0FrhlTHyv/jiIpNXpDsTFcxhQQaAZFV8UfpCb9epF6Xi7Ao
-yNZpOjLcx1cL/JhvWdt/2uUniL3iJFUZx6gMrnVb+Ptw9twHh4giZf5daSXfQZeA
-RgrBwbRevSKbiqFmZhegd9DUr8S/tsBTEx8q045N+wIU1I5W9nq3R3GLFl8CAwEA
-AaOB9TCB8jAdBgNVHQ4EFgQUo+jknbwRSKSbWFb/EJ/33T/Dpt0wgcIGA1UdIwSB
-ujCBt4AUo+jknbwRSKSbWFb/EJ/33T/Dpt2hgZukgZgwgZUxCzAJBgNVBAYTAlVT
-MRAwDgYDVQQIEwdGbG9yaWRhMREwDwYDVQQHEwhTYXJhc290YTEhMB8GA1UEChMY
-U3RhcjJTdGFyIENvbW11bmljYXRpb25zMQwwCgYDVQQLEwNFbmcxCjAIBgNVBAMU
-ASoxJDAiBgkqhkiG9w0BCQEWFXNlcnZpY2VAc3RhcjJzdGFyLmNvbYIBADAMBgNV
-HRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GBAD/GKj39hulJXNy8Vo1iFuAfBdCu
-fDoIAGIAaeC7HZMvlVNBY8gMbgCuEPKPtn5Tr0+ySUQO3aS0suXpAcdOujSSKrTe
-U5ARmM++P1rCQ6VFjdQYWKIQ9yAGUOn+zmb3yhxws8k/8e9rvNwKiOkwcWLNmaqN
-612HZw89BeKRyvJ2
------END CERTIFICATE-----
Added: branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem 2015-05-29 15:03:10 UTC (rev 7084)
@@ -0,0 +1 @@
+link default_https.pem
\ No newline at end of file
Property changes on: branches/1.0/project/astlinux/target_skeleton/etc/ssl/mini_httpd.pem
___________________________________________________________________
Added: svn:special
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-05-28 16:56:19 UTC (rev 7083)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-05-29 15:03:10 UTC (rev 7084)
@@ -336,7 +336,7 @@
HTTPS_LISTING="yes" # Allow directory listing if no index.* file exists
HTTPS_ACCESSLOG="no" # Enable access logging in /var/log/lighttpd/ssl-access.log
HTTPSCGI="yes" # Define yes|no to enable CGI
-HTTPSCERT="/etc/ssl/mini_httpd.pem" # Path to the https certificate
+HTTPSCERT="/etc/ssl/default_https.pem" # Path to the https certificate
## HTTP Server
## If you set HTTPDIR, serve files from that directory.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-06-05 16:22:43
|
Revision: 7098
http://sourceforge.net/p/astlinux/code/7098
Author: abelbeck
Date: 2015-06-05 16:22:40 +0000 (Fri, 05 Jun 2015)
Log Message:
-----------
asterisk, version bump to 11.18.0 and 13.4.0, pjsip version bump to 2.4 . Adjust for menuselect changing for no good reason in stable releases.
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/pjsip/pjsip.mk
branches/1.0/project/astlinux/asterisk.makeopts-1
branches/1.0/project/astlinux/asterisk.makeopts-11
branches/1.0/project/astlinux/asterisk.makeopts-13
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2015-06-05 16:22:40 UTC (rev 7098)
@@ -1,6 +1,6 @@
--- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2431,11 +2431,13 @@
+@@ -2398,11 +2398,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2015-06-05 16:22:40 UTC (rev 7098)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16733,7 +16733,7 @@
+@@ -16734,7 +16734,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2015-06-05 16:22:40 UTC (rev 7098)
@@ -1,6 +1,6 @@
--- asterisk-13.1.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-13.1.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2544,11 +2544,13 @@
+@@ -2511,11 +2511,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/asterisk/asterisk.mk 2015-06-05 16:22:40 UTC (rev 7098)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.17.1
+ASTERISK_VERSION := 11.18.0
else
-ASTERISK_VERSION := 13.3.2
+ASTERISK_VERSION := 13.4.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
@@ -271,6 +271,7 @@
endif
(cd $(ASTERISK_DIR); \
menuselect/menuselect --enable res_pktccops menuselect.makeopts; \
+ menuselect/menuselect --disable CORE-SOUNDS-EN-GSM --disable MOH-OPSOUND-WAV menuselect.makeopts; \
)
endif
touch $@
Modified: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/package/pjsip/pjsip.mk 2015-06-05 16:22:40 UTC (rev 7098)
@@ -4,7 +4,7 @@
#
################################################################################
-PJSIP_VERSION = 2.3
+PJSIP_VERSION = 2.4
PJSIP_SOURCE = pjproject-$(PJSIP_VERSION).tar.bz2
PJSIP_SITE = http://www.pjsip.org/release/$(PJSIP_VERSION)
PJSIP_INSTALL_STAGING = YES
Modified: branches/1.0/project/astlinux/asterisk.makeopts-1
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-1 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/project/astlinux/asterisk.makeopts-1 2015-06-05 16:22:40 UTC (rev 7098)
@@ -8,8 +8,8 @@
MENUSELECT_OPTS_app_voicemail=
MENUSELECT_CFLAGS=LOADABLE_MODULES
MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM -CORE-SOUNDS-EN-ULAW -CORE-SOUNDS-EN-G729
-MENUSELECT_MOH=-MOH-OPSOUND-ULAW -MOH-OPSOUND-G729 -MOH-OPSOUND-WAV
+MENUSELECT_CORE_SOUNDS=
+MENUSELECT_MOH=
MENUSELECT_EXTRA_SOUNDS=
MENUSELECT_BUILD_DEPS=res_adsi chan_local app_meetme res_monitor res_smdi res_features DEBUG_THREADS
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
Modified: branches/1.0/project/astlinux/asterisk.makeopts-11
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-11 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/project/astlinux/asterisk.makeopts-11 2015-06-05 16:22:40 UTC (rev 7098)
@@ -15,8 +15,8 @@
MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb
MENUSELECT_AGIS=
MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM
-MENUSELECT_MOH=-MOH-OPSOUND-WAV
+MENUSELECT_CORE_SOUNDS=
+MENUSELECT_MOH=
MENUSELECT_EXTRA_SOUNDS=
MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
Modified: branches/1.0/project/astlinux/asterisk.makeopts-13
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-13 2015-06-04 23:31:54 UTC (rev 7097)
+++ branches/1.0/project/astlinux/asterisk.makeopts-13 2015-06-05 16:22:40 UTC (rev 7098)
@@ -15,8 +15,8 @@
MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb
MENUSELECT_AGIS=
MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=-CORE-SOUNDS-EN-GSM
-MENUSELECT_MOH=-MOH-OPSOUND-WAV
+MENUSELECT_CORE_SOUNDS=
+MENUSELECT_MOH=
MENUSELECT_EXTRA_SOUNDS=
MENUSELECT_BUILD_DEPS=chan_local app_voicemail res_monitor res_agi res_adsi res_smdi res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_jack
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-06-06 00:13:34
|
Revision: 7100
http://sourceforge.net/p/astlinux/code/7100
Author: abelbeck
Date: 2015-06-06 00:13:32 +0000 (Sat, 06 Jun 2015)
Log Message:
-----------
build system, for wanpipe and freeswitch move runlevels symlinks to the .mk file
Modified Paths:
--------------
branches/1.0/package/freeswitch/freeswitch.mk
branches/1.0/package/wanpipe/wanpipe.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00freeswitch
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98wanrouter
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00wanrouter
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S60freeswitch
Modified: branches/1.0/package/freeswitch/freeswitch.mk
===================================================================
--- branches/1.0/package/freeswitch/freeswitch.mk 2015-06-05 16:31:12 UTC (rev 7099)
+++ branches/1.0/package/freeswitch/freeswitch.mk 2015-06-06 00:13:32 UTC (rev 7100)
@@ -86,6 +86,8 @@
ln -sf $(FREESWITCH_INSTALL_DIR)/bin/freeswitch $(TARGET_DIR)/usr/sbin/freeswitch
ln -sf $(FREESWITCH_INSTALL_DIR)/bin/fs_cli $(TARGET_DIR)/usr/sbin/fs_cli
$(INSTALL) -D -m 0755 package/freeswitch/freeswitch.init $(TARGET_DIR)/etc/init.d/freeswitch
+ ln -sf ../../init.d/freeswitch $(TARGET_DIR)/etc/runlevels/default/S60freeswitch
+ ln -sf ../../init.d/freeswitch $(TARGET_DIR)/etc/runlevels/default/K00freeswitch
freeswitch: $(TARGET_DIR)/$(FREESWITCH_TARGET_BINARY)
@@ -98,6 +100,8 @@
rm -rf $(TARGET_DIR)/$(FREESWITCH_INSTALL_DIR) $(TARGET_DIR)/usr/lib/libfreeswitch.so* \
$(TARGET_DIR)/usr/sbin/freeswitch $(TARGET_DIR)/usr/sbin/fs_cli \
$(TARGET_DIR)/etc/init.d/freeswitch
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S60freeswitch
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K00freeswitch
freeswitch-dirclean:
rm -rf $(FREESWITCH_DIR)
Modified: branches/1.0/package/wanpipe/wanpipe.mk
===================================================================
--- branches/1.0/package/wanpipe/wanpipe.mk 2015-06-05 16:31:12 UTC (rev 7099)
+++ branches/1.0/package/wanpipe/wanpipe.mk 2015-06-06 00:13:32 UTC (rev 7100)
@@ -107,6 +107,8 @@
$(INSTALL) -D -m 0755 -s $(WANPIPE_DIR)/util/wanec_client/wan_ec_client $(TARGET_DIR)/usr/sbin/wan_ec_client
$(INSTALL) -m 0755 $(WANPIPE_DIR)/util/wancfg_zaptel/wancfg_dahdi $(TARGET_DIR)/usr/sbin/wancfg_dahdi
$(INSTALL) -m 0755 package/wanpipe/wanrouter.init $(TARGET_DIR)/etc/init.d/wanrouter
+ ln -sf ../../init.d/wanrouter $(TARGET_DIR)/etc/runlevels/default/S00wanrouter
+ ln -sf ../../init.d/wanrouter $(TARGET_DIR)/etc/runlevels/default/K98wanrouter
## Install and Cleanup wancfg_zaptel directory
cp -af $(WANPIPE_DIR)/util/wancfg_zaptel $(TARGET_DIR)/etc/wanpipe
for i in setup-sangoma clean.sh install.sh uninstall.sh Makefile; do \
@@ -147,6 +149,9 @@
rm -f $(TARGET_DIR)/usr/sbin/wanpipe_lxdialog
rm -f $(TARGET_DIR)/usr/sbin/wan_ec_client
rm -f $(TARGET_DIR)/usr/sbin/wancfg_dahdi
+ rm -f $(TARGET_DIR)/etc/init.d/wanrouter
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S00wanrouter
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K98wanrouter
rm -f $(WANPIPE_DIR)/.built
wanpipe-dirclean:
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00freeswitch
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00freeswitch 2015-06-05 16:31:12 UTC (rev 7099)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K00freeswitch 2015-06-06 00:13:32 UTC (rev 7100)
@@ -1 +0,0 @@
-link ../../init.d/freeswitch
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98wanrouter
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98wanrouter 2015-06-05 16:31:12 UTC (rev 7099)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K98wanrouter 2015-06-06 00:13:32 UTC (rev 7100)
@@ -1 +0,0 @@
-link ../../init.d/wanrouter
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00wanrouter
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00wanrouter 2015-06-05 16:31:12 UTC (rev 7099)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S00wanrouter 2015-06-06 00:13:32 UTC (rev 7100)
@@ -1 +0,0 @@
-link ../../init.d/wanrouter
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S60freeswitch
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S60freeswitch 2015-06-05 16:31:12 UTC (rev 7099)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S60freeswitch 2015-06-06 00:13:32 UTC (rev 7100)
@@ -1 +0,0 @@
-link ../../init.d/freeswitch
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-07-16 00:28:04
|
Revision: 7153
http://sourceforge.net/p/astlinux/code/7153
Author: abelbeck
Date: 2015-07-16 00:28:02 +0000 (Thu, 16 Jul 2015)
Log Message:
-----------
dnscrypt-proxy, add support for ephemeral-keys and an optional secondary proxy server. New rc.conf variables are: DNSCRYPT_EPHEMERAL_KEYS, DNSCRYPT_2SERVER_ADDRESS, DNSCRYPT_2PROVIDER_NAME, DNSCRYPT_2PROVIDER_KEY
Modified Paths:
--------------
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-07-13 17:45:41 UTC (rev 7152)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-07-16 00:28:02 UTC (rev 7153)
@@ -4,6 +4,8 @@
PIDFILE="/var/run/dnscrypt-proxy.pid"
+PID2FILE="/var/run/dnscrypt-proxy2.pid"
+
init () {
:
}
@@ -18,8 +20,20 @@
name="${DNSCRYPT_PROVIDER_NAME:-2.dnscrypt-cert.opendns.com}"
key="${DNSCRYPT_PROVIDER_KEY:-B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79}"
- dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE \
+ if [ "$DNSCRYPT_EPHEMERAL_KEYS" = "yes" ]; then
+ ephemeral_keys="--ephemeral-keys"
+ else
+ ephemeral_keys=""
+ fi
+
+ dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE $ephemeral_keys \
--resolver-address "$address" --provider-name "$name" --provider-key "$key"
+
+ if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+
+ dnscrypt-proxy -d --local-address 127.0.0.1:2054 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PID2FILE $ephemeral_keys \
+ --resolver-address "$DNSCRYPT_2SERVER_ADDRESS" --provider-name "$DNSCRYPT_2PROVIDER_NAME" --provider-key "$DNSCRYPT_2PROVIDER_KEY"
+ fi
fi
}
@@ -30,6 +44,10 @@
kill $(cat $PIDFILE) >/dev/null 2>&1
fi
+
+ if [ -f $PID2FILE ]; then
+ kill $(cat $PID2FILE) >/dev/null 2>&1
+ fi
}
case $1 in
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-07-13 17:45:41 UTC (rev 7152)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-07-16 00:28:02 UTC (rev 7153)
@@ -39,15 +39,20 @@
return 1
}
-dnscrypt_proxy_check()
+dnscrypt_proxy_servers()
{
+ local servers=""
+
if [ -f /etc/init.d/dnscrypt ]; then
if [ "$DNSCRYPT_PROXY" = "yes" ]; then
- return 0
+ servers="127.0.0.1#2053"
+ if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+ servers="$servers 127.0.0.1#2054"
+ fi
fi
fi
- return 1
+ echo "$servers"
}
tftpd_check()
@@ -184,7 +189,7 @@
createDNSMASQbasic()
{
- local local_domain
+ local local_domain dnscrypt_servers server IFS
# DHCP options
if [ "$1" = "dhcp" ]; then
@@ -223,10 +228,14 @@
echo "dns-forward-max=512"
fi
- if dnscrypt_proxy_check; then
+ dnscrypt_servers="$(dnscrypt_proxy_servers)"
+ if [ -n "$dnscrypt_servers" ]; then
echo "no-resolv
-server=127.0.0.1#2053
proxy-dnssec"
+ unset IFS
+ for server in $dnscrypt_servers; do
+ echo "server=$server"
+ done
else
echo "resolv-file=/etc/resolv-extern.conf"
fi
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-07-13 17:45:41 UTC (rev 7152)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-07-16 00:28:02 UTC (rev 7153)
@@ -368,12 +368,17 @@
## DNSCrypt Proxy Server
## Note: dnsmasq must be restarted when DNSCRYPT_PROXY changes.
-#DNSCRYPT_PROXY="yes" # Enable with "yes", defaults to "no"
-#DNSCRYPT_VERBOSITY="5" # Syslog logging: "3" Error, "5" Notice, "6" Info, defaults to "5"
-## Leave the variables below empty to use the OpenDNS defaults. See http://dnscrypt.org/ for others.
+#DNSCRYPT_PROXY="yes" # Enable with "yes", defaults to "no"
+#DNSCRYPT_VERBOSITY="5" # Syslog logging: "3" Error, "5" Notice, "6" Info, defaults to "5"
+#DNSCRYPT_EPHEMERAL_KEYS="yes" # Generates short-lived public key for each query with "yes", defaults to "no"
+## Leave the three variables below empty to use the OpenDNS defaults. See http://dnscrypt.org/ for others.
#DNSCRYPT_SERVER_ADDRESS=""
#DNSCRYPT_PROVIDER_NAME=""
#DNSCRYPT_PROVIDER_KEY=""
+## Optional - Secondary Proxy Server, all three variables below must be defined to be enabled.
+#DNSCRYPT_2SERVER_ADDRESS=""
+#DNSCRYPT_2PROVIDER_NAME=""
+#DNSCRYPT_2PROVIDER_KEY=""
## Static hosts for local resolver + DNSMasq
##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-07-26 02:43:22
|
Revision: 7153
http://sourceforge.net/p/astlinux/code/7153
Author: abelbeck
Date: 2015-07-26 02:43:19 +0000 (Sun, 26 Jul 2015)
Log Message:
-----------
dnscrypt-proxy, add support for ephemeral-keys and an optional secondary proxy server. New rc.conf variables are: DNSCRYPT_EPHEMERAL_KEYS, DNSCRYPT_2SERVER_ADDRESS, DNSCRYPT_2PROVIDER_NAME, DNSCRYPT_2PROVIDER_KEY
Modified Paths:
--------------
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-07-13 17:45:41 UTC (rev 7152)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-07-26 02:43:19 UTC (rev 7153)
@@ -4,6 +4,8 @@
PIDFILE="/var/run/dnscrypt-proxy.pid"
+PID2FILE="/var/run/dnscrypt-proxy2.pid"
+
init () {
:
}
@@ -18,8 +20,20 @@
name="${DNSCRYPT_PROVIDER_NAME:-2.dnscrypt-cert.opendns.com}"
key="${DNSCRYPT_PROVIDER_KEY:-B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79}"
- dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE \
+ if [ "$DNSCRYPT_EPHEMERAL_KEYS" = "yes" ]; then
+ ephemeral_keys="--ephemeral-keys"
+ else
+ ephemeral_keys=""
+ fi
+
+ dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE $ephemeral_keys \
--resolver-address "$address" --provider-name "$name" --provider-key "$key"
+
+ if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+
+ dnscrypt-proxy -d --local-address 127.0.0.1:2054 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PID2FILE $ephemeral_keys \
+ --resolver-address "$DNSCRYPT_2SERVER_ADDRESS" --provider-name "$DNSCRYPT_2PROVIDER_NAME" --provider-key "$DNSCRYPT_2PROVIDER_KEY"
+ fi
fi
}
@@ -30,6 +44,10 @@
kill $(cat $PIDFILE) >/dev/null 2>&1
fi
+
+ if [ -f $PID2FILE ]; then
+ kill $(cat $PID2FILE) >/dev/null 2>&1
+ fi
}
case $1 in
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-07-13 17:45:41 UTC (rev 7152)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-07-26 02:43:19 UTC (rev 7153)
@@ -39,15 +39,20 @@
return 1
}
-dnscrypt_proxy_check()
+dnscrypt_proxy_servers()
{
+ local servers=""
+
if [ -f /etc/init.d/dnscrypt ]; then
if [ "$DNSCRYPT_PROXY" = "yes" ]; then
- return 0
+ servers="127.0.0.1#2053"
+ if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+ servers="$servers 127.0.0.1#2054"
+ fi
fi
fi
- return 1
+ echo "$servers"
}
tftpd_check()
@@ -184,7 +189,7 @@
createDNSMASQbasic()
{
- local local_domain
+ local local_domain dnscrypt_servers server IFS
# DHCP options
if [ "$1" = "dhcp" ]; then
@@ -223,10 +228,14 @@
echo "dns-forward-max=512"
fi
- if dnscrypt_proxy_check; then
+ dnscrypt_servers="$(dnscrypt_proxy_servers)"
+ if [ -n "$dnscrypt_servers" ]; then
echo "no-resolv
-server=127.0.0.1#2053
proxy-dnssec"
+ unset IFS
+ for server in $dnscrypt_servers; do
+ echo "server=$server"
+ done
else
echo "resolv-file=/etc/resolv-extern.conf"
fi
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-07-13 17:45:41 UTC (rev 7152)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-07-26 02:43:19 UTC (rev 7153)
@@ -368,12 +368,17 @@
## DNSCrypt Proxy Server
## Note: dnsmasq must be restarted when DNSCRYPT_PROXY changes.
-#DNSCRYPT_PROXY="yes" # Enable with "yes", defaults to "no"
-#DNSCRYPT_VERBOSITY="5" # Syslog logging: "3" Error, "5" Notice, "6" Info, defaults to "5"
-## Leave the variables below empty to use the OpenDNS defaults. See http://dnscrypt.org/ for others.
+#DNSCRYPT_PROXY="yes" # Enable with "yes", defaults to "no"
+#DNSCRYPT_VERBOSITY="5" # Syslog logging: "3" Error, "5" Notice, "6" Info, defaults to "5"
+#DNSCRYPT_EPHEMERAL_KEYS="yes" # Generates short-lived public key for each query with "yes", defaults to "no"
+## Leave the three variables below empty to use the OpenDNS defaults. See http://dnscrypt.org/ for others.
#DNSCRYPT_SERVER_ADDRESS=""
#DNSCRYPT_PROVIDER_NAME=""
#DNSCRYPT_PROVIDER_KEY=""
+## Optional - Secondary Proxy Server, all three variables below must be defined to be enabled.
+#DNSCRYPT_2SERVER_ADDRESS=""
+#DNSCRYPT_2PROVIDER_NAME=""
+#DNSCRYPT_2PROVIDER_KEY=""
## Static hosts for local resolver + DNSMasq
##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-07-26 03:05:09
|
Revision: 7154
http://sourceforge.net/p/astlinux/code/7154
Author: abelbeck
Date: 2015-07-26 03:05:07 +0000 (Sun, 26 Jul 2015)
Log Message:
-----------
dnscrypt-proxy, only require DNSCRYPT_2SERVER_ADDRESS to enable secondary proxy server, default to OpenDNS if the rest are empty
Modified Paths:
--------------
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-07-26 02:43:19 UTC (rev 7153)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2015-07-26 03:05:07 UTC (rev 7154)
@@ -29,10 +29,14 @@
dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PIDFILE $ephemeral_keys \
--resolver-address "$address" --provider-name "$name" --provider-key "$key"
- if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+ if [ -n "$DNSCRYPT_2SERVER_ADDRESS" ]; then
+ # Default to OpenDNS
+ name="${DNSCRYPT_2PROVIDER_NAME:-2.dnscrypt-cert.opendns.com}"
+ key="${DNSCRYPT_2PROVIDER_KEY:-B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79}"
+
dnscrypt-proxy -d --local-address 127.0.0.1:2054 -n 520 -m ${DNSCRYPT_VERBOSITY:-5} -p $PID2FILE $ephemeral_keys \
- --resolver-address "$DNSCRYPT_2SERVER_ADDRESS" --provider-name "$DNSCRYPT_2PROVIDER_NAME" --provider-key "$DNSCRYPT_2PROVIDER_KEY"
+ --resolver-address "$DNSCRYPT_2SERVER_ADDRESS" --provider-name "$name" --provider-key "$key"
fi
fi
}
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-07-26 02:43:19 UTC (rev 7153)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-07-26 03:05:07 UTC (rev 7154)
@@ -46,7 +46,7 @@
if [ -f /etc/init.d/dnscrypt ]; then
if [ "$DNSCRYPT_PROXY" = "yes" ]; then
servers="127.0.0.1#2053"
- if [ -n "$DNSCRYPT_2SERVER_ADDRESS" -a -n "$DNSCRYPT_2PROVIDER_NAME" -a -n "$DNSCRYPT_2PROVIDER_KEY" ]; then
+ if [ -n "$DNSCRYPT_2SERVER_ADDRESS" ]; then
servers="$servers 127.0.0.1#2054"
fi
fi
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-07-26 02:43:19 UTC (rev 7153)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-07-26 03:05:07 UTC (rev 7154)
@@ -375,7 +375,8 @@
#DNSCRYPT_SERVER_ADDRESS=""
#DNSCRYPT_PROVIDER_NAME=""
#DNSCRYPT_PROVIDER_KEY=""
-## Optional - Secondary Proxy Server, all three variables below must be defined to be enabled.
+## Optional - Secondary Proxy Server, DNSCRYPT_2SERVER_ADDRESS must be defined to be enabled.
+## Other empty DNSCRYPT_2PROVIDER_NAME/KEY fields use the OpenDNS defaults.
#DNSCRYPT_2SERVER_ADDRESS=""
#DNSCRYPT_2PROVIDER_NAME=""
#DNSCRYPT_2PROVIDER_KEY=""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-07-29 16:46:57
|
Revision: 7162
http://sourceforge.net/p/astlinux/code/7162
Author: abelbeck
Date: 2015-07-29 16:46:54 +0000 (Wed, 29 Jul 2015)
Log Message:
-----------
links, disable from default builds, use proxy instead
Ref: http://doc.astlinux.org/userdoc:tt-web-browser-proxy
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-07-29 13:56:56 UTC (rev 7161)
+++ branches/1.0/astlinux-ast11.config 2015-07-29 16:46:54 UTC (rev 7162)
@@ -725,8 +725,7 @@
# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
BR2_PACKAGE_LIGHTTPD_PCRE=y
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
-BR2_PACKAGE_LINKS=y
-# BR2_PACKAGE_LINKS_GRAPHICS is not set
+# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-07-29 13:56:56 UTC (rev 7161)
+++ branches/1.0/astlinux-ast13.config 2015-07-29 16:46:54 UTC (rev 7162)
@@ -725,8 +725,7 @@
# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
BR2_PACKAGE_LIGHTTPD_PCRE=y
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
-BR2_PACKAGE_LINKS=y
-# BR2_PACKAGE_LINKS_GRAPHICS is not set
+# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-07-29 13:56:56 UTC (rev 7161)
+++ branches/1.0/astlinux18.config 2015-07-29 16:46:54 UTC (rev 7162)
@@ -725,8 +725,7 @@
# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
BR2_PACKAGE_LIGHTTPD_PCRE=y
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
-BR2_PACKAGE_LINKS=y
-# BR2_PACKAGE_LINKS_GRAPHICS is not set
+# BR2_PACKAGE_LINKS is not set
# BR2_PACKAGE_LRZSZ is not set
BR2_PACKAGE_MDNSRESPONDER=y
# BR2_PACKAGE_MII_DIAG is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-16 00:58:57
|
Revision: 7195
http://sourceforge.net/p/astlinux/code/7195
Author: abelbeck
Date: 2015-08-16 00:58:55 +0000 (Sun, 16 Aug 2015)
Log Message:
-----------
fossil, new package, version 1.33, disabled by default
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/fossil/
branches/1.0/package/fossil/Config.in
branches/1.0/package/fossil/fossil.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-08-15 21:55:36 UTC (rev 7194)
+++ branches/1.0/astlinux-ast11.config 2015-08-16 00:58:55 UTC (rev 7195)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7070-dirty Configuration
-# Tue May 19 19:11:47 2015
+# Buildroot 2011.08-svn7194-dirty Configuration
+# Sat Aug 15 19:23:13 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -266,6 +266,7 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
+# BR2_PACKAGE_FOSSIL is not set
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-08-15 21:55:36 UTC (rev 7194)
+++ branches/1.0/astlinux-ast13.config 2015-08-16 00:58:55 UTC (rev 7195)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7070-dirty Configuration
-# Tue May 19 19:11:54 2015
+# Buildroot 2011.08-svn7194-dirty Configuration
+# Sat Aug 15 19:23:16 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -266,6 +266,7 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
+# BR2_PACKAGE_FOSSIL is not set
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-08-15 21:55:36 UTC (rev 7194)
+++ branches/1.0/astlinux18.config 2015-08-16 00:58:55 UTC (rev 7195)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7070-dirty Configuration
-# Tue May 19 19:11:42 2015
+# Buildroot 2011.08-svn7194-dirty Configuration
+# Sat Aug 15 19:23:12 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -266,6 +266,7 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
+# BR2_PACKAGE_FOSSIL is not set
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-08-15 21:55:36 UTC (rev 7194)
+++ branches/1.0/initrd.config 2015-08-16 00:58:55 UTC (rev 7195)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6989-dirty Configuration
-# Fri Feb 27 10:53:56 2015
+# Buildroot 2011.08-svn7194-dirty Configuration
+# Sat Aug 15 19:23:35 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -243,6 +243,7 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
# BR2_PACKAGE_FLEX is not set
+# BR2_PACKAGE_FOSSIL is not set
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-08-15 21:55:36 UTC (rev 7194)
+++ branches/1.0/package/Config.in 2015-08-16 00:58:55 UTC (rev 7195)
@@ -73,6 +73,7 @@
source "package/findutils/Config.in"
endif
source "package/flex/Config.in"
+source "package/fossil/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/gawk/Config.in"
endif
Added: branches/1.0/package/fossil/Config.in
===================================================================
--- branches/1.0/package/fossil/Config.in (rev 0)
+++ branches/1.0/package/fossil/Config.in 2015-08-16 00:58:55 UTC (rev 7195)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_FOSSIL
+ bool "fossil"
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_ZLIB
+ help
+ Fossil is a simple, high-reliability, distributed software
+ configuration management system.
+
+ http://www.fossil-scm.org/
Added: branches/1.0/package/fossil/fossil.mk
===================================================================
--- branches/1.0/package/fossil/fossil.mk (rev 0)
+++ branches/1.0/package/fossil/fossil.mk 2015-08-16 00:58:55 UTC (rev 7195)
@@ -0,0 +1,39 @@
+################################################################################
+#
+# fossil
+#
+################################################################################
+
+FOSSIL_VERSION = 1.33
+FOSSIL_SOURCE = fossil-src-$(FOSSIL_VERSION).tar.gz
+FOSSIL_SITE = http://www.fossil-scm.org/download
+FOSSIL_DEPENDENCIES = zlib openssl
+
+define FOSSIL_CONFIGURE_CMDS
+ # this is *NOT* GNU autoconf stuff
+ (cd $(@D); \
+ $(TARGET_CONFIGURE_OPTS) \
+ ./configure \
+ --prefix=/usr \
+ --host=$(GNU_TARGET_NAME) \
+ --build=$(GNU_HOST_NAME) \
+ --with-openssl="$(STAGING_DIR)/usr" \
+ --with-zlib="$(STAGING_DIR)/usr" \
+ )
+endef
+
+FOSSIL_MAKE_ENV = \
+ $(TARGET_MAKE_ENV) \
+ TCC="$(TARGET_CC)"
+
+FOSSIL_UNINSTALL_STAGING_OPT = --version
+
+define FOSSIL_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/fossil $(TARGET_DIR)/usr/bin/fossil
+endef
+
+define FOSSIL_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/fossil
+endef
+
+$(eval $(call AUTOTARGETS,package,fossil))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-08-15 21:55:36 UTC (rev 7194)
+++ branches/1.0/runnix-uclibc.config 2015-08-16 00:58:55 UTC (rev 7195)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6989-dirty Configuration
-# Fri Feb 27 10:53:53 2015
+# Buildroot 2011.08-svn7194-dirty Configuration
+# Sat Aug 15 19:23:25 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -367,6 +367,7 @@
# findutils requires a toolchain with WCHAR support
#
# BR2_PACKAGE_FLEX is not set
+# BR2_PACKAGE_FOSSIL is not set
#
# gcc needs development files in target filesystem
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-08-15 21:55:36 UTC (rev 7194)
+++ branches/1.0/runnix.config 2015-08-16 00:58:55 UTC (rev 7195)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6989-dirty Configuration
-# Fri Feb 27 10:53:49 2015
+# Buildroot 2011.08-svn7194-dirty Configuration
+# Sat Aug 15 19:23:19 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -252,6 +252,7 @@
# BR2_PACKAGE_DISTCC is not set
# BR2_PACKAGE_FINDUTILS is not set
# BR2_PACKAGE_FLEX is not set
+# BR2_PACKAGE_FOSSIL is not set
# BR2_PACKAGE_GAWK is not set
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-20 17:12:57
|
Revision: 7206
http://sourceforge.net/p/astlinux/code/7206
Author: abelbeck
Date: 2015-08-20 17:12:55 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
fossil, add rc.conf variables FOSSIL_DEFAULT_FILES and FOSSIL_INCLUDE_FILES, add a lockfile for fossil-update, and automatically perform a 'fossil-update' after creating a new repo.
Modified Paths:
--------------
branches/1.0/package/fossil/fossil.init
branches/1.0/package/fossil/scripts/fossil-close
branches/1.0/package/fossil/scripts/fossil-open
branches/1.0/package/fossil/scripts/fossil-update
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/fossil/fossil.init
===================================================================
--- branches/1.0/package/fossil/fossil.init 2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/fossil.init 2015-08-20 17:12:55 UTC (rev 7206)
@@ -37,6 +37,8 @@
fossil sqlite3 "REPLACE INTO config VALUES('project-name','${HOSTNAME}',now());" -R $REPO
fossil sqlite3 "REPLACE INTO config VALUES('timeline-utc','0',now());" -R $REPO
fossil sqlite3 "REPLACE INTO config VALUES('require-captcha','0',now());" -R $REPO
+
+ fossil-update "initial default check-in" >/dev/null
fi
fi
}
@@ -54,6 +56,12 @@
stop()
{
+ # Close any open fossil checkouts
+ if [ -f /mnt/kd/.fslckout ]; then
+ echo "Closing fossil checkout..."
+ fossil-close
+ fi
+
if [ -f $PIDFILE ]; then
echo "Stopping fossil..."
Modified: branches/1.0/package/fossil/scripts/fossil-close
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-close 2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/scripts/fossil-close 2015-08-20 17:12:55 UTC (rev 7206)
@@ -1,7 +1,14 @@
#!/bin/sh
+LOCKFILE="/var/lock/fossil-update.lock"
+
if ! cd /mnt/kd; then
exit 1
fi
+if [ -f "$LOCKFILE" ]; then
+ echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+ exit 9
+fi
+
fossil close --force
Modified: branches/1.0/package/fossil/scripts/fossil-open
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-open 2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/scripts/fossil-open 2015-08-20 17:12:55 UTC (rev 7206)
@@ -2,6 +2,8 @@
REPO="/mnt/kd/fossil/astlinux.fossil"
+LOCKFILE="/var/lock/fossil-update.lock"
+
if [ ! -f $REPO ]; then
echo "Fossil repository not found: $REPO" >&2
exit 1
@@ -11,5 +13,10 @@
exit 1
fi
+if [ -f "$LOCKFILE" ]; then
+ echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+ exit 9
+fi
+
fossil open $REPO --keep >/dev/null
fossil status
Modified: branches/1.0/package/fossil/scripts/fossil-update
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-update 2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/package/fossil/scripts/fossil-update 2015-08-20 17:12:55 UTC (rev 7206)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
. /etc/rc.conf
@@ -8,6 +8,8 @@
REPO="/mnt/kd/fossil/astlinux.fossil"
+LOCKFILE="/var/lock/fossil-update.lock"
+
if [ ! -f $REPO ]; then
echo "Fossil repository not found: $REPO" >&2
exit 1
@@ -17,6 +19,14 @@
exit 1
fi
+# Robust 'bash' method of creating/testing for a lockfile
+if ! ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
+ echo "fossil-update: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+ exit 9
+fi
+
+trap 'rm -f "$LOCKFILE"; exit $?' INT TERM EXIT
+
fossil open $REPO --keep >/dev/null
fossil status
@@ -25,19 +35,29 @@
if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
dirs="$FOSSIL_DEFAULT_DIRS"
else
- dirs="rc.conf.d monit/monit.d"
+ dirs="rc.conf.d monit/monit.d openvpn/ccd"
if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
fi
fi
+files="${FOSSIL_DEFAULT_FILES:-rc.elocal rc.local rc.local.stop dnsmasq.static}"
+
unset IFS
for dir in $dirs $FOSSIL_INCLUDE_DIRS; do
- if [ -d $dir ]; then
- fossil add --force $dir
+ if [ "$dir" != "/mnt/kd" -a "$dir" != "/mnt/kd/" -a -d "$dir" ]; then
+ fossil add --ignore '*.bak,*.db' --force "$dir"
fi
done
+for file in $files $FOSSIL_INCLUDE_FILES; do
+ if [ -f "$file" ]; then
+ if ! fossil ls "${file#/mnt/kd/}" | grep -q "${file#/mnt/kd/}"; then
+ fossil add --force "$file"
+ fi
+ fi
+done
+
## Check for locally deleted files, remove them from the repo
if fossil changes | grep -q '^MISSING'; then
fossil changes | awk '/^MISSING/ { print $2; }' | xargs fossil forget
@@ -48,4 +68,7 @@
fossil close --force
+rm -f "$LOCKFILE"
+trap - INT TERM EXIT
+
exit $rtn
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-08-20 04:12:09 UTC (rev 7205)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-08-20 17:12:55 UTC (rev 7206)
@@ -1099,6 +1099,16 @@
#MONIT_NOTIFY="no...@my..." # Notify via email, space separate multiple email addresses
#MONIT_NOTIFY_FROM="mo...@my..." # Optional, From: email address
+## Fossil-Software Configuration Management
+## Enable Fossil server by setting FOSSIL_SERVER="yes"
+#FOSSIL_SERVER="yes"
+## Note: All directory and file names are relative to /mnt/kd/
+## Space separate multiple directory and/or file names.
+#FOSSIL_DEFAULT_DIRS="" # Directory name(s), override the default set of directories: rc.conf.d asterisk dahdi etc.
+#FOSSIL_DEFAULT_FILES="" # File name(s), override the default set of files: rc.local rc.elocal dnsmasq.static etc.
+#FOSSIL_INCLUDE_DIRS="snmp" # Directory name(s), additional directories that are monitored for new added files and sub-dirs.
+#FOSSIL_INCLUDE_FILES="*.conf" # File name(s), additional files that are added to the repository, the * wildcard is allowed.
+
## BOOTPFILE
## For diskless clients, the image to use for booting.
#BOOTPFILE="/pxelinux.0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-21 20:38:27
|
Revision: 7214
http://sourceforge.net/p/astlinux/code/7214
Author: abelbeck
Date: 2015-08-21 20:38:24 +0000 (Fri, 21 Aug 2015)
Log Message:
-----------
default builds, enable fossil for now for testing, we can decide later if we want to revert this
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-08-21 17:46:16 UTC (rev 7213)
+++ branches/1.0/astlinux-ast11.config 2015-08-21 20:38:24 UTC (rev 7214)
@@ -266,7 +266,7 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
-# BR2_PACKAGE_FOSSIL is not set
+BR2_PACKAGE_FOSSIL=y
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-08-21 17:46:16 UTC (rev 7213)
+++ branches/1.0/astlinux-ast13.config 2015-08-21 20:38:24 UTC (rev 7214)
@@ -266,7 +266,7 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
-# BR2_PACKAGE_FOSSIL is not set
+BR2_PACKAGE_FOSSIL=y
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-08-21 17:46:16 UTC (rev 7213)
+++ branches/1.0/astlinux18.config 2015-08-21 20:38:24 UTC (rev 7214)
@@ -266,7 +266,7 @@
# BR2_PACKAGE_CVS is not set
# BR2_PACKAGE_DISTCC is not set
BR2_PACKAGE_FLEX=y
-# BR2_PACKAGE_FOSSIL is not set
+BR2_PACKAGE_FOSSIL=y
# BR2_PACKAGE_GMP is not set
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_MAKE is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-25 22:05:44
|
Revision: 7228
http://sourceforge.net/p/astlinux/code/7228
Author: abelbeck
Date: 2015-08-25 22:05:41 +0000 (Tue, 25 Aug 2015)
Log Message:
-----------
fossil, more consistently use FOSSIL_HOME rather than depend on the /root/.fossil symlink, no functional change
Modified Paths:
--------------
branches/1.0/package/fossil/scripts/fossil-close
branches/1.0/package/fossil/scripts/fossil-diff
branches/1.0/package/fossil/scripts/fossil-open
branches/1.0/package/fossil/scripts/fossil-revert
branches/1.0/package/fossil/scripts/fossil-status
branches/1.0/project/astlinux/target_skeleton/etc/profile
Modified: branches/1.0/package/fossil/scripts/fossil-close
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-close 2015-08-25 17:12:32 UTC (rev 7227)
+++ branches/1.0/package/fossil/scripts/fossil-close 2015-08-25 22:05:41 UTC (rev 7228)
@@ -1,5 +1,7 @@
#!/bin/sh
+export FOSSIL_HOME="/mnt/kd/fossil"
+
LOCKFILE="/var/lock/fossil-commit.lock"
if ! cd /mnt/kd; then
Modified: branches/1.0/package/fossil/scripts/fossil-diff
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-diff 2015-08-25 17:12:32 UTC (rev 7227)
+++ branches/1.0/package/fossil/scripts/fossil-diff 2015-08-25 22:05:41 UTC (rev 7228)
@@ -2,6 +2,8 @@
ARGS="$@"
+export FOSSIL_HOME="/mnt/kd/fossil"
+
REPO="/mnt/kd/fossil/astlinux.fossil"
LOCKFILE="/var/lock/fossil-commit.lock"
Modified: branches/1.0/package/fossil/scripts/fossil-open
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-open 2015-08-25 17:12:32 UTC (rev 7227)
+++ branches/1.0/package/fossil/scripts/fossil-open 2015-08-25 22:05:41 UTC (rev 7228)
@@ -1,5 +1,7 @@
#!/bin/sh
+export FOSSIL_HOME="/mnt/kd/fossil"
+
REPO="/mnt/kd/fossil/astlinux.fossil"
LOCKFILE="/var/lock/fossil-commit.lock"
Modified: branches/1.0/package/fossil/scripts/fossil-revert
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-revert 2015-08-25 17:12:32 UTC (rev 7227)
+++ branches/1.0/package/fossil/scripts/fossil-revert 2015-08-25 22:05:41 UTC (rev 7228)
@@ -1,5 +1,7 @@
#!/bin/sh
+export FOSSIL_HOME="/mnt/kd/fossil"
+
REPO="/mnt/kd/fossil/astlinux.fossil"
LOCKFILE="/var/lock/fossil-commit.lock"
Modified: branches/1.0/package/fossil/scripts/fossil-status
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-status 2015-08-25 17:12:32 UTC (rev 7227)
+++ branches/1.0/package/fossil/scripts/fossil-status 2015-08-25 22:05:41 UTC (rev 7228)
@@ -1,5 +1,7 @@
#!/bin/sh
+export FOSSIL_HOME="/mnt/kd/fossil"
+
REPO="/mnt/kd/fossil/astlinux.fossil"
LOCKFILE="/var/lock/fossil-commit.lock"
Modified: branches/1.0/project/astlinux/target_skeleton/etc/profile
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/profile 2015-08-25 17:12:32 UTC (rev 7227)
+++ branches/1.0/project/astlinux/target_skeleton/etc/profile 2015-08-25 22:05:41 UTC (rev 7228)
@@ -38,6 +38,11 @@
export PAGER=less
fi
+# Set Fossil home directory
+if [ -d /mnt/kd/fossil ]; then
+ export FOSSIL_HOME="/mnt/kd/fossil"
+fi
+
# Set UTF-8 character type for vi
if [ -f /usr/lib/locale/.locale ]; then
alias vi="LC_CTYPE=$(cat /usr/lib/locale/.locale) vi"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-08-26 17:15:35
|
Revision: 7230
http://sourceforge.net/p/astlinux/code/7230
Author: abelbeck
Date: 2015-08-26 17:15:33 +0000 (Wed, 26 Aug 2015)
Log Message:
-----------
fossil, monitor the 'crontabs' directory by default and automatically add a *disabled* cron entry for Fossil daily auto-commit
Modified Paths:
--------------
branches/1.0/package/fossil/scripts/fossil-commit
branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond
Modified: branches/1.0/package/fossil/scripts/fossil-commit
===================================================================
--- branches/1.0/package/fossil/scripts/fossil-commit 2015-08-25 22:15:37 UTC (rev 7229)
+++ branches/1.0/package/fossil/scripts/fossil-commit 2015-08-26 17:15:33 UTC (rev 7230)
@@ -35,7 +35,7 @@
if [ -n "$FOSSIL_DEFAULT_DIRS" ]; then
dirs="$FOSSIL_DEFAULT_DIRS"
else
- dirs="rc.conf.d arno-iptables-firewall/plugins monit/monit.d openvpn/ccd"
+ dirs="rc.conf.d crontabs arno-iptables-firewall/plugins monit/monit.d openvpn/ccd"
if [ "$ASTERISK_DAHDI_DISABLE" != "yes" ]; then
dirs="$dirs asterisk dahdi fop2 phoneprov/templates"
fi
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond 2015-08-25 22:15:37 UTC (rev 7229)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/crond 2015-08-26 17:15:33 UTC (rev 7230)
@@ -20,6 +20,16 @@
0 4 * * * /usr/sbin/logrotate /etc/logrotate.conf >/dev/null 2>&1" >> /var/spool/cron/crontabs/root
fi
fi
+
+ # Automatically add daily cron entry for Fossil - disabled by default
+ if [ -x /usr/bin/fossil-commit ]; then
+ if [ ! -f /var/spool/cron/crontabs/root ] || ! grep -q '/usr/bin/fossil-commit ' /var/spool/cron/crontabs/root; then
+ echo "
+##
+## Fossil daily auto-commit - Do not remove, un-comment to enable
+#5 4 * * * /usr/bin/fossil-commit >/dev/null 2>&1" >> /var/spool/cron/crontabs/root
+ fi
+ fi
}
start () {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-09-16 21:35:37
|
Revision: 7247
http://sourceforge.net/p/astlinux/code/7247
Author: abelbeck
Date: 2015-09-16 21:35:35 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
sipsak, new package SIP-swiss-army-knife, enabled for Asterisk builds
Ref: http://blog.krisk.org/2010/10/breaking-rfc-compliance-to-improve.html
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/sipsak/
branches/1.0/package/sipsak/Config.in
branches/1.0/package/sipsak/sipsak-0001-support-D-option-retransmits.patch
branches/1.0/package/sipsak/sipsak-0002-fix-string-off-by-one-bugs.patch
branches/1.0/package/sipsak/sipsak.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-09-12 15:44:14 UTC (rev 7246)
+++ branches/1.0/astlinux-ast11.config 2015-09-16 21:35:35 UTC (rev 7247)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7194-dirty Configuration
-# Sat Aug 15 19:23:13 2015
+# Buildroot 2011.08-svn7246-dirty Configuration
+# Wed Sep 16 16:25:07 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -781,6 +781,7 @@
# BR2_PACKAGE_SER2NET is not set
BR2_PACKAGE_SHELLINABOX=y
BR2_PACKAGE_SIPGREP=y
+BR2_PACKAGE_SIPSAK=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-09-12 15:44:14 UTC (rev 7246)
+++ branches/1.0/astlinux-ast13.config 2015-09-16 21:35:35 UTC (rev 7247)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7194-dirty Configuration
-# Sat Aug 15 19:23:16 2015
+# Buildroot 2011.08-svn7246-dirty Configuration
+# Wed Sep 16 16:25:12 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -781,6 +781,7 @@
# BR2_PACKAGE_SER2NET is not set
BR2_PACKAGE_SHELLINABOX=y
BR2_PACKAGE_SIPGREP=y
+BR2_PACKAGE_SIPSAK=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-09-12 15:44:14 UTC (rev 7246)
+++ branches/1.0/astlinux18.config 2015-09-16 21:35:35 UTC (rev 7247)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7194-dirty Configuration
-# Sat Aug 15 19:23:12 2015
+# Buildroot 2011.08-svn7246-dirty Configuration
+# Wed Sep 16 16:25:04 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -781,6 +781,7 @@
# BR2_PACKAGE_SER2NET is not set
BR2_PACKAGE_SHELLINABOX=y
BR2_PACKAGE_SIPGREP=y
+BR2_PACKAGE_SIPSAK=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-09-12 15:44:14 UTC (rev 7246)
+++ branches/1.0/initrd.config 2015-09-16 21:35:35 UTC (rev 7247)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7194-dirty Configuration
-# Sat Aug 15 19:23:35 2015
+# Buildroot 2011.08-svn7246-dirty Configuration
+# Wed Sep 16 16:25:17 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -628,6 +628,7 @@
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SIPGREP is not set
+# BR2_PACKAGE_SIPSAK is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-09-12 15:44:14 UTC (rev 7246)
+++ branches/1.0/package/Config.in 2015-09-16 21:35:35 UTC (rev 7247)
@@ -526,6 +526,7 @@
source "package/ser2net/Config.in"
source "package/shellinabox/Config.in"
source "package/sipgrep/Config.in"
+source "package/sipsak/Config.in"
source "package/socat/Config.in"
source "package/spawn-fcgi/Config.in"
source "package/squid/Config.in"
Added: branches/1.0/package/sipsak/Config.in
===================================================================
--- branches/1.0/package/sipsak/Config.in (rev 0)
+++ branches/1.0/package/sipsak/Config.in 2015-09-16 21:35:35 UTC (rev 7247)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_SIPSAK
+ bool "sipsak"
+ select BR2_PACKAGE_OPENSSL
+ default n
+ help
+ sipsak is a small command line tool for developers and administrators of Session Initiation Protocol (SIP) applications.
+ It can be used for some simple tests on SIP applications and devices.
+
+ http://sourceforge.net/projects/sipsak.berlios/
+ http://linux.die.net/man/1/sipsak
+ https://github.com/sipwise/sipsak
+
Added: branches/1.0/package/sipsak/sipsak-0001-support-D-option-retransmits.patch
===================================================================
--- branches/1.0/package/sipsak/sipsak-0001-support-D-option-retransmits.patch (rev 0)
+++ branches/1.0/package/sipsak/sipsak-0001-support-D-option-retransmits.patch 2015-09-16 21:35:35 UTC (rev 7247)
@@ -0,0 +1,12 @@
+diff -urN sipsak-0.9.6.orig/transport.c sipsak-0.9.6/transport.c
+--- sipsak-0.9.6.orig/transport.c 2006-01-28 16:11:34.000000000 -0500
++++ sipsak-0.9.6/transport.c 2010-10-26 18:38:51.000000000 -0400
+@@ -286,7 +286,7 @@
+ }
+ }
+ senddiff = deltaT(&(srt->starttime), &(srt->recvtime));
+- if (senddiff > (float)64 * (float)SIP_T1) {
++ if (senddiff > inv_final) {
+ if (timing == 0) {
+ if (verbose>0)
+ printf("*** giving up, no final response after %.3f ms\n", senddiff);
Added: branches/1.0/package/sipsak/sipsak-0002-fix-string-off-by-one-bugs.patch
===================================================================
--- branches/1.0/package/sipsak/sipsak-0002-fix-string-off-by-one-bugs.patch (rev 0)
+++ branches/1.0/package/sipsak/sipsak-0002-fix-string-off-by-one-bugs.patch 2015-09-16 21:35:35 UTC (rev 7247)
@@ -0,0 +1,58 @@
+diff --git a/helper.c b/helper.c
+index b09963c..4fbbae5 100644
+--- a/helper.c
++++ b/helper.c
+@@ -508,12 +508,12 @@ void get_fqdn(){
+ memset(&hlp, 0, sizeof(hlp));
+
+ if (hostname) {
+- strncpy(fqdn, hostname, FQDN_SIZE);
+- strncpy(hname, hostname, 100);
++ strncpy(fqdn, hostname, FQDN_SIZE-1);
++ strncpy(hname, hostname, sizeof(hname)-1);
+ }
+ else {
+ if ((uname(&un))==0) {
+- strncpy(hname, un.nodename, 100);
++ strncpy(hname, un.nodename, sizeof(hname)-1);
+ }
+ else {
+ if (gethostname(&hname[0], namelen) < 0) {
+@@ -532,7 +532,7 @@ void get_fqdn(){
+ snprintf(fqdn, FQDN_SIZE, "%s.%s", hname, dname);
+ }
+ else {
+- strncpy(fqdn, hname, FQDN_SIZE);
++ strncpy(fqdn, hname, FQDN_SIZE-1);
+ }
+ #endif
+ }
+@@ -541,15 +541,15 @@ void get_fqdn(){
+ he=gethostbyname(hname);
+ if (he) {
+ if (numeric == 1) {
+- snprintf(hlp, 15, "%s", inet_ntoa(*(struct in_addr *) he->h_addr_list[0]));
+- strncpy(fqdn, hlp, FQDN_SIZE);
++ snprintf(hlp, sizeof(hlp), "%s", inet_ntoa(*(struct in_addr *) he->h_addr_list[0]));
++ strncpy(fqdn, hlp, FQDN_SIZE-1);
+ }
+ else {
+ if ((strchr(he->h_name, '.'))!=NULL && (strchr(hname, '.'))==NULL) {
+- strncpy(fqdn, he->h_name, FQDN_SIZE);
++ strncpy(fqdn, he->h_name, FQDN_SIZE-1);
+ }
+ else {
+- strncpy(fqdn, hname, FQDN_SIZE);
++ strncpy(fqdn, hname, FQDN_SIZE-1);
+ }
+ }
+ }
+@@ -561,7 +561,7 @@ void get_fqdn(){
+ if ((strchr(fqdn, '.'))==NULL) {
+ if (hostname) {
+ fprintf(stderr, "warning: %s is not resolvable... continouing anyway\n", fqdn);
+- strncpy(fqdn, hostname, FQDN_SIZE);
++ strncpy(fqdn, hostname, FQDN_SIZE-1);
+ }
+ else {
+ fprintf(stderr, "error: this FQDN or IP is not valid: %s\n", fqdn);
Added: branches/1.0/package/sipsak/sipsak.mk
===================================================================
--- branches/1.0/package/sipsak/sipsak.mk (rev 0)
+++ branches/1.0/package/sipsak/sipsak.mk 2015-09-16 21:35:35 UTC (rev 7247)
@@ -0,0 +1,27 @@
+#############################################################
+#
+# sipsak
+#
+#############################################################
+
+SIPSAK_VERSION = 0.9.6-1
+SIPSAK_SOURCE = sipsak-$(SIPSAK_VERSION).tar.gz
+SIPSAK_SITE = http://downloads.sourceforge.net/project/sipsak.berlios
+SIPSAK_DEPENDENCIES = openssl
+
+# Generate a modern ./configure
+SIPSAK_AUTORECONF = YES
+
+SIPSAK_CONF_OPT += \
+ --disable-gnutls \
+ --enable-timeout=150
+
+define SIPSAK_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/sipsak $(TARGET_DIR)/usr/bin/sipsak
+endef
+
+define SIPSAK_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/sipsak
+endef
+
+$(eval $(call AUTOTARGETS,package,sipsak))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-09-12 15:44:14 UTC (rev 7246)
+++ branches/1.0/runnix-uclibc.config 2015-09-16 21:35:35 UTC (rev 7247)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7194-dirty Configuration
-# Sat Aug 15 19:23:25 2015
+# Buildroot 2011.08-svn7246-dirty Configuration
+# Wed Sep 16 16:25:16 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -952,6 +952,7 @@
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SIPGREP is not set
+# BR2_PACKAGE_SIPSAK is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-09-12 15:44:14 UTC (rev 7246)
+++ branches/1.0/runnix.config 2015-09-16 21:35:35 UTC (rev 7247)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7194-dirty Configuration
-# Sat Aug 15 19:23:19 2015
+# Buildroot 2011.08-svn7246-dirty Configuration
+# Wed Sep 16 16:25:15 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -665,6 +665,7 @@
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SIPGREP is not set
+# BR2_PACKAGE_SIPSAK is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-10-26 18:16:27
|
Revision: 7286
http://sourceforge.net/p/astlinux/code/7286
Author: abelbeck
Date: 2015-10-26 18:16:25 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
dibbler, new package, disabled for now. Adds DHCPv6 client support but configuration is missing. Quite large binart at 680kb, but the spawned daemon is much smaller.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/dibbler/
branches/1.0/package/dibbler/Config.in
branches/1.0/package/dibbler/dibbler.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/astlinux-ast11.config 2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:07 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:22 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -691,6 +691,7 @@
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/astlinux-ast13.config 2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:12 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:23 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -691,6 +691,7 @@
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/astlinux18.config 2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:04 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:21 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -691,6 +691,7 @@
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/initrd.config 2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:17 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:28 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -571,6 +571,7 @@
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/package/Config.in 2015-10-26 18:16:25 UTC (rev 7286)
@@ -461,6 +461,7 @@
source "package/dhcp/Config.in"
endif
source "package/dhcpdump/Config.in"
+source "package/dibbler/Config.in"
source "package/dnscrypt-proxy/Config.in"
source "package/dnsmasq/Config.in"
source "package/dropbear/Config.in"
Added: branches/1.0/package/dibbler/Config.in
===================================================================
--- branches/1.0/package/dibbler/Config.in (rev 0)
+++ branches/1.0/package/dibbler/Config.in 2015-10-26 18:16:25 UTC (rev 7286)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_DIBBLER
+ bool "dibbler"
+ help
+ Dibbler is a portable DHCPv6 implementation.
+
+ http://klub.com.pl/dhcpv6/
+ http://sourceforge.net/projects/dibbler/
+
Added: branches/1.0/package/dibbler/dibbler.mk
===================================================================
--- branches/1.0/package/dibbler/dibbler.mk (rev 0)
+++ branches/1.0/package/dibbler/dibbler.mk 2015-10-26 18:16:25 UTC (rev 7286)
@@ -0,0 +1,30 @@
+################################################################################
+#
+# dibbler
+#
+################################################################################
+
+DIBBLER_VERSION = 1.0.1
+DIBBLER_SOURCE = dibbler-$(DIBBLER_VERSION).tar.gz
+DIBBLER_SITE = http://downloads.sourceforge.net/project/dibbler/dibbler/$(DIBBLER_VERSION)
+
+DIBBLER_CONF_OPT = \
+ --enable-dst-addr-check \
+ --disable-dns-update \
+ --disable-auth \
+ --disable-link-state
+
+## Only build dibbler-client
+DIBBLER_MAKE_OPT = client
+
+define DIBBLER_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/dibbler-client $(TARGET_DIR)/usr/sbin/
+ ln -sf /tmp/etc/dibbler $(TARGET_DIR)/etc/dibbler
+endef
+
+define DIBBLER_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/dibbler-client
+ rm -f $(TARGET_DIR)/etc/dibbler
+endef
+
+$(eval $(call AUTOTARGETS,package,dibbler))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/runnix-uclibc.config 2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:16 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:26 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -854,6 +854,7 @@
# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-10-25 17:46:52 UTC (rev 7285)
+++ branches/1.0/runnix.config 2015-10-26 18:16:25 UTC (rev 7286)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7246-dirty Configuration
-# Wed Sep 16 16:25:15 2015
+# Buildroot 2011.08-svn7285-dirty Configuration
+# Mon Oct 26 13:04:24 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -602,6 +602,7 @@
# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-10-26 21:58:12
|
Revision: 7287
http://sourceforge.net/p/astlinux/code/7287
Author: abelbeck
Date: 2015-10-26 21:58:09 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
iperf3, new package, enabled where iperf is enabled. iperf3 is becomming more common and since it is small (100KB) let it sit along side the old iperf since they are not compatible
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/iperf3/
branches/1.0/package/iperf3/Config.in
branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch
branches/1.0/package/iperf3/iperf3.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/astlinux-ast11.config 2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:22 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:51:59 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -706,6 +706,7 @@
BR2_PACKAGE_IFTOP=y
BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IPSEC_TOOLS=y
BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/astlinux-ast13.config 2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:23 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:01 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -706,6 +706,7 @@
BR2_PACKAGE_IFTOP=y
BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IPSEC_TOOLS=y
BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/astlinux18.config 2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:21 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:51:52 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -706,6 +706,7 @@
BR2_PACKAGE_IFTOP=y
BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
+BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_IPSEC_TOOLS=y
BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/initrd.config 2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:28 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:31 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -583,6 +583,7 @@
# BR2_PACKAGE_IFTOP is not set
# BR2_PACKAGE_INADYN is not set
# BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPERF3 is not set
# BR2_PACKAGE_IPROUTE2 is not set
# BR2_PACKAGE_IPSEC_TOOLS is not set
# BR2_PACKAGE_IPSET is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/package/Config.in 2015-10-26 21:58:09 UTC (rev 7287)
@@ -473,6 +473,7 @@
source "package/iftop/Config.in"
source "package/inadyn/Config.in"
source "package/iperf/Config.in"
+source "package/iperf3/Config.in"
source "package/iproute2/Config.in"
source "package/ipsec-tools/Config.in"
source "package/ipset/Config.in"
Added: branches/1.0/package/iperf3/Config.in
===================================================================
--- branches/1.0/package/iperf3/Config.in (rev 0)
+++ branches/1.0/package/iperf3/Config.in 2015-10-26 21:58:09 UTC (rev 7287)
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_IPERF3
+ bool "iperf3"
+ help
+ iperf is a tool for active measurements of the maximum
+ achievable bandwidth on IP networks.
+ It supports tuning of various parameters related to timing,
+ protocols, and buffers. For each test it reports the bandwidth,
+ loss, and other parameters.
+ It's a redesign of the NLANR/DAST iperf(2) and is not
+ backward compatible.
+
+ https://iperf.fr
+ https://github.com/esnet/iperf
+
Added: branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch
===================================================================
--- branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch (rev 0)
+++ branches/1.0/package/iperf3/iperf3-0001-disable-profiling.patch 2015-10-26 21:58:09 UTC (rev 7287)
@@ -0,0 +1,20 @@
+This should be an option, but it's not.
+Don't force profiled builds, it breaks on many toolchains.
+Patch Makefile.in to avoid AUTORECONFing since it needs dummy files
+that are missing to succeed (ChangeLog, COPYING, NEWS, README) and it's
+simple enough so avoid pulling in dependencies and delays.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura iperf-3.0.10.orig/src/Makefile.in iperf-3.0.10/src/Makefile.in
+--- iperf-3.0.10.orig/src/Makefile.in 2014-12-17 07:30:46.878310789 -0300
++++ iperf-3.0.10/src/Makefile.in 2014-12-17 07:33:41.879356643 -0300
+@@ -82,7 +82,7 @@
+ host_triplet = @host@
+ bin_PROGRAMS = iperf3$(EXEEXT)
+ noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) \
+- iperf3_profile$(EXEEXT)
++ iperf3$(EXEEXT)
+ TESTS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
Added: branches/1.0/package/iperf3/iperf3.mk
===================================================================
--- branches/1.0/package/iperf3/iperf3.mk (rev 0)
+++ branches/1.0/package/iperf3/iperf3.mk 2015-10-26 21:58:09 UTC (rev 7287)
@@ -0,0 +1,11 @@
+################################################################################
+#
+# iperf3
+#
+################################################################################
+
+IPERF3_VERSION = 3.0.11
+IPERF3_SOURCE = iperf-$(IPERF3_VERSION)-source.tar.gz
+IPERF3_SITE = --no-check-certificate https://iperf.fr/download/iperf_3.0
+
+$(eval $(call AUTOTARGETS,package,iperf3))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/runnix-uclibc.config 2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:26 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:27 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -874,6 +874,7 @@
#
# iperf requires a toolchain with C++ support enabled
#
+# BR2_PACKAGE_IPERF3 is not set
# BR2_PACKAGE_IPROUTE2 is not set
# BR2_PACKAGE_IPSEC_TOOLS is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2015-10-26 18:16:25 UTC (rev 7286)
+++ branches/1.0/runnix.config 2015-10-26 21:58:09 UTC (rev 7287)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7285-dirty Configuration
-# Mon Oct 26 13:04:24 2015
+# Buildroot 2011.08-svn7286-dirty Configuration
+# Mon Oct 26 16:52:12 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -616,6 +616,7 @@
# BR2_PACKAGE_IFTOP is not set
# BR2_PACKAGE_INADYN is not set
# BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPERF3 is not set
# BR2_PACKAGE_IPROUTE2 is not set
# BR2_PACKAGE_IPSEC_TOOLS is not set
# BR2_PACKAGE_IPSET is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-10-27 22:44:45
|
Revision: 7288
http://sourceforge.net/p/astlinux/code/7288
Author: abelbeck
Date: 2015-10-27 22:44:42 +0000 (Tue, 27 Oct 2015)
Log Message:
-----------
wide-dhcpv6, new package, disabled for now. Adds DHCPv6 client support but configuration is missing. Includes 10 patches from the Debian project to make it current. Much smaller than dibbler.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/wide-dhcpv6/
branches/1.0/package/wide-dhcpv6/Config.in
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0005-Update-ifid-on-interface-restart.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0006-Add-new-feature-dhcp6c-profiles.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0007-Adding-ifid-option-to-the-dhcp6c.conf-prefix-interfa.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0008-Close-file-descriptors-on-exec.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0009-Fix-renewal-of-IA-NA.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0010-Call-client-script-after-interfaces-have-been-update.patch
branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/astlinux-ast11.config 2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:51:59 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:38 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -799,6 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/astlinux-ast13.config 2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:52:01 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:39 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -799,6 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/astlinux18.config 2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:51:52 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:36 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -799,6 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/initrd.config 2015-10-27 22:44:42 UTC (rev 7288)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7286-dirty Configuration
-# Mon Oct 26 16:52:31 2015
+# Buildroot 2011.08-svn7287-dirty Configuration
+# Tue Oct 27 17:37:43 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -645,6 +645,7 @@
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2015-10-26 21:58:09 UTC (rev 7287)
+++ branches/1.0/package/Config.in 2015-10-27 22:44:42 UTC (rev 7288)
@@ -552,6 +552,7 @@
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/wget/Config.in"
endif
+source "package/wide-dhcpv6/Config.in"
source "package/wireless_tools/Config.in"
source "package/wpa_supplicant/Config.in"
Added: branches/1.0/package/wide-dhcpv6/Config.in
===================================================================
--- branches/1.0/package/wide-dhcpv6/Config.in (rev 0)
+++ branches/1.0/package/wide-dhcpv6/Config.in 2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,14 @@
+config BR2_PACKAGE_WIDE_DHCPV6
+ bool "wide-dhcpv6"
+ help
+ WIDE-DHCPv6 is an open-source implementation of Dynamic Host Configuration Protocol
+ for IPv6 (DHCPv6) originally developed by the KAME project.
+
+ This package installs the client component.
+
+ http://sourceforge.net/projects/wide-dhcpv6/
+
+ Debian Patches:
+ http://git.famille-corbier.net/?p=packages/wide-dhcpv6.git;a=summary
+ http://http.debian.net/debian/pool/main/w/wide-dhcpv6/wide-dhcpv6_20080615-13.debian.tar.xz
+
Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0001-Fix-manpages.patch 2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,168 @@
+From e9fd60840eb125dcd55aab859dd838a47c02931f Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:03 +0200
+Subject: [PATCH] Fix manpages
+
+This patch fixes wide-dhcpv6 manpages (paths, typos, ...).
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ dhcp6c.8 | 8 ++++----
+ dhcp6c.conf.5 | 4 ++--
+ dhcp6ctl.8 | 13 ++++++-------
+ dhcp6relay.8 | 1 -
+ dhcp6s.8 | 10 +++++-----
+ dhcp6s.conf.5 | 2 +-
+ 6 files changed, 18 insertions(+), 20 deletions(-)
+
+diff --git a/dhcp6c.8 b/dhcp6c.8
+index 6824ae0..1d69c9d 100644
+--- a/dhcp6c.8
++++ b/dhcp6c.8
+@@ -114,13 +114,13 @@ In either case,
+ will send DHCPv6 Release messages to release resources assigned from servers.
+ .\"
+ .Sh FILES
+-.Bl -tag -width /usr/local/etc/dhcp6c.conf -compact
++.Bl -tag -width /etc/wide-dhcpv6/dhcp6c.conf -compact
+ .It Pa /var/run/dhcp6c.pid
+ is the default file that contains pid of the currently running
+ .Nm dhcp6c .
+-.It Pa /usr/local/etc/dhcp6c.conf
++.It Pa /etc/wide-dhcpv6/dhcp6c.conf
+ is the default configuration file.
+-.It Pa /var/db/dhcp6c_duid
++.It Pa /var/lib/dhcpv6/dhcp6c_duid
+ is the file to store the client's DUID.
+ .El
+ .Sh Configuration Script
+@@ -203,6 +203,6 @@ command first appeared in WIDE/KAME IPv6 protocol stack kit.
+ is incomplete and violates DHCPv6 protocol spec, in several aspects.
+ In particular, temporary address assignment is intentionally omitted.
+ .Pp
+-Information Refresh Time Option is not recognied in Info-req mode, since
++Information Refresh Time Option is not recognized in Info-req mode, since
+ .Nm
+ terminates after it receives a REPLY message.
+diff --git a/dhcp6c.conf.5 b/dhcp6c.conf.5
+index 611ab4f..5fc03d3 100644
+--- a/dhcp6c.conf.5
++++ b/dhcp6c.conf.5
+@@ -36,7 +36,7 @@
+ .Nd DHCPv6 client configuration file
+ .\"
+ .Sh SYNOPSIS
+-.Pa /usr/local/etc/dhcp6c.conf
++.Pa /etc/wide-dhcpv6/dhcp6c.conf
+ .\"
+ .Sh DESCRIPTION
+ The
+@@ -630,7 +630,7 @@ execute the
+ .Xr openssl 1
+ command (when available) as follows,
+ .Bd -literal -offset
+-% openssl rand -base64 16
++% openssl rand \-base64 16
+ .Ed
+ .Pp
+ and copy the output to the
+diff --git a/dhcp6ctl.8 b/dhcp6ctl.8
+index 86ea0e1..e11889b 100644
+--- a/dhcp6ctl.8
++++ b/dhcp6ctl.8
+@@ -85,12 +85,11 @@ Use
+ .Ar keyfile
+ to provide the shared secret to communicate with the process.
+ The default file name used when unspecified is
+-.Pa /usr/local/etc/dhcp6cctlkey
++.Pa /etc/wide-dhcpv6/dhcp6cctlkey
+ with a client,
+ and
+-.Pa /usr/local/etc/dhcp6sctlkey
++.Pa /etc/wide-dhcpv6/dhcp6sctlkey
+ with a server.
+-
+ .It Fl p Ar port
+ Specify
+ .Ar port
+@@ -99,7 +98,7 @@ The default port number used when unspecified is 5546 for a client,
+ and 5547 for a server.
+ .It Fl s Ar address
+ Specify
+-.A address
++.Ar address
+ as the listening address of the process.
+ The default address used when unspecified is ::1.
+ .El
+@@ -183,10 +182,10 @@ information (if any) and exits.
+ .El
+ .\"
+ .Sh FILES
+-.Bl -tag -width /usr/local/etc/dhcp6cctlkey -compact
+-.It Pa /usr/local/etc/dhcp6cctlkey
++.Bl -tag -width /etc/wide-dhcpv6/dhcp6cctlkey -compact
++.It Pa /etc/wide-dhcpv6/dhcp6cctlkey
+ is the default key file to communicate with a client.
+-.It Pa /usr/local/etc/dhcp6sctlkey
++.It Pa /etc/wide-dhcpv6/dhcp6sctlkey
+ is the default key file to communicate with a server.
+ .El
+ .\"
+diff --git a/dhcp6relay.8 b/dhcp6relay.8
+index 4f761b0..7ad8ada 100644
+--- a/dhcp6relay.8
++++ b/dhcp6relay.8
+@@ -107,7 +107,6 @@ to dump the process ID of
+ is the default file that contains pid of the currently running
+ .Nm .
+ .El
+-
+ .Sh SEE ALSO
+ .Xr dhcp6c 8 ,
+ .Xr dhcp6s 8
+diff --git a/dhcp6s.8 b/dhcp6s.8
+index 888117a..29dcc7b 100644
+--- a/dhcp6s.8
++++ b/dhcp6s.8
+@@ -102,7 +102,7 @@ Use
+ to store the shared secret to authenticate the communication with
+ .Nm dhcp6ctl .
+ The default file name used when unspecified is
+-.Pa /usr/local/etc/dhcp6sctlkey .
++.Pa /etc/wide-dhcpv6/dhcp6sctlkey .
+ The default name is intentionally same as that for
+ .Nm dhcp6ctl
+ so that the server and the control command can share the file when
+@@ -122,12 +122,12 @@ to dump the process ID of
+ .El
+ .\"
+ .Sh FILES
+-.Bl -tag -width /usr/local/etc/dhcp6s.conf -compact
+-.It Pa /usr/local/etc/dhcp6s.conf
++.Bl -tag -width /etc/wide-dhcpv6/dhcp6s.conf -compact
++.It Pa /etc/wide-dhcpv6/dhcp6s.conf
+ is the default configuration file.
+-.It Pa /var/db/dhcp6s_duid
++.It Pa /var/lib/dhcpv6/dhcp6s_duid
+ is the default file to store the server's DUID.
+-.It Pa /usr/local/etc/dhcp6sctlkey
++.It Pa /etc/wide-dhcpv6/dhcp6sctlkey
+ is the default key file to communicate with the control command.
+ See
+ .Xr dhcp6ctl 8
+diff --git a/dhcp6s.conf.5 b/dhcp6s.conf.5
+index 1206764..2cb08ce 100644
+--- a/dhcp6s.conf.5
++++ b/dhcp6s.conf.5
+@@ -36,7 +36,7 @@
+ .Nd DHCPv6 server configuration file
+ .\"
+ .Sh SYNOPSIS
+-.Pa /usr/local/etc/dhcp6s.conf
++.Pa /etc/wide-dhcpv6/dhcp6s.conf
+ .\"
+ .Sh DESCRIPTION
+ The
+--
+1.5.6.5
+
Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0002-Don-t-strip-binaries.patch 2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,28 @@
+From 30c43a801bd5b4bb96c878d2efc97042511fea92 Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:06 +0200
+Subject: [PATCH] Don't strip binaries
+
+This patch prevents wide-dhcpv6 build system from stripping built binaries.
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ Makefile.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index a39596f..de25f48 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -103,7 +103,7 @@ $(srcdir)/ianaopts.h: gentab.pl bootp-dhcp-parameters
+
+ install::
+ -mkdir -p $(sbindir) $(mandir)/man5 $(mandir)/man8
+- $(INSTALL_PROGRAM) -s -o $(user) -g $(group) $(TARGET) $(sbindir)
++ $(INSTALL_PROGRAM) -o $(user) -g $(group) $(TARGET) $(sbindir)
+ $(INSTALL_DATA) -o $(user) -g $(group) dhcp6c.8 $(mandir)/man8
+ $(INSTALL_DATA) -o $(user) -g $(group) dhcp6s.8 $(mandir)/man8
+ $(INSTALL_DATA) -o $(user) -g $(group) dhcp6relay.8 $(mandir)/man8
+--
+1.5.6.5
+
Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0003-Close-inherited-file-descriptors.patch 2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,80 @@
+From 2bb6f1769a5c3ea4f669382801c9bb2b74881d48 Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:08 +0200
+Subject: [PATCH] Close inherited file descriptors
+
+wide-dhcpv6 binaries should close inherited fds.
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ dhcp6c.c | 7 ++++++-
+ dhcp6relay.c | 6 ++++++
+ dhcp6s.c | 5 +++++
+ 3 files changed, 17 insertions(+), 1 deletions(-)
+
+diff --git a/dhcp6c.c b/dhcp6c.c
+index 1caaaa5..b5f5ed7 100644
+--- a/dhcp6c.c
++++ b/dhcp6c.c
+@@ -159,6 +159,7 @@ main(argc, argv)
+ char *progname;
+ FILE *pidfp;
+ struct dhcp6_if *ifp;
++ int fd;
+
+ #ifndef HAVE_ARC4RANDOM
+ srandom(time(NULL) & getpid());
+@@ -205,8 +206,12 @@ main(argc, argv)
+ exit(0);
+ }
+
+- if (foreground == 0)
++ if (foreground == 0) {
++ for (fd = 3; fd < 1024; fd++)
++ close(fd);
++
+ openlog(progname, LOG_NDELAY|LOG_PID, LOG_DAEMON);
++ }
+
+ setloglevel(debug);
+
+diff --git a/dhcp6relay.c b/dhcp6relay.c
+index fb84ce3..eb0bce9 100644
+--- a/dhcp6relay.c
++++ b/dhcp6relay.c
+@@ -207,8 +207,14 @@ main(argc, argv)
+ }
+
+ if (foreground == 0) {
++ int fd;
++
+ if (daemon(0, 0) < 0)
+ err(1, "daemon");
++
++ for (fd = 3; fd < 1024; fd++)
++ close(fd);
++
+ openlog(progname, LOG_NDELAY|LOG_PID, LOG_DAEMON);
+ }
+ setloglevel(debug);
+diff --git a/dhcp6s.c b/dhcp6s.c
+index 544afff..494e571 100644
+--- a/dhcp6s.c
++++ b/dhcp6s.c
+@@ -316,8 +316,13 @@ main(argc, argv)
+ }
+
+ if (foreground == 0) {
++ int fd;
++
+ if (daemon(0, 0) < 0)
+ err(1, "daemon");
++
++ for (fd = 3; fd < 1024; fd++)
++ close(fd);
+ }
+
+ /* dump current PID */
+--
+1.5.6.5
+
Added: branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch (rev 0)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6-0004-GNU-libc6-fixes.patch 2015-10-27 22:44:42 UTC (rev 7288)
@@ -0,0 +1,6710 @@
+From 78c2ba34951f378f847aaeb0b82fa6be9014ad46 Mon Sep 17 00:00:00 2001
+From: Jeremie Corbier <jer...@fa...>
+Date: Tue, 6 Apr 2010 15:51:10 +0200
+Subject: [PATCH] GNU libc6 fixes
+
+Fixes for recent libc releases.
+
+Signed-off-by: Jeremie Corbier <je...@fa...>
+---
+ addrconf.c | 16 +-
+ cftoken.c | 12 +-
+ cftoken.l | 12 +-
+ common.c | 226 +++++++++++++-------------
+ common.h | 2 +-
+ config.c | 268 +++++++++++++++---------------
+ configure | 50 ++++++-
+ configure.in | 7 +
+ dhcp6.h | 7 +
+ dhcp6_ctl.c | 40 +++---
+ dhcp6c.c | 246 ++++++++++++++--------------
+ dhcp6c_ia.c | 86 +++++-----
+ dhcp6c_script.c | 36 ++--
+ dhcp6relay.c | 118 +++++++-------
+ dhcp6relay_script.c | 28 ++--
+ dhcp6s.c | 446 +++++++++++++++++++++++++-------------------------
+ if.c | 12 +-
+ lease.c | 14 +-
+ prefixconf.c | 24 ++--
+ timer.c | 6 +-
+ 20 files changed, 859 insertions(+), 797 deletions(-)
+
+diff --git a/addrconf.c b/addrconf.c
+index d98373f..98d03e5 100644
+--- a/addrconf.c
++++ b/addrconf.c
+@@ -122,7 +122,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ if (addr->vltime != DHCP6_DURATION_INFINITE &&
+ (addr->pltime == DHCP6_DURATION_INFINITE ||
+ addr->pltime > addr->vltime)) {
+- dprintf(LOG_INFO, FNAME, "invalid address %s: "
++ debug_printf(LOG_INFO, FNAME, "invalid address %s: "
+ "pltime (%lu) is larger than vltime (%lu)",
+ in6addr2str(&addr->addr, 0),
+ addr->pltime, addr->vltime);
+@@ -131,7 +131,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+
+ if (iac_na == NULL) {
+ if ((iac_na = malloc(sizeof(*iac_na))) == NULL) {
+- dprintf(LOG_NOTICE, FNAME, "memory allocation failed");
++ debug_printf(LOG_NOTICE, FNAME, "memory allocation failed");
+ return (-1);
+ }
+ memset(iac_na, 0, sizeof(*iac_na));
+@@ -152,7 +152,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ /* search for the given address, and make a new one if it fails */
+ if ((sa = find_addr(&iac_na->statefuladdr_head, addr)) == NULL) {
+ if ((sa = malloc(sizeof(*sa))) == NULL) {
+- dprintf(LOG_NOTICE, FNAME, "memory allocation failed");
++ debug_printf(LOG_NOTICE, FNAME, "memory allocation failed");
+ return (-1);
+ }
+ memset(sa, 0, sizeof(*sa));
+@@ -169,7 +169,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ sa->addr.pltime = addr->pltime;
+ sa->addr.vltime = addr->vltime;
+ sa->dhcpif = dhcpifp;
+- dprintf(LOG_DEBUG, FNAME, "%s an address %s pltime=%lu, vltime=%lu",
++ debug_printf(LOG_DEBUG, FNAME, "%s an address %s pltime=%lu, vltime=%lu",
+ sacreate ? "create" : "update",
+ in6addr2str(&addr->addr, 0), addr->pltime, addr->vltime);
+
+@@ -194,7 +194,7 @@ update_address(ia, addr, dhcpifp, ctlp, callback)
+ if (sa->timer == NULL) {
+ sa->timer = dhcp6_add_timer(addr_timo, sa);
+ if (sa->timer == NULL) {
+- dprintf(LOG_NOTICE, FNAME,
++ debug_printf(LOG_NOTICE, FNAME,
+ "failed to add stateful addr timer");
+ remove_addr(sa); /* XXX */
+ return (-1);
+@@ -233,7 +233,7 @@ remove_addr(sa)
+ {
+ int ret;
+
+- dprintf(LOG_DEBUG, FNAME, "remove an address %s",
++ debug_printf(LOG_DEBUG, FNAME, "remove an address %s",
+ in6addr2str(&sa->addr.addr, 0));
+
+ if (sa->timer)
+@@ -343,7 +343,7 @@ na_renew_data_free(evd)
+ struct dhcp6_list *ial;
+
+ if (evd->type != DHCP6_EVDATA_IANA) {
+- dprintf(LOG_ERR, FNAME, "assumption failure");
++ debug_printf(LOG_ERR, FNAME, "assumption failure");
+ exit(1);
+ }
+
+@@ -362,7 +362,7 @@ addr_timo(arg)
+ struct ia *ia;
+ void (*callback)__P((struct ia *));
+
+- dprintf(LOG_DEBUG, FNAME, "address timeout for %s",
++ debug_printf(LOG_DEBUG, FNAME, "address timeout for %s",
+ in6addr2str(&sa->addr.addr, 0));
+
+ ia = sa->ctl->iacna_ia;
+diff --git a/cftoken.c b/cftoken.c
+index fcccc5a..0f6c1bf 100644
+--- a/cftoken.c
++++ b/cftoken.c
+@@ -2475,10 +2475,10 @@ cfdebug_print(w, t, l)
+ int l;
+ {
+ if (w) {
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "<%d>%s [%s] (%d)", yy_start, w, t, l);
+ } else {
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "<%d>[%s] (%d)", yy_start, t, l);
+ }
+ }
+@@ -2494,7 +2494,7 @@ yyerror0(int level, char *s, va_list ap)
+ if (bp < ep)
+ bp += vsnprintf(bp, ep - bp, s, ap);
+
+- dprintf(level, FNAME, ebuf);
++ debug_printf(level, FNAME, ebuf);
+ }
+
+ void
+@@ -2532,7 +2532,7 @@ cfswitch_buffer(incl)
+ FILE *fp;
+
+ if (incstackp >= MAX_INCLUDE_DEPTH) {
+- dprintf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
++ debug_printf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
+ return (-1);
+ }
+ incstack[incstackp].path = configfilename;
+@@ -2541,7 +2541,7 @@ cfswitch_buffer(incl)
+
+ fp = fopen(path, "r");
+ if (fp == NULL) {
+- dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++ debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ path, strerror(errno));
+ if (errno == ENOENT)
+ return (0);
+@@ -2563,7 +2563,7 @@ cfparse(conf)
+ {
+ configfilename = conf;
+ if ((yyin = fopen(configfilename, "r")) == NULL) {
+- dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++ debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ configfilename, strerror(errno));
+ if (errno == ENOENT)
+ return (0);
+diff --git a/cftoken.l b/cftoken.l
+index ece7fbb..ad4128d 100644
+--- a/cftoken.l
++++ b/cftoken.l
+@@ -340,10 +340,10 @@ cfdebug_print(w, t, l)
+ int l;
+ {
+ if (w) {
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "<%d>%s [%s] (%d)", yy_start, w, t, l);
+ } else {
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "<%d>[%s] (%d)", yy_start, t, l);
+ }
+ }
+@@ -359,7 +359,7 @@ yyerror0(int level, char *s, va_list ap)
+ if (bp < ep)
+ bp += vsnprintf(bp, ep - bp, s, ap);
+
+- dprintf(level, FNAME, ebuf);
++ debug_printf(level, FNAME, ebuf);
+ }
+
+ void
+@@ -397,7 +397,7 @@ cfswitch_buffer(incl)
+ FILE *fp;
+
+ if (incstackp >= MAX_INCLUDE_DEPTH) {
+- dprintf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
++ debug_printf(LOG_ERR, FNAME, "cfparse: includes nested too deeply");
+ return (-1);
+ }
+ incstack[incstackp].path = configfilename;
+@@ -406,7 +406,7 @@ cfswitch_buffer(incl)
+
+ fp = fopen(path, "r");
+ if (fp == NULL) {
+- dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++ debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ path, strerror(errno));
+ if (errno == ENOENT)
+ return (0);
+@@ -428,7 +428,7 @@ cfparse(conf)
+ {
+ configfilename = conf;
+ if ((yyin = fopen(configfilename, "r")) == NULL) {
+- dprintf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
++ debug_printf(LOG_ERR, FNAME, "cfparse: fopen(%s): %s",
+ configfilename, strerror(errno));
+ if (errno == ENOENT)
+ return (0);
+diff --git a/common.c b/common.c
+index f35399c..cc4abcc 100644
+--- a/common.c
++++ b/common.c
+@@ -265,7 +265,7 @@ dhcp6_add_listval(head, type, val, sublist)
+ struct dhcp6_listval *lv = NULL;
+
+ if ((lv = malloc(sizeof(*lv))) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to allocate memory for list entry");
+ goto fail;
+ }
+@@ -298,7 +298,7 @@ dhcp6_add_listval(head, type, val, sublist)
+ goto fail;
+ break;
+ default:
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "unexpected list value type (%d)", type);
+ goto fail;
+ }
+@@ -361,7 +361,7 @@ dhcp6_get_addr(optlen, cp, type, list)
+ void *val;
+
+ if (optlen % sizeof(struct in6_addr) || optlen == 0) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "malformed DHCP option: type %d, len %d", type, optlen);
+ return -1;
+ }
+@@ -371,14 +371,14 @@ dhcp6_get_addr(optlen, cp, type, list)
+ memcpy(&valaddr, val, sizeof(valaddr));
+ if (dhcp6_find_listval(list,
+ DHCP6_LISTVAL_ADDR6, &valaddr, 0)) {
+- dprintf(LOG_INFO, FNAME, "duplicated %s address (%s)",
++ debug_printf(LOG_INFO, FNAME, "duplicated %s address (%s)",
+ dhcp6optstr(type), in6addr2str(&valaddr, 0));
+ continue;
+ }
+
+ if (dhcp6_add_listval(list, DHCP6_LISTVAL_ADDR6,
+ &valaddr, NULL) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to copy %s address", dhcp6optstr(type));
+ return -1;
+ }
+@@ -405,7 +405,7 @@ dhcp6_set_addr(type, list, p, optep, len)
+ tmpbuf = NULL;
+ optlen = dhcp6_count_list(list) * sizeof(struct in6_addr);
+ if ((tmpbuf = malloc(optlen)) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "memory allocation failed for %s options",
+ dhcp6optstr(type));
+ return -1;
+@@ -438,10 +438,10 @@ dhcp6_get_domain(optlen, cp, type, list)
+
+ if (dnsdecode((u_char **)(void *)&val,
+ (u_char *)(cp + optlen), name, sizeof(name)) == NULL) {
+- dprintf(LOG_INFO, FNAME, "failed to "
++ debug_printf(LOG_INFO, FNAME, "failed to "
+ "decode a %s domain name",
+ dhcp6optstr(type));
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "malformed DHCP option: type %d, len %d",
+ type, optlen);
+ return -1;
+@@ -452,7 +452,7 @@ dhcp6_get_domain(optlen, cp, type, list)
+
+ if (dhcp6_add_listval(list,
+ DHCP6_LISTVAL_VBUF, &vb, NULL) == NULL) {
+- dprintf(LOG_ERR, FNAME, "failed to "
++ debug_printf(LOG_ERR, FNAME, "failed to "
+ "copy a %s domain name", dhcp6optstr(type));
+ return -1;
+ }
+@@ -485,7 +485,7 @@ dhcp6_set_domain(type, list, p, optep, len)
+
+ tmpbuf = NULL;
+ if ((tmpbuf = malloc(optlen)) == NULL) {
+- dprintf(LOG_ERR, FNAME, "memory allocation failed for "
++ debug_printf(LOG_ERR, FNAME, "memory allocation failed for "
+ "%s domain options", dhcp6optstr(type));
+ return -1;
+ }
+@@ -497,14 +497,14 @@ dhcp6_set_domain(type, list, p, optep, len)
+ nlen = dnsencode((const char *)d->val_vbuf.dv_buf,
+ name, sizeof (name));
+ if (nlen < 0) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to encode a %s domain name",
+ dhcp6optstr(type));
+ free(tmpbuf);
+ return -1;
+ }
+ if (ep - cp < nlen) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "buffer length for %s domain name is too short",
+ dhcp6optstr(type));
+ free(tmpbuf);
+@@ -530,7 +530,7 @@ dhcp6_create_event(ifp, state)
+ struct dhcp6_event *ev;
+
+ if ((ev = malloc(sizeof(*ev))) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to allocate memory for an event");
+ return (NULL);
+ }
+@@ -548,7 +548,7 @@ dhcp6_remove_event(ev)
+ {
+ struct dhcp6_serverinfo *sp, *sp_next;
+
+- dprintf(LOG_DEBUG, FNAME, "removing an event on %s, state=%s",
++ debug_printf(LOG_DEBUG, FNAME, "removing an event on %s, state=%s",
+ ev->ifp->ifname, dhcp6_event_statestr(ev));
+
+ dhcp6_remove_evdata(ev);
+@@ -562,7 +562,7 @@ dhcp6_remove_event(ev)
+ for (sp = ev->servers; sp; sp = sp_next) {
+ sp_next = sp->next;
+
+- dprintf(LOG_DEBUG, FNAME, "removing server (ID: %s)",
++ debug_printf(LOG_DEBUG, FNAME, "removing server (ID: %s)",
+ duidstr(&sp->optinfo.serverID));
+ dhcp6_clear_options(&sp->optinfo);
+ if (sp->authparam != NULL)
+@@ -649,14 +649,14 @@ dhcp6_auth_replaycheck(method, prev, current)
+ char bufcurrent[] = "ffff ffff ffff ffff";
+
+ if (method != DHCP6_AUTHRDM_MONOCOUNTER) {
+- dprintf(LOG_ERR, FNAME, "unsupported replay detection "
++ debug_printf(LOG_ERR, FNAME, "unsupported replay detection "
+ "method (%d)", method);
+ return (-1);
+ }
+
+ (void)sprint_uint64(bufprev, sizeof(bufprev), prev);
+ (void)sprint_uint64(bufcurrent, sizeof(bufcurrent), current);
+- dprintf(LOG_DEBUG, FNAME, "previous: %s, current: %s",
++ debug_printf(LOG_DEBUG, FNAME, "previous: %s, current: %s",
+ bufprev, bufcurrent);
+
+ prev = ntohq(prev);
+@@ -667,7 +667,7 @@ dhcp6_auth_replaycheck(method, prev, current)
+ * whether the serial number is increasing or not.
+ */
+ if (prev == (current ^ 0x8000000000000000ULL)) {
+- dprintf(LOG_INFO, FNAME, "detected a singular point");
++ debug_printf(LOG_INFO, FNAME, "detected a singular point");
+ return (1);
+ }
+
+@@ -688,7 +688,7 @@ getifaddr(addr, ifnam, prefix, plen, strong, ignoreflags)
+ int error = -1;
+
+ if (getifaddrs(&ifap) != 0) {
+- dprintf(LOG_WARNING, FNAME,
++ debug_printf(LOG_WARNING, FNAME,
+ "getifaddrs failed: %s", strerror(errno));
+ return (-1);
+ }
+@@ -765,7 +765,7 @@ getifidfromaddr(addr, ifidp)
+ int retval = -1;
+
+ if (getifaddrs(&ifap) != 0) {
+- dprintf(LOG_WARNING, FNAME,
++ debug_printf(LOG_WARNING, FNAME,
+ "getifaddrs failed: %s", strerror(errno));
+ return (-1);
+ }
+@@ -781,7 +781,7 @@ getifidfromaddr(addr, ifidp)
+
+ if (ifa != NULL) {
+ if ((ifid = if_nametoindex(ifa->ifa_name)) == 0) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "if_nametoindex failed for %s", ifa->ifa_name);
+ goto end;
+ }
+@@ -999,20 +999,20 @@ get_duid(idfile, duid)
+ char tmpbuf[256]; /* DUID should be no more than 256 bytes */
+
+ if ((fp = fopen(idfile, "r")) == NULL && errno != ENOENT)
+- dprintf(LOG_NOTICE, FNAME, "failed to open DUID file: %s",
++ debug_printf(LOG_NOTICE, FNAME, "failed to open DUID file: %s",
+ idfile);
+
+ if (fp) {
+ /* decode length */
+ if (fread(&len, sizeof(len), 1, fp) != 1) {
+- dprintf(LOG_ERR, FNAME, "DUID file corrupted");
++ debug_printf(LOG_ERR, FNAME, "DUID file corrupted");
+ goto fail;
+ }
+ } else {
+ int l;
+
+ if ((l = gethwid(tmpbuf, sizeof(tmpbuf), NULL, &hwtype)) < 0) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "failed to get a hardware address");
+ goto fail;
+ }
+@@ -1022,18 +1022,18 @@ get_duid(idfile, duid)
+ memset(duid, 0, sizeof(*duid));
+ duid->duid_len = len;
+ if ((duid->duid_id = (char *)malloc(len)) == NULL) {
+- dprintf(LOG_ERR, FNAME, "failed to allocate memory");
++ debug_printf(LOG_ERR, FNAME, "failed to allocate memory");
+ goto fail;
+ }
+
+ /* copy (and fill) the ID */
+ if (fp) {
+ if (fread(duid->duid_id, len, 1, fp) != 1) {
+- dprintf(LOG_ERR, FNAME, "DUID file corrupted");
++ debug_printf(LOG_ERR, FNAME, "DUID file corrupted");
+ goto fail;
+ }
+
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "extracted an existing DUID from %s: %s",
+ idfile, duidstr(duid));
+ } else {
+@@ -1047,27 +1047,27 @@ get_duid(idfile, duid)
+ dp->dh6_duid1_time = htonl((u_long)(t64 & 0xffffffff));
+ memcpy((void *)(dp + 1), tmpbuf, (len - sizeof(*dp)));
+
+- dprintf(LOG_DEBUG, FNAME, "generated a new DUID: %s",
++ debug_printf(LOG_DEBUG, FNAME, "generated a new DUID: %s",
+ duidstr(duid));
+ }
+
+ /* save the (new) ID to the file for next time */
+ if (!fp) {
+ if ((fp = fopen(idfile, "w+")) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to open DUID file for save");
+ goto fail;
+ }
+ if ((fwrite(&len, sizeof(len), 1, fp)) != 1) {
+- dprintf(LOG_ERR, FNAME, "failed to save DUID");
++ debug_printf(LOG_ERR, FNAME, "failed to save DUID");
+ goto fail;
+ }
+ if ((fwrite(duid->duid_id, len, 1, fp)) != 1) {
+- dprintf(LOG_ERR, FNAME, "failed to save DUID");
++ debug_printf(LOG_ERR, FNAME, "failed to save DUID");
+ goto fail;
+ }
+
+- dprintf(LOG_DEBUG, FNAME, "saved generated DUID to %s",
++ debug_printf(LOG_DEBUG, FNAME, "saved generated DUID to %s",
+ idfile);
+ }
+
+@@ -1104,7 +1104,7 @@ getifhwaddr(const char *ifname, char *buf, u_int16_t *hwtypep, int ppa)
+ dl_phys_addr_req_t dlpar;
+ dl_phys_addr_ack_t *dlpaa;
+
+- dprintf(LOG_DEBUG, FNAME, "trying %s ppa %d", ifname, ppa);
++ debug_printf(LOG_DEBUG, FNAME, "trying %s ppa %d", ifname, ppa);
+
+ if (ifname[0] == '\0')
+ return (-1);
+@@ -1239,7 +1239,7 @@ gethwid(buf, len, ifname, hwtypep)
+
+ if ((root = di_init("/", DINFOSUBTREE | DINFOMINOR |
+ DINFOPROP)) == DI_NODE_NIL) {
+- dprintf(LOG_INFO, FNAME, "di_init failed");
++ debug_printf(LOG_INFO, FNAME, "di_init failed");
+ return (-1);
+ }
+ parms.buf = buf;
+@@ -1283,7 +1283,7 @@ gethwid(buf, len, ifname, hwtypep)
+ default:
+ continue; /* XXX */
+ }
+- dprintf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
++ debug_printf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
+ ifa->ifa_name);
+ memcpy(buf, LLADDR(sdl), sdl->sdl_alen);
+ l = sdl->sdl_alen; /* sdl will soon be freed */
+@@ -1296,7 +1296,7 @@ gethwid(buf, len, ifname, hwtypep)
+ if (sll->sll_hatype != ARPHRD_ETHER)
+ continue;
+ *hwtypep = ARPHRD_ETHER;
+- dprintf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
++ debug_printf(LOG_DEBUG, FNAME, "found an interface %s for DUID",
+ ifa->ifa_name);
+ memcpy(buf, sll->sll_addr, sll->sll_halen);
+ l = sll->sll_halen; /* sll will soon be freed */
+@@ -1512,12 +1512,12 @@ dhcp6_get_options(p, ep, optinfo)
+ cp = (char *)(p + 1);
+ np = (struct dhcp6opt *)(cp + optlen);
+
+- dprintf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
++ debug_printf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
+ dhcp6optstr(opt), optlen);
+
+ /* option length field overrun */
+ if (np > ep) {
+- dprintf(LOG_INFO, FNAME, "malformed DHCP options");
++ debug_printf(LOG_INFO, FNAME, "malformed DHCP options");
+ goto fail;
+ }
+
+@@ -1527,10 +1527,10 @@ dhcp6_get_options(p, ep, optinfo)
+ goto malformed;
+ duid0.duid_len = optlen;
+ duid0.duid_id = cp;
+- dprintf(LOG_DEBUG, "",
++ debug_printf(LOG_DEBUG, "",
+ " DUID: %s", duidstr(&duid0));
+ if (duidcpy(&optinfo->clientID, &duid0)) {
+- dprintf(LOG_ERR, FNAME, "failed to copy DUID");
++ debug_printf(LOG_ERR, FNAME, "failed to copy DUID");
+ goto fail;
+ }
+ break;
+@@ -1539,9 +1539,9 @@ dhcp6_get_options(p, ep, optinfo)
+ goto malformed;
+ duid0.duid_len = optlen;
+ duid0.duid_id = cp;
+- dprintf(LOG_DEBUG, "", " DUID: %s", duidstr(&duid0));
++ debug_printf(LOG_DEBUG, "", " DUID: %s", duidstr(&duid0));
+ if (duidcpy(&optinfo->serverID, &duid0)) {
+- dprintf(LOG_ERR, FNAME, "failed to copy DUID");
++ debug_printf(LOG_ERR, FNAME, "failed to copy DUID");
+ goto fail;
+ }
+ break;
+@@ -1550,14 +1550,14 @@ dhcp6_get_options(p, ep, optinfo)
+ goto malformed;
+ memcpy(&val16, cp, sizeof(val16));
+ num16 = ntohs(val16);
+- dprintf(LOG_DEBUG, "", " status code: %s",
++ debug_printf(LOG_DEBUG, "", " status code: %s",
+ dhcp6_stcodestr(num16));
+
+ /* need to check duplication? */
+
+ if (dhcp6_add_listval(&optinfo->stcode_list,
+ DHCP6_LISTVAL_STCODE, &num16, NULL) == NULL) {
+- dprintf(LOG_ERR, FNAME, "failed to copy "
++ debug_printf(LOG_ERR, FNAME, "failed to copy "
+ "status code");
+ goto fail;
+ }
+@@ -1574,13 +1574,13 @@ dhcp6_get_options(p, ep, optinfo)
+ memcpy(&opttype, val, sizeof(u_int16_t));
+ num = (int)ntohs(opttype);
+
+- dprintf(LOG_DEBUG, "",
++ debug_printf(LOG_DEBUG, "",
+ " requested option: %s",
+ dhcp6optstr(num));
+
+ if (dhcp6_find_listval(&optinfo->reqopt_list,
+ DHCP6_LISTVAL_NUM, &num, 0)) {
+- dprintf(LOG_INFO, FNAME, "duplicated "
++ debug_printf(LOG_INFO, FNAME, "duplicated "
+ "option type (%s)",
+ dhcp6optstr(opttype));
+ goto nextoption;
+@@ -1588,7 +1588,7 @@ dhcp6_get_options(p, ep, optinfo)
+
+ if (dhcp6_add_listval(&optinfo->reqopt_list,
+ DHCP6_LISTVAL_NUM, &num, NULL) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to copy requested option");
+ goto fail;
+ }
+@@ -1599,10 +1599,10 @@ dhcp6_get_options(p, ep, optinfo)
+ case DH6OPT_PREFERENCE:
+ if (optlen != 1)
+ goto malformed;
+- dprintf(LOG_DEBUG, "", " preference: %d",
++ debug_printf(LOG_DEBUG, "", " preference: %d",
+ (int)*(u_char *)cp);
+ if (optinfo->pref != DH6OPT_PREF_UNDEF) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated preference option");
+ } else
+ optinfo->pref = (int)*(u_char *)cp;
+@@ -1612,11 +1612,11 @@ dhcp6_get_options(p, ep, optinfo)
+ goto malformed;
+ memcpy(&val16, cp, sizeof(val16));
+ val16 = ntohs(val16);
+- dprintf(LOG_DEBUG, "", " elapsed time: %lu",
++ debug_printf(LOG_DEBUG, "", " elapsed time: %lu",
+ (u_int32_t)val16);
+ if (optinfo->elapsed_time !=
+ DH6OPT_ELAPSED_TIME_UNDEF) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated elapsed time option");
+ } else
+ optinfo->elapsed_time = val16;
+@@ -1637,7 +1637,7 @@ dhcp6_get_options(p, ep, optinfo)
+ * [RFC3315 Section 21.4.2]
+ */
+ if (optinfo->authproto != DHCP6_AUTHPROTO_UNDEF) {
+- dprintf(LOG_INFO, FNAME, "found more than one "
++ debug_printf(LOG_INFO, FNAME, "found more than one "
+ "authentication option");
+ goto fail;
+ }
+@@ -1648,7 +1648,7 @@ dhcp6_get_options(p, ep, optinfo)
+ memcpy(&optinfo->authrd, cp, sizeof(optinfo->authrd));
+ cp += sizeof(optinfo->authrd);
+
+- dprintf(LOG_DEBUG, "", " %s", sprint_auth(optinfo));
++ debug_printf(LOG_DEBUG, "", " %s", sprint_auth(optinfo));
+
+ authinfolen =
+ optlen - (sizeof(struct dhcp6opt_auth) - 4);
+@@ -1670,7 +1670,7 @@ dhcp6_get_options(p, ep, optinfo)
+ optinfo->delayedauth_realmval =
+ malloc(optinfo->delayedauth_realmlen);
+ if (optinfo->delayedauth_realmval == NULL) {
+- dprintf(LOG_WARNING, FNAME, "failed "
++ debug_printf(LOG_WARNING, FNAME, "failed "
+ "allocate memory for auth realm");
+ goto fail;
+ }
+@@ -1687,7 +1687,7 @@ dhcp6_get_options(p, ep, optinfo)
+ optinfo->delayedauth_offset = cp - bp;
+ cp += 16;
+
+- dprintf(LOG_DEBUG, "", " auth key ID: %x, "
++ debug_printf(LOG_DEBUG, "", " auth key ID: %x, "
+ "offset=%d, realmlen=%d",
+ optinfo->delayedauth_keyid,
+ optinfo->delayedauth_offset,
+@@ -1698,7 +1698,7 @@ dhcp6_get_options(p, ep, optinfo)
+ break;
+ #endif
+ default:
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "unsupported authentication protocol: %d",
+ *cp);
+ goto fail;
+@@ -1779,14 +1779,14 @@ dhcp6_get_options(p, ep, optinfo)
+ ia.t1 = ntohl(optia.dh6_ia_t1);
+ ia.t2 = ntohl(optia.dh6_ia_t2);
+
+- dprintf(LOG_DEBUG, "",
++ debug_printf(LOG_DEBUG, "",
+ " IA_PD: ID=%lu, T1=%lu, T2=%lu",
+ ia.iaid, ia.t1, ia.t2);
+
+ /* duplication check */
+ if (dhcp6_find_listval(&optinfo->iapd_list,
+ DHCP6_LISTVAL_IAPD, &ia, 0)) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated IA_PD %lu", ia.iaid);
+ break; /* ignore this IA_PD */
+ }
+@@ -1813,7 +1813,7 @@ dhcp6_get_options(p, ep, optinfo)
+ goto malformed;
+ memcpy(&val32, cp, sizeof(val32));
+ val32 = ntohl(val32);
+- dprintf(LOG_DEBUG, "",
++ debug_printf(LOG_DEBUG, "",
+ " information refresh time: %lu", val32);
+ if (val32 < DHCP6_IRT_MINIMUM) {
+ /*
+@@ -1823,13 +1823,13 @@ dhcp6_get_options(p, ep, optinfo)
+ * [draft-ietf-dhc-lifetime-02.txt,
+ * Section 3.2]
+ */
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "refresh time is too small (%d), adjusted",
+ val32);
+ val32 = DHCP6_IRT_MINIMUM;
+ }
+ if (optinfo->refreshtime != DH6OPT_REFRESHTIME_UNDEF) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated refresh time option");
+ } else
+ optinfo->refreshtime = (int64_t)val32;
+@@ -1843,14 +1843,14 @@ dhcp6_get_options(p, ep, optinfo)
+ ia.t1 = ntohl(optia.dh6_ia_t1);
+ ia.t2 = ntohl(optia.dh6_ia_t2);
+
+- dprintf(LOG_DEBUG, "",
++ debug_printf(LOG_DEBUG, "",
+ " IA_NA: ID=%lu, T1=%lu, T2=%lu",
+ ia.iaid, ia.t1, ia.t2);
+
+ /* duplication check */
+ if (dhcp6_find_listval(&optinfo->iana_list,
+ DHCP6_LISTVAL_IANA, &ia, 0)) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated IA_NA %lu", ia.iaid);
+ break; /* ignore this IA_NA */
+ }
+@@ -1874,7 +1874,7 @@ dhcp6_get_options(p, ep, optinfo)
+ break;
+ default:
+ /* no option specific behavior */
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "unknown or unexpected DHCP6 option %s, len %d",
+ dhcp6optstr(opt), optlen);
+ break;
+@@ -1884,7 +1884,7 @@ dhcp6_get_options(p, ep, optinfo)
+ return (0);
+
+ malformed:
+- dprintf(LOG_INFO, FNAME, "malformed DHCP option: type %d, len %d",
++ debug_printf(LOG_INFO, FNAME, "malformed DHCP option: type %d, len %d",
+ opt, optlen);
+ fail:
+ dhcp6_clear_options(optinfo);
+@@ -1967,11 +1967,11 @@ copyin_option(type, p, ep, list)
+ cp = (char *)(p + 1);
+ np = (struct dhcp6opt *)(cp + optlen);
+
+- dprintf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
++ debug_printf(LOG_DEBUG, FNAME, "get DHCP option %s, len %d",
+ dhcp6optstr(opt), optlen);
+
+ if (np > ep) {
+- dprintf(LOG_INFO, FNAME, "malformed DHCP option");
++ debug_printf(LOG_INFO, FNAME, "malformed DHCP option");
+ goto fail;
+ }
+
+@@ -1979,7 +1979,7 @@ copyin_option(type, p, ep, list)
+ case DH6OPT_IA_PD_PREFIX:
+ /* check option context */
+ if (type != DH6OPT_IA_PD) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "%s is an invalid position for %s",
+ dhcp6optstr(type), dhcp6optstr(opt));
+ goto fail;
+@@ -1991,7 +1991,7 @@ copyin_option(type, p, ep, list)
+ /* copy and convert option values */
+ memcpy(&opt_iapd_prefix, p, sizeof(opt_iapd_prefix));
+ if (opt_iapd_prefix.dh6_iapd_prefix_prefix_len > 128) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "invalid prefix length (%d)",
+ opt_iapd_prefix.dh6_iapd_prefix_prefix_len);
+ goto malformed;
+@@ -2006,7 +2006,7 @@ copyin_option(type, p, ep, list)
+ /* clear padding bits in the prefix address */
+ prefix6_mask(&iapd_prefix.addr, iapd_prefix.plen);
+
+- dprintf(LOG_DEBUG, FNAME, " IA_PD prefix: "
++ debug_printf(LOG_DEBUG, FNAME, " IA_PD prefix: "
+ "%s/%d pltime=%lu vltime=%lu",
+ in6addr2str(&iapd_prefix.addr, 0),
+ iapd_prefix.plen,
+@@ -2014,7 +2014,7 @@ copyin_option(type, p, ep, list)
+
+ if (dhcp6_find_listval(list, DHCP6_LISTVAL_PREFIX6,
+ &iapd_prefix, 0)) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated IA_PD prefix "
+ "%s/%d pltime=%lu vltime=%lu",
+ in6addr2str(&iapd_prefix.addr, 0),
+@@ -2041,7 +2041,7 @@ copyin_option(type, p, ep, list)
+ case DH6OPT_IAADDR:
+ /* check option context */
+ if (type != DH6OPT_IA_NA) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "%s is an invalid position for %s",
+ dhcp6optstr(type), dhcp6optstr(opt));
+ goto fail;
+@@ -2057,14 +2057,14 @@ copyin_option(type, p, ep, list)
+ memcpy(&ia_addr.addr, &opt_ia_addr.dh6_ia_addr_addr,
+ sizeof(ia_addr.addr));
+
+- dprintf(LOG_DEBUG, FNAME, " IA_NA address: "
++ debug_printf(LOG_DEBUG, FNAME, " IA_NA address: "
+ "%s pltime=%lu vltime=%lu",
+ in6addr2str(&ia_addr.addr, 0),
+ ia_addr.pltime, ia_addr.vltime);
+
+ if (dhcp6_find_listval(list,
+ DHCP6_LISTVAL_STATEFULADDR6, &ia_addr, 0)) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated IA_NA address"
+ "%s pltime=%lu vltime=%lu",
+ in6addr2str(&ia_addr.addr, 0),
+@@ -2093,7 +2093,7 @@ copyin_option(type, p, ep, list)
+ type != DH6OPT_IA_PD_PREFIX &&
+ type != DH6OPT_IA_NA &&
+ type != DH6OPT_IAADDR) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "%s is an invalid position for %s",
+ dhcp6optstr(type), dhcp6optstr(opt));
+ goto nextoption; /* or discard the message? */
+@@ -2107,13 +2107,13 @@ copyin_option(type, p, ep, list)
+ opt_stcode.dh6_stcode_code =
+ ntohs(opt_stcode.dh6_stcode_code);
+
+- dprintf(LOG_DEBUG, "", " status code: %s",
++ debug_printf(LOG_DEBUG, "", " status code: %s",
+ dhcp6_stcodestr(opt_stcode.dh6_stcode_code));
+
+ /* duplication check */
+ if (dhcp6_find_listval(list, DHCP6_LISTVAL_STCODE,
+ &opt_stcode.dh6_stcode_code, 0)) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "duplicated status code (%d)",
+ opt_stcode.dh6_stcode_code);
+ goto nextoption;
+@@ -2133,7 +2133,7 @@ copyin_option(type, p, ep, list)
+ return (0);
+
+ malformed:
+- dprintf(LOG_INFO, "", " malformed DHCP option: type %d", opt);
++ debug_printf(LOG_INFO, "", " malformed DHCP option: type %d", opt);
+
+ fail:
+ dhcp6_clear_list(&sublist);
+@@ -2221,7 +2221,7 @@ copy_option(type, len, val, optp, ep, totallenp)
+ struct dhcp6opt *opt = *optp, opth;
+
+ if ((void *)ep - (void *)optp < len + sizeof(struct dhcp6opt)) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "option buffer short for %s", dhcp6optstr(type));
+ return (-1);
+ }
+@@ -2233,7 +2233,7 @@ copy_option(type, len, val, optp, ep, totallenp)
+
+ *optp = (struct dhcp6opt *)((char *)(opt + 1) + len);
+ *totallenp += sizeof(struct dhcp6opt) + len;
+- dprintf(LOG_DEBUG, FNAME, "set %s (len %d)", dhcp6optstr(type), len);
++ debug_printf(LOG_DEBUG, FNAME, "set %s (len %d)", dhcp6optstr(type), len);
+
+ return (0);
+ }
+@@ -2269,21 +2269,21 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+
+ tmpbuf = NULL;
+ if ((optlen = copyout_option(NULL, NULL, op)) < 0) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "failed to count option length");
+ goto fail;
+ }
+ if ((void *)optep - (void *)p < optlen) {
+- dprintf(LOG_INFO, FNAME, "short buffer");
++ debug_printf(LOG_INFO, FNAME, "short buffer");
+ goto fail;
+ }
+ if ((tmpbuf = malloc(optlen)) == NULL) {
+- dprintf(LOG_NOTICE, FNAME,
++ debug_printf(LOG_NOTICE, FNAME,
+ "memory allocation failed for IA_NA options");
+ goto fail;
+ }
+ if (copyout_option(tmpbuf, tmpbuf + optlen, op) < 0) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to construct an IA_NA option");
+ goto fail;
+ }
+@@ -2340,7 +2340,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ buflen = dhcp6_count_list(&optinfo->reqopt_list) *
+ sizeof(u_int16_t);
+ if ((tmpbuf = malloc(buflen)) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "memory allocation failed for options");
+ goto fail;
+ }
+@@ -2355,7 +2355,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ */
+ if (opt->val_num == DH6OPT_REFRESHTIME &&
+ type != DH6_INFORM_REQ) {
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "refresh time option is not requested "
+ "for %s", dhcp6msgstr(type));
+ }
+@@ -2423,21 +2423,21 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+
+ tmpbuf = NULL;
+ if ((optlen = copyout_option(NULL, NULL, op)) < 0) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "failed to count option length");
+ goto fail;
+ }
+ if ((void *)optep - (void *)p < optlen) {
+- dprintf(LOG_INFO, FNAME, "short buffer");
++ debug_printf(LOG_INFO, FNAME, "short buffer");
+ goto fail;
+ }
+ if ((tmpbuf = malloc(optlen)) == NULL) {
+- dprintf(LOG_NOTICE, FNAME,
++ debug_printf(LOG_NOTICE, FNAME,
+ "memory allocation failed for IA_PD options");
+ goto fail;
+ }
+ if (copyout_option(tmpbuf, tmpbuf + optlen, op) < 0) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "failed to construct an IA_PD option");
+ goto fail;
+ }
+@@ -2492,13 +2492,13 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ break;
+ #endif
+ default:
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "unexpected authentication protocol");
+ goto fail;
+ }
+ }
+ if ((auth = malloc(authlen)) == NULL) {
+- dprintf(LOG_WARNING, FNAME, "failed to allocate "
++ debug_printf(LOG_WARNING, FNAME, "failed to allocate "
+ "memory for authentication information");
+ goto fail;
+ }
+@@ -2534,7 +2534,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ optinfo->delayedauth_offset =
+ ((char *)p - (char *)optbp) + authlen - 16;
+
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "key ID %x, offset %d",
+ optinfo->delayedauth_keyid,
+ optinfo->delayedauth_offset);
+@@ -2543,7 +2543,7 @@ dhcp6_set_options(type, optbp, optep, optinfo)
+ case DHCP6_AUTHPROTO_RECONFIG:
+ #endif
+ default:
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "unexpected authentication protocol");
+ free(auth);
+ goto fail;
+@@ -2695,7 +2695,7 @@ copyout_option(p, ep, optval)
+ * we encounter an unknown option. this should be an internal
+ * error.
+ */
+- dprintf(LOG_ERR, FNAME, "unknown option: code %d",
++ debug_printf(LOG_ERR, FNAME, "unknown option: code %d",
+ optval->type);
+ return (-1);
+ }
+@@ -2721,7 +2721,7 @@ copyout_option(p, ep, optval)
+ if (!p)
+ return(optlen);
+
+- dprintf(LOG_DEBUG, FNAME, "set %s", dhcp6optstr(opttype));
++ debug_printf(LOG_DEBUG, FNAME, "set %s", dhcp6optstr(opttype));
+ if (ep - p < headlen) /* check it just in case */
+ return (-1);
+
+@@ -2812,7 +2812,7 @@ dhcp6_set_timeoparam(ev)
+ ev->max_retrans_cnt = REL_MAX_RC;
+ break;
+ default:
+- dprintf(LOG_ERR, FNAME, "unexpected event state %d on %s",
++ debug_printf(LOG_ERR, FNAME, "unexpected event state %d on %s",
+ ev->state, ev->ifp->ifname);
+ exit(1);
+ }
+@@ -2870,7 +2870,7 @@ dhcp6_reset_timer(ev)
+
+ statestr = dhcp6_event_statestr(ev);
+
+- dprintf(LOG_DEBUG, FNAME, "reset a timer on %s, "
++ debug_printf(LOG_DEBUG, FNAME, "reset a timer on %s, "
+ "state=%s, timeo=%d, retrans=%d",
+ ev->ifp->ifname, statestr, ev->timeouts, ev->retrans);
+ }
+@@ -2881,7 +2881,7 @@ duidcpy(dd, ds)
+ {
+ dd->duid_len = ds->duid_len;
+ if ((dd->duid_id = malloc(dd->duid_len)) == NULL) {
+- dprintf(LOG_ERR, FNAME, "memory allocation failed");
++ debug_printf(LOG_ERR, FNAME, "memory allocation failed");
+ return (-1);
+ }
+ memcpy(dd->duid_id, ds->duid_id, dd->duid_len);
+@@ -2929,17 +2929,17 @@ get_rdvalue(rdm, rdvalue, rdsize)
+ u_int32_t u32, l32;
+
+ if (rdm != DHCP6_AUTHRDM_MONOCOUNTER) {
+- dprintf(LOG_INFO, FNAME, "unsupported RDM (%d)", rdm);
++ debug_printf(LOG_INFO, FNAME, "unsupported RDM (%d)", rdm);
+ return (-1);
+ }
+ if (rdsize != sizeof(u_int64_t)) {
+- dprintf(LOG_INFO, FNAME, "unsupported RD size (%d)", rdsize);
++ debug_printf(LOG_INFO, FNAME, "unsupported RD size (%d)", rdsize);
+ return (-1);
+ }
+
+ #if defined(HAVE_CLOCK_GETTIME)
+ if (clock_gettime(CLOCK_REALTIME, &tp)) {
+- dprintf(LOG_WARNING, FNAME, "clock_gettime failed: %s",
++ debug_printf(LOG_WARNING, FNAME, "clock_gettime failed: %s",
+ strerror(errno));
+ return (-1);
+ }
+@@ -2952,7 +2952,7 @@ get_rdvalue(rdm, rdvalue, rdsize)
+ l32 = (u_int32_t)nsec;
+ #else
+ if (gettimeofday(&tv, NULL) != 0) {
+- dprintf(LOG_WARNING, FNAME, "gettimeofday failed: %s",
++ debug_printf(LOG_WARNING, FNAME, "gettimeofday failed: %s",
+ strerror(errno));
+ return (-1);
+ }
+@@ -3207,7 +3207,7 @@ setloglevel(debuglevel)
+ }
+
+ void
+-dprintf(int level, const char *fname, const char *fmt, ...)
++debug_printf(int level, const char *fname, const char *fmt, ...)
+ {
+ va_list ap;
+ char logbuf[LINE_MAX];
+@@ -3293,7 +3293,7 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ }
+
+ if ((s = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP)) < 0) {
+- dprintf(LOG_ERR, FNAME, "can't open a temporary socket: %s",
++ debug_printf(LOG_ERR, FNAME, "can't open a temporary socket: %s",
+ strerror(errno));
+ return (-1);
+ }
+@@ -3311,7 +3311,7 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ memset(&ifr, 0, sizeof(ifr));
+ strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
+ if (ioctl(s, SIOGIFINDEX, &ifr) < 0) {
+- dprintf(LOG_NOTICE, FNAME, "failed to get the index of %s: %s",
++ debug_printf(LOG_NOTICE, FNAME, "failed to get the index of %s: %s",
+ ifname, strerror(errno));
+ close(s);
+ return (-1);
+@@ -3325,7 +3325,7 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ #endif
+
+ if (ioctl(s, ioctl_cmd, &req)) {
+- dprintf(LOG_NOTICE, FNAME, "failed to %s an address on %s: %s",
++ debug_printf(LOG_NOTICE, FNAME, "failed to %s an address on %s: %s",
+ cmdstr, ifname, strerror(errno));
+ close(s);
+ return (-1);
+@@ -3334,14 +3334,14 @@ ifaddrconf(cmd, ifname, addr, plen, pltime, vltime)
+ #ifdef __sun__
+ memcpy(&req.lifr_addr, addr, sizeof (*addr));
+ if (ioctl(s, SIOCSLIFADDR, &req) == -1) {
+- dprintf(LOG_NOTICE, FNAME, "failed to %s new address on %s: %s",
++ debug_printf(LOG_NOTICE, FNAME, "failed to %s new address on %s: %s",
+ cmdstr, ifname, strerror(errno));
+ close(s);
+ return (-1);
+ }
+ #endif
+
+- dprintf(LOG_DEBUG, FNAME, "%s an address %s/%d on %s", cmdstr,
++ debug_printf(LOG_DEBUG, FNAME, "%s an address %s/%d on %s", cmdstr,
+ addr2str((struct sockaddr *)addr), plen, ifname);
+
+ close(s);
+@@ -3357,13 +3357,13 @@ safefile(path)
+
+ /* no setuid */
+ if (getuid() != geteuid()) {
+- dprintf(LOG_NOTICE, FNAME,
++ debug_printf(LOG_NOTICE, FNAME,
+ "setuid'ed execution not allowed");
+ return (-1);
+ }
+
+ if (lstat(path, &s) != 0) {
+- dprintf(LOG_NOTICE, FNAME, "lstat failed: %s",
++ debug_printf(LOG_NOTICE, FNAME, "lstat failed: %s",
+ strerror(errno));
+ return (-1);
+ }
+@@ -3371,7 +3371,7 @@ safefile(path)
+ /* the file must be owned by the running uid */
+ myuid = getuid();
+ if (s.st_uid != myuid) {
+- dprintf(LOG_NOTICE, FNAME, "%s has invalid owner uid", path);
++ debug_printf(LOG_NOTICE, FNAME, "%s has invalid owner uid", path);
+ return (-1);
+ }
+
+@@ -3379,7 +3379,7 @@ safefile(path)
+ case S_IFREG:
+ break;
+ default:
+- dprintf(LOG_NOTICE, FNAME, "%s is an invalid file type 0x%o",
++ debug_printf(LOG_NOTICE, FNAME, "%s is an invalid file type 0x%o",
+ path, (s.st_mode & S_IFMT));
+ return (-1);
+ }
+diff --git a/common.h b/common.h
+index 7366c25..9fd8008 100644
+--- a/common.h
++++ b/common.h
+@@ -155,7 +155,7 @@ extern char *in6addr2str __P((struct in6_addr *, int));
+ extern int in6_addrscopebyif __P((struct in6_addr *, char *));
+ extern int in6_scope __P((struct in6_addr *));
+ extern void setloglevel __P((int));
+-extern void dprintf __P((int, const char *, const char *, ...));
++extern void debug_printf __P((int, const char *, const char *, ...));
+ extern int get_duid __P((char *, struct duid *));
+ extern void dhcp6_init_options __P((struct dhcp6_optinfo *));
+ extern void dhcp6_clear_options __P((struct dhcp6_optinfo *));
+diff --git a/config.c b/config.c
+index 383c12a..3721545 100644
+--- a/config.c
++++ b/config.c
+@@ -156,13 +156,13 @@ configure_interface(iflist)
+ struct cf_list *cfl;
+
+ if (if_nametoindex(ifp->name) == 0) {
+- dprintf(LOG_ERR, FNAME, "invalid interface(%s): %s",
++ debug_printf(LOG_ERR, FNAME, "invalid interface(%s): %s",
+ ifp->name, strerror(errno));
+ goto bad;
+ }
+
+ if ((ifc = malloc(sizeof(*ifc))) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "memory allocation for %s failed", ifp->name);
+ goto bad;
+ }
+@@ -171,7 +171,7 @@ configure_interface(iflist)
+ dhcp6_ifconflist = ifc;
+
+ if ((ifc->ifname = strdup(ifp->name)) == NULL) {
+- dprintf(LOG_ERR, FNAME, "failed to copy ifname");
++ debug_printf(LOG_ERR, FNAME, "failed to copy ifname");
+ goto bad;
+ }
+
+@@ -183,7 +183,7 @@ configure_interface(iflist)
+ switch(cfl->type) {
+ case DECL_REQUEST:
+ if (dhcp6_mode != DHCP6_MODE_CLIENT) {
+- dprintf(LOG_INFO, FNAME, "%s:%d "
++ debug_printf(LOG_INFO, FNAME, "%s:%d "
+ "client-only configuration",
+ configfilename,
+ cfl->line);
+@@ -208,7 +208,7 @@ configure_interface(iflist)
+ break;
+ case DECL_INFO_ONLY:
+ if (dhcp6_mode != DHCP6_MODE_CLIENT) {
+- dprintf(LOG_INFO, FNAME, "%s:%d "
++ debug_printf(LOG_INFO, FNAME, "%s:%d "
+ "client-only configuration",
+ configfilename, cfl->line);
+ goto bad;
+@@ -217,7 +217,7 @@ configure_interface(iflist)
+ break;
+ case DECL_PREFERENCE:
+ if (dhcp6_mode != DHCP6_MODE_SERVER) {
+- dprintf(LOG_INFO, FNAME, "%s:%d "
++ debug_printf(LOG_INFO, FNAME, "%s:%d "
+ "server-only configuration",
+ configfilename, cfl->line);
+ goto bad;
+@@ -225,7 +225,7 @@ configure_interface(iflist)
+ ifc->server_pref = (int)cfl->num;
+ if (ifc->server_pref < 0 ||
+ ifc->server_pref > 255) {
+- dprintf(LOG_INFO, FNAME, "%s:%d "
++ debug_printf(LOG_INFO, FNAME, "%s:%d "
+ "bad value: %d",
+ configfilename, cfl->line,
+ ifc->server_pref);
+@@ -234,13 +234,13 @@ configure_interface(iflist)
+ break;
+ case DECL_SCRIPT:
+ if (dhcp6_mode != DHCP6_MODE_CLIENT) {
+- dprintf(LOG_INFO, FNAME, "%s:%d "
++ debug_printf(LOG_INFO, FNAME, "%s:%d "
+ "client-only configuration",
+ configfilename, cfl->line);
+ goto bad;
+ }
+ if (ifc->scriptpath) {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "%s:%d duplicated configuration",
+ configfilename, cfl->line);
+ goto bad;
+@@ -248,13 +248,13 @@ configure_interface(iflist)
+ cp = cfl->ptr;
+ ifc->scriptpath = strdup(cp + 1);
+ if (ifc->scriptpath == NULL) {
+- dprintf(LOG_NOTICE, FNAME,
++ debug_printf(LOG_NOTICE, FNAME,
+ "failed to copy script path");
+ goto bad;
+ }
+ cp = ifc->scriptpath;
+ if (*cp != '/') {
+- dprintf(LOG_INFO, FNAME,
++ debug_printf(LOG_INFO, FNAME,
+ "script must be an absolute path");
+ goto bad;
+ }
+@@ -272,7 +272,7 @@ configure_interface(iflist)
+ if (strcmp(spec->name, pool->name) == 0)
+ break;
+ if (pool == NULL) {
+- dprintf(LOG_ERR, FNAME, "%s:%d "
++ debug_printf(LOG_ERR, FNAME, "%s:%d "
+ "pool '%s' not found",
+ configfilename, cfl->line,
+ spec->name);
+@@ -281,7 +281,7 @@ configure_interface(iflist)
+ if (spec->vltime != DHCP6_DURATION_INFINITE &&
+ (spec->pltime == DHCP6_DURATION_INFINITE ||
+ spec->pltime > spec->vltime)) {
+- dprintf(LOG_ERR, FNAME, "%s:%d ",
++ debug_printf(LOG_ERR, FNAME, "%s:%d ",
+ configfilename, cfl->line,
+ "specified a larger preferred lifetime "
+ "than valid lifetime");
+@@ -289,17 +289,17 @@ configure_interface(iflist)
+ }
+ ifc->pool = *spec;
+ if ((ifc->pool.name = strdup(spec->name)) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "memory allocation failed");
+ goto bad;
+ }
+- dprintf(LOG_DEBUG, FNAME,
++ debug_printf(LOG_DEBUG, FNAME,
+ "pool '%s' is specified to the interface '%s'",
+ ifc->pool.name, ifc->ifname);
+ }
+ break;
+ default:
+- dprintf(LOG_ERR, FNAME, "%s:%d "
++ debug_printf(LOG_ERR, FNAME, "%s:%d "
+ "invalid interface configuration",
+ configfilename, cfl->line);
+ goto bad;
+@@ -338,7 +338,7 @@ configure_ia(ialist, iatype)
+ confsize = sizeof(struct iana_conf);
+ break;
+ default:
+- dprintf(LOG_ERR, FNAME, "internal error");
++ debug_printf(LOG_ERR, FNAME, "internal error");
+ goto bad;
+ }
+
+@@ -346,7 +346,7 @@ configure_ia(ialist, iatype)
+ struct cf_list *cfl;
+
+ if ((iac = malloc(confsize)) == NULL) {
+- dprintf(LOG_ERR, FNAME,
++ debug_printf(LOG_ERR, FNAME,
+ "memory allocation for IA %s failed",
+ iap->name);
+ goto bad;
+@@ -386,13 +386,13 @@ configure_ia(ialist, iatype)
+ if (add_prefix(&pdp->iapd_prefix_list,
+ "IAPD", DHCP6_LISTVAL_PREFIX6,
+ cfl->ptr)) {
+- dprintf(LOG_NOTICE, FNAME, "failed "
++ debug_printf(LOG_NOTICE, FNAME, "failed "
+ "to configure prefix");
+ goto bad;
+ }
+ break;
+ default:
+- dprintf(LOG_ERR, FNAME, "%s:%d "
++ debug_printf(LOG_ERR, FNAME, "%s:%d "
+ "invalid configuration",
+ configfilename, cfl->line);
+ goto bad;
+@@ -404,20 +404,20 @@ configure_ia(ialist, iatype)
+ if (add_prefix(&nap->iana_address_list,
+ "IANA", DHCP6_LISTVAL_STATEFULADDR6,
+ cfl->ptr)) {
+- ...
[truncated message content] |
|
From: <abe...@us...> - 2015-10-30 22:06:16
|
Revision: 7296
http://sourceforge.net/p/astlinux/code/7296
Author: abelbeck
Date: 2015-10-30 22:06:14 +0000 (Fri, 30 Oct 2015)
Log Message:
-----------
Add DHCPv6 Client, including Prefix Delegation. Enable with DHCPV6_CLIENT_ENABLE="yes" and reboot, needs testing
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/astlinux-ast11.config 2015-10-30 22:06:14 UTC (rev 7296)
@@ -799,7 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIDE_DHCPV6 is not set
+BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/astlinux-ast13.config 2015-10-30 22:06:14 UTC (rev 7296)
@@ -799,7 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIDE_DHCPV6 is not set
+BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/astlinux18.config 2015-10-30 22:06:14 UTC (rev 7296)
@@ -799,7 +799,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
-# BR2_PACKAGE_WIDE_DHCPV6 is not set
+BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Added: branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch
===================================================================
--- branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch (rev 0)
+++ branches/1.0/package/arnofw/arnofw-do-not-reset-accept_ra.patch 2015-10-30 22:06:14 UTC (rev 7296)
@@ -0,0 +1,11 @@
+--- arno-iptables-firewall_2.0.1f/bin/arno-iptables-firewall.orig 2015-10-30 15:52:23.000000000 -0500
++++ arno-iptables-firewall_2.0.1f/bin/arno-iptables-firewall 2015-10-30 16:00:37.000000000 -0500
+@@ -495,7 +495,7 @@
+ sysctl_set_all "net.ipv6.conf" "forwarding" 1
+ echo " Disabling Local IPv6 Auto-Configuration"
+ sysctl_set_all "net.ipv6.conf" "autoconf" 0
+- sysctl_set_all "net.ipv6.conf" "accept_ra" 0
++ ## Setting accept_ra=0 is not needed with forwarding=1, don't overwrite any existing accept_ra=2 values
+ fi
+ elif [ "$IP_FORWARDING" = "0" ]; then
+ echo " DISABLING packet forwarding"
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-10-30 22:06:14 UTC (rev 7296)
@@ -119,7 +119,7 @@
addIPV6net()
{
# args: IF, tag
- local interface="$1" tag="$2" prefix="" iname IFS
+ local interface="$1" tag="$2" dhcpv6="" prefix="" iname IFS
if [ "$IPV6" != "yes" ]; then
return 2
@@ -130,24 +130,28 @@
case $iname in
INTIF)
if [ "$tag" = "lan" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$INTIPV6")"
break
fi
;;
INT2IF)
if [ "$tag" = "lan2" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$INT2IPV6")"
break
fi
;;
INT3IF)
if [ "$tag" = "lan3" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$INT3IPV6")"
break
fi
;;
DMZIF)
if [ "$tag" = "dmz" ]; then
+ dhcpv6="$DHCPV6_CLIENT_ENABLE"
prefix="$(addr_to_prefix64 "$DMZIPV6")"
break
fi
@@ -155,8 +159,12 @@
esac
done
- if [ -n "$prefix" ]; then
+ if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
echo "
+dhcp-range=$tag,::1,constructor:$interface,ra-only,24h"
+ return 0
+ elif [ -n "$prefix" ]; then
+ echo "
dhcp-range=$tag,$prefix,ra-only,64,24h"
return 0
fi
Modified: branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/project/astlinux/target_skeleton/etc/ifplugd/udhcpc.action 2015-10-30 22:06:14 UTC (rev 7296)
@@ -4,6 +4,14 @@
action="$2"
+kill_dhcp6c()
+{
+ if [ -f "/var/run/dhcp6c-${interface}.pid" ]; then
+ kill $(cat "/var/run/dhcp6c-${interface}.pid") 2>/dev/null
+ sleep 1
+ fi
+}
+
kill_udhcpc()
{
if [ -f "/var/run/udhcpc-${interface}.pid" ]; then
@@ -15,11 +23,16 @@
case $action in
up)
+ if [ -f "/etc/wide-dhcpv6/dhcp6c-${interface}.conf" ]; then
+ kill_dhcp6c
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-${interface}.conf -p /var/run/dhcp6c-${interface}.pid ${interface}
+ fi
kill_udhcpc
udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $(uname -n) -p /var/run/udhcpc-${interface}.pid -i ${interface}
;;
down)
+ kill_dhcp6c
kill_udhcpc
;;
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2015-10-30 22:06:14 UTC (rev 7296)
@@ -54,6 +54,97 @@
return 0
}
+gen_dhcp6c_conf()
+{
+ local interface="$1" len id iname int IFS
+
+ len="${DHCPV6_CLIENT_PREFIX_LEN:-60}"
+
+ # Sanity check the prefix length
+ if [ $len -lt 8 -o $len -gt 64 ]; then
+ len="60"
+ fi
+
+ echo "# Autogenerated. Do not edit.
+interface $interface {"
+ if [ "$DHCPV6_CLIENT_REQUEST_ADDRESS" != "no" ]; then
+ echo " send ia-na 1;"
+ fi
+ if [ "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
+ echo " send ia-pd 1;"
+ fi
+ echo " send rapid-commit;"
+ echo "};"
+
+ if [ "$DHCPV6_CLIENT_REQUEST_ADDRESS" != "no" ]; then
+ echo "
+id-assoc na 1 { };"
+ fi
+
+ if [ "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
+ echo "
+id-assoc pd 1 {"
+ if [ "$DHCPV6_CLIENT_PREFIX_HINT" != "no" ]; then
+ echo " prefix ::/$len infinity;"
+ fi
+
+ id=0
+ unset IFS
+ for iname in $IPV6_AUTOCONF; do
+ int=""
+ case $iname in
+ INTIF)
+ if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" ]; then
+ int="$INTIF"
+ fi
+ ;;
+ INT2IF)
+ if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" ]; then
+ int="$INT2IF"
+ fi
+ ;;
+ INT3IF)
+ if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" ]; then
+ int="$INT3IF"
+ fi
+ ;;
+ DMZIF)
+ if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
+ int="$DMZIF"
+ fi
+ ;;
+ esac
+ if [ -n "$int" ]; then
+ echo " prefix-interface $int {
+ sla-id $id;
+ sla-len $((64-len));
+ ifid 1;
+ };"
+ id=$((id+1))
+ fi
+
+ # Only assign one interface given only a /64 prefix
+ if [ $len -eq 64 ]; then
+ break
+ fi
+ done
+
+ echo "};"
+ fi
+}
+
+init_dhcp6c()
+{
+ local interface="$1"
+
+ sysctl -w net/ipv6/conf/${interface}/accept_ra=2 >/dev/null
+
+ # Make DUID persistant
+ ln -sf /mnt/kd/dhcp6c_duid /var/db/dhcp6c_duid
+
+ gen_dhcp6c_conf $interface > /etc/wide-dhcpv6/dhcp6c-${interface}.conf
+}
+
ipv6_tunnel()
{
local action="$1" type local_addr remote_addr endpoint_addr
@@ -135,6 +226,8 @@
init () {
+ mkdir -p /tmp/etc/wide-dhcpv6
+
if [ -n "$IFRENAME" ]; then
#clear existing iftabs
@@ -514,11 +607,15 @@
if [ -n "$EXTIF" -a -z "$EXTIP" ] && ! isextppp extif; then
ip link set dev $EXTIF up
sleep 4
+ if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ init_dhcp6c $EXTIF
+ dhcp6c -c /etc/wide-dhcpv6/dhcp6c-$EXTIF.conf -p /var/run/dhcp6c-$EXTIF.pid $EXTIF
+ fi
udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXTIF.pid -i $EXTIF
ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/udhcpc.action
# No DHCPv6 - Static IPv6 if defined
- if [ "$IPV6" = "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ]; then
+ if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" != "yes" -a -n "$EXTIPV6" -a -n "$EXTGWIPV6" ]; then
ip -6 addr add $EXTIPV6 dev $EXTIF
ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
fi
@@ -555,6 +652,11 @@
kill $(cat "$PID")
done
+ for PID in $(ls -1 /var/run/dhcp6c-*.pid 2>/dev/null); do
+ echo "Stopping dhcp6c..."
+ kill $(cat "$PID")
+ done
+
for PID in $(ls -1 /var/run/udhcpc-*.pid 2>/dev/null); do
echo "Stopping udhcpc..."
kill $(cat "$PID")
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-10-30 12:43:29 UTC (rev 7295)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-10-30 22:06:14 UTC (rev 7296)
@@ -234,13 +234,21 @@
## DMZ IPv6 address
#DMZIPV6="2001:db8:20::1/64"
-## Configure IPv6 Router Advertisement Daemon (radvd)
+## Configure IPv6 Router Advertisement Daemon
## Define: Interface_Name, space separated for multiple
## Interface_Name is "INTIF" for 1st, "INT2IF" for 2nd, and "INT3IF" for 3rd Internal Interface
## "DMZIF" for DMZ Interface
## Note: the autoconf prefix is derived from the IPv6 address on the interface, which must be defined.
#IPV6_AUTOCONF="INTIF"
+## DHCPv6 Client
+## Enable DHCPv6 client by setting DHCPV6_CLIENT_ENABLE="yes"
+#DHCPV6_CLIENT_ENABLE="yes"
+#DHCPV6_CLIENT_REQUEST_ADDRESS="yes" # Request IPv6 Address, disable with "no", defaults to "yes"
+#DHCPV6_CLIENT_REQUEST_PREFIX="yes" # Request Prefix Delegation, disable with "no", defaults to "yes"
+#DHCPV6_CLIENT_PREFIX_LEN="60" # Prefix Delegation Length, defaults to "60"
+#DHCPV6_CLIENT_PREFIX_HINT="yes" # Request the Prefix Delegation Length, disable with "no", defaults to "yes"
+
## Configure IPv6 tunnel gateway for 6in4 and 6to4
## Supported Types: "6in4-static" "6to4-relay"
## Define 3 ~ (tilde) separated arguments
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-07 22:29:23
|
Revision: 7322
http://sourceforge.net/p/astlinux/code/7322
Author: abelbeck
Date: 2015-11-07 22:29:20 +0000 (Sat, 07 Nov 2015)
Log Message:
-----------
New SSL certificate creation, deprecate SHA-1 and migrate to SHA-256. Applies only to new certificates
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php
branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php
branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php
branches/1.0/package/webinterface/altweb/common/openssl.php
branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
Modified: branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php 2015-11-07 15:04:04 UTC (rev 7321)
+++ branches/1.0/package/webinterface/altweb/common/openssl-ipsecmobile.php 2015-11-07 22:29:20 UTC (rev 7322)
@@ -40,27 +40,27 @@
);
$ssl['configArgs'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'encrypt_key' => FALSE
);
$ssl['sign_ca'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'v3_ca',
'encrypt_key' => FALSE
);
$ssl['sign_server'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'ipsecmobile_server',
'encrypt_key' => FALSE
);
$ssl['sign_client'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'usr_cert',
'encrypt_key' => FALSE
Modified: branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php 2015-11-07 15:04:04 UTC (rev 7321)
+++ branches/1.0/package/webinterface/altweb/common/openssl-openvpn.php 2015-11-07 22:29:20 UTC (rev 7322)
@@ -42,27 +42,27 @@
);
$ssl['configArgs'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'encrypt_key' => FALSE
);
$ssl['sign_ca'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'v3_ca',
'encrypt_key' => FALSE
);
$ssl['sign_server'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'openvpn_server',
'encrypt_key' => FALSE
);
$ssl['sign_client'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'usr_cert',
'encrypt_key' => FALSE
Modified: branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php 2015-11-07 15:04:04 UTC (rev 7321)
+++ branches/1.0/package/webinterface/altweb/common/openssl-sip-tls.php 2015-11-07 22:29:20 UTC (rev 7322)
@@ -40,27 +40,27 @@
);
$ssl['configArgs'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'encrypt_key' => FALSE
);
$ssl['sign_ca'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'v3_ca',
'encrypt_key' => FALSE
);
$ssl['sign_server'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'sip_tls_server',
'encrypt_key' => FALSE
);
$ssl['sign_client'] = array(
'config' => $ssl['config'],
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => $opts['keysize'],
'x509_extensions' => 'usr_cert',
'encrypt_key' => FALSE
Modified: branches/1.0/package/webinterface/altweb/common/openssl.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl.php 2015-11-07 15:04:04 UTC (rev 7321)
+++ branches/1.0/package/webinterface/altweb/common/openssl.php 2015-11-07 22:29:20 UTC (rev 7322)
@@ -157,12 +157,12 @@
'emailAddress' => $email
);
$configArgs = array(
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => 1024,
'encrypt_key' => FALSE
);
$sign_ca = array(
- 'digest_alg' => 'sha1',
+ 'digest_alg' => 'sha256',
'private_key_bits' => 1024,
'x509_extensions' => 'v3_ca',
'encrypt_key' => FALSE
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc 2015-11-07 15:04:04 UTC (rev 7321)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/misc 2015-11-07 22:29:20 UTC (rev 7322)
@@ -11,6 +11,7 @@
openssl req \
-new -batch \
+ -sha256 \
-newkey rsa:1024 \
-days 36500 \
-nodes \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-18 16:05:42
|
Revision: 7329
http://sourceforge.net/p/astlinux/code/7329
Author: abelbeck
Date: 2015-11-18 16:05:40 +0000 (Wed, 18 Nov 2015)
Log Message:
-----------
dnsmasq, add DHCP_LEASETIME rc.cronf variable, defaults to 24 hours as before
Modified Paths:
--------------
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-11-15 16:16:12 UTC (rev 7328)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-11-18 16:05:40 UTC (rev 7329)
@@ -86,7 +86,7 @@
trueDNSMASQnet()
{
- # args: tag, IP, ip.dstart, ip.dend
+ # args: tag, IP, ip.dstart, ip.dend, leasetime
local servername="$2" gateway="$2"
if [ "$1" = "lan" ]; then
@@ -96,7 +96,7 @@
fi
echo "
-dhcp-range=$1,$3,$4,24h
+dhcp-range=$1,$3,$4,$5
dhcp-option=$1,option:router,$gateway
dhcp-option=$1,option:dns-server,$gateway
dhcp-option=$1,option:tftp-server,\"$servername\"
@@ -118,8 +118,8 @@
addIPV6net()
{
- # args: IF, tag
- local interface="$1" tag="$2" dhcpv6="" prefix="" iname IFS
+ # args: IF, tag, leasetime
+ local interface="$1" tag="$2" leasetime="$3" dhcpv6="" prefix="" iname IFS
if [ "$IPV6" != "yes" ]; then
return 2
@@ -161,11 +161,11 @@
if [ "$dhcpv6" = "yes" -a "$DHCPV6_CLIENT_REQUEST_PREFIX" != "no" ]; then
echo "
-dhcp-range=$tag,::1,constructor:$interface,ra-only,24h"
+dhcp-range=$tag,::1,constructor:$interface,ra-only,$leasetime"
return 0
elif [ -n "$prefix" ]; then
echo "
-dhcp-range=$tag,$prefix,ra-only,64,24h"
+dhcp-range=$tag,$prefix,ra-only,64,$leasetime"
return 0
fi
@@ -175,9 +175,10 @@
addDNSMASQnet()
{
# args: IF, IP, NM, tag
- local ipbase dstart dend ipstart ipend NETWORK
+ local ipbase dstart dend ipstart ipend leasetime NETWORK
if [ -n "$1" -a "$1" != "none" -a -n "$2" -a -n "$3" ]; then
+ leasetime="${DHCP_LEASETIME:-24}h"
if isDHCPinterface $1; then
eval $(ipcalc -n "$2" "$3")
ipbase=$(_isdottedquad $NETWORK)
@@ -191,11 +192,11 @@
fi
ipstart=$(($ipbase + $dstart))
ipend=$(($ipbase + $dend))
- trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend)
+ trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend) $leasetime
- addIPV6net $1 $4
+ addIPV6net $1 $4 $leasetime
else
- if ! addIPV6net $1 $4; then
+ if ! addIPV6net $1 $4 $leasetime; then
falseDNSMASQnet $1
fi
fi
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-11-15 16:16:12 UTC (rev 7328)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2015-11-18 16:05:40 UTC (rev 7329)
@@ -126,6 +126,10 @@
## 192.168.0.100 - 192.168.0.220
#DHCPRANGE="100:220"
+## DHCP Lease Time
+## Specify the DHCP server lease time in hours, defaults to 24 hours.
+#DHCP_LEASETIME="24"
+
## VLANS
## Configure vlans here. These will be created on boot BEFORE INTIF, etc are
## brought up. You can then use these values for INTIF, EXTIF, etc.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-23 13:49:03
|
Revision: 7340
http://sourceforge.net/p/astlinux/code/7340
Author: abelbeck
Date: 2015-11-23 13:49:01 +0000 (Mon, 23 Nov 2015)
Log Message:
-----------
build system, add x86_64 support for building the initrd
Modified Paths:
--------------
branches/1.0/scripts/build
branches/1.0/scripts/build-initrd
Added Paths:
-----------
branches/1.0/x86_64-configs/
branches/1.0/x86_64-configs/initrd.config
Modified: branches/1.0/scripts/build
===================================================================
--- branches/1.0/scripts/build 2015-11-22 16:44:28 UTC (rev 7339)
+++ branches/1.0/scripts/build 2015-11-23 13:49:01 UTC (rev 7340)
@@ -139,12 +139,8 @@
##
"
-if [ ! -f "initrd.img" ]; then
- if ! ./scripts/build-initrd; then
- exit 1
- fi
-else
- echo "File initrd.img exists, skipping 'scripts/build-initrd'."
+if ! ./scripts/build-initrd; then
+ exit 1
fi
make oldconfig
Modified: branches/1.0/scripts/build-initrd
===================================================================
--- branches/1.0/scripts/build-initrd 2015-11-22 16:44:28 UTC (rev 7339)
+++ branches/1.0/scripts/build-initrd 2015-11-23 13:49:01 UTC (rev 7340)
@@ -6,7 +6,7 @@
save_state()
{
cp -p .config .config.initrd.save
- cp -p initrd.config .config
+ cp -p "$initrd_config_file" .config
if [ -d "output" ]; then
mv output output.initrd.save
@@ -34,13 +34,32 @@
PATH=/sbin:/usr/sbin:$PATH
-if [ -f "initrd.img" -a "$1" != "force" ]; then
+build_arch="$(awk -F'"' '/^BR2_ARCH=/ { print $2; nextfile }' .config)"
+
+if [ -z "$build_arch" ]; then
+ echo "Unknown build architecture, exiting."
+ exit 1
+fi
+
+if [ "$build_arch" = "x86_64" ]; then
+ initrd_config_file="x86_64-configs/initrd.config"
+else
+ initrd_config_file="initrd.config"
+fi
+
+if [ -f "initrd.arch" ]; then
+ initrd_arch="$(cat initrd.arch)"
+else
+ initrd_arch=""
+fi
+
+if [ -f "initrd.img" -a "$initrd_arch" = "$build_arch" -a "$1" != "force" ]; then
echo "The initrd image (initrd.img) already exists, skipping build."
exit 0
fi
-if [ ! -f "initrd.config" ]; then
- echo "The initrd.config file does not exist, exiting."
+if [ ! -f "$initrd_config_file" ]; then
+ echo "The $initrd_config_file file does not exist, exiting."
exit 1
fi
@@ -57,13 +76,16 @@
if [ -f "output/images/rootfs.ext2.gz" ]; then
echo "Installing initrd.img..."
cp "output/images/rootfs.ext2.gz" "initrd.img"
+ echo "$build_arch" > "initrd.arch"
+ rtn_val=0
else
echo "Initrd build failed."
+ rtn_val=1
fi
restore_state
make oldconfig
-exit 0
+exit $rtn_val
Added: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config (rev 0)
+++ branches/1.0/x86_64-configs/initrd.config 2015-11-23 13:49:01 UTC (rev 7340)
@@ -0,0 +1,736 @@
+#
+# Automatically generated make config: don't edit
+# Buildroot 2011.08-svn7339 Configuration
+# Sun Nov 22 15:51:12 2015
+#
+BR2_HAVE_DOT_CONFIG=y
+BR2_ARCH_IS_64=y
+# BR2_arm is not set
+# BR2_armeb is not set
+# BR2_avr32 is not set
+# BR2_bfin is not set
+# BR2_i386 is not set
+# BR2_mips is not set
+# BR2_mipsel is not set
+# BR2_powerpc is not set
+# BR2_sh is not set
+# BR2_sh64 is not set
+# BR2_sparc is not set
+BR2_x86_64=y
+# BR2_xtensa is not set
+BR2_x86_64_generic=y
+# BR2_x86_64_barcelona is not set
+# BR2_x86_64_opteron_sse3 is not set
+# BR2_x86_64_opteron is not set
+# BR2_x86_64_nocona is not set
+# BR2_x86_64_core2 is not set
+BR2_ARCH="x86_64"
+BR2_ENDIAN="LITTLE"
+BR2_GCC_TARGET_TUNE="generic"
+
+#
+# Build options
+#
+
+#
+# Commands
+#
+BR2_WGET="toolchain/getter_script.sh"
+BR2_SVN="svn"
+BR2_BZR="bzr"
+BR2_GIT="git"
+BR2_ZCAT="gzip -d -c"
+BR2_BZCAT="bzcat"
+BR2_XZCAT="xzcat"
+BR2_TAR_OPTIONS=""
+BR2_DL_DIR="$(TOPDIR)/dl"
+BR2_HOST_DIR="$(BASE_DIR)/host"
+
+#
+# Mirrors and Download locations
+#
+BR2_PRIMARY_SITE=""
+BR2_BACKUP_SITE=""
+BR2_SOURCEFORGE_MIRROR="colocrossing"
+BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
+BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
+BR2_DEBIAN_MIRROR="http://ftp.debian.org"
+BR2_JLEVEL=1
+# BR2_CCACHE is not set
+# BR2_DEPRECATED is not set
+# BR2_ENABLE_DEBUG is not set
+BR2_STRIP_strip=y
+# BR2_STRIP_sstrip is not set
+# BR2_STRIP_none is not set
+# BR2_OPTIMIZE_0 is not set
+# BR2_OPTIMIZE_1 is not set
+# BR2_OPTIMIZE_2 is not set
+# BR2_OPTIMIZE_3 is not set
+BR2_OPTIMIZE_S=y
+# BR2_PREFER_STATIC_LIB is not set
+# BR2_HAVE_DOCUMENTATION is not set
+# BR2_HAVE_DEVFILES is not set
+
+#
+# Toolchain
+#
+# BR2_TOOLCHAIN_BUILDROOT is not set
+BR2_TOOLCHAIN_EXTERNAL=y
+# BR2_TOOLCHAIN_CTNG is not set
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2/x86_64-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="x86_64-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PREFIX="x86_64-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
+# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC is not set
+BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_CXX=y
+
+#
+# Gdb Options
+#
+# BR2_PACKAGE_GDB is not set
+# BR2_PACKAGE_GDB_SERVER is not set
+BR2_LARGEFILE=y
+BR2_INET_IPV6=y
+BR2_INET_RPC=y
+BR2_USE_WCHAR=y
+BR2_ENABLE_LOCALE=y
+BR2_INSTALL_LIBSTDCPP=y
+BR2_TOOLCHAIN_HAS_THREADS=y
+BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
+BR2_ENABLE_LOCALE_PURGE=y
+BR2_ENABLE_LOCALE_WHITELIST=""
+BR2_USE_MMU=y
+BR2_TARGET_OPTIMIZATION="-pipe"
+BR2_TARGET_LDFLAGS=""
+
+#
+# System configuration
+#
+BR2_TARGET_GENERIC_HOSTNAME=""
+BR2_TARGET_GENERIC_ISSUE=""
+BR2_ROOTFS_DEVICE_CREATION_STATIC=y
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
+# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV is not set
+BR2_ROOTFS_DEVICE_TABLE="project/initrd/device_table.txt"
+BR2_ROOTFS_STATIC_DEVICE_TABLE="project/initrd/device_table_dev.txt"
+# BR2_ROOTFS_SKELETON_DEFAULT is not set
+BR2_ROOTFS_SKELETON_CUSTOM=y
+BR2_ROOTFS_SKELETON_CUSTOM_PATH="project/initrd/target_skeleton"
+BR2_ROOTFS_POST_BUILD_SCRIPT=""
+
+#
+# Package Selection for the target
+#
+BR2_PACKAGE_BUSYBOX=y
+# BR2_BUSYBOX_VERSION_1_16_X is not set
+# BR2_BUSYBOX_VERSION_1_17_X is not set
+# BR2_BUSYBOX_VERSION_1_18_X is not set
+BR2_BUSYBOX_VERSION_1_19_X=y
+# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
+BR2_BUSYBOX_VERSION="1.19.4"
+BR2_PACKAGE_BUSYBOX_CONFIG="project/initrd/busybox.config"
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
+# BR2_PACKAGE_CUSTOMIZE is not set
+
+#
+# Asterisk, XMPP and telephony applications
+#
+# BR2_PACKAGE_ASTERISK is not set
+# BR2_PACKAGE_FONULATOR is not set
+# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_CLIX is not set
+# BR2_PACKAGE_KAMAILIO is not set
+# BR2_PACKAGE_OPENSIPS is not set
+# BR2_PACKAGE_PROSODY is not set
+# BR2_PACKAGE_RTPPROXY is not set
+
+#
+# Audio and video libraries and applications
+#
+# BR2_PACKAGE_ALSA_LIB is not set
+# BR2_PACKAGE_ALSA_UTILS is not set
+# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_BEEP is not set
+# BR2_PACKAGE_FAAD2 is not set
+# BR2_PACKAGE_FLAC is not set
+# BR2_PACKAGE_FFMPEG is not set
+# BR2_PACKAGE_GSTREAMER is not set
+# BR2_PACKAGE_LAME is not set
+# BR2_PACKAGE_LIBAO is not set
+# BR2_PACKAGE_LIBCDAUDIO is not set
+# BR2_PACKAGE_LIBCUE is not set
+# BR2_PACKAGE_LIBCUEFILE is not set
+# BR2_PACKAGE_LIBDVDREAD is not set
+# BR2_PACKAGE_LIBDVDNAV is not set
+# BR2_PACKAGE_LIBID3TAG is not set
+# BR2_PACKAGE_LIBMAD is not set
+# BR2_PACKAGE_LIBMMS is not set
+# BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBMPEG2 is not set
+# BR2_PACKAGE_LIBOGG is not set
+# BR2_PACKAGE_LIBREPLAYGAIN is not set
+# BR2_PACKAGE_LIBSAMPLERATE is not set
+# BR2_PACKAGE_LIBSNDFILE is not set
+# BR2_PACKAGE_LIBTHEORA is not set
+# BR2_PACKAGE_LIBVORBIS is not set
+# BR2_PACKAGE_LIVE555 is not set
+# BR2_PACKAGE_MADPLAY is not set
+# BR2_PACKAGE_MPD is not set
+# BR2_PACKAGE_MPG123 is not set
+# BR2_PACKAGE_MPLAYER is not set
+# BR2_PACKAGE_MUSEPACK is not set
+# BR2_PACKAGE_SOX is not set
+# BR2_PACKAGE_SPEEX is not set
+# BR2_PACKAGE_TAGLIB is not set
+# BR2_PACKAGE_TREMOR is not set
+# BR2_PACKAGE_VORBIS_TOOLS is not set
+# BR2_PACKAGE_WAVPACK is not set
+
+#
+# Compressors and decompressors
+#
+# BR2_PACKAGE_BZIP2 is not set
+# BR2_PACKAGE_LZOP is not set
+# BR2_PACKAGE_XZ is not set
+
+#
+# Debugging, profiling and benchmark
+#
+# BR2_PACKAGE_BONNIE is not set
+# BR2_PACKAGE_DHRYSTONE is not set
+# BR2_PACKAGE_DMALLOC is not set
+# BR2_PACKAGE_KEXEC is not set
+# BR2_PACKAGE_LMBENCH is not set
+# BR2_PACKAGE_LSOF is not set
+# BR2_PACKAGE_LTP_TESTSUITE is not set
+# BR2_PACKAGE_LTRACE is not set
+# BR2_PACKAGE_MEMSTAT is not set
+# BR2_PACKAGE_NETPERF is not set
+# BR2_PACKAGE_STRACE is not set
+# BR2_PACKAGE_WHETSTONE is not set
+# BR2_PACKAGE_VALGRIND is not set
+
+#
+# Development tools
+#
+# BR2_PACKAGE_AUTOCONF is not set
+# BR2_PACKAGE_AUTOMAKE is not set
+# BR2_PACKAGE_BISON is not set
+# BR2_PACKAGE_BSDIFF is not set
+# BR2_PACKAGE_CCACHE is not set
+# BR2_PACKAGE_CVS is not set
+# BR2_PACKAGE_DISTCC is not set
+# BR2_PACKAGE_FLEX is not set
+# BR2_PACKAGE_FOSSIL is not set
+# BR2_PACKAGE_GMP is not set
+# BR2_PACKAGE_GPERF is not set
+# BR2_PACKAGE_MAKE is not set
+# BR2_PACKAGE_MPC is not set
+# BR2_PACKAGE_MPFR is not set
+# BR2_PACKAGE_LIBTOOL is not set
+# BR2_PACKAGE_M4 is not set
+# BR2_PACKAGE_PKG_CONFIG is not set
+# BR2_PACKAGE_SSTRIP is not set
+
+#
+# Games
+#
+# BR2_PACKAGE_GNUCHESS is not set
+# BR2_PACKAGE_PRBOOM is not set
+
+#
+# Graphic libraries and applications (graphic/text)
+#
+
+#
+# Graphic applications
+#
+# BR2_PACKAGE_RRDTOOL is not set
+
+#
+# graphic libraries
+#
+# BR2_PACKAGE_DIRECTFB is not set
+# BR2_PACKAGE_FBDUMP is not set
+# BR2_PACKAGE_FBGRAB is not set
+# BR2_PACKAGE_FBV is not set
+# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_SDL is not set
+
+#
+# other GUIs
+#
+# BR2_PACKAGE_QT is not set
+
+#
+# X libraries and helper libraries
+#
+# BR2_PACKAGE_LIBERATION is not set
+
+#
+# X Window managers
+#
+
+#
+# X applications
+#
+# BR2_PACKAGE_GOB2 is not set
+
+#
+# midori requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
+# Hardware handling
+#
+
+#
+# Network Interface Kernel Drivers
+#
+
+#
+# Other Hardware
+#
+# BR2_PACKAGE_ACPID is not set
+# BR2_PACKAGE_BFDETECT is not set
+# BR2_PACKAGE_CDRKIT is not set
+# BR2_PACKAGE_CRAMFS is not set
+# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DMIDECODE is not set
+# BR2_PACKAGE_DMRAID is not set
+# BR2_PACKAGE_DOSFSTOOLS is not set
+BR2_PACKAGE_E2FSPROGS=y
+# BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
+# BR2_PACKAGE_E2FSPROGS_CHATTR is not set
+# BR2_PACKAGE_E2FSPROGS_DEBUGFS is not set
+# BR2_PACKAGE_E2FSPROGS_DUMPE2FS is not set
+# BR2_PACKAGE_E2FSPROGS_E2FREEFRAG is not set
+BR2_PACKAGE_E2FSPROGS_E2FSCK=y
+# BR2_PACKAGE_E2FSPROGS_E2IMAGE is not set
+# BR2_PACKAGE_E2FSPROGS_E2LABEL is not set
+# BR2_PACKAGE_E2FSPROGS_E2UNDO is not set
+# BR2_PACKAGE_E2FSPROGS_FILEFRAG is not set
+# BR2_PACKAGE_E2FSPROGS_FSCK is not set
+# BR2_PACKAGE_E2FSPROGS_LOGSAVE is not set
+# BR2_PACKAGE_E2FSPROGS_LSATTR is not set
+# BR2_PACKAGE_E2FSPROGS_MKE2FS is not set
+# BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND is not set
+# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
+# BR2_PACKAGE_E2FSPROGS_TUNE2FS is not set
+# BR2_PACKAGE_EEPROG is not set
+# BR2_PACKAGE_FCONFIG is not set
+# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FLASHROM is not set
+# BR2_PACKAGE_FXLOAD is not set
+# BR2_PACKAGE_GADGETFS_TEST is not set
+# BR2_PACKAGE_GDISK is not set
+# BR2_PACKAGE_GENEXT2FS is not set
+# BR2_PACKAGE_GENROMFS is not set
+# BR2_PACKAGE_GPSD is not set
+# BR2_PACKAGE_GVFS is not set
+# BR2_PACKAGE_HWDATA is not set
+# BR2_PACKAGE_I2C_TOOLS is not set
+# BR2_PACKAGE_INPUT_EVENT_DAEMON is not set
+# BR2_PACKAGE_INPUT_TOOLS is not set
+# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_IRDA_UTILS is not set
+# BR2_PACKAGE_KBD is not set
+# BR2_PACKAGE_LIBV4L is not set
+# BR2_PACKAGE_LM_SENSORS is not set
+# BR2_PACKAGE_LSUIO is not set
+# BR2_PACKAGE_LVM2 is not set
+# BR2_PACKAGE_MAKEDEVS is not set
+# BR2_PACKAGE_MDADM is not set
+# BR2_PACKAGE_MEMTEST is not set
+# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MONIT is not set
+# BR2_PACKAGE_MTD is not set
+# BR2_PACKAGE_NTFS_3G is not set
+# BR2_PACKAGE_NTFSPROGS is not set
+# BR2_PACKAGE_RNG_TOOLS is not set
+# BR2_PACKAGE_SDPARM is not set
+# BR2_PACKAGE_SETSERIAL is not set
+# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_SQUASHFS is not set
+# BR2_PACKAGE_SREDIRD is not set
+# BR2_PACKAGE_SSHFS is not set
+# BR2_PACKAGE_STATSERIAL is not set
+# BR2_PACKAGE_SYSSTAT is not set
+# BR2_PACKAGE_TI_UTILS is not set
+# BR2_PACKAGE_UBOOT_TOOLS is not set
+
+#
+# udev requires /dev mgmnt set to udev under System configuration
+#
+# BR2_PACKAGE_USB_MODESWITCH is not set
+# BR2_PACKAGE_USBUTILS is not set
+# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XFSPROGS is not set
+# BR2_PACKAGE_ZABBIX is not set
+
+#
+# Interpreter languages and scripting
+#
+# BR2_PACKAGE_BC is not set
+# BR2_PACKAGE_HASERL is not set
+# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_MICROPERL is not set
+# BR2_PACKAGE_PHP is not set
+# BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_RUBY is not set
+# BR2_PACKAGE_TCL is not set
+
+#
+# Libraries
+#
+
+#
+# Compression and decompression
+#
+# BR2_PACKAGE_LIBARCHIVE is not set
+# BR2_PACKAGE_LZO is not set
+# BR2_PACKAGE_SPANDSP is not set
+# BR2_PACKAGE_ZLIB is not set
+
+#
+# Crypto
+#
+# BR2_PACKAGE_BEECRYPT is not set
+# BR2_PACKAGE_GNUTLS is not set
+# BR2_PACKAGE_LIBGCRYPT is not set
+# BR2_PACKAGE_LIBGPG_ERROR is not set
+# BR2_PACKAGE_LIBNSS is not set
+# BR2_PACKAGE_OPENSSL is not set
+# BR2_PACKAGE_LIBSODIUM is not set
+# BR2_PACKAGE_LIBSRTP is not set
+
+#
+# Database
+#
+# BR2_PACKAGE_BERKELEYDB is not set
+# BR2_PACKAGE_MYSQL_CLIENT is not set
+# BR2_PACKAGE_SQLITE is not set
+# BR2_PACKAGE_UNIXODBC is not set
+
+#
+# Filesystem
+#
+# BR2_PACKAGE_GAMIN is not set
+# BR2_PACKAGE_LIBCONFIG is not set
+# BR2_PACKAGE_LIBCONFUSE is not set
+# BR2_PACKAGE_LIBFUSE is not set
+# BR2_PACKAGE_LIBLOCKFILE is not set
+# BR2_PACKAGE_LIBSYSFS is not set
+
+#
+# Graphics
+#
+# BR2_PACKAGE_ATK is not set
+# BR2_PACKAGE_CAIRO is not set
+# BR2_PACKAGE_FONTCONFIG is not set
+# BR2_PACKAGE_FREETYPE is not set
+# BR2_PACKAGE_JPEG is not set
+# BR2_PACKAGE_LIBART is not set
+# BR2_PACKAGE_LIBEXIF is not set
+# BR2_PACKAGE_GDK_PIXBUF is not set
+# BR2_PACKAGE_LIBPNG is not set
+# BR2_PACKAGE_LIBRAW is not set
+# BR2_PACKAGE_LIBSVGTINY is not set
+# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_PANGO is not set
+# BR2_PACKAGE_PIXMAN is not set
+# BR2_PACKAGE_TIFF is not set
+
+#
+# webkit requires C++, WCHAR in toolchain and libgtk2
+#
+
+#
+# Hardware handling
+#
+# BR2_PACKAGE_LIBAIO is not set
+# BR2_PACKAGE_LIBRAW1394 is not set
+# BR2_PACKAGE_TSLIB is not set
+# BR2_PACKAGE_LIBHID is not set
+# BR2_PACKAGE_LIBIQRF is not set
+# BR2_PACKAGE_LIBUSB is not set
+
+#
+# Networking
+#
+# BR2_PACKAGE_LIBCGI is not set
+# BR2_PACKAGE_LIBCGICC is not set
+# BR2_PACKAGE_LIBCURL is not set
+# BR2_PACKAGE_LIBDNET is not set
+# BR2_PACKAGE_LIBEXOSIP2 is not set
+# BR2_PACKAGE_LIBIDN is not set
+# BR2_PACKAGE_LIBMICROHTTPD is not set
+# BR2_PACKAGE_NEON is not set
+# BR2_PACKAGE_LIBMNL is not set
+# BR2_PACKAGE_LIBNET is not set
+# BR2_PACKAGE_LIBNFNETLINK is not set
+# BR2_PACKAGE_LIBNL is not set
+# BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_PJSIP is not set
+# BR2_PACKAGE_LIBOSIP2 is not set
+# BR2_PACKAGE_LIBRSYNC is not set
+# BR2_PACKAGE_LIBSOUP is not set
+# BR2_PACKAGE_LIBUPNP is not set
+# BR2_PACKAGE_LIBURIPARSER is not set
+# BR2_PACKAGE_LINUX_ATM is not set
+
+#
+# Other
+#
+# BR2_PACKAGE_LIBARGTABLE2 is not set
+# BR2_PACKAGE_ARGP_STANDALONE is not set
+# BR2_PACKAGE_LIBATOMIC_OPS is not set
+# BR2_PACKAGE_LIBCAP is not set
+# BR2_PACKAGE_LIBDAEMON is not set
+# BR2_PACKAGE_LIBELF is not set
+# BR2_PACKAGE_LIBEVENT is not set
+# BR2_PACKAGE_LIBFB is not set
+# BR2_PACKAGE_LIBFFI is not set
+# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBICAL is not set
+# BR2_PACKAGE_LIBNSPR is not set
+# BR2_PACKAGE_LIBSIGC is not set
+# BR2_PACKAGE_ORC is not set
+
+#
+# Text and terminal handling
+#
+# BR2_PACKAGE_ENCHANT is not set
+# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_NCURSES is not set
+# BR2_PACKAGE_NEWT is not set
+# BR2_PACKAGE_PCRE is not set
+# BR2_PACKAGE_POPT is not set
+# BR2_PACKAGE_READLINE is not set
+# BR2_PACKAGE_SLANG is not set
+
+#
+# JSON/XML
+#
+# BR2_PACKAGE_EXPAT is not set
+# BR2_PACKAGE_EZXML is not set
+# BR2_PACKAGE_JANSSON is not set
+# BR2_PACKAGE_LIBROXML is not set
+# BR2_PACKAGE_LIBXML2 is not set
+# BR2_PACKAGE_LIBXSLT is not set
+# BR2_PACKAGE_LIBYAML is not set
+# BR2_PACKAGE_MXML is not set
+# BR2_PACKAGE_XERCES is not set
+# BR2_PACKAGE_YAJL is not set
+
+#
+# Miscellaneous
+#
+# BR2_PACKAGE_HTPASSWD is not set
+# BR2_PACKAGE_MAC2VENDOR is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
+# BR2_PACKAGE_ZONEINFO is not set
+
+#
+# Networking applications
+#
+# BR2_PACKAGE_APCUPSD is not set
+# BR2_PACKAGE_ARGUS is not set
+# BR2_PACKAGE_ARNOFW is not set
+# BR2_PACKAGE_AVAHI is not set
+# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
+# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BMON is not set
+# BR2_PACKAGE_BRIDGE is not set
+# BR2_PACKAGE_BWM_NG is not set
+# BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CTORRENT is not set
+# BR2_PACKAGE_CUPS is not set
+# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DIBBLER is not set
+# BR2_PACKAGE_DNSCRYPT_PROXY is not set
+# BR2_PACKAGE_DNSMASQ is not set
+# BR2_PACKAGE_DROPBEAR is not set
+# BR2_PACKAGE_EBTABLES is not set
+# BR2_PACKAGE_ETHTOOL is not set
+# BR2_PACKAGE_FPING is not set
+# BR2_PACKAGE_HOSTAPD is not set
+# BR2_PACKAGE_IFPLUGD is not set
+# BR2_PACKAGE_IFTOP is not set
+# BR2_PACKAGE_INADYN is not set
+# BR2_PACKAGE_IPERF is not set
+# BR2_PACKAGE_IPERF3 is not set
+# BR2_PACKAGE_IPROUTE2 is not set
+# BR2_PACKAGE_IPSEC_TOOLS is not set
+# BR2_PACKAGE_IPSET is not set
+# BR2_PACKAGE_IPTABLES is not set
+# BR2_PACKAGE_IW is not set
+# BR2_PACKAGE_KISMET is not set
+# BR2_PACKAGE_XL2TP is not set
+# BR2_PACKAGE_LIGHTTPD is not set
+# BR2_PACKAGE_LINKS is not set
+# BR2_PACKAGE_LRZSZ is not set
+# BR2_PACKAGE_MDNSRESPONDER is not set
+# BR2_PACKAGE_MII_DIAG is not set
+# BR2_PACKAGE_MROUTED is not set
+# BR2_PACKAGE_MSMTP is not set
+# BR2_PACKAGE_MTR is not set
+# BR2_PACKAGE_MUTT is not set
+# BR2_PACKAGE_NBD is not set
+# BR2_PACKAGE_NCFTP is not set
+# BR2_PACKAGE_NETPLUG is not set
+# BR2_PACKAGE_NETSNMP is not set
+# BR2_PACKAGE_NETSTAT_NAT is not set
+# BR2_PACKAGE_NFS_UTILS is not set
+# BR2_PACKAGE_NGIRCD is not set
+# BR2_PACKAGE_NGREP is not set
+# BR2_PACKAGE_NMAP is not set
+# BR2_PACKAGE_NTP is not set
+# BR2_PACKAGE_NUT is not set
+# BR2_PACKAGE_NUTTCP is not set
+# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENLDAP is not set
+# BR2_PACKAGE_OPENNTPD is not set
+# BR2_PACKAGE_OPENSSH is not set
+# BR2_PACKAGE_OPENVPN is not set
+# BR2_PACKAGE_P910ND is not set
+# BR2_PACKAGE_PORTMAP is not set
+# BR2_PACKAGE_PPPD is not set
+# BR2_PACKAGE_RADVD is not set
+# BR2_PACKAGE_PPTP_LINUX is not set
+# BR2_PACKAGE_PPTPD is not set
+# BR2_PACKAGE_PROFTPD is not set
+# BR2_PACKAGE_QUAGGA is not set
+# BR2_PACKAGE_RSH_REDONE is not set
+# BR2_PACKAGE_RSYNC is not set
+# BR2_PACKAGE_SAMBA is not set
+# BR2_PACKAGE_SER2NET is not set
+# BR2_PACKAGE_SIPGREP is not set
+# BR2_PACKAGE_SIPSAK is not set
+# BR2_PACKAGE_SOCAT is not set
+# BR2_PACKAGE_SPAWN_FCGI is not set
+# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STUNNEL is not set
+# BR2_PACKAGE_TCPDUMP is not set
+# BR2_PACKAGE_TCPREPLAY is not set
+# BR2_PACKAGE_TINYPROXY is not set
+# BR2_PACKAGE_TN5250 is not set
+# BR2_PACKAGE_TTCP is not set
+# BR2_PACKAGE_UDPCAST is not set
+# BR2_PACKAGE_UW_IMAP is not set
+# BR2_PACKAGE_VPNC is not set
+# BR2_PACKAGE_VSFTPD is not set
+# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WIDE_DHCPV6 is not set
+# BR2_PACKAGE_WIRELESS_TOOLS is not set
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
+
+#
+# Package managers
+#
+# BR2_PACKAGE_IPKG is not set
+
+#
+# Shell and utilities
+#
+# BR2_PACKAGE_AT is not set
+# BR2_PACKAGE_BASH is not set
+# BR2_PACKAGE_DIALOG is not set
+# BR2_PACKAGE_FILE is not set
+# BR2_PACKAGE_INOTIFY_TOOLS is not set
+# BR2_PACKAGE_LOCKFILE_PROGS is not set
+# BR2_PACKAGE_LOGROTATE is not set
+# BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SUDO is not set
+# BR2_PACKAGE_WHICH is not set
+# BR2_PACKAGE_XMLSTARLET is not set
+
+#
+# System tools
+#
+# BR2_PACKAGE_ACL is not set
+# BR2_PACKAGE_ATTR is not set
+# BR2_PACKAGE_HTOP is not set
+# BR2_PACKAGE_MODULE_INIT_TOOLS is not set
+BR2_PACKAGE_UTIL_LINUX=y
+# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
+# BR2_PACKAGE_UTIL_LINUX_FSCK is not set
+# BR2_PACKAGE_UTIL_LINUX_LIBMOUNT is not set
+BR2_PACKAGE_UTIL_LINUX_LIBUUID=y
+# BR2_PACKAGE_UTIL_LINUX_UUIDD is not set
+BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
+# BR2_PACKAGE_UTIL_LINUX_AGETTY is not set
+# BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set
+# BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set
+# BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set
+# BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set
+# BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set
+# BR2_PACKAGE_UTIL_LINUX_RENAME is not set
+# BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS is not set
+# BR2_PACKAGE_UTIL_LINUX_WALL is not set
+# BR2_PACKAGE_UTIL_LINUX_ARCH is not set
+# BR2_PACKAGE_UTIL_LINUX_INIT is not set
+# BR2_PACKAGE_UTIL_LINUX_KILL is not set
+# BR2_PACKAGE_UTIL_LINUX_LAST is not set
+# BR2_PACKAGE_UTIL_LINUX_MESG is not set
+# BR2_PACKAGE_UTIL_LINUX_PARTX is not set
+# BR2_PACKAGE_UTIL_LINUX_RAW is not set
+# BR2_PACKAGE_UTIL_LINUX_RESET is not set
+# BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set
+# BR2_PACKAGE_UTIL_LINUX_WRITE is not set
+
+#
+# Text editors and viewers
+#
+# BR2_PACKAGE_ED is not set
+# BR2_PACKAGE_EX_VI is not set
+# BR2_PACKAGE_JOE is not set
+# BR2_PACKAGE_NANO is not set
+# BR2_PACKAGE_UEMACS is not set
+
+#
+# Filesystem images
+#
+# BR2_TARGET_ROOTFS_CRAMFS is not set
+# BR2_TARGET_ROOTFS_CLOOP is not set
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
+BR2_TARGET_ROOTFS_EXT2_INODES=0
+BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
+# BR2_TARGET_ROOTFS_EXT2_NONE is not set
+BR2_TARGET_ROOTFS_EXT2_GZIP=y
+# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
+# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
+# BR2_TARGET_ROOTFS_JFFS2 is not set
+# BR2_TARGET_ROOTFS_UBIFS is not set
+# BR2_TARGET_ROOTFS_SQUASHFS is not set
+# BR2_TARGET_ROOTFS_TAR is not set
+# BR2_TARGET_ROOTFS_CPIO is not set
+
+#
+# iso image requires a Linux kernel to be built
+#
+
+#
+# initramfs requires a Linux kernel to be built
+#
+# BR2_TARGET_ROOTFS_ROMFS is not set
+
+#
+# Bootloaders
+#
+# BR2_TARGET_BAREBOX is not set
+# BR2_TARGET_GRUB is not set
+# BR2_TARGET_SYSLINUX is not set
+# BR2_TARGET_RUNNIX is not set
+# BR2_TARGET_UBOOT is not set
+
+#
+# Kernel
+#
+# BR2_LINUX_KERNEL is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-24 00:24:19
|
Revision: 7347
http://sourceforge.net/p/astlinux/code/7347
Author: abelbeck
Date: 2015-11-24 00:24:16 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Add genx86_64 and genx86_64-serial board types
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
branches/1.0/scripts/master-build
Added Paths:
-----------
branches/1.0/project/astlinux/board/genx86_64/
branches/1.0/project/astlinux/board/genx86_64/runnix.conf
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
branches/1.0/project/astlinux/board/genx86_64-serial/
branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab
branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules
Added: branches/1.0/project/astlinux/board/genx86_64/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/runnix.conf (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/runnix.conf 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=genx86_64 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/inittab 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,15 @@
+#
+# /etc/inittab
+#
+# $Id: inittab 1681 2004-09-01 18:12:49Z $
+#
+
+console::sysinit:/etc/rc sysinit
+console::respawn:/sbin/getty -L 19200 /dev/tty1 linux
+
+# ttyS0::respawn:/sbin/getty -L 19200 /dev/ttyS0 vt100
+# ttyS1::respawn:/sbin/getty -L 19200 /dev/ttyS1 vt100
+
+# Stuff to do before rebooting
+::ctrlaltdel:/sbin/reboot
+::shutdown:/etc/rc shutdown
Added: branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64/target_skeleton/etc/rc.modules 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,26 @@
+## These modules get modprobe'd when the system starts up.
+rtc
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
+3c59x
+typhoon
+tulip
+e100
+natsemi
+forcedeth
+8139too
+via-rhine
+via-velocity
+vmxnet3
+pcnet32
+acenic
+e1000
+e1000e
+igb
+ns83820
+r8168
+r8169
+tg3
+skge
Added: branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/runnix.conf 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,10 @@
+# Kernel command line
+KCMD="root=/dev/ram0 rw init=/linuxrc astlinux=genx86_64 astimg=ASTVER.run astkd=auto asturw=auto astlive libata.dma=3 console=ttyS0,19200n8"
+# Offset for root filesystem
+# OFFSET="32256"
+# location of kernel binary inside root (include mountpoint)
+KERN="/mnt/root/boot/bzImage"
+# root fs type
+FSTYPE="squashfs"
+# initrd location relative to runnix /
+INITRD="/mnt/base/os/initrd.img"
Added: branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/inittab 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,12 @@
+#
+# /etc/inittab
+#
+# $Id: inittab 1681 2004-09-01 18:12:49Z $
+#
+
+console::sysinit:/etc/rc sysinit
+console::respawn:/sbin/getty -L 19200 /dev/ttyS0 vt100
+
+# Stuff to do before rebooting
+::ctrlaltdel:/sbin/reboot
+::shutdown:/etc/rc shutdown
Added: branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules (rev 0)
+++ branches/1.0/project/astlinux/board/genx86_64-serial/target_skeleton/etc/rc.modules 2015-11-24 00:24:16 UTC (rev 7347)
@@ -0,0 +1,26 @@
+## These modules get modprobe'd when the system starts up.
+rtc
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
+3c59x
+typhoon
+tulip
+e100
+natsemi
+forcedeth
+8139too
+via-rhine
+via-velocity
+#vmxnet3
+pcnet32
+acenic
+e1000
+e1000e
+igb
+ns83820
+r8168
+r8169
+tg3
+skge
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-RUNNIX-image 2015-11-24 00:24:16 UTC (rev 7347)
@@ -127,7 +127,7 @@
exit $RED
fi
- if [ "$ARCH" = "geni586" ]; then
+ if [ "$ARCH" = "geni586" -o "$ARCH" = "genx86_64" ]; then
if [ -n "$SERIAL" ]; then
IS_SERIAL="-serial"
ARCH="${ARCH}${IS_SERIAL}"
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image 2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-run-image 2015-11-24 00:24:16 UTC (rev 7347)
@@ -135,6 +135,10 @@
ARCH=`echo $i | sed -e 's/astlinux=//'`
if [ "$ARCH" = "via" -o "$ARCH" = "viac7" ]; then # Redirect deprecated boards
ARCH="geni586"
+ elif [ "$ARCH" = "geni586" -a "$ARCH_BITS" = "64" ]; then
+ ARCH="genx86_64"
+ elif [ "$ARCH" = "genx86_64" -a "$ARCH_BITS" = "32" ]; then
+ ARCH="geni586"
fi
elif echo $i | grep -q "console="; then
SERIAL=`echo $i | sed -e 's/console=//'`
@@ -146,7 +150,7 @@
exit $RED
fi
- if [ "$ARCH" = "geni586" ]; then
+ if [ "$ARCH" = "geni586" -o "$ARCH" = "genx86_64" ]; then
if [ -n "$SERIAL" ]; then
ARCH="${ARCH}-serial"
fi
@@ -345,9 +349,10 @@
if [ -n "$2" ]; then
SRC_URL=$2
else
- echo "Usage: upgrade-run-image check firmware_repository_url"
+ echo "Usage: upgrade-run-image check firmware_repository_url [32|64]"
exit 1
fi
+ ARCH_BITS="$3"
check
echo "Current version is: ${OVER}${AFTER_REBOOT}, Newest available version is: ${VER}"
exit $GREEN
@@ -357,9 +362,10 @@
if [ -n "$2" ]; then
SRC_URL=$2
else
- echo "Usage: upgrade-run-image upgrade firmware_repository_url"
+ echo "Usage: upgrade-run-image upgrade firmware_repository_url [32|64]"
exit 1
fi
+ ARCH_BITS="$3"
check
upgrade
echo "Successful upgrade to: ${VER}${AFTER_REBOOT}"
@@ -379,7 +385,7 @@
;;
*)
- echo "Usage: upgrade-run-image check|upgrade|show|revert firmware_repository_url"
+ echo "Usage: upgrade-run-image check|upgrade|show|revert firmware_repository_url [32|64]"
exit 1
;;
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2015-11-23 16:30:24 UTC (rev 7346)
+++ branches/1.0/scripts/master-build 2015-11-24 00:24:16 UTC (rev 7347)
@@ -9,6 +9,8 @@
FAT_SIZE=256
+BOARDS_SMP64="genx86_64 genx86_64-serial"
+
BOARDS_SMP="geni586 geni586-serial"
BOARDS_NO_SMP="net5501 alix"
@@ -139,6 +141,16 @@
for board in $BOARDS_SMP; do
build_board "$FIRMWARE" "$IMG"
done
+
+ # SMP64 Builds
+ echo "Cleaning out any existing builds..."
+ rm -rf output
+
+ cp "x86_64-configs/$CONFIG" .config
+
+ for board in $BOARDS_SMP64; do
+ build_board "$FIRMWARE" "$IMG"
+ done
done
echo "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2015-11-24 18:36:55
|
Revision: 7349
http://sourceforge.net/p/astlinux/code/7349
Author: abelbeck
Date: 2015-11-24 18:36:52 +0000 (Tue, 24 Nov 2015)
Log Message:
-----------
Asterisk FOP2, add support for x86_64 binary blob
Modified Paths:
--------------
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2015-11-24 17:38:50 UTC (rev 7348)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2015-11-24 18:36:52 UTC (rev 7349)
@@ -8,6 +8,13 @@
ASTERISK_FOP2_SITE = http://download.fop2.com
# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
+ASTERISK_FOP2_X86_64_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-x86_64.tgz
+
+define ASTERISK_FOP2_X86_64_DOWNLOAD
+ $(call DOWNLOAD,$(ASTERISK_FOP2_SITE),$(ASTERISK_FOP2_X86_64_SOURCE))
+endef
+ASTERISK_FOP2_POST_DOWNLOAD_HOOKS += ASTERISK_FOP2_X86_64_DOWNLOAD
+
define ASTERISK_FOP2_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 package/asterisk-fop2/fop2.init $(TARGET_DIR)/etc/init.d/fop2
$(INSTALL) -D -m 0644 package/asterisk-fop2/config/fop2.cfg $(TARGET_DIR)/stat/etc/fop2/fop2.cfg
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2015-11-24 17:38:50 UTC (rev 7348)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2015-11-24 18:36:52 UTC (rev 7349)
@@ -248,7 +248,7 @@
if ! RAM_needed_MB 475; then
finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
fi
- SRC_URL="http://files.astlinux.org/fop2-2.28-debian-i386.tgz"
+ SRC_URL="http://files.astlinux.org/fop2-2.28-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
;;
show)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X