Menu
▾
▴
astlinux-commits — Commits to the AstLinux SVN repository
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
(14) |
Aug
(156) |
Sep
(35) |
Oct
(48) |
Nov
(55) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(154) |
Mar
(139) |
Apr
(175) |
May
(87) |
Jun
(34) |
Jul
(42) |
Aug
(68) |
Sep
(41) |
Oct
(76) |
Nov
(77) |
Dec
(50) |
| 2008 |
Jan
(98) |
Feb
(43) |
Mar
(102) |
Apr
(27) |
May
(55) |
Jun
(13) |
Jul
(58) |
Aug
(62) |
Sep
(61) |
Oct
(43) |
Nov
(87) |
Dec
(134) |
| 2009 |
Jan
(175) |
Feb
(106) |
Mar
(58) |
Apr
(41) |
May
(74) |
Jun
(123) |
Jul
(252) |
Aug
(192) |
Sep
(69) |
Oct
(38) |
Nov
(117) |
Dec
(95) |
| 2010 |
Jan
(146) |
Feb
(76) |
Mar
(90) |
Apr
(60) |
May
(23) |
Jun
(19) |
Jul
(208) |
Aug
(140) |
Sep
(103) |
Oct
(114) |
Nov
(50) |
Dec
(47) |
| 2011 |
Jan
(59) |
Feb
(47) |
Mar
(61) |
Apr
(58) |
May
(41) |
Jun
(11) |
Jul
(17) |
Aug
(49) |
Sep
(34) |
Oct
(166) |
Nov
(38) |
Dec
(70) |
| 2012 |
Jan
(87) |
Feb
(37) |
Mar
(28) |
Apr
(25) |
May
(29) |
Jun
(30) |
Jul
(43) |
Aug
(27) |
Sep
(46) |
Oct
(27) |
Nov
(51) |
Dec
(70) |
| 2013 |
Jan
(92) |
Feb
(34) |
Mar
(58) |
Apr
(37) |
May
(46) |
Jun
(9) |
Jul
(38) |
Aug
(22) |
Sep
(28) |
Oct
(42) |
Nov
(44) |
Dec
(34) |
| 2014 |
Jan
(63) |
Feb
(39) |
Mar
(48) |
Apr
(31) |
May
(21) |
Jun
(43) |
Jul
(36) |
Aug
(69) |
Sep
(53) |
Oct
(56) |
Nov
(46) |
Dec
(49) |
| 2015 |
Jan
(63) |
Feb
(35) |
Mar
(30) |
Apr
(38) |
May
(27) |
Jun
(42) |
Jul
(42) |
Aug
(63) |
Sep
(18) |
Oct
(45) |
Nov
(65) |
Dec
(71) |
| 2016 |
Jan
(54) |
Feb
(79) |
Mar
(59) |
Apr
(38) |
May
(32) |
Jun
(46) |
Jul
(42) |
Aug
(30) |
Sep
(58) |
Oct
(33) |
Nov
(98) |
Dec
(59) |
| 2017 |
Jan
(79) |
Feb
(12) |
Mar
(43) |
Apr
(32) |
May
(76) |
Jun
(59) |
Jul
(44) |
Aug
(14) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <abe...@us...> - 2016-02-11 21:41:59
|
Revision: 7520
http://sourceforge.net/p/astlinux/code/7520
Author: abelbeck
Date: 2016-02-11 21:41:57 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
openldap, version bump to 2.4.44
Modified Paths:
--------------
branches/1.0/package/openldap/openldap.mk
Modified: branches/1.0/package/openldap/openldap.mk
===================================================================
--- branches/1.0/package/openldap/openldap.mk 2016-02-11 21:26:30 UTC (rev 7519)
+++ branches/1.0/package/openldap/openldap.mk 2016-02-11 21:41:57 UTC (rev 7520)
@@ -4,7 +4,7 @@
#
#############################################################
-OPENLDAP_VERSION = 2.4.43
+OPENLDAP_VERSION = 2.4.44
OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz
OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release
OPENLDAP_INSTALL_STAGING = YES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-11 21:26:32
|
Revision: 7519
http://sourceforge.net/p/astlinux/code/7519
Author: abelbeck
Date: 2016-02-11 21:26:30 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
wanpipe, version bump to 7.0.16
Modified Paths:
--------------
branches/1.0/package/wanpipe/wanpipe.mk
Modified: branches/1.0/package/wanpipe/wanpipe.mk
===================================================================
--- branches/1.0/package/wanpipe/wanpipe.mk 2016-02-11 21:13:22 UTC (rev 7518)
+++ branches/1.0/package/wanpipe/wanpipe.mk 2016-02-11 21:26:30 UTC (rev 7519)
@@ -3,7 +3,7 @@
# wanpipe
#
#############################################################
-WANPIPE_VER:= 7.0.15
+WANPIPE_VER:= 7.0.16
WANPIPE_SITE:= ftp://ftp.sangoma.com/linux/current_wanpipe
WANPIPE_SOURCE:=wanpipe-$(WANPIPE_VER).tgz
WANPIPE_DIR:=$(BUILD_DIR)/wanpipe-$(WANPIPE_VER)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-11 21:13:25
|
Revision: 7518
http://sourceforge.net/p/astlinux/code/7518
Author: abelbeck
Date: 2016-02-11 21:13:22 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
dnscrypt-proxy, version bump to 1.6.1
Modified Paths:
--------------
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk
Modified: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk 2016-02-11 17:24:07 UTC (rev 7517)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk 2016-02-11 21:13:22 UTC (rev 7518)
@@ -3,7 +3,7 @@
# dnscrypt-proxy
#
#############################################################
-DNSCRYPT_PROXY_VERSION = 1.6.0
+DNSCRYPT_PROXY_VERSION = 1.6.1
DNSCRYPT_PROXY_SOURCE = dnscrypt-proxy-$(DNSCRYPT_PROXY_VERSION).tar.gz
DNSCRYPT_PROXY_SITE = http://download.dnscrypt.org/dnscrypt-proxy
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-11 17:24:09
|
Revision: 7517
http://sourceforge.net/p/astlinux/code/7517
Author: abelbeck
Date: 2016-02-11 17:24:07 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
pjsip, version bump to 2.4.5
Modified Paths:
--------------
branches/1.0/package/pjsip/pjsip.mk
Modified: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk 2016-02-11 15:13:00 UTC (rev 7516)
+++ branches/1.0/package/pjsip/pjsip.mk 2016-02-11 17:24:07 UTC (rev 7517)
@@ -4,7 +4,7 @@
#
################################################################################
-PJSIP_VERSION = 2.4
+PJSIP_VERSION = 2.4.5
PJSIP_SOURCE = pjproject-$(PJSIP_VERSION).tar.bz2
PJSIP_SITE = http://www.pjsip.org/release/$(PJSIP_VERSION)
PJSIP_INSTALL_STAGING = YES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-11 15:13:02
|
Revision: 7516
http://sourceforge.net/p/astlinux/code/7516
Author: abelbeck
Date: 2016-02-11 15:13:00 +0000 (Thu, 11 Feb 2016)
Log Message:
-----------
libsrtp, version bump to 1.5.4
Modified Paths:
--------------
branches/1.0/package/libsrtp/libsrtp.mk
Modified: branches/1.0/package/libsrtp/libsrtp.mk
===================================================================
--- branches/1.0/package/libsrtp/libsrtp.mk 2016-02-10 23:25:23 UTC (rev 7515)
+++ branches/1.0/package/libsrtp/libsrtp.mk 2016-02-11 15:13:00 UTC (rev 7516)
@@ -3,7 +3,7 @@
# libsrtp
#
#############################################################
-LIBSRTP_VERSION = 1.5.3
+LIBSRTP_VERSION = 1.5.4
LIBSRTP_SITE = http://files.astlinux.org
#LIBSRTP_SITE = https://github.com/cisco/libsrtp/releases
LIBSRTP_SOURCE = libsrtp-$(LIBSRTP_VERSION).tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-10 23:25:26
|
Revision: 7515
http://sourceforge.net/p/astlinux/code/7515
Author: abelbeck
Date: 2016-02-10 23:25:23 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
asterisk, version 1.8 security patches
Ref: http://downloads.asterisk.org/pub/security/AST-2016-001.pdf
Ref: http://downloads.asterisk.org/pub/security/AST-2016-002.pdf
Ref: http://downloads.asterisk.org/pub/security/AST-2016-003.pdf
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.28.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -0,0 +1,140 @@
+diff --git a/configs/http.conf.sample b/configs/http.conf.sample
+index 1a7f4fd..9a06fcf 100644
+--- a/configs/http.conf.sample
++++ b/configs/http.conf.sample
+@@ -67,10 +67,31 @@ bindaddr=127.0.0.1
+ ; If no path is given for tlscertfile or tlsprivatekey, default is to look in current
+ ; directory. If no tlsprivatekey is given, default is to search tlscertfile for private key.
+ ;
++;
+ ; To produce a certificate you can e.g. use openssl. This places both the cert and
+ ; private in same .pem file.
+ ; openssl req -new -x509 -days 365 -nodes -out /tmp/foo.pem -keyout /tmp/foo.pem
+ ;
++; tlscipher= ; The list of allowed ciphers
++; ; if none are specified the following cipher
++; ; list will be used instead:
++; ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:
++; ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:
++; kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:
++; ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:
++; ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:
++; DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:
++; AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:
++; AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:
++; !EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
++;
++; tlsdisablev1=yes ; Disable TLSv1 support - if not set this defaults to "yes"
++; tlsdisablev11=yes ; Disable TLSv1.1 support - if not set this defaults to "no"
++; tlsdisablev12=yes ; Disable TLSv1.2 support - if not set this defaults to "no"
++;
++; tlsservercipherorder=yes ; Use the server preference order instead of the client order
++; ; Defaults to "yes"
++;
+ ; The post_mappings section maps URLs to real paths on the filesystem. If a
+ ; POST is done from within an authenticated manager session to one of the
+ ; configured POST mappings, then any files in the POST will be placed in the
+diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
+index f3f5e1f..eb7166f 100644
+--- a/include/asterisk/tcptls.h
++++ b/include/asterisk/tcptls.h
+@@ -79,7 +79,15 @@ enum ast_ssl_flags {
+ /*! Use SSLv3 for outgoing client connections */
+ AST_SSL_SSLV3_CLIENT = (1 << 4),
+ /*! Use TLSv1 for outgoing client connections */
+- AST_SSL_TLSV1_CLIENT = (1 << 5)
++ AST_SSL_TLSV1_CLIENT = (1 << 5),
++ /*! Use server cipher order instead of the client order */
++ AST_SSL_SERVER_CIPHER_ORDER = (1 << 6),
++ /*! Disable TLSv1 support */
++ AST_SSL_DISABLE_TLSV1 = (1 << 7),
++ /*! Disable TLSv1.1 support */
++ AST_SSL_DISABLE_TLSV11 = (1 << 8),
++ /*! Disable TLSv1.2 support */
++ AST_SSL_DISABLE_TLSV12 = (1 << 9),
+ };
+
+ struct ast_tls_config {
+diff --git a/main/http.c b/main/http.c
+index 9bebbe7..4bfa985 100644
+--- a/main/http.c
++++ b/main/http.c
+@@ -1118,10 +1118,13 @@ static int __ast_http_load(int reload)
+ }
+ http_tls_cfg.pvtfile = ast_strdup("");
+
++ /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */
++ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER);
++
+ if (http_tls_cfg.cipher) {
+ ast_free(http_tls_cfg.cipher);
+ }
+- http_tls_cfg.cipher = ast_strdup("");
++ http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA");
+
+ AST_RWLIST_WRLOCK(&uri_redirects);
+ while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) {
+@@ -1146,8 +1149,6 @@ static int __ast_http_load(int reload)
+ && strcasecmp(v->name, "tlsdontverifyserver")
+ && strcasecmp(v->name, "tlsclientmethod")
+ && strcasecmp(v->name, "sslclientmethod")
+- && strcasecmp(v->name, "tlscipher")
+- && strcasecmp(v->name, "sslcipher")
+ && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
+ continue;
+ }
+diff --git a/main/tcptls.c b/main/tcptls.c
+index 6f918ce..0f27e45 100644
+--- a/main/tcptls.c
++++ b/main/tcptls.c
+@@ -749,6 +749,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
+ return 0;
+ #else
+ int disable_ssl = 0;
++ long ssl_opts = 0;
+
+ if (!cfg->enabled)
+ return 0;
+@@ -793,11 +794,24 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
+ * them. SSLv23_*_method supports TLSv1+.
+ */
+ if (disable_ssl) {
+- long ssl_opts;
++ ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
++ }
++
++ if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
++ ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
++ }
+
+- ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
+- SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
++ ssl_opts |= SSL_OP_NO_TLSv1;
+ }
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
++ ssl_opts |= SSL_OP_NO_TLSv1_1;
++ }
++ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
++ ssl_opts |= SSL_OP_NO_TLSv1_2;
++ }
++
++ SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
+
+ SSL_CTX_set_verify(cfg->ssl_ctx,
+ ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
+@@ -1109,6 +1123,14 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
+ ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
+ ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
+ }
++ } else if (!strcasecmp(varname, "tlsservercipherorder")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
++ } else if (!strcasecmp(varname, "tlsdisablev1")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
++ } else if (!strcasecmp(varname, "tlsdisablev11")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
++ } else if (!strcasecmp(varname, "tlsdisablev12")) {
++ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
+ } else {
+ return -1;
+ }
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.28.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -0,0 +1,18 @@
+diff --git a/channels/chan_sip.c b/channels/chan_sip.c
+index 16e3e53..86c52e9 100644
+--- a/channels/chan_sip.c
++++ b/channels/chan_sip.c
+@@ -3771,6 +3771,13 @@ static int retrans_pkt(const void *data)
+ }
+
+ /* For non-invites, a maximum of 4 secs */
++ if (INT_MAX / pkt->timer_a < pkt->timer_t1) {
++ /*
++ * Uh Oh, we will have an integer overflow.
++ * Recalculate previous timeout time instead.
++ */
++ pkt->timer_a = pkt->timer_a / 2;
++ }
+ siptimer_a = pkt->timer_t1 * pkt->timer_a; /* Double each time */
+ if (pkt->method != SIP_INVITE && siptimer_a > 4000) {
+ siptimer_a = 4000;
Added: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.28.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -0,0 +1,28 @@
+diff --git a/main/udptl.c b/main/udptl.c
+index 8885d7a..136dcb6 100644
+--- a/main/udptl.c
++++ b/main/udptl.c
+@@ -231,16 +231,15 @@ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len,
+ if (decode_length(buf, limit, len, &octet_cnt) != 0)
+ return -1;
+
+- if (octet_cnt > 0) {
+- /* Make sure the buffer contains at least the number of bits requested */
+- if ((*len + octet_cnt) > limit)
+- return -1;
+-
+- *p_num_octets = octet_cnt;
+- *p_object = &buf[*len];
+- *len += octet_cnt;
++ /* Make sure the buffer contains at least the number of bits requested */
++ if ((*len + octet_cnt) > limit) {
++ return -1;
+ }
+
++ *p_num_octets = octet_cnt;
++ *p_object = &buf[*len];
++ *len += octet_cnt;
++
+ return 0;
+ }
+ /*- End of function --------------------------------------------------------*/
Modified: branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-02-10 17:31:49 UTC (rev 7514)
+++ branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-02-10 23:25:23 UTC (rev 7515)
@@ -1,6 +1,6 @@
--- asterisk-1.8.32.3/channels/chan_sip.c.orig 2015-04-23 10:15:19.000000000 -0500
+++ asterisk-1.8.32.3/channels/chan_sip.c 2015-04-23 10:15:40.000000000 -0500
-@@ -15121,7 +15121,7 @@
+@@ -15128,7 +15128,7 @@
ast_set_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-10 17:31:52
|
Revision: 7514
http://sourceforge.net/p/astlinux/code/7514
Author: abelbeck
Date: 2016-02-10 17:31:49 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-02-10 17:29:48 UTC (rev 7513)
+++ branches/1.0/docs/ChangeLog.txt 2016-02-10 17:31:49 UTC (rev 7514)
@@ -30,7 +30,12 @@
-- Network tab, remove 'inadyn' dynamic DNS client support, add a few more "DNS Service Type" entries.
+-- Prefs tab, new options under "Show Network Tab", checked by default:
+ _x_ Disable DNS Hosts Tab for "staff" user
+ _x_ Disable XMPP Users Tab for "staff" user
+ When unchecked, new tabs are presented for "staff" users.
+
Additions for AstLinux 1.2.5:
=============================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-10 17:29:50
|
Revision: 7513
http://sourceforge.net/p/astlinux/code/7513
Author: abelbeck
Date: 2016-02-10 17:29:48 +0000 (Wed, 10 Feb 2016)
Log Message:
-----------
web interface, add Prefs tab options to enable staff user 'DNS Hosts' and 'XMPP Users' tabs
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/dnshosts.php
branches/1.0/package/webinterface/altweb/admin/prefs.php
branches/1.0/package/webinterface/altweb/admin/xmpp.php
branches/1.0/package/webinterface/altweb/common/functions.php
branches/1.0/package/webinterface/altweb/common/header.php
Modified: branches/1.0/package/webinterface/altweb/admin/dnshosts.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/dnshosts.php 2016-02-09 19:21:57 UTC (rev 7512)
+++ branches/1.0/package/webinterface/altweb/admin/dnshosts.php 2016-02-10 17:29:48 UTC (rev 7513)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2013 Lonnie Abelbeck
+// Copyright (C) 2008-2016 Lonnie Abelbeck
// This is free software, licensed under the GNU General Public License
// version 3 as published by the Free Software Foundation; you can
// redistribute it and/or modify it under the terms of the GNU
@@ -10,6 +10,7 @@
// 01-05-2009
// 12-10-2010, Added IPv6 support
// 07-22-2013, Reorganize to force unique IP's
+// 02-10-2016, Added Staff support
//
// System location of /mnt/kd/rc.conf.d directory
$DNSHOSTSCONFDIR = '/mnt/kd/rc.conf.d';
@@ -122,7 +123,7 @@
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$result = 1;
- if (! $global_admin) {
+ if (! ($global_admin || $global_staff_enable_dnshosts)) {
$result = 999;
} elseif (isset($_POST['submit_save'])) {
$n = count($db['data']);
@@ -161,7 +162,7 @@
header('Location: '.$myself.'?result='.$result);
exit;
} else { // Start of HTTP GET
-$ACCESS_RIGHTS = 'admin';
+$ACCESS_RIGHTS = $global_staff_enable_dnshosts ? 'staff' : 'admin';
require_once '../common/header.php';
putHtml("<center>");
Modified: branches/1.0/package/webinterface/altweb/admin/prefs.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/prefs.php 2016-02-09 19:21:57 UTC (rev 7512)
+++ branches/1.0/package/webinterface/altweb/admin/prefs.php 2016-02-10 17:29:48 UTC (rev 7513)
@@ -493,6 +493,14 @@
$value = 'tab_network_show = no';
fwrite($fp, $value."\n");
}
+ if (! isset($_POST['dnshosts_disable_staff'])) {
+ $value = 'tab_dnshosts_disable_staff = no';
+ fwrite($fp, $value."\n");
+ }
+ if (! isset($_POST['xmpp_disable_staff'])) {
+ $value = 'tab_xmpp_disable_staff = no';
+ fwrite($fp, $value."\n");
+ }
if (! isset($_POST['tab_edit'])) {
$value = 'tab_edit_show = no';
fwrite($fp, $value."\n");
@@ -1204,7 +1212,14 @@
putHtml('<tr class="dtrow1"><td style="text-align: right;">');
$sel = (getPREFdef($global_prefs, 'tab_network_show') !== 'no') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="tab_network" name="tab_network"'.$sel.' /></td><td colspan="5">Show Network Tab</td></tr>');
+ putHtml('<tr class="dtrow1"><td> </td><td colspan="5">');
+ $sel = (getPREFdef($global_prefs, 'tab_dnshosts_disable_staff') !== 'no') ? ' checked="checked"' : '';
+ putHtml('<input type="checkbox" value="dnshosts_disable_staff" name="dnshosts_disable_staff"'.$sel.' /> Disable DNS Hosts Tab for "staff" user</td></tr>');
+ putHtml('<tr class="dtrow1"><td> </td><td colspan="5">');
+ $sel = (getPREFdef($global_prefs, 'tab_xmpp_disable_staff') !== 'no') ? ' checked="checked"' : '';
+ putHtml('<input type="checkbox" value="xmpp_disable_staff" name="xmpp_disable_staff"'.$sel.' /> Disable XMPP Users Tab for "staff" user</td></tr>');
+
putHtml('<tr class="dtrow1"><td style="text-align: right;">');
$sel = (getPREFdef($global_prefs, 'tab_edit_show') !== 'no') ? ' checked="checked"' : '';
putHtml('<input type="checkbox" value="tab_edit" name="tab_edit"'.$sel.' /></td><td colspan="5">Show Edit Tab</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/admin/xmpp.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/xmpp.php 2016-02-09 19:21:57 UTC (rev 7512)
+++ branches/1.0/package/webinterface/altweb/admin/xmpp.php 2016-02-10 17:29:48 UTC (rev 7513)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2013 Lonnie Abelbeck
+// Copyright (C) 2013-2016 Lonnie Abelbeck
// This is free software, licensed under the GNU General Public License
// version 3 as published by the Free Software Foundation; you can
// redistribute it and/or modify it under the terms of the GNU
@@ -8,6 +8,7 @@
// xmpp.php for AstLinux
// 11-01-2013
+// 02-10-2016, Added Staff support
//
// System location of /mnt/kd/rc.conf.d directory
$XMPPCONFDIR = '/mnt/kd/rc.conf.d';
@@ -77,8 +78,14 @@
// Function: saveXMPPsettings
//
function saveXMPPsettings($conf_dir, $conf_file) {
+ global $global_admin;
$result = 11;
+ // Don't save settings if 'staff' user.
+ if (! $global_admin) {
+ return($result);
+ }
+
if (! is_dir($conf_dir)) {
return(3);
}
@@ -235,7 +242,7 @@
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$result = 1;
- if (! $global_admin) {
+ if (! ($global_admin || $global_staff_enable_xmpp)) {
$result = 999;
} elseif (isset($_POST['submit_save'])) {
$ok = 0;
@@ -299,7 +306,7 @@
header('Location: '.$myself.'?result='.$result);
exit;
} else { // Start of HTTP GET
-$ACCESS_RIGHTS = 'admin';
+$ACCESS_RIGHTS = $global_staff_enable_xmpp ? 'staff' : 'admin';
require_once '../common/header.php';
putHtml('<center>');
@@ -314,7 +321,7 @@
} elseif ($result == 10) {
putHtml('<p style="color: green;">XMPP Server'.statusPROCESS('prosody').'.</p>');
} elseif ($result == 11) {
- putHtml('<p style="color: green;">Settings saved, click "Restart Server" to apply any changed settings.</p>');
+ putHtml('<p style="color: green;">Settings saved'.($global_admin ? ', click "Restart Server" to apply any changed settings.' : '.').'</p>');
} elseif ($result == 12) {
putHtml('<p style="color: red;">Missing Password, User not added or changed.</p>');
} elseif ($result == 13) {
@@ -363,6 +370,7 @@
putHtml('<table width="100%" class="stdtable">');
putHtml('<tr class="dtrow0"><td width="180"> </td><td> </td></tr>');
+if ($global_admin) {
if (! is_file('/mnt/kd/ssl/sip-tls/keys/server.crt') || ! is_file('/mnt/kd/ssl/sip-tls/keys/server.key')) {
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="2">');
putHtml('<strong>Missing SIP-TLS Server Certificate:</strong> <i>(Shared with XMPP)</i>');
@@ -535,6 +543,7 @@
}
putHtml('</select>');
putHtml('</td></tr>');
+} // if global_admin
if (is_file('/mnt/kd/prosody/prosody.cfg.lua')) {
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="2">');
Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-09 19:21:57 UTC (rev 7512)
+++ branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-10 17:29:48 UTC (rev 7513)
@@ -995,4 +995,6 @@
$global_staff_disable_followme = ($global_user === 'staff' && (getPREFdef($global_prefs, 'tab_followme_disable_staff') === 'yes'));
$global_staff_enable_sqldata = ($global_user === 'staff' && (getPREFdef($global_prefs, 'tab_sqldata_disable_staff') === 'no'));
$global_staff_disable_staff = ($global_user === 'staff' && (getPREFdef($global_prefs, 'tab_staff_disable_staff') === 'yes'));
+$global_staff_enable_dnshosts = ($global_user === 'staff' && (getPREFdef($global_prefs, 'tab_dnshosts_disable_staff') === 'no'));
+$global_staff_enable_xmpp = ($global_user === 'staff' && (getPREFdef($global_prefs, 'tab_xmpp_disable_staff') === 'no'));
?>
Modified: branches/1.0/package/webinterface/altweb/common/header.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/header.php 2016-02-09 19:21:57 UTC (rev 7512)
+++ branches/1.0/package/webinterface/altweb/common/header.php 2016-02-10 17:29:48 UTC (rev 7513)
@@ -250,6 +250,12 @@
if ($global_staff && (getPREFdef($global_prefs, 'tab_netstat_show') === 'yes')) {
putHtml('<li><a href="/admin/netstat.php"><span>NetStat</span></a></li>');
}
+ if ($global_staff_enable_dnshosts) {
+ putHtml('<li><a href="/admin/dnshosts.php"><span>DNS Hosts</span></a></li>');
+ }
+ if ($global_staff_enable_xmpp) {
+ putHtml('<li><a href="/admin/xmpp.php"><span>XMPP Users</span></a></li>');
+ }
if (! is_null($custom_tabs = getCUSTOMtabs($global_prefs))) {
foreach ($custom_tabs as $tab) {
if ($tab['access'] === 'all' || ($global_staff && $tab['access'] === 'staff')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-09 19:22:00
|
Revision: 7512
http://sourceforge.net/p/astlinux/code/7512
Author: abelbeck
Date: 2016-02-09 19:21:57 +0000 (Tue, 09 Feb 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-02-09 19:15:16 UTC (rev 7511)
+++ branches/1.0/docs/ChangeLog.txt 2016-02-09 19:21:57 UTC (rev 7512)
@@ -5,11 +5,37 @@
=== docs/ChangeLog.txt
=========================================================
-Additions for AstLinux 1.2.5:
+Additions for AstLinux 1.2.6:
=============================
Released **TBD**
+** System
+
+-- no change
+
+** Networking
+
+-- ddclient, now the only dynamic DNS client support, remove 'inadyn' dynamic DNS client support
+
+** Asterisk
+
+-- Asterisk 1.8.32.3 (no change), 11.19.0 (no change) and 13.5.0 (no change)
+
+-- DAHDI, dahdi-linux 2.8.0.1 (no change) and dahdi-tools 2.8.0 (no change)
+
+-- pjsip 2.4 (no change)
+
+** Web Interface
+
+-- Network tab, remove 'inadyn' dynamic DNS client support, add a few more "DNS Service Type" entries.
+
+
+Additions for AstLinux 1.2.5:
+=============================
+
+Released 2015-02-10
+
** Build System
-- Added 64-bit support for x86_64 CPU's with new board types genx86_64 and genx86_64-serial
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-09 19:15:18
|
Revision: 7511
http://sourceforge.net/p/astlinux/code/7511
Author: abelbeck
Date: 2016-02-09 19:15:16 +0000 (Tue, 09 Feb 2016)
Log Message:
-----------
add ddclient package, no longer use inadyn package
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/package/inadyn/Config.in
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/package/webinterface/altweb/common/functions.php
branches/1.0/package/webinterface/altweb/common/version.php
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/ddclient/
branches/1.0/package/ddclient/Config.in
branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
branches/1.0/package/ddclient/ddclient.conf
branches/1.0/package/ddclient/ddclient.mk
branches/1.0/package/ddclient/dynamicdns.init
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux-ast11.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:38 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:48 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux-ast13.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:39 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:51 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/astlinux18.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:36 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:45 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -704,7 +705,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/initrd.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:43 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:36:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -570,6 +570,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -457,6 +457,7 @@
source "package/ctorrent/Config.in"
source "package/cups/Config.in"
source "package/darkstat/Config.in"
+source "package/ddclient/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/dhcp/Config.in"
endif
Added: branches/1.0/package/ddclient/Config.in
===================================================================
--- branches/1.0/package/ddclient/Config.in (rev 0)
+++ branches/1.0/package/ddclient/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_DDCLIENT
+ bool "ddclient"
+ select BR2_PACKAGE_PERL
+ select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_CURL
+ default n
+ help
+ DDclient is a Perl client used to update dynamic DNS entries for
+ accounts on a Dynamic DNS Network Service Provider.
+
+ http://sourceforge.net/projects/ddclient/
+
Added: branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,6 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
+@@ -1,3 +1,2 @@
+ #!/usr/bin/perl -w
+-#!/usr/local/bin/perl -w
+ ######################################################################
Added: branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,11 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
+@@ -3072,7 +3072,7 @@
+ $status_text = $var{'TEXT'} if exists $var{'TEXT'};
+ $status_ip = $var{'IP'} if exists $var{'IP'};
+
+- if ($status eq 'SUCCESS' || ($status eq 'ERROR' && $var{'CODE'} eq '707')) {
++ if ($status eq 'SUCCESS' || ($status eq 'ERROR' && ($var{'CODE'} eq '707' || $var{'CODE'} eq '702'))) {
+ $config{$h}{'ip'} = $status_ip;
+ $config{$h}{'mtime'} = $now;
+ $config{$h}{'status'} = 'good';
Added: branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,38 @@
+--- ddclient-3.8.3/ddclient.orig 2014-05-09 18:00:02.000000000 -0500
++++ ddclient-3.8.3/ddclient 2014-05-09 18:00:51.000000000 -0500
+@@ -1916,7 +1916,7 @@
+ if ( $force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip') ) {
+ $use_ssl = 1;
+ $default_port = 443;
+- load_ssl_support;
++ #load_ssl_support;
+ } else {
+ $use_ssl = 0;
+ $default_port = 80;
+@@ -1953,14 +1953,18 @@
+ debug("skipped network connection");
+ verbose("SENDING:", "%s", $request);
+ } elsif ($use_ssl) {
+- $sd = IO::Socket::SSL->new(
+- PeerAddr => $peer,
+- PeerPort => $port,
+- Proto => 'tcp',
+- MultiHomed => 1,
+- Timeout => opt('timeout'),
+- );
+- defined $sd or warning("cannot connect to $peer:$port socket: $@ " . IO::Socket::SSL::errstr());
++ $0 = sprintf("%s - curl sending to %s port %s", $program, $peer, $port);
++ my $timeout = opt('timeout');
++
++ $reply = <<`CURL_SSL`;
++/usr/bin/curl -ksi0 --user '${login}:${password}' --user-agent '${program}/${version}' \\
++ --connect-timeout $timeout --max-time $timeout \\
++ --url 'https://${server}/${url}' 2>/dev/null
++CURL_SSL
++
++ if (! $reply) {
++ warning("curl cannot connect to $peer:$port");
++ }
+ } else {
+ $sd = IO::Socket::INET->new(
+ PeerAddr => $peer,
Added: branches/1.0/package/ddclient/ddclient.conf
===================================================================
--- branches/1.0/package/ddclient/ddclient.conf (rev 0)
+++ branches/1.0/package/ddclient/ddclient.conf 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,106 @@
+daemon=@DELAY@
+@USE_WEB@use=web, web=@WEB_STR@
+@USE_IF@use=if, if=@EXTIF@
+#@zoneedit@>
+#@zoneedit@>## ZoneEdit
+#@zoneedit@>ssl=yes
+#@zoneedit@>server=dynamic.zoneedit.com
+#@zoneedit@>protocol=zoneedit1
+#@zoneedit@>login=@DDUSER@
+#@zoneedit@>password=@DDPASS@
+#@zoneedit@>@DDHOST@
+#@dyndns@>
+#@dyndns@>## dyndns.org dynamic addresses
+#@dyndns@>server=members.dyndns.org
+#@dyndns@>protocol=dyndns2
+#@dyndns@>login=@DDUSER@
+#@dyndns@>password=@DDPASS@
+#@dyndns@>@DDHOST@
+#@dyndns-static@>
+#@dyndns-static@>## dyndns.org static addresses
+#@dyndns-static@>server=members.dyndns.org
+#@dyndns-static@>protocol=dyndns2
+#@dyndns-static@>login=@DDUSER@
+#@dyndns-static@>password=@DDPASS@
+#@dyndns-static@>static=yes, @DDHOST@
+#@dyndns-custom@>
+#@dyndns-custom@>## dyndns.org custom addresses
+#@dyndns-custom@>server=members.dyndns.org
+#@dyndns-custom@>protocol=dyndns2
+#@dyndns-custom@>login=@DDUSER@
+#@dyndns-custom@>password=@DDPASS@
+#@dyndns-custom@>custom=yes, @DDHOST@
+#@no-ip@>
+#@no-ip@>## No-IP
+#@no-ip@>server=dynupdate.no-ip.com
+#@no-ip@>protocol=noip
+#@no-ip@>login=@DDUSER@
+#@no-ip@>password=@DDPASS@
+#@no-ip@>@DDHOST@
+#@freedns@>
+#@freedns@>## FreeDNS
+#@freedns@>server=freedns.afraid.org
+#@freedns@>protocol=freedns
+#@freedns@>login=@DDUSER@
+#@freedns@>password=@DDPASS@
+#@freedns@>@DDHOST@
+#@dnsomatic@>
+#@dnsomatic@>## DNS-O-MATIC
+#@dnsomatic@>ssl=yes
+#@dnsomatic@>server=updates.dnsomatic.com
+#@dnsomatic@>protocol=dyndns2
+#@dnsomatic@>login=@DDUSER@
+#@dnsomatic@>password=@DDPASS@
+#@dnsomatic@>@DDHOST@
+#@pairnic@>
+#@pairnic@>## pairNIC
+#@pairnic@>ssl=yes
+#@pairnic@>server=dynamic.pairnic.com
+#@pairnic@>protocol=dyndns2
+#@pairnic@>login=@DDUSER@
+#@pairnic@>password=@DDPASS@
+#@pairnic@>@DDHOST@
+#@nsupdate-ipv4@>
+#@nsupdate-ipv4@>## nsupdate.info
+#@nsupdate-ipv4@>ssl=yes
+#@nsupdate-ipv4@>server=ipv4.nsupdate.info
+#@nsupdate-ipv4@>protocol=dyndns2
+#@nsupdate-ipv4@>login=@DDUSER@
+#@nsupdate-ipv4@>password=@DDPASS@
+#@nsupdate-ipv4@>@DDHOST@
+#@easydns@>
+#@easydns@>## EasyDNS
+#@easydns@>server=members.easydns.com
+#@easydns@>protocol=easydns
+#@easydns@>login=@DDUSER@
+#@easydns@>password=@DDPASS@
+#@easydns@>@DDHOST@
+#@dnspark@>
+#@dnspark@>## dnspark.com
+#@dnspark@>server=www.dnspark.com
+#@dnspark@>protocol=dnspark
+#@dnspark@>login=@DDUSER@
+#@dnspark@>password=@DDPASS@
+#@dnspark@>@DDHOST@
+#@namecheap@>
+#@namecheap@>## NameCheap
+#@namecheap@>server=dynamicdns.park-your-domain.com
+#@namecheap@>protocol=namecheap
+#@namecheap@>login=@DDUSER@
+#@namecheap@>password=@DDPASS@
+#@namecheap@>@DDHOST@
+#@changeip@>
+#@changeip@>## ChangeIP
+#@changeip@>server=nic.changeip.com
+#@changeip@>protocol=changeip
+#@changeip@>login=@DDUSER@
+#@changeip@>password=@DDPASS@
+#@changeip@>@DDHOST@
+#@dtdns@>
+#@dtdns@>## DtDNS
+#@dtdns@>server=www.dtdns.com
+#@dtdns@>protocol=dtdns
+#@dtdns@>client=ddclient
+#@dtdns@>password=@DDPASS@
+#@dtdns@>@DDHOST@
+
Added: branches/1.0/package/ddclient/ddclient.mk
===================================================================
--- branches/1.0/package/ddclient/ddclient.mk (rev 0)
+++ branches/1.0/package/ddclient/ddclient.mk 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,23 @@
+#############################################################
+#
+# ddclient
+#
+#############################################################
+DDCLIENT_VERSION = 3.8.3
+DDCLIENT_SOURCE = ddclient-$(DDCLIENT_VERSION).tar.gz
+DDCLIENT_SITE = http://downloads.sourceforge.net/project/ddclient/ddclient/ddclient-$(DDCLIENT_VERSION)
+
+define DDCLIENT_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D package/ddclient/dynamicdns.init $(TARGET_DIR)/etc/init.d/dynamicdns
+ $(INSTALL) -m 0755 -D $(@D)/ddclient $(TARGET_DIR)/usr/sbin/ddclient
+ $(INSTALL) -m 0644 -D package/ddclient/ddclient.conf $(TARGET_DIR)/stat/etc/ddclient.conf
+ ln -sf /tmp/etc/ddclient.conf $(TARGET_DIR)/etc/ddclient.conf
+endef
+
+define DDCLIENT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/etc/init.d/dynamicdns
+ rm -f $(TARGET_DIR)/usr/sbin/ddclient
+ rm -f $(TARGET_DIR)/stat/etc/ddclient.conf
+endef
+
+$(eval $(call GENTARGETS,package,ddclient))
Added: branches/1.0/package/ddclient/dynamicdns.init
===================================================================
--- branches/1.0/package/ddclient/dynamicdns.init (rev 0)
+++ branches/1.0/package/ddclient/dynamicdns.init 2016-02-09 19:15:16 UTC (rev 7511)
@@ -0,0 +1,130 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+gen_ddclient_conf()
+{
+ local use_web="" use_if="#" web_str delay service
+
+ if [ ! -x /usr/sbin/ddclient ]; then
+ echo "dynamicdns: Script \"/usr/sbin/ddclient\" not found, exiting." >&2
+ exit 1
+ fi
+
+ delay="360"
+
+ if [ -z "$DDGETIP" ]; then
+ web_str="myip.dnsomatic.com/"
+ elif [ "$DDGETIP" = "interface" ]; then
+ use_web="#"
+ use_if=""
+ web_str="$DDGETIP/"
+ delay="120"
+ elif [ "$DDGETIP" = "checkip.dyndns.org" -o "$DDGETIP" = "checkip.dyndns.com" ]; then
+ web_str="$DDGETIP/, web-skip='IP Address'"
+ else
+ web_str="$DDGETIP/"
+ fi
+
+ # Handle Service Types
+ case "$DDSERVICE" in
+ 'de...@zo...') service="zoneedit" ;;
+ 'dy...@dy...') service="dyndns" ;;
+ 'st...@dy...') service="dyndns-static" ;;
+ 'cu...@dy...') service="dyndns-custom" ;;
+ 'de...@no...') service="no-ip" ;;
+ 'de...@fr...') service="freedns" ;;
+ 'de...@dn...') service="dnsomatic" ;;
+ 'de...@pa...') service="pairnic" ;;
+ 'de...@ns...') service="nsupdate-ipv4" ;;
+ *) service="$(echo "$DDSERVICE" | tr -d '^$*[]|"')" ;; # sanitize for sed regex
+ esac
+
+ if [ -n "$DDUSER" -a -n "$DDPASS" -a -n "$DDHOST" ]; then
+
+ # Genearate /etc/ddclient.conf configuration file
+ if [ -f /mnt/kd/ddclient.conf ]; then
+ echo "# Autogenerated. Edit /mnt/kd/ddclient.conf file.
+" >/tmp/etc/ddclient.conf
+ cat /mnt/kd/ddclient.conf >>/tmp/etc/ddclient.conf
+ else
+ echo "# Autogenerated. Do not edit.
+# A manually generated ddclient config will use /mnt/kd/ddclient.conf if it exists.
+" >/tmp/etc/ddclient.conf
+ cat /stat/etc/ddclient.conf >>/tmp/etc/ddclient.conf
+ fi
+
+ sed -i -e "s|^#@${service}@>||" \
+ -e '/^#@/ d' \
+ /tmp/etc/ddclient.conf
+
+ sed -i -e "s|@DDUSER@|${DDUSER}|g" \
+ -e "s|@DDPASS@|${DDPASS}|g" \
+ -e "s|@DDHOST@|${DDHOST}|g" \
+ -e "s|@EXTIF@|${EXTIF}|g" \
+ -e "s|@EXT2IF@|${EXT2IF}|g" \
+ -e "s|@DELAY@|${delay}|g" \
+ -e "s|@USE_WEB@|${use_web}|g" \
+ -e "s|@USE_IF@|${use_if}|g" \
+ -e "s|@WEB_STR@|${web_str}|g" \
+ /tmp/etc/ddclient.conf
+
+ chmod 600 /tmp/etc/ddclient.conf
+ fi
+}
+
+init () {
+
+ if [ -f /tmp/etc/ddclient.conf ]; then
+ rm /tmp/etc/ddclient.conf
+ fi
+
+ if [ "$DDCLIENT" = "ddclient" -o "$DDCLIENT" = "inadyn" -o -z "$DDCLIENT" ]; then # unset default for backward compatibility
+ gen_ddclient_conf
+ fi
+}
+
+start () {
+
+ if [ -f /etc/ddclient.conf ]; then
+ echo "Starting dynamicdns (ddclient)..."
+ ddclient -syslog -file /etc/ddclient.conf -cache /var/db/ddclient.cache -pid /var/run/ddclient.pid
+ fi
+}
+
+stop () {
+
+ if [ -f /etc/ddclient.conf ]; then
+ if [ -f /var/run/ddclient.pid ]; then
+ echo "Stopping dynamicdns (ddclient)..."
+ kill $(cat /var/run/ddclient.pid) >/dev/null 2>&1
+ fi
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
Property changes on: branches/1.0/package/ddclient/dynamicdns.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/inadyn/Config.in
===================================================================
--- branches/1.0/package/inadyn/Config.in 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/inadyn/Config.in 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,4 +1,5 @@
config BR2_PACKAGE_INADYN
+ depends on !BR2_PACKAGE_DDCLIENT
bool "inadyn"
default n
help
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -82,11 +82,16 @@
$select_dyndns = array (
'User Defined >>>' => '',
+ 'ChangeIP' => 'changeip',
'DNS-O-Matic' => 'de...@dn...',
+ 'DNS Park' => 'dnspark',
+ 'DtDNS' => 'dtdns',
'DynDNS' => 'dy...@dy...',
'DynDNS [custom]' => 'cu...@dy...',
'DynDNS [static]' => 'st...@dy...',
+ 'EasyDNS' => 'easydns',
'FreeDNS' => 'de...@fr...',
+ 'NameCheap' => 'namecheap',
'No-IP' => 'de...@no...',
'nsupdate.info' => 'de...@ns...',
'pairNIC' => 'de...@pa...',
@@ -1951,15 +1956,13 @@
putHtml('<strong>Dynamic DNS Update:</strong>');
if (($dd_client = getVARdef($db, 'DDCLIENT', $cur_db)) === '') {
if (getVARdef($db, 'DDUSER', $cur_db) !== '' && getVARdef($db, 'DDPASS', $cur_db) !== '') {
- $dd_client = 'inadyn';
+ $dd_client = 'ddclient';
}
}
putHtml('<select name="dd_client">');
putHtml('<option value="none">disabled</option>');
- $sel = ($dd_client === 'inadyn') ? ' selected="selected"' : '';
- putHtml('<option value="inadyn"'.$sel.'>inadyn</option>');
- $sel = ($dd_client === 'ddclient') ? ' selected="selected"' : '';
- putHtml('<option value="ddclient"'.$sel.'>ddclient</option>');
+ $sel = ($dd_client === 'ddclient' || $dd_client === 'inadyn') ? ' selected="selected"' : '';
+ putHtml('<option value="ddclient"'.$sel.'>enabled</option>');
putHtml('</select>');
putHtml('</td></tr>');
Modified: branches/1.0/package/webinterface/altweb/common/functions.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/common/functions.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -105,7 +105,7 @@
if ($process === 'asterisk' || $process === 'prosody' || $process === 'slapd' || $process === 'kamailio') {
$path .= $process.'/';
} elseif ($process === 'dynamicdns') {
- if (is_file($path.'ddclient.pid') || is_file($path.'inadyn.pid')) {
+ if (is_file($path.'ddclient.pid')) {
$str = $running;
} else {
$str = $stopped;
Modified: branches/1.0/package/webinterface/altweb/common/version.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/version.php 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/package/webinterface/altweb/common/version.php 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,6 +1,6 @@
<?php
// version.php for AstLinux Alternate Web Interface
-$GUI_VERSION = '1.8.35';
+$GUI_VERSION = '1.8.36';
?>
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-02-09 19:15:16 UTC (rev 7511)
@@ -200,9 +200,9 @@
#PPPOE_RESTART_DELAY=2
## Dynamic DNS Support
-## Both "inadyn" and "ddclient" clients are supported.
-## For a list of valid DDSERVICE names, see the ouput of "inadyn".
-#DDCLIENT="ddclient" # "none", "inadyn" or "ddclient", unset defaults to "inadyn" for backward compatibility
+## The "ddclient" client is supported.
+## For a list of valid DDSERVICE names, issue "ddclient -help".
+#DDCLIENT="ddclient" # "none", "ddclient", unset defaults to "ddclient" for backward compatibility
#DDSERVICE=
#DDUSER=
#DDPASS=
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/runnix-iso.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7496 Configuration
-# Mon Feb 1 17:42:11 2016
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:09 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -599,6 +599,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/runnix.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7287-dirty Configuration
-# Tue Oct 27 17:37:40 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:03 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -600,6 +600,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:21 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:23 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7342-dirty Configuration
-# Mon Nov 23 09:11:34 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:14 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -671,6 +671,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
+BR2_PACKAGE_DDCLIENT=y
BR2_PACKAGE_DHCPDUMP=y
# BR2_PACKAGE_DIBBLER is not set
BR2_PACKAGE_DNSCRYPT_PROXY=y
@@ -685,7 +686,6 @@
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_INADYN=y
BR2_PACKAGE_IPERF=y
BR2_PACKAGE_IPERF3=y
BR2_PACKAGE_IPROUTE2=y
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-02-09 03:40:20 UTC (rev 7510)
+++ branches/1.0/x86_64-configs/initrd.config 2016-02-09 19:15:16 UTC (rev 7511)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7339 Configuration
-# Sun Nov 22 15:51:12 2015
+# Buildroot 2011.08-svn7510-dirty Configuration
+# Tue Feb 9 12:37:26 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -551,6 +551,7 @@
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
+# BR2_PACKAGE_DDCLIENT is not set
# BR2_PACKAGE_DHCPDUMP is not set
# BR2_PACKAGE_DIBBLER is not set
# BR2_PACKAGE_DNSCRYPT_PROXY is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-09 03:40:23
|
Revision: 7510
http://sourceforge.net/p/astlinux/code/7510
Author: abelbeck
Date: 2016-02-09 03:40:20 +0000 (Tue, 09 Feb 2016)
Log Message:
-----------
master-build tweak for ISO generation
Modified Paths:
--------------
branches/1.0/scripts/master-build
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2016-02-08 17:15:00 UTC (rev 7509)
+++ branches/1.0/scripts/master-build 2016-02-09 03:40:20 UTC (rev 7510)
@@ -189,8 +189,11 @@
cp runnix-iso.config .config
for board in $BOARDS_NO_SMP $BOARDS_SMP $BOARDS_SMP64; do
+ ISO_NAME="${ASTVER}-${board}.iso"
if [ "${board}" != "${board%-serial}" -o "$board" = "alix" -o "$board" = "net5501" ]; then
SERIAL="serial"
+ ISO_NAME="${ISO_NAME%-serial.iso}"
+ ISO_NAME="${ISO_NAME%.iso}-serial.iso"
else
SERIAL=""
fi
@@ -198,10 +201,10 @@
if [ $? -ne 0 ]; then
exit 1
fi
- if [ ! -f "${ASTVER}-${board}.iso" ]; then
+ if [ ! -f "$ISO_NAME" ]; then
exit 1
fi
- mv "${ASTVER}-${board}.iso" "$output_path/iso/"
+ mv "$ISO_NAME" "$output_path/iso/"
done
echo "
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-08 17:15:01
|
Revision: 7509
http://sourceforge.net/p/astlinux/code/7509
Author: abelbeck
Date: 2016-02-08 17:15:00 +0000 (Mon, 08 Feb 2016)
Log Message:
-----------
update master-build and master-upload for ISO installer images
Modified Paths:
--------------
branches/1.0/scripts/master-build
branches/1.0/scripts/master-upload
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2016-02-05 16:17:55 UTC (rev 7508)
+++ branches/1.0/scripts/master-build 2016-02-08 17:15:00 UTC (rev 7509)
@@ -9,6 +9,8 @@
FAT_SIZE=256
+REQUIRED_CMDS="which sudo genisoimage sha1sum"
+
BOARDS_SMP64="genx86_64 genx86_64-serial"
BOARDS_SMP="geni586 geni586-serial"
@@ -19,11 +21,8 @@
build_board()
{
- local firmware="$1" img="$2"
+ local firmware="$1"
- mkdir "$output_path/$firmware/$board"
- mkdir "$output_path/$img/$board"
-
./scripts/build $board
if [ $? -ne 0 ]; then
@@ -39,9 +38,12 @@
./scripts/astlinux-makeimage -z $FAT_SIZE $FAT_SIZE 0
+ mkdir "$output_path/$firmware/$board"
+ mkdir -p "$output_path/img/${ASTVER}-${board}"
+
mv "${ASTVER}.tar.gz" "$output_path/$firmware/$board/${ASTVER}.tar.gz"
mv "${ASTVER}.tar.gz.sha1" "$output_path/$firmware/$board/${ASTVER}.tar.gz.sha1"
- mv "${ASTVER}.img.gz" "$output_path/$img/$board/${board}-${ASTVER#astlinux-}-${ASTERISK_VERSION}.img.gz"
+ mv "${ASTVER}.img.gz" "$output_path/img/${ASTVER}-${board}/${board}-${ASTVER#astlinux-}-${ASTERISK_VERSION}.img.gz"
rm -rf "${ASTVER}"
}
@@ -59,21 +61,18 @@
ASTERISK_VERSION="$(awk -F'=' '/^ASTERISK_VERSION/ { if ($2 ~ /^ *1.8/) {print $2; exit} }' package/asterisk/asterisk.mk)"
ASTERISK_VERSION="asterisk-${ASTERISK_VERSION// /}"
FIRMWARE="ast18-firmware-1.x"
- IMG="ast18-img"
;;
ast11)
CONFIG="astlinux-ast11.config"
ASTERISK_VERSION="$(awk -F'=' '/^ASTERISK_VERSION/ { if ($2 ~ /^ *11./) {print $2; exit} }' package/asterisk/asterisk.mk)"
ASTERISK_VERSION="asterisk-${ASTERISK_VERSION// /}"
FIRMWARE="ast11-firmware-1.x"
- IMG="ast11-img"
;;
ast13)
CONFIG="astlinux-ast13.config"
ASTERISK_VERSION="$(awk -F'=' '/^ASTERISK_VERSION/ { if ($2 ~ /^ *13./) {print $2; exit} }' package/asterisk/asterisk.mk)"
ASTERISK_VERSION="asterisk-${ASTERISK_VERSION// /}"
FIRMWARE="ast13-firmware-1.x"
- IMG="ast13-img"
;;
*)
echo "master-build: Unknown Asterisk Version."
@@ -103,6 +102,28 @@
fi
fi
+if ! mkdir "$output_path/img"; then
+ exit 1
+fi
+if ! mkdir "$output_path/iso"; then
+ exit 1
+fi
+
+error=0
+for i in $REQUIRED_CMDS; do
+ if ! which $i >/dev/null 2>&1; then
+ error=1
+ echo "master-build: Required command \"$i\" is missing in your build environment." >&2
+ if [ "$i" = "which" ]; then # no use proceeding
+ break
+ fi
+ fi
+done
+if [ $error -ne 0 ]; then
+ echo "Missing Required Command(s)." >&2
+ exit 1
+fi
+
echo "
Trying sudo, if this prompts for a password, ^C and 'sudoedit /etc/sudoers' and add a line at the end
something like:
@@ -128,9 +149,6 @@
if ! mkdir "$output_path/$FIRMWARE"; then
exit 1
fi
- if ! mkdir "$output_path/$IMG"; then
- exit 1
- fi
# Non-SMP Builds
echo "Cleaning out any existing builds..."
@@ -139,7 +157,7 @@
cp "$CONFIG" .config
for board in $BOARDS_NO_SMP; do
- build_board "$FIRMWARE" "$IMG"
+ build_board "$FIRMWARE"
done
# SMP Builds
@@ -150,7 +168,7 @@
set_smp_kernel
for board in $BOARDS_SMP; do
- build_board "$FIRMWARE" "$IMG"
+ build_board "$FIRMWARE"
done
# SMP64 Builds
@@ -160,10 +178,32 @@
cp "x86_64-configs/$CONFIG" .config
for board in $BOARDS_SMP64; do
- build_board "$FIRMWARE" "$IMG"
+ build_board "$FIRMWARE"
done
done
+# AstLinux ISO Installer
+echo "Cleaning out any existing builds..."
+rm -rf output
+
+cp runnix-iso.config .config
+
+for board in $BOARDS_NO_SMP $BOARDS_SMP $BOARDS_SMP64; do
+ if [ "${board}" != "${board%-serial}" -o "$board" = "alix" -o "$board" = "net5501" ]; then
+ SERIAL="serial"
+ else
+ SERIAL=""
+ fi
+ ./scripts/build-runnix-iso "$output_path/img/${ASTVER}-${board}" $SERIAL
+ if [ $? -ne 0 ]; then
+ exit 1
+ fi
+ if [ ! -f "${ASTVER}-${board}.iso" ]; then
+ exit 1
+ fi
+ mv "${ASTVER}-${board}.iso" "$output_path/iso/"
+done
+
echo "
##
## Master Build Successful for ${ASTVER}
Modified: branches/1.0/scripts/master-upload
===================================================================
--- branches/1.0/scripts/master-upload 2016-02-05 16:17:55 UTC (rev 7508)
+++ branches/1.0/scripts/master-upload 2016-02-08 17:15:00 UTC (rev 7509)
@@ -55,15 +55,22 @@
{
local local_dir="$1" firmware_path="$2"
- for board in $(ls -1 "$local_dir"); do
- echo "Flash Image for Board: $board"
- file="$(ls -1 "$local_dir/$board/"*.img.gz | head -n1)"
- if [ -n "$file" ]; then
- upload_file "$firmware_path/$board" "$file" count
- else
- echo "master-upload: missing file(s) in \"$local_dir/$board/\""
- exit 1
- fi
+ for astver_board in $(ls -1 "$local_dir"); do
+ for file in $(ls -1 "$local_dir/$astver_board/"*.img.gz); do
+ echo "Flash Image: ${file##*/}"
+ upload_file "$firmware_path/$astver_board" "$file" count
+ echo ""
+ done
+ done
+}
+
+upload_iso_images()
+{
+ local local_dir="$1" firmware_path="$2"
+
+ for file in $(ls -1 "$local_dir/"*.iso); do
+ echo "ISO Image: ${file##*/}"
+ upload_file "$firmware_path" "$file" count
echo ""
done
}
@@ -73,21 +80,15 @@
case $1 in
ast18)
FIRMWARE="ast18-firmware-1.x"
- IMG="ast18-img"
MIRROR_FIRMWARE="$FIRMWARE"
- MIRROR_IMG="downloads/img"
;;
ast11)
FIRMWARE="ast11-firmware-1.x"
- IMG="ast11-img"
MIRROR_FIRMWARE="$FIRMWARE"
- MIRROR_IMG="downloads/img"
;;
ast13)
FIRMWARE="ast13-firmware-1.x"
- IMG="ast13-img"
MIRROR_FIRMWARE="$FIRMWARE"
- MIRROR_IMG="downloads/img"
;;
*)
echo "master-upload: Unknown Asterisk Version."
@@ -105,16 +106,18 @@
echo "master-upload: directory \"$input_path\" not found."
exit 1
else
+ check_iso=0
check_img=0
check_firmware=0
for dir in $(ls -1 "$input_path"); do
case $dir in
- *img) check_img=1 ;;
+ iso) check_iso=1 ;;
+ img) check_img=1 ;;
*firmware-1.x) check_firmware=1 ;;
esac
done
- if [ $check_img -eq 0 -o $check_firmware -eq 0 ]; then
- echo "master-upload: missing img/firmware-1.x directories."
+ if [ $check_iso -eq 0 -o $check_img -eq 0 -o $check_firmware -eq 0 ]; then
+ echo "master-upload: missing iso/img/firmware-1.x directories."
exit 1
fi
fi
@@ -124,9 +127,6 @@
exit 1
fi
-#
-# Upload Asterisk 1.8, 11 and 13 versions of AstLinux
-#
for asterisk in ast18 ast11 ast13; do
@@ -135,11 +135,15 @@
# Upload .tar.gz run images
upload_run_images "$input_path/$FIRMWARE" "$MIRROR_FIRMWARE"
- # Upload .img.gz flash images
- upload_flash_images "$input_path/$IMG" "$MIRROR_IMG"
-
done
+# Upload .img.gz flash images
+upload_flash_images "$input_path/img" "downloads/img"
+
+# Upload .iso installer images
+upload_iso_images "$input_path/iso" "downloads/iso"
+
+
echo "
##
## Master Upload Finished for '$success_count' Images
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-05 16:17:58
|
Revision: 7508
http://sourceforge.net/p/astlinux/code/7508
Author: abelbeck
Date: 2016-02-05 16:17:55 +0000 (Fri, 05 Feb 2016)
Log Message:
-----------
runnix-iso, installer-menu, if zero-ing first 1 GB fails, allow a choice to continue. Possible with thin clients and small built-in DOM's or 1 GB CF cards
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-04 15:17:05 UTC (rev 7507)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-05 16:17:55 UTC (rev 7508)
@@ -121,8 +121,16 @@
dd if=/dev/zero of=$disk bs=64k count=16000 >/dev/null 2>/dev/null
if [ $? -ne 0 ]; then
- display_msg "Error zero'ing first 1 GB.\nInstall failed !"
- return 1
+ dialog \
+ --clear \
+ --backtitle "$BACKTITLE" \
+ --title "[ Error Erasing ]" \
+ --yesno "Error zero'ing first 1 GB.\nContinue anyway ?" 6 60
+
+ if [ $? -ne 0 ]; then
+ display_msg "Error zero'ing first 1 GB.\nInstall failed !"
+ return 1
+ fi
fi
display_progress "Step 3 of 3: Writing AstLinux Image to '$disk'\nThis may take a long time..."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-04 15:17:07
|
Revision: 7507
http://sourceforge.net/p/astlinux/code/7507
Author: abelbeck
Date: 2016-02-04 15:17:05 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
runnix-iso, installer-menu, tweak image selection label to [N]
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-04 00:38:39 UTC (rev 7506)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-04 15:17:05 UTC (rev 7507)
@@ -32,14 +32,14 @@
menu_image()
{
- local label text image IFS
+ local label num=0 image IFS
IFS=$NL
for image in $IMAGES; do
image="${image##*/}"
label="${image%.img.gz}"
- text='.img.gz'
- echo "$label $text"
+ num=$((num+1))
+ echo "$label [$num]"
done
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-04 00:38:41
|
Revision: 7506
http://sourceforge.net/p/astlinux/code/7506
Author: abelbeck
Date: 2016-02-04 00:38:39 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
master-build, for the install images, naming change, replace 'astlinux' with the 'board-type' so all the filenames will be unique
Modified Paths:
--------------
branches/1.0/scripts/master-build
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2016-02-03 21:20:12 UTC (rev 7505)
+++ branches/1.0/scripts/master-build 2016-02-04 00:38:39 UTC (rev 7506)
@@ -41,7 +41,7 @@
mv "${ASTVER}.tar.gz" "$output_path/$firmware/$board/${ASTVER}.tar.gz"
mv "${ASTVER}.tar.gz.sha1" "$output_path/$firmware/$board/${ASTVER}.tar.gz.sha1"
- mv "${ASTVER}.img.gz" "$output_path/$img/$board/${ASTVER}-${ASTERISK_VERSION}.img.gz"
+ mv "${ASTVER}.img.gz" "$output_path/$img/$board/${board}-${ASTVER#astlinux-}-${ASTERISK_VERSION}.img.gz"
rm -rf "${ASTVER}"
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-03 21:20:15
|
Revision: 7505
http://sourceforge.net/p/astlinux/code/7505
Author: abelbeck
Date: 2016-02-03 21:20:12 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, /runnix script, as last resort try to mount boot disk as 'vfat'
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/runnix
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-03 16:01:17 UTC (rev 7504)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-03 21:20:12 UTC (rev 7505)
@@ -148,6 +148,19 @@
done
fi
+if [ -z "$DEVICE" ]; then
+ for x in $DRIVES; do
+ if mount -t vfat -o ro /dev/${x}1 $BASE 2>/dev/null; then
+ if [ -f $BASE/os/isoflag ]; then
+ DEVICE="${x}"
+ break
+ else
+ umount /dev/${x}1
+ fi
+ fi
+ done
+fi
+
hostname runnix
# Loader not found
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-03 16:01:19
|
Revision: 7504
http://sourceforge.net/p/astlinux/code/7504
Author: abelbeck
Date: 2016-02-03 16:01:17 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, include ChangeLog.txt as <ISO_NAME>.txt and move runnix files to a directory
Modified Paths:
--------------
branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
branches/1.0/scripts/build-runnix-iso
Added Paths:
-----------
branches/1.0/project/runnix-iso/files/rootfs_vfat/runnix/
Modified: branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg 2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg 2016-02-03 16:01:17 UTC (rev 7504)
@@ -6,6 +6,6 @@
display /isolinux/boot.msg
label install
- kernel /runnix
- append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8 console=ttyS0,19200n8
+ kernel /runnix/runnix
+ append initrd=/runnix/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8 console=ttyS0,19200n8
Modified: branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-03 16:01:17 UTC (rev 7504)
@@ -4,6 +4,6 @@
display /isolinux/boot.msg
label install
- kernel /runnix
- append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8
+ kernel /runnix/runnix
+ append initrd=/runnix/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-03 14:20:05 UTC (rev 7503)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-03 16:01:17 UTC (rev 7504)
@@ -61,8 +61,8 @@
touch ${RUNDIR}/os/serialflag
fi
cp -p ${SYSLINUX_DIR}/core/isolinux.bin ${RUNDIR}/isolinux/isolinux.bin
- cp -p ${KERNEL} ${RUNDIR}/runnix
- cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix.img
+ cp -p ${KERNEL} ${RUNDIR}/runnix/runnix
+ cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix/runnix.img
if [ -n "$ISO_DIR" ]; then
cp "$ISO_DIR"/*.img.gz ${RUNDIR}/os/
@@ -71,11 +71,13 @@
fi
gen_image_sha1_files ${RUNDIR}/os
- rm -f ${ISO_NAME}
+ cp -p docs/ChangeLog.txt "${RUNDIR}/${ISO_NAME%.iso}.txt"
+ rm -f "${ISO_NAME}"
+
echo "Generating ISO '${ISO_NAME}' ..."
sudo genisoimage \
- -o ${ISO_NAME} \
+ -o "${ISO_NAME}" \
-b isolinux/isolinux.bin \
-c isolinux/boot.cat \
-V 'AstLinux ISO' \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-03 14:20:08
|
Revision: 7503
http://sourceforge.net/p/astlinux/code/7503
Author: abelbeck
Date: 2016-02-03 14:20:05 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, generate install-image '.sha1' files and validate them on install
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
branches/1.0/scripts/build-runnix-iso
Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-03 12:37:17 UTC (rev 7502)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-03 14:20:05 UTC (rev 7503)
@@ -75,9 +75,22 @@
12 60 3 $(menu_disk)
}
+validate_image_file()
+{
+ local image="$1"
+
+ cd "$(dirname "$image")"
+
+ if sha1sum -cs "${image}.sha1" 2>/dev/null; then
+ echo "true"
+ else
+ echo "false"
+ fi
+}
+
install_disk()
{
- local disk="$1" image="$2"
+ local disk="$1" image="$2" valid
if [ ! -e "$disk" ]; then
display_msg "Disk '$disk' does not exist.\nExiting, no action performed."
@@ -89,16 +102,30 @@
return 1
fi
- display_progress "Step 1 of 2: Erasing first 1 GB of '$disk'\nThis may take a long time..."
+ if [ ! -f "${image}.sha1" ]; then
+ display_msg "SHA1 '${image##*/}.sha1' does not exist.\nExiting, no action performed."
+ return 1
+ fi
+
+ display_progress "Step 1 of 3: Validating AstLinux Image..."
sleep 1
+ valid="$(validate_image_file "$image")"
+ if [ "$valid" != "true" ]; then
+ display_msg "Error validating AstLinux Image.\nExiting, no action performed."
+ return 1
+ fi
+
+ display_progress "Step 2 of 3: Erasing first 1 GB of '$disk'\nThis may take a long time..."
+ sleep 1
+
dd if=/dev/zero of=$disk bs=64k count=16000 >/dev/null 2>/dev/null
if [ $? -ne 0 ]; then
display_msg "Error zero'ing first 1 GB.\nInstall failed !"
return 1
fi
- display_progress "Step 2 of 2: Writing AstLinux Image to '$disk'\nThis may take a long time..."
+ display_progress "Step 3 of 3: Writing AstLinux Image to '$disk'\nThis may take a long time..."
sleep 1
zcat "$image" | dd of=$disk bs=64k >/dev/null 2>/dev/null
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-03 12:37:17 UTC (rev 7502)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-03 14:20:05 UTC (rev 7503)
@@ -3,7 +3,7 @@
# build-runnix-iso install_image.img.gz|install_image_dir [serial]
#
-REQUIRED_CMDS="which sudo genisoimage"
+REQUIRED_CMDS="which sudo genisoimage sha1sum"
CONFIG="runnix-iso.config"
@@ -15,6 +15,20 @@
SYSLINUX_DIR="output/build/syslinux-${SYSLINUX_VERSION// /}"
+gen_image_sha1_files()
+{
+ local dir="$1" image images IFS
+ (
+ cd "$dir"
+ images="$(ls -1 *.img.gz 2>/dev/null)"
+
+ IFS=$'\n'
+ for image in $images; do
+ sha1sum "${image}" > "${image}.sha1"
+ done
+ )
+}
+
make_release_version()
{
RUNBASE="1.0"
@@ -55,6 +69,7 @@
elif [ -n "$ISO_FILE" ]; then
cp "$ISO_FILE" ${RUNDIR}/os/
fi
+ gen_image_sha1_files ${RUNDIR}/os
rm -f ${ISO_NAME}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-03 12:37:20
|
Revision: 7502
http://sourceforge.net/p/astlinux/code/7502
Author: abelbeck
Date: 2016-02-03 12:37:17 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
build-runnix-iso, remove superfluous code
Modified Paths:
--------------
branches/1.0/scripts/build-runnix-iso
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-03 12:26:57 UTC (rev 7501)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-03 12:37:17 UTC (rev 7502)
@@ -141,10 +141,6 @@
echo "build-runnix-iso: The $ISO_DIR directory does not contain *.img.gz files, exiting." >&2
exit 1
fi
-if [ -z "$ISO_FILE" -a -z "$ISO_DIR" ]; then
- echo "build-runnix-iso: Neither install_image.img.gz|install_image_dir is valid, exiting." >&2
- exit 1
-fi
error=0
for i in $REQUIRED_CMDS; do
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-03 12:27:00
|
Revision: 7501
http://sourceforge.net/p/astlinux/code/7501
Author: abelbeck
Date: 2016-02-03 12:26:57 +0000 (Wed, 03 Feb 2016)
Log Message:
-----------
runnix-iso, add 'Network' menu item to choose to 'Exit to shell with ssh server'
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/runnix
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-02 23:19:10 UTC (rev 7500)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-03 12:26:57 UTC (rev 7501)
@@ -166,13 +166,16 @@
echo "Menu..."
/sbin/installer-menu
+menu_rtn=$?
if [ -f $BASE/os/default.conf ]; then
. $BASE/os/default.conf
fi
-if setup_network eth0; then
- setup_ssh 2222
+if [ $menu_rtn -eq 8 ]; then
+ if setup_network eth0; then
+ setup_ssh 2222
+ fi
fi
do_shell
# reboot
Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-02 23:19:10 UTC (rev 7500)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-03 12:26:57 UTC (rev 7501)
@@ -50,7 +50,7 @@
--backtitle "$BACKTITLE" \
--title "[ AstLinux Install Image ]" \
--menu "UP/DOWN arrow keys to select the AstLinux Install Image:" \
- 12 60 2 $(menu_image)
+ 12 60 3 $(menu_image)
}
menu_disk()
@@ -72,7 +72,7 @@
--backtitle "$BACKTITLE" \
--title "[ Target Install Disk ]" \
--menu "UP/DOWN arrow keys to select the target install disk:\nWarning: Selected disk will be overwritten !" \
- 12 60 2 $(menu_disk)
+ 12 60 3 $(menu_disk)
}
install_disk()
@@ -212,13 +212,16 @@
--title "[ $BACKTITLE Menu ]" \
--no-cancel \
--menu "UP/DOWN arrow keys to select actions:" \
- 12 60 4 \
+ 12 60 5 \
Install "Install AstLinux to an existing drive" \
Shutdown "Shutdown the install system" \
Reboot "Reboot the install system" \
+ Network "Exit to shell with ssh server" \
Shell "Exit to shell"
}
+menu_rtn=0
+
while true; do
select_main 2>"$TMP_RESULT"
MAIN="$(cat "$TMP_RESULT")"
@@ -227,10 +230,12 @@
Install) do_install ;;
Shutdown) do_shutdown ;;
Reboot) do_reboot ;;
+ Network) menu_rtn=8 ; break ;;
Shell) break ;;
esac
done
rm -f "$TMP_RESULT"
clear
+exit $menu_rtn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-02 23:19:13
|
Revision: 7500
http://sourceforge.net/p/astlinux/code/7500
Author: abelbeck
Date: 2016-02-02 23:19:10 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
runnix-iso, add support for a directory containing *.img.gz images
Modified Paths:
--------------
branches/1.0/scripts/build-runnix-iso
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-02 21:25:17 UTC (rev 7499)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-02 23:19:10 UTC (rev 7500)
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# build-runnix-iso install_image.img.gz [serial]
+# build-runnix-iso install_image.img.gz|install_image_dir [serial]
#
REQUIRED_CMDS="which sudo genisoimage"
@@ -50,11 +50,15 @@
cp -p ${KERNEL} ${RUNDIR}/runnix
cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix.img
- cp "$ISO_FILE" ${RUNDIR}/os/
+ if [ -n "$ISO_DIR" ]; then
+ cp "$ISO_DIR"/*.img.gz ${RUNDIR}/os/
+ elif [ -n "$ISO_FILE" ]; then
+ cp "$ISO_FILE" ${RUNDIR}/os/
+ fi
rm -f ${ISO_NAME}
- echo "Generating ISO..."
+ echo "Generating ISO '${ISO_NAME}' ..."
sudo genisoimage \
-o ${ISO_NAME} \
-b isolinux/isolinux.bin \
@@ -106,26 +110,41 @@
PATH=/sbin:/usr/sbin:$PATH
-if [ -n "$1" ] && [ "${1}" != "${1%.img.gz}" ]; then
+ISO_DIR=""
+ISO_FILE=""
+
+if [ -n "$1" ] && [ -d "$1" ]; then
+ ISO_DIR="$1"
+ ISO_NAME="$(basename "$1").iso"
+elif [ -n "$1" ] && [ "${1}" != "${1%.img.gz}" ]; then
ISO_FILE="$1"
ISO_NAME="${ISO_FILE##*/}"
ISO_NAME="${ISO_NAME%.img.gz}.iso"
else
- echo "Usage: ./scripts/build-runnix-iso install_image.img.gz [serial]"
+ echo "Usage: ./scripts/build-runnix-iso install_image.img.gz|install_image_dir [serial]"
exit 1
fi
if [ "$2" = "serial" ]; then
SERIAL="$2"
+ ISO_NAME="${ISO_NAME%-serial.iso}"
ISO_NAME="${ISO_NAME%.iso}-serial.iso"
else
SERIAL=""
fi
-if [ ! -f "$ISO_FILE" ]; then
+if [ -n "$ISO_FILE" ] && [ ! -f "$ISO_FILE" ]; then
echo "build-runnix-iso: The $ISO_FILE file does not exist, exiting." >&2
exit 1
fi
+if [ -n "$ISO_DIR" ] && ! ls "$ISO_DIR"/*.img.gz >/dev/null 2>&1; then
+ echo "build-runnix-iso: The $ISO_DIR directory does not contain *.img.gz files, exiting." >&2
+ exit 1
+fi
+if [ -z "$ISO_FILE" -a -z "$ISO_DIR" ]; then
+ echo "build-runnix-iso: Neither install_image.img.gz|install_image_dir is valid, exiting." >&2
+ exit 1
+fi
error=0
for i in $REQUIRED_CMDS; do
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-02 21:25:20
|
Revision: 7499
http://sourceforge.net/p/astlinux/code/7499
Author: abelbeck
Date: 2016-02-02 21:25:17 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
runnix-iso, add support for a serial console via 'build-runnix-iso install_image.img.gz serial'
Modified Paths:
--------------
branches/1.0/project/runnix-iso/target_skeleton/runnix
branches/1.0/scripts/build-runnix-iso
Added Paths:
-----------
branches/1.0/project/runnix-iso/files/configs/
branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
Added: branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg (rev 0)
+++ branches/1.0/project/runnix-iso/files/configs/isolinux-serial.cfg 2016-02-02 21:25:17 UTC (rev 7499)
@@ -0,0 +1,11 @@
+serial 0 19200
+console 0
+default install
+timeout 10
+prompt 0
+display /isolinux/boot.msg
+
+label install
+ kernel /runnix
+ append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8 console=ttyS0,19200n8
+
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-02 18:00:56 UTC (rev 7498)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-02 21:25:17 UTC (rev 7499)
@@ -159,6 +159,11 @@
echo "$DEVICE" >/tmp/boot_disk
+if [ -f $BASE/os/serialflag ]; then
+ export DIALOGOPTS="--ascii-lines"
+ export TERM="vt100"
+fi
+
echo "Menu..."
/sbin/installer-menu
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-02 18:00:56 UTC (rev 7498)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-02 21:25:17 UTC (rev 7499)
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# build-runnix-iso install_image.img.gz
+# build-runnix-iso install_image.img.gz [serial]
#
REQUIRED_CMDS="which sudo genisoimage"
@@ -41,7 +41,11 @@
rm -rf ${RUNDIR}
mkdir ${RUNDIR}
cp -a project/runnix-iso/files/rootfs_vfat/* ${RUNDIR}/
- find ${RUNDIR} -type d -name .svn | xargs rm -rf
+ find ${RUNDIR} -type d -name '.svn' | xargs rm -rf
+ if [ "$SERIAL" = "serial" ]; then
+ cp -p project/runnix-iso/files/configs/isolinux-serial.cfg ${RUNDIR}/isolinux/isolinux.cfg
+ touch ${RUNDIR}/os/serialflag
+ fi
cp -p ${SYSLINUX_DIR}/core/isolinux.bin ${RUNDIR}/isolinux/isolinux.bin
cp -p ${KERNEL} ${RUNDIR}/runnix
cp -p ${ROOTFS_EXT2_GZ} ${RUNDIR}/runnix.img
@@ -107,10 +111,17 @@
ISO_NAME="${ISO_FILE##*/}"
ISO_NAME="${ISO_NAME%.img.gz}.iso"
else
- echo "Usage: ./scripts/build-runnix-iso install_image.img.gz"
+ echo "Usage: ./scripts/build-runnix-iso install_image.img.gz [serial]"
exit 1
fi
+if [ "$2" = "serial" ]; then
+ SERIAL="$2"
+ ISO_NAME="${ISO_NAME%.iso}-serial.iso"
+else
+ SERIAL=""
+fi
+
if [ ! -f "$ISO_FILE" ]; then
echo "build-runnix-iso: The $ISO_FILE file does not exist, exiting." >&2
exit 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-02 18:00:59
|
Revision: 7498
http://sourceforge.net/p/astlinux/code/7498
Author: abelbeck
Date: 2016-02-02 18:00:56 +0000 (Tue, 02 Feb 2016)
Log Message:
-----------
runnix-iso, add Hybrid ISO support so the .iso can also be dd'ed to a USB drive if desired
Modified Paths:
--------------
branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
branches/1.0/project/runnix-iso/target_skeleton/runnix
branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
branches/1.0/scripts/build-runnix-iso
Added Paths:
-----------
branches/1.0/project/runnix-iso/files/rootfs_vfat/os/isoflag
Removed Paths:
-------------
branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag
Modified: branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg
===================================================================
--- branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/project/runnix-iso/files/rootfs_vfat/isolinux/isolinux.cfg 2016-02-02 18:00:56 UTC (rev 7498)
@@ -5,5 +5,5 @@
label install
kernel /runnix
- append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto ibata.dma=3 rootdelay=5
+ append initrd=/runnix.img root=/dev/ram0 ro init=/runnix runimg=auto libata.dma=3 rootdelay=8
Deleted: branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag
===================================================================
Copied: branches/1.0/project/runnix-iso/files/rootfs_vfat/os/isoflag (from rev 7497, branches/1.0/project/runnix-iso/files/rootfs_vfat/os/astflag)
===================================================================
Modified: branches/1.0/project/runnix-iso/target_skeleton/runnix
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/project/runnix-iso/target_skeleton/runnix 2016-02-02 18:00:56 UTC (rev 7498)
@@ -6,8 +6,10 @@
RUNVER="$(cat /etc/runnix-release)"
-DRIVES="sr0 sr1 sr2 sr3"
+CDROM_DRIVES="sr0 sr1 sr2 sr3"
+DRIVES="sda sdb sdc sdd sde sdf sdg sdh"
+
setup_network () {
if [ -z "$NDEV" -a -n "$1" ]; then
@@ -120,10 +122,12 @@
CMDLINE="$(cat /proc/cmdline)"
-for x in $DRIVES; do
+DEVICE=""
+
+for x in $CDROM_DRIVES; do
if mount -t iso9660 -o ro /dev/${x} $BASE 2>/dev/null; then
- if [ -f $BASE/os/astflag ]; then
- DEVICE=${x}
+ if [ -f $BASE/os/isoflag ]; then
+ DEVICE="${x}"
break
else
umount /dev/${x}
@@ -131,6 +135,19 @@
fi
done
+if [ -z "$DEVICE" ]; then
+ for x in $DRIVES; do
+ if mount -t iso9660 -o ro /dev/${x}1 $BASE 2>/dev/null; then
+ if [ -f $BASE/os/isoflag ]; then
+ DEVICE="${x}"
+ break
+ else
+ umount /dev/${x}1
+ fi
+ fi
+ done
+fi
+
hostname runnix
# Loader not found
@@ -140,6 +157,8 @@
# reboot
fi
+echo "$DEVICE" >/tmp/boot_disk
+
echo "Menu..."
/sbin/installer-menu
Modified: branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu
===================================================================
--- branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/project/runnix-iso/target_skeleton/sbin/installer-menu 2016-02-02 18:00:56 UTC (rev 7498)
@@ -113,6 +113,14 @@
do_install()
{
+ local boot_disk
+
+ if [ -f /tmp/boot_disk ]; then
+ boot_disk="$(cat /tmp/boot_disk)"
+ else
+ boot_disk=""
+ fi
+
IMAGES="$(ls -1 $IMAGE_DIR/*.img.gz 2>/dev/null)"
if [ -z "$IMAGES" ]; then
@@ -131,7 +139,7 @@
return 1
fi
- DISKS="$(fdisk -l 2>/dev/null | grep '^Disk */dev/sd[a-h]:')"
+ DISKS="$(fdisk -l 2>/dev/null | grep '^Disk */dev/sd[a-h]:' | grep -v "^Disk */dev/${boot_disk}:")"
if [ -z "$DISKS" ]; then
display_msg "No suitable disk found.\nExiting, no action performed."
Modified: branches/1.0/scripts/build-runnix-iso
===================================================================
--- branches/1.0/scripts/build-runnix-iso 2016-02-01 23:45:10 UTC (rev 7497)
+++ branches/1.0/scripts/build-runnix-iso 2016-02-02 18:00:56 UTC (rev 7498)
@@ -50,6 +50,7 @@
rm -f ${ISO_NAME}
+ echo "Generating ISO..."
sudo genisoimage \
-o ${ISO_NAME} \
-b isolinux/isolinux.bin \
@@ -61,6 +62,13 @@
-boot-info-table \
-input-charset utf-8 \
${RUNDIR}
+
+ if [ -x "${SYSLINUX_DIR}/utils/isohybrid" ]; then
+ echo "Blessing as Hybrid ISO..."
+ sudo "${SYSLINUX_DIR}/utils/isohybrid" "${ISO_NAME}"
+ else
+ echo "Error: No Hybrid ISO support."
+ fi
}
save_state()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-01 23:45:13
|
Revision: 7497
http://sourceforge.net/p/astlinux/code/7497
Author: abelbeck
Date: 2016-02-01 23:45:10 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
runnix-iso, disable 'memtest', no functional change
Modified Paths:
--------------
branches/1.0/runnix-iso.config
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-02-01 23:35:14 UTC (rev 7496)
+++ branches/1.0/runnix-iso.config 2016-02-01 23:45:10 UTC (rev 7497)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7493 Configuration
-# Mon Feb 1 09:17:08 2016
+# Buildroot 2011.08-svn7496 Configuration
+# Mon Feb 1 17:42:11 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -386,7 +386,7 @@
# BR2_PACKAGE_LVM2 is not set
# BR2_PACKAGE_MAKEDEVS is not set
# BR2_PACKAGE_MDADM is not set
-BR2_PACKAGE_MEMTEST=y
+# BR2_PACKAGE_MEMTEST is not set
# BR2_PACKAGE_MEMTESTER is not set
# BR2_PACKAGE_MONIT is not set
# BR2_PACKAGE_MTD is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-02-01 23:35:17
|
Revision: 7496
http://sourceforge.net/p/astlinux/code/7496
Author: abelbeck
Date: 2016-02-01 23:35:14 +0000 (Mon, 01 Feb 2016)
Log Message:
-----------
Amazon has issues with the '+' character in the filename, exclude .sha1 checking
Modified Paths:
--------------
branches/1.0/toolchain/file_exclude
Modified: branches/1.0/toolchain/file_exclude
===================================================================
--- branches/1.0/toolchain/file_exclude 2016-02-01 19:09:43 UTC (rev 7495)
+++ branches/1.0/toolchain/file_exclude 2016-02-01 23:35:14 UTC (rev 7496)
@@ -4,3 +4,4 @@
oui.txt
bfdetect.tar.gz
fop2-2.27-debian-i386.tgz
+memtest86+-4.20.tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.
