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...> - 2017-03-31 16:30:33
|
Revision: 8252 http://sourceforge.net/p/astlinux/code/8252 Author: abelbeck Date: 2017-03-31 16:30:31 +0000 (Fri, 31 Mar 2017) Log Message: ----------- asterisk, backport Asterisk 14 'followme: allow disabling callee prompt' feature. Requested by Michael Keuter. Ref: http://git.asterisk.org/gitweb/?p=asterisk/asterisk.git;a=commit;h=1d60bfcdf1ad7a265177fa35a9d2a55468bbe78f Added Paths: ----------- branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch Added: branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch (rev 0) +++ branches/1.0/package/asterisk/asterisk-11-followme-callee-prompt-control.patch 2017-03-31 16:30:31 UTC (rev 8252) @@ -0,0 +1,205 @@ +diff --git a/apps/app_followme.c b/apps/app_followme.c +index 1069020..7d13bb4 100644 +--- a/apps/app_followme.c ++++ b/apps/app_followme.c +@@ -160,6 +160,8 @@ struct call_followme { + char context[AST_MAX_CONTEXT]; /*!< Context to dial from */ + unsigned int active; /*!< Profile is active (1), or disabled (0). */ + int realtime; /*!< Cached from realtime */ ++ /*! Allow callees to accept/reject the forwarded call */ ++ unsigned int enable_callee_prompt:1; + char takecall[MAX_YN_STRING]; /*!< Digit mapping to take a call */ + char nextindp[MAX_YN_STRING]; /*!< Digit mapping to decline a call */ + char callfromprompt[PATH_MAX]; /*!< Sound prompt name and path */ +@@ -190,6 +192,8 @@ struct fm_args { + unsigned int pending_out_connected_update:1; + /*! TRUE if caller has a pending hold request for the winning call. */ + unsigned int pending_hold:1; ++ /*! TRUE if callees will be prompted to answer */ ++ unsigned int enable_callee_prompt:1; + /*! Music On Hold Class suggested by caller hold for winning call. */ + char suggested_moh[MAX_MUSICCLASS]; + char context[AST_MAX_CONTEXT]; +@@ -260,6 +264,7 @@ static const char *defaultmoh = "default"; /*!< Default Music-On-Hold Class + + static char takecall[MAX_YN_STRING] = "1"; + static char nextindp[MAX_YN_STRING] = "2"; ++static int enable_callee_prompt = 1; + static char callfromprompt[PATH_MAX] = "followme/call-from"; + static char norecordingprompt[PATH_MAX] = "followme/no-recording"; + static char optionsprompt[PATH_MAX] = "followme/options"; +@@ -312,6 +317,7 @@ + static void init_profile(struct call_followme *f, int activate) + { + f->context[0] = '\0'; ++ f->enable_callee_prompt = enable_callee_prompt; + ast_copy_string(f->moh, defaultmoh, sizeof(f->moh)); + ast_copy_string(f->takecall, takecall, sizeof(f->takecall)); + ast_copy_string(f->nextindp, nextindp, sizeof(f->nextindp)); +@@ -336,6 +342,8 @@ static void profile_set_param(struct call_followme *f, const char *param, const + ast_copy_string(f->moh, val, sizeof(f->moh)); + else if (!strcasecmp(param, "context")) + ast_copy_string(f->context, val, sizeof(f->context)); ++ else if (!strcasecmp(param, "enable_callee_prompt")) ++ f->enable_callee_prompt = ast_true(val); + else if (!strcasecmp(param, "takecall")) + ast_copy_string(f->takecall, val, sizeof(f->takecall)); + else if (!strcasecmp(param, "declinecall")) +@@ -391,6 +399,7 @@ static int reload_followme(int reload) + char *numberstr; + int timeout; + int numorder; ++ const char* enable_callee_prompt_str; + const char *takecallstr; + const char *declinecallstr; + const char *tmpstr; +@@ -423,6 +432,12 @@ static int reload_followme(int reload) + featuredigittimeout = 5000; + } + ++ if ((enable_callee_prompt_str = ast_variable_retrieve(cfg, "general", ++ "enable_callee_prompt")) && ++ !ast_strlen_zero(enable_callee_prompt_str)) { ++ enable_callee_prompt = ast_true(enable_callee_prompt_str); ++ } ++ + if ((takecallstr = ast_variable_retrieve(cfg, "general", "takecall")) && !ast_strlen_zero(takecallstr)) { + ast_copy_string(takecall, takecallstr, sizeof(takecall)); + } +@@ -656,26 +671,30 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us + if (tmpuser->digts && (tmpuser->digts > featuredigittimeout)) { + ast_verb(3, "<%s> We've been waiting for digits longer than we should have.\n", + ast_channel_name(tmpuser->ochan)); +- if (!ast_strlen_zero(tpargs->namerecloc)) { +- tmpuser->state = 1; +- tmpuser->digts = 0; +- if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) { +- ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ if (tpargs->enable_callee_prompt) { ++ if (!ast_strlen_zero(tpargs->namerecloc)) { ++ tmpuser->state = 1; ++ tmpuser->digts = 0; ++ if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) { ++ ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ } else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); ++ clear_caller(tmpuser); ++ continue; ++ } + } else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); +- clear_caller(tmpuser); +- continue; ++ tmpuser->state = 2; ++ tmpuser->digts = 0; ++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) ++ ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); ++ clear_caller(tmpuser); ++ continue; ++ } + } + } else { +- tmpuser->state = 2; +- tmpuser->digts = 0; +- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) +- ast_sched_runq(ast_channel_sched(tmpuser->ochan)); +- else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); +- clear_caller(tmpuser); +- continue; +- } ++ tmpuser->state = 3; + } + } + if (ast_channel_stream(tmpuser->ochan)) { +@@ -789,23 +808,28 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us + /* If call has been answered, then the eventual hangup is likely to be normal hangup */ + ast_channel_hangupcause_set(winner, AST_CAUSE_NORMAL_CLEARING); + ast_channel_hangupcause_set(caller, AST_CAUSE_NORMAL_CLEARING); +- ast_verb(3, "Starting playback of %s\n", callfromname); +- if (!ast_strlen_zero(tpargs->namerecloc)) { +- if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) { +- ast_sched_runq(ast_channel_sched(winner)); +- tmpuser->state = 1; ++ if (tpargs->enable_callee_prompt) { ++ ast_verb(3, "Starting playback of %s\n", callfromname); ++ if (!ast_strlen_zero(tpargs->namerecloc)) { ++ if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) { ++ ast_sched_runq(ast_channel_sched(winner)); ++ tmpuser->state = 1; ++ } else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); ++ clear_caller(tmpuser); ++ } + } else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); +- clear_caller(tmpuser); ++ tmpuser->state = 2; ++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) ++ ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); ++ clear_caller(tmpuser); ++ } + } + } else { ++ ast_verb(3, "Skip playback of caller name / norecording\n"); + tmpuser->state = 2; +- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) +- ast_sched_runq(ast_channel_sched(tmpuser->ochan)); +- else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); +- clear_caller(tmpuser); +- } + } + break; + case AST_CONTROL_BUSY: +@@ -927,6 +951,11 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us + break; + } + } ++ if (!tpargs->enable_callee_prompt && tmpuser) { ++ ast_debug(1, "Taking call with no prompt\n"); ++ ast_frfree(f); ++ return tmpuser->ochan; ++ } + if (tmpuser && tmpuser->state == 3 && f->frametype == AST_FRAME_DTMF) { + int cmp_len; + +@@ -1365,6 +1394,7 @@ static int app_exec(struct ast_channel *chan, const char *data) + + /* Lock the profile lock and copy out everything we need to run with before unlocking it again */ + ast_mutex_lock(&f->lock); ++ targs->enable_callee_prompt = f->enable_callee_prompt; + targs->mohclass = ast_strdupa(f->moh); + ast_copy_string(targs->context, f->context, sizeof(targs->context)); + ast_copy_string(targs->takecall, f->takecall, sizeof(targs->takecall)); + +diff --git a/configs/samples/followme.conf.sample b/configs/samples/followme.conf.sample +index a233948..7e1d40f 100644 +--- a/configs/followme.conf.sample ++++ b/configs/followme.conf.sample +@@ -5,6 +5,11 @@ featuredigittimeout=>5000 + ; The number of ms to wait for a digit input for the callee on whether to take the call or + ; not before we consider them "done" entering digits. + ; ++enable_callee_prompt=>true ++; Enable prompting a callee to either accept or reject the forwarded call. ++; If disabled, the optional prompting for caller name (option 'a') is ++; likewise disabled. Enabled by default. ++; + takecall=>1 + ; The global default keypress for the callee to take taking the current call. This can be + ; a single digit or multiple digits. Default is "1". +@@ -54,6 +59,9 @@ number=>01233456,25 + ; step to make a choice on whether to take the call or not. That being the case, + ; you may want to make the timeout on the last step longer to give enough time to + ; make the choice to accept or not. ++enable_callee_prompt=>true ++; Enable prompting the callee to accept the forwarded call. The default ++; is the global value. + takecall=>1 + ; The keypress for the callee to take taking the current call. This can be + ; a single digit or multiple digits. Default is the global default. Added: branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch =================================================================== --- branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch (rev 0) +++ branches/1.0/package/asterisk/asterisk-13-followme-callee-prompt-control.patch 2017-03-31 16:30:31 UTC (rev 8252) @@ -0,0 +1,205 @@ +diff --git a/apps/app_followme.c b/apps/app_followme.c +index 1069020..7d13bb4 100644 +--- a/apps/app_followme.c ++++ b/apps/app_followme.c +@@ -168,6 +168,8 @@ struct call_followme { + char context[AST_MAX_CONTEXT]; /*!< Context to dial from */ + unsigned int active; /*!< Profile is active (1), or disabled (0). */ + int realtime; /*!< Cached from realtime */ ++ /*! Allow callees to accept/reject the forwarded call */ ++ unsigned int enable_callee_prompt:1; + char takecall[MAX_YN_STRING]; /*!< Digit mapping to take a call */ + char nextindp[MAX_YN_STRING]; /*!< Digit mapping to decline a call */ + char callfromprompt[PATH_MAX]; /*!< Sound prompt name and path */ +@@ -198,6 +200,8 @@ struct fm_args { + unsigned int pending_out_connected_update:1; + /*! TRUE if caller has a pending hold request for the winning call. */ + unsigned int pending_hold:1; ++ /*! TRUE if callees will be prompted to answer */ ++ unsigned int enable_callee_prompt:1; + /*! Music On Hold Class suggested by caller hold for winning call. */ + char suggested_moh[MAX_MUSICCLASS]; + char context[AST_MAX_CONTEXT]; +@@ -268,6 +272,7 @@ static const char *defaultmoh = "default"; /*!< Default Music-On-Hold Class + + static char takecall[MAX_YN_STRING] = "1"; + static char nextindp[MAX_YN_STRING] = "2"; ++static int enable_callee_prompt = 1; + static char callfromprompt[PATH_MAX] = "followme/call-from"; + static char norecordingprompt[PATH_MAX] = "followme/no-recording"; + static char optionsprompt[PATH_MAX] = "followme/options"; +@@ -320,6 +325,7 @@ + static void init_profile(struct call_followme *f, int activate) + { + f->context[0] = '\0'; ++ f->enable_callee_prompt = enable_callee_prompt; + ast_copy_string(f->moh, defaultmoh, sizeof(f->moh)); + ast_copy_string(f->takecall, takecall, sizeof(f->takecall)); + ast_copy_string(f->nextindp, nextindp, sizeof(f->nextindp)); +@@ -344,6 +350,8 @@ static void profile_set_param(struct call_followme *f, const char *param, const + ast_copy_string(f->moh, val, sizeof(f->moh)); + else if (!strcasecmp(param, "context")) + ast_copy_string(f->context, val, sizeof(f->context)); ++ else if (!strcasecmp(param, "enable_callee_prompt")) ++ f->enable_callee_prompt = ast_true(val); + else if (!strcasecmp(param, "takecall")) + ast_copy_string(f->takecall, val, sizeof(f->takecall)); + else if (!strcasecmp(param, "declinecall")) +@@ -399,6 +407,7 @@ static int reload_followme(int reload) + char *numberstr; + int timeout; + int numorder; ++ const char* enable_callee_prompt_str; + const char *takecallstr; + const char *declinecallstr; + const char *tmpstr; +@@ -431,6 +440,12 @@ static int reload_followme(int reload) + featuredigittimeout = 5000; + } + ++ if ((enable_callee_prompt_str = ast_variable_retrieve(cfg, "general", ++ "enable_callee_prompt")) && ++ !ast_strlen_zero(enable_callee_prompt_str)) { ++ enable_callee_prompt = ast_true(enable_callee_prompt_str); ++ } ++ + if ((takecallstr = ast_variable_retrieve(cfg, "general", "takecall")) && !ast_strlen_zero(takecallstr)) { + ast_copy_string(takecall, takecallstr, sizeof(takecall)); + } +@@ -652,26 +667,30 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us + if (tmpuser->digts && (tmpuser->digts > featuredigittimeout)) { + ast_verb(3, "<%s> We've been waiting for digits longer than we should have.\n", + ast_channel_name(tmpuser->ochan)); +- if (!ast_strlen_zero(tpargs->namerecloc)) { +- tmpuser->state = 1; +- tmpuser->digts = 0; +- if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) { +- ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ if (tpargs->enable_callee_prompt) { ++ if (!ast_strlen_zero(tpargs->namerecloc)) { ++ tmpuser->state = 1; ++ tmpuser->digts = 0; ++ if (!ast_streamfile(tmpuser->ochan, callfromname, ast_channel_language(tmpuser->ochan))) { ++ ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ } else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); ++ clear_caller(tmpuser); ++ continue; ++ } + } else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); +- clear_caller(tmpuser); +- continue; ++ tmpuser->state = 2; ++ tmpuser->digts = 0; ++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) ++ ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); ++ clear_caller(tmpuser); ++ continue; ++ } + } + } else { +- tmpuser->state = 2; +- tmpuser->digts = 0; +- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) +- ast_sched_runq(ast_channel_sched(tmpuser->ochan)); +- else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); +- clear_caller(tmpuser); +- continue; +- } ++ tmpuser->state = 3; + } + } + if (ast_channel_stream(tmpuser->ochan)) { +@@ -788,23 +807,28 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us + /* If call has been answered, then the eventual hangup is likely to be normal hangup */ + ast_channel_hangupcause_set(winner, AST_CAUSE_NORMAL_CLEARING); + ast_channel_hangupcause_set(caller, AST_CAUSE_NORMAL_CLEARING); +- ast_verb(3, "Starting playback of %s\n", callfromname); +- if (!ast_strlen_zero(tpargs->namerecloc)) { +- if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) { +- ast_sched_runq(ast_channel_sched(winner)); +- tmpuser->state = 1; ++ if (tpargs->enable_callee_prompt) { ++ ast_verb(3, "Starting playback of %s\n", callfromname); ++ if (!ast_strlen_zero(tpargs->namerecloc)) { ++ if (!ast_streamfile(winner, callfromname, ast_channel_language(winner))) { ++ ast_sched_runq(ast_channel_sched(winner)); ++ tmpuser->state = 1; ++ } else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); ++ clear_caller(tmpuser); ++ } + } else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", callfromname); +- clear_caller(tmpuser); ++ tmpuser->state = 2; ++ if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) ++ ast_sched_runq(ast_channel_sched(tmpuser->ochan)); ++ else { ++ ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); ++ clear_caller(tmpuser); ++ } + } + } else { ++ ast_verb(3, "Skip playback of caller name / norecording\n"); + tmpuser->state = 2; +- if (!ast_streamfile(tmpuser->ochan, tpargs->norecordingprompt, ast_channel_language(tmpuser->ochan))) +- ast_sched_runq(ast_channel_sched(tmpuser->ochan)); +- else { +- ast_log(LOG_WARNING, "Unable to playback %s.\n", tpargs->norecordingprompt); +- clear_caller(tmpuser); +- } + } + break; + case AST_CONTROL_BUSY: +@@ -928,6 +952,11 @@ static struct ast_channel *wait_for_winner(struct findme_user_listptr *findme_us + break; + } + } ++ if (!tpargs->enable_callee_prompt && tmpuser) { ++ ast_debug(1, "Taking call with no prompt\n"); ++ ast_frfree(f); ++ return tmpuser->ochan; ++ } + if (tmpuser && tmpuser->state == 3 && f->frametype == AST_FRAME_DTMF) { + int cmp_len; + +@@ -1367,6 +1396,7 @@ static int app_exec(struct ast_channel *chan, const char *data) + + /* Lock the profile lock and copy out everything we need to run with before unlocking it again */ + ast_mutex_lock(&f->lock); ++ targs->enable_callee_prompt = f->enable_callee_prompt; + targs->mohclass = ast_strdupa(f->moh); + ast_copy_string(targs->context, f->context, sizeof(targs->context)); + ast_copy_string(targs->takecall, f->takecall, sizeof(targs->takecall)); + +diff --git a/configs/samples/followme.conf.sample b/configs/samples/followme.conf.sample +index a233948..7e1d40f 100644 +--- a/configs/samples/followme.conf.sample ++++ b/configs/samples/followme.conf.sample +@@ -5,6 +5,11 @@ featuredigittimeout=>5000 + ; The number of ms to wait for a digit input for the callee on whether to take the call or + ; not before we consider them "done" entering digits. + ; ++enable_callee_prompt=>true ++; Enable prompting a callee to either accept or reject the forwarded call. ++; If disabled, the optional prompting for caller name (option 'a') is ++; likewise disabled. Enabled by default. ++; + takecall=>1 + ; The global default keypress for the callee to take taking the current call. This can be + ; a single digit or multiple digits. Default is "1". +@@ -54,6 +59,9 @@ number=>01233456,25 + ; step to make a choice on whether to take the call or not. That being the case, + ; you may want to make the timeout on the last step longer to give enough time to + ; make the choice to accept or not. ++enable_callee_prompt=>true ++; Enable prompting the callee to accept the forwarded call. The default ++; is the global value. + takecall=>1 + ; The keypress for the callee to take taking the current call. This can be + ; a single digit or multiple digits. Default is the global default. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-31 14:50:01
|
Revision: 8251 http://sourceforge.net/p/astlinux/code/8251 Author: abelbeck Date: 2017-03-31 14:49:58 +0000 (Fri, 31 Mar 2017) Log Message: ----------- sqlite, version bump to 3.18.0, fix configure.ac regression Modified Paths: -------------- branches/1.0/package/sqlite/sqlite.mk Added Paths: ----------- branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch Added: branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch =================================================================== --- branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch (rev 0) +++ branches/1.0/package/sqlite/sqlite-0001-editline-configure-fix.patch 2017-03-31 14:49:58 UTC (rev 8251) @@ -0,0 +1,14 @@ +--- a/configure.ac 2017-03-31 09:15:57.593261737 -0500 ++++ b/configure.ac 2017-03-31 09:17:32.969716649 -0500 +@@ -55,9 +55,9 @@ + LIBS="" + AC_SEARCH_LIBS([readline],[edit],[ + AC_DEFINE([HAVE_EDITLINE],1,Define to use BSD editline) +- READLINE_LIBS="$LIBS -ltinfo" ++ READLINE_LIBS="$LIBS" + enable_readline=no +- ],[],[-ltinfo]) ++ ]) + AS_UNSET(ac_cv_search_readline) + LIBS=$sLIBS + ]) Modified: branches/1.0/package/sqlite/sqlite.mk =================================================================== --- branches/1.0/package/sqlite/sqlite.mk 2017-03-31 13:22:31 UTC (rev 8250) +++ branches/1.0/package/sqlite/sqlite.mk 2017-03-31 14:49:58 UTC (rev 8251) @@ -4,11 +4,14 @@ # ############################################################# -SQLITE_VERSION = 3170000 +SQLITE_VERSION = 3180000 SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz SQLITE_SITE = http://www.sqlite.org/2017 SQLITE_INSTALL_STAGING = YES +# sqlite-0001-editline-configure-fix.patch +SQLITE_AUTORECONF = YES + SQLITE_CFLAGS += -DSQLITE_ENABLE_COLUMN_METADATA SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-31 13:22:33
|
Revision: 8250 http://sourceforge.net/p/astlinux/code/8250 Author: abelbeck Date: 2017-03-31 13:22:31 +0000 (Fri, 31 Mar 2017) Log Message: ----------- pcre, add upstream Buildroot security fixes: CVE-2017-6004, CVE-2017-7186 Added Paths: ----------- branches/1.0/package/pcre/pcre-0003-CVE-2017-6004.patch branches/1.0/package/pcre/pcre-0004-CVE-2017-7186.patch Added: branches/1.0/package/pcre/pcre-0003-CVE-2017-6004.patch =================================================================== --- branches/1.0/package/pcre/pcre-0003-CVE-2017-6004.patch (rev 0) +++ branches/1.0/package/pcre/pcre-0003-CVE-2017-6004.patch 2017-03-31 13:22:31 UTC (rev 8250) @@ -0,0 +1,21 @@ +Description: CVE-2017-6004: crafted regular expression may cause denial of service +Origin: upstream, https://vcs.pcre.org/pcre/code/trunk/pcre_jit_compile.c?r1=1676&r2=1680&view=patch +Bug: https://bugs.exim.org/show_bug.cgi?id=2035 +Bug-Debian: https://bugs.debian.org/855405 +Forwarded: not-needed +Author: Salvatore Bonaccorso <ca...@de...> +Last-Update: 2017-02-17 + +Signed-off-by: Baruch Siach <ba...@tk...> + +--- a/pcre_jit_compile.c ++++ b/pcre_jit_compile.c +@@ -8111,7 +8111,7 @@ if (opcode == OP_COND || opcode == OP_SC + + if (*matchingpath == OP_FAIL) + stacksize = 0; +- if (*matchingpath == OP_RREF) ++ else if (*matchingpath == OP_RREF) + { + stacksize = GET2(matchingpath, 1); + if (common->currententry == NULL) Added: branches/1.0/package/pcre/pcre-0004-CVE-2017-7186.patch =================================================================== --- branches/1.0/package/pcre/pcre-0004-CVE-2017-7186.patch (rev 0) +++ branches/1.0/package/pcre/pcre-0004-CVE-2017-7186.patch 2017-03-31 13:22:31 UTC (rev 8250) @@ -0,0 +1,60 @@ +Description: Upstream fix for CVE-2017-7186 (Upstream rev 1688) + Fix Unicode property crash for 32-bit characters greater than 0x10ffff. +Author: Matthew Vernon <ma...@de...> +X-Dgit-Generated: 2:8.39-3 c4c2c7c4f74d53b263af2471d8e11db88096bd13 + +Signed-off-by: Baruch Siach <ba...@tk...> +--- + +--- pcre3-8.39.orig/pcre_internal.h ++++ pcre3-8.39/pcre_internal.h +@@ -2772,6 +2772,9 @@ extern const pcre_uint8 PRIV(ucd_stage1 + extern const pcre_uint16 PRIV(ucd_stage2)[]; + extern const pcre_uint32 PRIV(ucp_gentype)[]; + extern const pcre_uint32 PRIV(ucp_gbtable)[]; ++#ifdef COMPILE_PCRE32 ++extern const ucd_record PRIV(dummy_ucd_record)[]; ++#endif + #ifdef SUPPORT_JIT + extern const int PRIV(ucp_typerange)[]; + #endif +@@ -2780,9 +2783,15 @@ extern const int PRIV(ucp_typera + /* UCD access macros */ + + #define UCD_BLOCK_SIZE 128 +-#define GET_UCD(ch) (PRIV(ucd_records) + \ ++#define REAL_GET_UCD(ch) (PRIV(ucd_records) + \ + PRIV(ucd_stage2)[PRIV(ucd_stage1)[(int)(ch) / UCD_BLOCK_SIZE] * \ + UCD_BLOCK_SIZE + (int)(ch) % UCD_BLOCK_SIZE]) ++ ++#ifdef COMPILE_PCRE32 ++#define GET_UCD(ch) ((ch > 0x10ffff)? PRIV(dummy_ucd_record) : REAL_GET_UCD(ch)) ++#else ++#define GET_UCD(ch) REAL_GET_UCD(ch) ++#endif + + #define UCD_CHARTYPE(ch) GET_UCD(ch)->chartype + #define UCD_SCRIPT(ch) GET_UCD(ch)->script +--- pcre3-8.39.orig/pcre_ucd.c ++++ pcre3-8.39/pcre_ucd.c +@@ -38,6 +38,20 @@ const pcre_uint16 PRIV(ucd_stage2)[] = { + const pcre_uint32 PRIV(ucd_caseless_sets)[] = {0}; + #else + ++/* If the 32-bit library is run in non-32-bit mode, character values ++greater than 0x10ffff may be encountered. For these we set up a ++special record. */ ++ ++#ifdef COMPILE_PCRE32 ++const ucd_record PRIV(dummy_ucd_record)[] = {{ ++ ucp_Common, /* script */ ++ ucp_Cn, /* type unassigned */ ++ ucp_gbOther, /* grapheme break property */ ++ 0, /* case set */ ++ 0, /* other case */ ++ }}; ++#endif ++ + /* When recompiling tables with a new Unicode version, please check the + types in this structure definition from pcre_internal.h (the actual + field names will be different): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-30 13:43:44
|
Revision: 8249 http://sourceforge.net/p/astlinux/code/8249 Author: abelbeck Date: 2017-03-30 13:43:42 +0000 (Thu, 30 Mar 2017) 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 2017-03-30 13:41:15 UTC (rev 8248) +++ branches/1.0/docs/ChangeLog.txt 2017-03-30 13:43:42 UTC (rev 8249) @@ -86,6 +86,8 @@ -- ipset, version bump to 6.32 +-- strongSwan, version bump to 5.5.2 + -- stunnel, version bump to 5.40 -- unbound (host), version bump to 1.6.1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-30 13:41:18
|
Revision: 8248 http://sourceforge.net/p/astlinux/code/8248 Author: abelbeck Date: 2017-03-30 13:41:15 +0000 (Thu, 30 Mar 2017) Log Message: ----------- strongswan, version bump to 5.5.2 Modified Paths: -------------- branches/1.0/package/strongswan/strongswan.mk Modified: branches/1.0/package/strongswan/strongswan.mk =================================================================== --- branches/1.0/package/strongswan/strongswan.mk 2017-03-30 00:15:17 UTC (rev 8247) +++ branches/1.0/package/strongswan/strongswan.mk 2017-03-30 13:41:15 UTC (rev 8248) @@ -4,7 +4,7 @@ # ################################################################################ -STRONGSWAN_VERSION = 5.5.1 +STRONGSWAN_VERSION = 5.5.2 STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = https://download.strongswan.org STRONGSWAN_DEPENDENCIES = openssl host-pkg-config @@ -27,6 +27,7 @@ --enable-tnccs-11=no \ --enable-tnccs-20=no \ --enable-tnccs-dynamic=no \ + --enable-tpm=no \ --enable-xauth-generic=yes \ --enable-xauth-eap=yes \ --enable-unity=yes \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-30 00:15:20
|
Revision: 8247 http://sourceforge.net/p/astlinux/code/8247 Author: abelbeck Date: 2017-03-30 00:15:17 +0000 (Thu, 30 Mar 2017) Log Message: ----------- openssh, tweak sshd init.d log text Modified Paths: -------------- branches/1.0/package/openssh/sshd.init Modified: branches/1.0/package/openssh/sshd.init =================================================================== --- branches/1.0/package/openssh/sshd.init 2017-03-29 22:29:07 UTC (rev 8246) +++ branches/1.0/package/openssh/sshd.init 2017-03-30 00:15:17 UTC (rev 8247) @@ -71,7 +71,7 @@ cp -a /stat/etc/ssh/* /tmp/etc/ssh/ else if upgrade_moduli /tmp/etc/ssh/moduli /stat/etc/ssh/moduli; then - echo "Upgrading ssh DH primes in /etc/ssh/moduli" + echo "Upgrading ssh DH groups in /etc/ssh/moduli" cp -p /stat/etc/ssh/moduli /tmp/etc/ssh/moduli fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-29 22:29:08
|
Revision: 8246 http://sourceforge.net/p/astlinux/code/8246 Author: abelbeck Date: 2017-03-29 22:29:07 +0000 (Wed, 29 Mar 2017) Log Message: ----------- openssh, tweak moduli comment note Modified Paths: -------------- branches/1.0/package/openssh/openssh.mk Modified: branches/1.0/package/openssh/openssh.mk =================================================================== --- branches/1.0/package/openssh/openssh.mk 2017-03-29 22:06:23 UTC (rev 8245) +++ branches/1.0/package/openssh/openssh.mk 2017-03-29 22:29:07 UTC (rev 8246) @@ -38,7 +38,7 @@ define OPENSSH_INSTALL_MODULI grep '^#' $(@D)/moduli > $(@D)/moduli.astlinux - echo '# Note: Entries limited to bit sizes greater than 2000 and less than 5000' >> $(@D)/moduli.astlinux + echo '# Note: DH group entries using lengths greater than 2000-bits and less than 5000-bits' >> $(@D)/moduli.astlinux awk '/^[^#]/ && $$5 > 2000 && $$5 < 5000' $(@D)/moduli >> $(@D)/moduli.astlinux $(INSTALL) -D -m 644 $(@D)/moduli.astlinux $(TARGET_DIR)/stat/etc/ssh/moduli endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-29 22:06:26
|
Revision: 8245 http://sourceforge.net/p/astlinux/code/8245 Author: abelbeck Date: 2017-03-29 22:06:23 +0000 (Wed, 29 Mar 2017) 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 2017-03-29 18:10:05 UTC (rev 8244) +++ branches/1.0/docs/ChangeLog.txt 2017-03-29 22:06:23 UTC (rev 8245) @@ -20,6 +20,8 @@ -- rbash, new command (part of bash package), a restricted login shell /bin/rbash for non-root users. More info: http://doc.astlinux-project.org/userdoc:tt_restricted_user_login +-- netcalc, new command, IPv4 and IPv6 network calculator. Also used by dnsmasq init.d script. + -- unique-local-ipv6, new command to generate a pseudo-random IPv6 ULA (Unique Local Address) /48 Prefix for local, VPN, etc. use. These prefixes are not globally routable without some Network Prefix Translation (NPTv6). @@ -52,6 +54,7 @@ -- OpenSSL, version bump to 1.0.2k, security fixes: CVE-2017-3731, CVE-2017-3732 -- OpenSSH, version bump to 7.5p1, allow PubkeyAcceptedKeyTypes 'ssh-dss' for backward compatibility. + Updated /etc/ssh/moduli DH group parameters file, starting with 2048-bit length. -- OpenVPN, version bump to 2.4.1, add rc.conf variable OVPNC_REMOTE_CERT_TLS to replace deprecated OVPNC_NSCERTTYPE @@ -64,6 +67,7 @@ -- ddclient, switch to ddclient-curl version 3.8.3-02, adds IPv6 and Hurricane Electric support Cloudflare, FreeDNS, and HE Free DNS (Hurricane Electric) now support mixed IPv4/IPv6 DNS updates. + Added script get-ipv6-from-ipv4 to retrieve a neighboring IPv6 address to be published as an AAAA record. New rc.conf variable: DDGETIPV6, DDGETIPV6="" or DDGETIPV6="no" -> IPv6 dynamic DNS is disabled More info: http://doc.astlinux-project.org/userdoc:tt_dynamic_dns_client This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-29 18:10:07
|
Revision: 8244 http://sourceforge.net/p/astlinux/code/8244 Author: abelbeck Date: 2017-03-29 18:10:05 +0000 (Wed, 29 Mar 2017) Log Message: ----------- openssh, build /stat/etc/ssh/moduli from the latest OpenBSD moduli but limited to bit lengths greater than 2000 and less than 5000, additionally automaticaly upgrade the current /etc/ssh/moduli if the current version does not match the latest version Modified Paths: -------------- branches/1.0/package/openssh/openssh.mk branches/1.0/package/openssh/sshd.init Removed Paths: ------------- branches/1.0/project/astlinux/target_skeleton/stat/etc/ssh/ Modified: branches/1.0/package/openssh/openssh.mk =================================================================== --- branches/1.0/package/openssh/openssh.mk 2017-03-29 14:12:29 UTC (rev 8243) +++ branches/1.0/package/openssh/openssh.mk 2017-03-29 18:10:05 UTC (rev 8244) @@ -36,6 +36,15 @@ ln -snf /tmp/etc/ssh $(TARGET_DIR)/etc/ssh endef +define OPENSSH_INSTALL_MODULI + grep '^#' $(@D)/moduli > $(@D)/moduli.astlinux + echo '# Note: Entries limited to bit sizes greater than 2000 and less than 5000' >> $(@D)/moduli.astlinux + awk '/^[^#]/ && $$5 > 2000 && $$5 < 5000' $(@D)/moduli >> $(@D)/moduli.astlinux + $(INSTALL) -D -m 644 $(@D)/moduli.astlinux $(TARGET_DIR)/stat/etc/ssh/moduli +endef + OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_INITSCRIPT +OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_MODULI + $(eval $(call AUTOTARGETS,package,openssh)) Modified: branches/1.0/package/openssh/sshd.init =================================================================== --- branches/1.0/package/openssh/sshd.init 2017-03-29 14:12:29 UTC (rev 8243) +++ branches/1.0/package/openssh/sshd.init 2017-03-29 18:10:05 UTC (rev 8244) @@ -2,6 +2,24 @@ . /etc/rc.conf +upgrade_moduli() +{ + local old_file="$1" new_file="$2" old_ver new_ver + + if [ ! -f "$old_file" ]; then + return 0 + fi + + old_ver="$(sed -n -r -e '1 s/^#.* moduli,v ([0-9.]+) .*$/\1/p' "$old_file")" + new_ver="$(sed -n -r -e '1 s/^#.* moduli,v ([0-9.]+) .*$/\1/p' "$new_file")" + + if [ "$old_ver" != "$new_ver" ]; then + return 0 + fi + + return 1 +} + init () { mkdir -p /var/run/sshd @@ -52,9 +70,9 @@ if [ ! -L /tmp/etc/ssh ]; then cp -a /stat/etc/ssh/* /tmp/etc/ssh/ else - # or even if it is... - if [ ! -f /tmp/etc/ssh/moduli ]; then - cp -p /stat/etc/ssh/moduli /tmp/etc/ssh/ + if upgrade_moduli /tmp/etc/ssh/moduli /stat/etc/ssh/moduli; then + echo "Upgrading ssh DH primes in /etc/ssh/moduli" + cp -p /stat/etc/ssh/moduli /tmp/etc/ssh/moduli fi fi This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-29 14:12:31
|
Revision: 8243 http://sourceforge.net/p/astlinux/code/8243 Author: abelbeck Date: 2017-03-29 14:12:29 +0000 (Wed, 29 Mar 2017) Log Message: ----------- ddclient, install the get-ipv6-from-ipv4 script from the ddclient-curl repository, allowing to retrieve a neighboring IPv6 address to be published as an AAAA record Modified Paths: -------------- branches/1.0/package/ddclient/ddclient.mk Modified: branches/1.0/package/ddclient/ddclient.mk =================================================================== --- branches/1.0/package/ddclient/ddclient.mk 2017-03-28 22:11:31 UTC (rev 8242) +++ branches/1.0/package/ddclient/ddclient.mk 2017-03-29 14:12:29 UTC (rev 8243) @@ -10,6 +10,7 @@ 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 0755 -D $(@D)/contrib/get-ipv6-from-ipv4/get-ipv6-from-ipv4.pl $(TARGET_DIR)/usr/sbin/get-ipv6-from-ipv4 $(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 @@ -17,6 +18,7 @@ define DDCLIENT_UNINSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/etc/init.d/dynamicdns rm -f $(TARGET_DIR)/usr/sbin/ddclient + rm -f $(TARGET_DIR)/usr/sbin/get-ipv6-from-ipv4 rm -f $(TARGET_DIR)/stat/etc/ddclient.conf endef This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-28 22:11:33
|
Revision: 8242 http://sourceforge.net/p/astlinux/code/8242 Author: abelbeck Date: 2017-03-28 22:11:31 +0000 (Tue, 28 Mar 2017) Log Message: ----------- bash, rbash user, allow netcalc Modified Paths: -------------- branches/1.0/package/bash/rbash/cmd_symlinks.txt Modified: branches/1.0/package/bash/rbash/cmd_symlinks.txt =================================================================== --- branches/1.0/package/bash/rbash/cmd_symlinks.txt 2017-03-28 21:59:53 UTC (rev 8241) +++ branches/1.0/package/bash/rbash/cmd_symlinks.txt 2017-03-28 22:11:31 UTC (rev 8242) @@ -11,6 +11,7 @@ usr/bin/host usr/bin/nslookup usr/bin/htop +usr/bin/netcalc usr/bin/top usr/bin/traceroute usr/bin/traceroute6 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-28 21:59:54
|
Revision: 8241 http://sourceforge.net/p/astlinux/code/8241 Author: abelbeck Date: 2017-03-28 21:59:53 +0000 (Tue, 28 Mar 2017) Log Message: ----------- netcalc, version bump to 2.1.1 Modified Paths: -------------- branches/1.0/package/netcalc/netcalc.mk Modified: branches/1.0/package/netcalc/netcalc.mk =================================================================== --- branches/1.0/package/netcalc/netcalc.mk 2017-03-28 18:23:01 UTC (rev 8240) +++ branches/1.0/package/netcalc/netcalc.mk 2017-03-28 21:59:53 UTC (rev 8241) @@ -4,20 +4,11 @@ # ################################################################################ -NETCALC_VERSION = 2.1-694614e +NETCALC_VERSION = 2.1.1 NETCALC_SOURCE = netcalc-$(NETCALC_VERSION).tar.gz -NETCALC_SITE = http://files.astlinux-project.org -#NETCALC_SITE = https://github.com/troglobit/netcalc/releases/download/v$(NETCALC_VERSION) -NETCALC_AUTORECONF = YES +NETCALC_SITE = https://github.com/troglobit/netcalc/releases/download/v$(NETCALC_VERSION) -## Default install adds ipcalc symlink, confused with Busybox's -## -define NETCALC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/netcalc $(TARGET_DIR)/usr/bin/ -endef +NETCALC_CONF_OPT = \ + --disable-ipcalc-symlink -define NETCALC_UNINSTALL_TARGET_CMDS - rm -f $(TARGET_DIR)/usr/bin/netcalc -endef - $(eval $(call AUTOTARGETS,package,netcalc)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-28 18:23:03
|
Revision: 8240 http://sourceforge.net/p/astlinux/code/8240 Author: abelbeck Date: 2017-03-28 18:23:01 +0000 (Tue, 28 Mar 2017) Log Message: ----------- dnsmasq, use 'netcalc' to sanitize and calculate the IPv4 address ranges for the DHCP pool. Modified Paths: -------------- branches/1.0/package/dnsmasq/Config.in branches/1.0/package/dnsmasq/dnsmasq.init Removed Paths: ------------- branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/bash/ Modified: branches/1.0/package/dnsmasq/Config.in =================================================================== --- branches/1.0/package/dnsmasq/Config.in 2017-03-28 14:49:35 UTC (rev 8239) +++ branches/1.0/package/dnsmasq/Config.in 2017-03-28 18:23:01 UTC (rev 8240) @@ -1,5 +1,6 @@ config BR2_PACKAGE_DNSMASQ bool "dnsmasq" + select BR2_PACKAGE_NETCALC help A lightweight DNS and DHCP server. It is intended to provide coupled DNS and DHCP service to a LAN. Modified: branches/1.0/package/dnsmasq/dnsmasq.init =================================================================== --- branches/1.0/package/dnsmasq/dnsmasq.init 2017-03-28 14:49:35 UTC (rev 8239) +++ branches/1.0/package/dnsmasq/dnsmasq.init 2017-03-28 18:23:01 UTC (rev 8240) @@ -2,7 +2,6 @@ . /etc/rc.conf -. /etc/init.d/functions.d/bash/ipcalc . /etc/init.d/functions.d/network . /etc/init.d/functions.d/misc @@ -182,25 +181,40 @@ addDNSMASQnet() { # args: IF, IP, NM, tag - local ipbase dstart dend ipstart ipend leasetime NETWORK + local max_hosts range_min range_max ip_min ip_max leasetime 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) - if [ -n "$DHCPRANGE" ]; then - dstart=$(echo $DHCPRANGE | cut -d: -f1) - dend=$(echo $DHCPRANGE | cut -d: -f2) + range_min=$(echo "$DHCPRANGE" | cut -d: -f1) + range_max=$(echo "$DHCPRANGE" | cut -d: -f2) else - dstart=100 - dend=220 + range_min=100 + range_max=220 fi - ipstart=$(($ipbase + $dstart)) - ipend=$(($ipbase + $dend)) - trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend) $leasetime + max_hosts="$(netcalc "$2" "$3" | sed -n -r -e 's/^Hosts\/Net *: *([0-9]+).*$/\1/p')" + if [ -n "$max_hosts" ]; then + if [ $range_max -gt $max_hosts ]; then + range_max=$(($max_hosts - ($max_hosts / 4) - 1)) + fi + if [ $range_min -ge $range_max ]; then + range_min=$(($range_max - ($max_hosts / 4) - 1)) + fi + if [ $range_min -le 0 ]; then + range_min=$((($max_hosts / 4) + 1)) + fi + if [ $range_max -le $range_min ]; then + range_max=$(($range_min + ($max_hosts / 4) + 1)) + fi + fi + + ip_min="$(netcalc -R "$range_min:$range_max" "$2" "$3" | sed -n -r -e 's/^RangeMin *: *([0-9.]+).*$/\1/p')" + ip_max="$(netcalc -R "$range_min:$range_max" "$2" "$3" | sed -n -r -e 's/^RangeMax *: *([0-9.]+).*$/\1/p')" + + trueDNSMASQnet $4 $2 "$ip_min" "$ip_max" $leasetime + addIPV6net $1 $4 $leasetime else if ! addIPV6net $1 $4 $leasetime; then This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-28 14:49:37
|
Revision: 8239 http://sourceforge.net/p/astlinux/code/8239 Author: abelbeck Date: 2017-03-28 14:49:35 +0000 (Tue, 28 Mar 2017) Log Message: ----------- web interface, add netcalc to 'Show Licenses' Modified Paths: -------------- branches/1.0/package/webinterface/altweb/common/license-packages.txt Modified: branches/1.0/package/webinterface/altweb/common/license-packages.txt =================================================================== --- branches/1.0/package/webinterface/altweb/common/license-packages.txt 2017-03-27 20:21:49 UTC (rev 8238) +++ branches/1.0/package/webinterface/altweb/common/license-packages.txt 2017-03-28 14:49:35 UTC (rev 8239) @@ -65,3 +65,4 @@ strongSwan~Copyright (c) 2006-2016 Andreas Steffen, Tobias Brunner, et al. chrony~Copyright (c) 1997-2017 Richard P. Curnow, Miroslav Lichvar. gntp-send~Copyright (c) 2009-2016 Yasuhiro Matsumoto. +netcalc~Copyright (c) 2003-2017 Simon Ekstrand, Joachim Nilsson. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-27 20:21:51
|
Revision: 8238 http://sourceforge.net/p/astlinux/code/8238 Author: abelbeck Date: 2017-03-27 20:21:49 +0000 (Mon, 27 Mar 2017) Log Message: ----------- netcalc, version bump to 2.1-694614e, official 2.1 soon Modified Paths: -------------- branches/1.0/package/netcalc/netcalc.mk Modified: branches/1.0/package/netcalc/netcalc.mk =================================================================== --- branches/1.0/package/netcalc/netcalc.mk 2017-03-26 22:46:47 UTC (rev 8237) +++ branches/1.0/package/netcalc/netcalc.mk 2017-03-27 20:21:49 UTC (rev 8238) @@ -4,7 +4,7 @@ # ################################################################################ -NETCALC_VERSION = 2.1-beta1 +NETCALC_VERSION = 2.1-694614e NETCALC_SOURCE = netcalc-$(NETCALC_VERSION).tar.gz NETCALC_SITE = http://files.astlinux-project.org #NETCALC_SITE = https://github.com/troglobit/netcalc/releases/download/v$(NETCALC_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-26 22:46:49
|
Revision: 8237 http://sourceforge.net/p/astlinux/code/8237 Author: abelbeck Date: 2017-03-26 22:46:47 +0000 (Sun, 26 Mar 2017) Log Message: ----------- netcalc, version bump to 2.1-beta1, Kudos to Joachim Nilsson's (@troglobit) cooperation Modified Paths: -------------- branches/1.0/package/netcalc/netcalc.mk Removed Paths: ------------- branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch Deleted: branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch =================================================================== --- branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch 2017-03-26 15:13:03 UTC (rev 8236) +++ branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch 2017-03-26 22:46:47 UTC (rev 8237) @@ -1,35 +0,0 @@ -From 1163f6a698c54624c653bb1142018f01d6d1d865 Mon Sep 17 00:00:00 2001 -From: Lonnie Abelbeck <lo...@ab...> -Date: Sun, 26 Mar 2017 09:50:50 -0500 -Subject: [PATCH] Fix stdin argument length, Issue #7 - ---- - netcalc.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/netcalc.c b/netcalc.c -index b194905..0775b00 100644 ---- a/netcalc.c -+++ b/netcalc.c -@@ -167,9 +167,9 @@ int get_stdin(char *args[]) - - memset(buf, 0, sizeof(buf)); - -- argmax = (IFNAMSIZ + 1 > 19) ? IFNAMSIZ + 1 : 19; -- arg1 = (char *)calloc(1, argmax); -- arg2 = (char *)calloc(1, 16); -+ argmax = ARGLEN - 1; -+ arg1 = (char *)calloc(1, ARGLEN); -+ arg2 = (char *)calloc(1, ARGLEN); - memset(sbuf, 0, sizeof(sbuf)); - memset(dbuf, 0, sizeof(dbuf)); - -@@ -221,7 +221,7 @@ int get_stdin(char *args[]) - } - y++; - z = 0; -- while (y < strlen(dbuf) && z < 15 && dbuf[y] != ' ') { -+ while (y < strlen(dbuf) && z < argmax && dbuf[y] != ' ') { - arg2[z] = dbuf[y]; - y++; - z++; Modified: branches/1.0/package/netcalc/netcalc.mk =================================================================== --- branches/1.0/package/netcalc/netcalc.mk 2017-03-26 15:13:03 UTC (rev 8236) +++ branches/1.0/package/netcalc/netcalc.mk 2017-03-26 22:46:47 UTC (rev 8237) @@ -4,7 +4,7 @@ # ################################################################################ -NETCALC_VERSION = 2.0.1-pre +NETCALC_VERSION = 2.1-beta1 NETCALC_SOURCE = netcalc-$(NETCALC_VERSION).tar.gz NETCALC_SITE = http://files.astlinux-project.org #NETCALC_SITE = https://github.com/troglobit/netcalc/releases/download/v$(NETCALC_VERSION) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-26 15:13:05
|
Revision: 8236 http://sourceforge.net/p/astlinux/code/8236 Author: abelbeck Date: 2017-03-26 15:13:03 +0000 (Sun, 26 Mar 2017) Log Message: ----------- netcalc, [PATCH] Fix stdin argument length Added Paths: ----------- branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch Added: branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch =================================================================== --- branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch (rev 0) +++ branches/1.0/package/netcalc/netcalc-0001-fix-stdin-argument-length.patch 2017-03-26 15:13:03 UTC (rev 8236) @@ -0,0 +1,35 @@ +From 1163f6a698c54624c653bb1142018f01d6d1d865 Mon Sep 17 00:00:00 2001 +From: Lonnie Abelbeck <lo...@ab...> +Date: Sun, 26 Mar 2017 09:50:50 -0500 +Subject: [PATCH] Fix stdin argument length, Issue #7 + +--- + netcalc.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/netcalc.c b/netcalc.c +index b194905..0775b00 100644 +--- a/netcalc.c ++++ b/netcalc.c +@@ -167,9 +167,9 @@ int get_stdin(char *args[]) + + memset(buf, 0, sizeof(buf)); + +- argmax = (IFNAMSIZ + 1 > 19) ? IFNAMSIZ + 1 : 19; +- arg1 = (char *)calloc(1, argmax); +- arg2 = (char *)calloc(1, 16); ++ argmax = ARGLEN - 1; ++ arg1 = (char *)calloc(1, ARGLEN); ++ arg2 = (char *)calloc(1, ARGLEN); + memset(sbuf, 0, sizeof(sbuf)); + memset(dbuf, 0, sizeof(dbuf)); + +@@ -221,7 +221,7 @@ int get_stdin(char *args[]) + } + y++; + z = 0; +- while (y < strlen(dbuf) && z < 15 && dbuf[y] != ' ') { ++ while (y < strlen(dbuf) && z < argmax && dbuf[y] != ' ') { + arg2[z] = dbuf[y]; + y++; + z++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-26 02:08:57
|
Revision: 8235 http://sourceforge.net/p/astlinux/code/8235 Author: abelbeck Date: 2017-03-26 02:08:54 +0000 (Sun, 26 Mar 2017) Log Message: ----------- ipsec-tools, racoon-ipsec script, remove dependence on '/etc/init.d/functions.d/bash/ipcalc' functions Modified Paths: -------------- branches/1.0/package/ipsec-tools/racoon-ipsec Modified: branches/1.0/package/ipsec-tools/racoon-ipsec =================================================================== --- branches/1.0/package/ipsec-tools/racoon-ipsec 2017-03-26 01:27:11 UTC (rev 8234) +++ branches/1.0/package/ipsec-tools/racoon-ipsec 2017-03-26 02:08:54 UTC (rev 8235) @@ -433,7 +433,7 @@ { local keyword IFS - if ! _ismember "$p1_encrypt" des 3des blowfish cast128 \ + if ! is_member "$p1_encrypt" des 3des blowfish cast128 \ aes "aes 128" "aes 192" "aes 256" \ camellia; then bad_config "unknown IPsec phase 1 encryption type '$p1_encrypt'." @@ -440,12 +440,12 @@ return 1 fi - if ! _ismember "$p1_hash" md5 sha1 sha256 sha384 sha512; then + if ! is_member "$p1_hash" md5 sha1 sha256 sha384 sha512; then bad_config "unknown IPsec phase 1 hash type '$p1_hash'." return 1 fi - if ! _ismember "$p1_dhgrp" modp768 modp1024 modp1536 modp2048 \ + if ! is_member "$p1_dhgrp" modp768 modp1024 modp1536 modp2048 \ modp3072 modp4096 modp6144 modp8192 \ 1 2 5 14 15 16 17 18; then bad_config "unknown IPsec phase 1 DH group type '$p1_dhgrp'." @@ -452,7 +452,7 @@ return 1 fi - if ! _ismember "$p2_pfsgrp" none modp768 modp1024 modp1536 modp2048 \ + if ! is_member "$p2_pfsgrp" none modp768 modp1024 modp1536 modp2048 \ modp3072 modp4096 modp6144 modp8192 \ 1 2 5 14 15 16 17 18; then bad_config "unknown IPsec phase 2 PFS group type '$p2_pfsgrp'." @@ -461,7 +461,7 @@ IFS=',' for keyword in $p2_encrypt; do - if ! _ismember "$keyword" des 3des des_iv64 des_iv32 rc5 rc4 idea 3idea \ + if ! is_member "$keyword" des 3des des_iv64 des_iv32 rc5 rc4 idea 3idea \ cast128 blowfish null_enc twofish rijndael \ aes "aes 128" "aes 192" "aes 256" \ camellia; then @@ -472,7 +472,7 @@ IFS=',' for keyword in $p2_auth; do - if ! _ismember "$keyword" des 3des des_iv64 des_iv32 hmac_md5 hmac_sha1 \ + if ! is_member "$keyword" des 3des des_iv64 des_iv32 hmac_md5 hmac_sha1 \ hmac_sha256 hmac_sha384 hmac_sha512 \ non_auth; then bad_config "unknown IPsec phase 2 authentication type '$keyword'." @@ -567,9 +567,23 @@ touch /tmp/etc/racoon_bad_config } +is_member() +{ + local ARG="$1" ELEM IFS + shift + + unset IFS + for ELEM in "$@"; do + if [ "$ARG" = "$ELEM" ]; then + return 0 + fi + done + + return 1 +} + . /etc/rc.conf -. /etc/init.d/functions.d/bash/ipcalc . /etc/init.d/functions.d/network . /etc/init.d/functions.d/misc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-26 01:27:13
|
Revision: 8234 http://sourceforge.net/p/astlinux/code/8234 Author: abelbeck Date: 2017-03-26 01:27:11 +0000 (Sun, 26 Mar 2017) Log Message: ----------- netsnmp, remove extraneous 'net-snmp-create-v3-user' script installed to target Modified Paths: -------------- branches/1.0/package/netsnmp/netsnmp.mk Modified: branches/1.0/package/netsnmp/netsnmp.mk =================================================================== --- branches/1.0/package/netsnmp/netsnmp.mk 2017-03-26 01:06:12 UTC (rev 8233) +++ branches/1.0/package/netsnmp/netsnmp.mk 2017-03-26 01:27:11 UTC (rev 8234) @@ -96,9 +96,10 @@ endef NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP -define NETSNMP_TARGET_REMOVE_NETSNMP_CONFIG - rm -f $(TARGET_DIR)/usr/bin/net-snmp-config +define NETSNMP_TARGET_REMOVE_NETSNMP_SCRIPTS + rm -f $(TARGET_DIR)/usr/bin/net-snmp-config + rm -f $(TARGET_DIR)/usr/bin/net-snmp-create-v3-user endef -NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_TARGET_REMOVE_NETSNMP_CONFIG +NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_TARGET_REMOVE_NETSNMP_SCRIPTS $(eval $(call AUTOTARGETS,package,netsnmp)) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-26 01:06:14
|
Revision: 8233 http://sourceforge.net/p/astlinux/code/8233 Author: abelbeck Date: 2017-03-26 01:06:12 +0000 (Sun, 26 Mar 2017) Log Message: ----------- netcalc, new package, enabled for default builds Modified Paths: -------------- branches/1.0/astlinux-ast11.config branches/1.0/astlinux-ast13.config branches/1.0/initrd.config branches/1.0/package/Config.in 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/initrd.config Added Paths: ----------- branches/1.0/package/netcalc/ branches/1.0/package/netcalc/Config.in branches/1.0/package/netcalc/netcalc.mk Modified: branches/1.0/astlinux-ast11.config =================================================================== --- branches/1.0/astlinux-ast11.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/astlinux-ast11.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:08 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:20 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -670,6 +670,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +BR2_PACKAGE_NETCALC=y # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/astlinux-ast13.config =================================================================== --- branches/1.0/astlinux-ast13.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/astlinux-ast13.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:09 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:23 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -670,6 +670,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +BR2_PACKAGE_NETCALC=y # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/initrd.config =================================================================== --- branches/1.0/initrd.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/initrd.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:10 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:35 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -551,6 +551,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_NETCALC is not set # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set Modified: branches/1.0/package/Config.in =================================================================== --- branches/1.0/package/Config.in 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/package/Config.in 2017-03-26 01:06:12 UTC (rev 8233) @@ -436,6 +436,7 @@ menu "Miscellaneous" source "package/htpasswd/Config.in" source "package/mac2vendor/Config.in" +source "package/netcalc/Config.in" source "package/qemu/Config.in" source "package/shared-mime-info/Config.in" source "package/zoneinfo/Config.in" Added: branches/1.0/package/netcalc/Config.in =================================================================== --- branches/1.0/package/netcalc/Config.in (rev 0) +++ branches/1.0/package/netcalc/Config.in 2017-03-26 01:06:12 UTC (rev 8233) @@ -0,0 +1,9 @@ +config BR2_PACKAGE_NETCALC + bool "netcalc" + help + netcalc is a slimmed down clone of sipcalc, using the output + format of ipcalc. It is written in C and has very few dependencies. + Both IPv4 and IPv6 is supported. + + https://github.com/troglobit/netcalc + Added: branches/1.0/package/netcalc/netcalc.mk =================================================================== --- branches/1.0/package/netcalc/netcalc.mk (rev 0) +++ branches/1.0/package/netcalc/netcalc.mk 2017-03-26 01:06:12 UTC (rev 8233) @@ -0,0 +1,23 @@ +################################################################################ +# +# netcalc +# +################################################################################ + +NETCALC_VERSION = 2.0.1-pre +NETCALC_SOURCE = netcalc-$(NETCALC_VERSION).tar.gz +NETCALC_SITE = http://files.astlinux-project.org +#NETCALC_SITE = https://github.com/troglobit/netcalc/releases/download/v$(NETCALC_VERSION) +NETCALC_AUTORECONF = YES + +## Default install adds ipcalc symlink, confused with Busybox's +## +define NETCALC_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/netcalc $(TARGET_DIR)/usr/bin/ +endef + +define NETCALC_UNINSTALL_TARGET_CMDS + rm -f $(TARGET_DIR)/usr/bin/netcalc +endef + +$(eval $(call AUTOTARGETS,package,netcalc)) Modified: branches/1.0/runnix-iso.config =================================================================== --- branches/1.0/runnix-iso.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/runnix-iso.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:13 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:42 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -579,6 +579,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_NETCALC is not set # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set Modified: branches/1.0/runnix.config =================================================================== --- branches/1.0/runnix.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/runnix.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:11 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:38 2017 # BR2_HAVE_DOT_CONFIG=y # BR2_arm is not set @@ -580,6 +580,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_NETCALC is not set # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set Modified: branches/1.0/x86_64-configs/astlinux-ast11.config =================================================================== --- branches/1.0/x86_64-configs/astlinux-ast11.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:17 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:44 2017 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -651,6 +651,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +BR2_PACKAGE_NETCALC=y # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/x86_64-configs/astlinux-ast13.config =================================================================== --- branches/1.0/x86_64-configs/astlinux-ast13.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:19 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:47 2017 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -651,6 +651,7 @@ # BR2_PACKAGE_HTPASSWD=y BR2_PACKAGE_MAC2VENDOR=y +BR2_PACKAGE_NETCALC=y # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set BR2_PACKAGE_ZONEINFO=y Modified: branches/1.0/x86_64-configs/initrd.config =================================================================== --- branches/1.0/x86_64-configs/initrd.config 2017-03-25 14:30:39 UTC (rev 8232) +++ branches/1.0/x86_64-configs/initrd.config 2017-03-26 01:06:12 UTC (rev 8233) @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Buildroot astlinux-1.x-svn8180-dirty Configuration -# Mon Feb 20 15:39:21 2017 +# Buildroot astlinux-1.x-svn8232-dirty Configuration +# Sat Mar 25 20:00:54 2017 # BR2_HAVE_DOT_CONFIG=y BR2_ARCH_IS_64=y @@ -532,6 +532,7 @@ # # BR2_PACKAGE_HTPASSWD is not set # BR2_PACKAGE_MAC2VENDOR is not set +# BR2_PACKAGE_NETCALC is not set # BR2_PACKAGE_QEMU is not set # BR2_PACKAGE_SHARED_MIME_INFO is not set # BR2_PACKAGE_ZONEINFO is not set This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-25 14:30:41
|
Revision: 8232 http://sourceforge.net/p/astlinux/code/8232 Author: abelbeck Date: 2017-03-25 14:30:39 +0000 (Sat, 25 Mar 2017) Log Message: ----------- web interface, Status tab, OpenVPN Server Status, adjust for new 'Virtual IPv6 Address' column with OpenVPN 2.4 . Thanks Michael. Modified Paths: -------------- branches/1.0/package/webinterface/altweb/common/status.inc Modified: branches/1.0/package/webinterface/altweb/common/status.inc =================================================================== --- branches/1.0/package/webinterface/altweb/common/status.inc 2017-03-24 20:39:30 UTC (rev 8231) +++ branches/1.0/package/webinterface/altweb/common/status.inc 2017-03-25 14:30:39 UTC (rev 8232) @@ -454,16 +454,18 @@ $status['header']['CommonName'] = $linetokens[2]; $status['header']['RealAddr'] = $linetokens[3]; $status['header']['VirtAddr'] = $linetokens[4]; - $status['header']['BytesRcv'] = $linetokens[5]; - $status['header']['BytesSnd'] = $linetokens[6]; - $status['header']['Since'] = $linetokens[7]; + $status['header']['Virt6Addr'] = $linetokens[5]; + $status['header']['BytesRcv'] = $linetokens[6]; + $status['header']['BytesSnd'] = $linetokens[7]; + $status['header']['Since'] = $linetokens[8]; } elseif ($linetokens[0] === "CLIENT_LIST") { $status['clients'][$cid]['CommonName'] = $linetokens[1]; $status['clients'][$cid]['RealAddr'] = $linetokens[2]; $status['clients'][$cid]['VirtAddr'] = $linetokens[3]; - $status['clients'][$cid]['BytesRcv'] = $linetokens[4]; - $status['clients'][$cid]['BytesSnd'] = $linetokens[5]; - $status['clients'][$cid]['Since'] = $linetokens[6]; + $status['clients'][$cid]['Virt6Addr'] = $linetokens[4]; + $status['clients'][$cid]['BytesRcv'] = $linetokens[5]; + $status['clients'][$cid]['BytesSnd'] = $linetokens[6]; + $status['clients'][$cid]['Since'] = $linetokens[7]; $cid++; } } @@ -821,6 +823,7 @@ echo "<td>", $openvpn['header']['CommonName'], "</td>"; echo "<td>", $openvpn['header']['RealAddr'], "</td>"; echo "<td>", $openvpn['header']['VirtAddr'], "</td>"; + echo "<td>", $openvpn['header']['Virt6Addr'], "</td>"; echo "<td>", $openvpn['header']['BytesRcv'], "</td>"; echo "<td>", $openvpn['header']['BytesSnd'], "</td>"; echo "<td>", $openvpn['header']['Since'], "</td>"; @@ -829,6 +832,7 @@ echo "<td>", $openvpn['clients'][$i]['CommonName'], "</td>"; echo "<td>", $openvpn['clients'][$i]['RealAddr'], "</td>"; echo "<td>", $openvpn['clients'][$i]['VirtAddr'], "</td>"; + echo "<td>", $openvpn['clients'][$i]['Virt6Addr'], "</td>"; echo "<td>", $openvpn['clients'][$i]['BytesRcv'], "</td>"; echo "<td>", $openvpn['clients'][$i]['BytesSnd'], "</td>"; echo "<td>", $openvpn['clients'][$i]['Since'], "</td>"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-24 20:39:32
|
Revision: 8231 http://sourceforge.net/p/astlinux/code/8231 Author: abelbeck Date: 2017-03-24 20:39:30 +0000 (Fri, 24 Mar 2017) 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 2017-03-24 20:37:28 UTC (rev 8230) +++ branches/1.0/docs/ChangeLog.txt 2017-03-24 20:39:30 UTC (rev 8231) @@ -131,7 +131,9 @@ -- CLI tab, add user selectable styles; Black, White or Green on White or Black background, right-click for menu. +-- Network -> OpenVPN Client sub-tab, generate OVPNC_REMOTE_CERT_TLS instead of the deprecated OVPNC_NSCERTTYPE + Additions for AstLinux 1.2.9: ============================= This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-24 20:37:30
|
Revision: 8230 http://sourceforge.net/p/astlinux/code/8230 Author: abelbeck Date: 2017-03-24 20:37:28 +0000 (Fri, 24 Mar 2017) Log Message: ----------- web interface, OpenVPN Client, generate OVPNC_REMOTE_CERT_TLS instead of the deprecated OVPNC_NSCERTTYPE Modified Paths: -------------- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php Modified: branches/1.0/package/webinterface/altweb/admin/openvpnclient.php =================================================================== --- branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2017-03-24 16:57:24 UTC (rev 8229) +++ branches/1.0/package/webinterface/altweb/admin/openvpnclient.php 2017-03-24 20:37:28 UTC (rev 8230) @@ -11,6 +11,7 @@ // 08-13-2010, Added QoS Passthrough, setting passtos // 02-13-2013, Added OpenVPN 2.3 IPv6 support // 02-23-2013, Added User/Pass support +// 03-24-2017, Change from OVPNC_NSCERTTYPE to OVPNC_REMOTE_CERT_TLS // // System location of /mnt/kd/rc.conf.d directory $OVPNCONFDIR = '/mnt/kd/rc.conf.d'; @@ -129,7 +130,7 @@ } fwrite($fp, "### Auth User/Pass\n".$value."\n"); - $value = 'OVPNC_NSCERTTYPE="'.$_POST['nscerttype'].'"'; + $value = 'OVPNC_REMOTE_CERT_TLS="'.$_POST['nscerttype'].'"'; fwrite($fp, "### nsCertType\n".$value."\n"); $value = 'OVPNC_REMOTE="'.tuq($_POST['remote']).'"'; @@ -455,9 +456,11 @@ putHtml('</td></tr>'); putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">'); - putHtml('Require nsCertType:'); + putHtml('Require TLS Cert:'); putHtml('</td><td style="text-align: left;" colspan="4">'); - $nscerttype = getVARdef($db, 'OVPNC_NSCERTTYPE'); + if (($nscerttype = getVARdef($db, 'OVPNC_REMOTE_CERT_TLS')) === '') { + $nscerttype = getVARdef($db, 'OVPNC_NSCERTTYPE'); + } putHtml('<select name="nscerttype">'); foreach ($nscerttype_menu as $key => $value) { $sel = ($nscerttype === $key) ? ' selected="selected"' : ''; @@ -464,6 +467,7 @@ putHtml('<option value="'.$key.'"'.$sel.'>'.$value.'</option>'); } putHtml('</select>'); + putHtml('<i>(nsCertType)</i>'); putHtml('</td></tr>'); putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-24 16:57:26
|
Revision: 8229 http://sourceforge.net/p/astlinux/code/8229 Author: abelbeck Date: 2017-03-24 16:57:24 +0000 (Fri, 24 Mar 2017) 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 2017-03-24 16:42:55 UTC (rev 8228) +++ branches/1.0/docs/ChangeLog.txt 2017-03-24 16:57:24 UTC (rev 8229) @@ -14,6 +14,9 @@ -- Linux Kernel 3.2.87 (minor bump) +-- genx86_64-vm board type, add support for Hyper-V VM's with hv_netvsc and hv_utils kernel drivers. + More info: http://doc.astlinux-project.org/userdoc:guest_vm_hyperv + -- rbash, new command (part of bash package), a restricted login shell /bin/rbash for non-root users. More info: http://doc.astlinux-project.org/userdoc:tt_restricted_user_login @@ -50,6 +53,8 @@ -- OpenSSH, version bump to 7.5p1, allow PubkeyAcceptedKeyTypes 'ssh-dss' for backward compatibility. +-- OpenVPN, version bump to 2.4.1, add rc.conf variable OVPNC_REMOTE_CERT_TLS to replace deprecated OVPNC_NSCERTTYPE + -- libcurl (curl) version bump to 7.53.1, security fixes: CVE-2017-2629 -- gntp-send, version 0.3.4, new package, CLI tool for sending Growl (GNTP) notifications. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <abe...@us...> - 2017-03-24 16:42:57
|
Revision: 8228 http://sourceforge.net/p/astlinux/code/8228 Author: abelbeck Date: 2017-03-24 16:42:55 +0000 (Fri, 24 Mar 2017) Log Message: ----------- genx86_64-vm, test for Hyper-V and modprobe hv_* modules automatically Modified Paths: -------------- branches/1.0/project/astlinux/target_skeleton/etc/rc Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc =================================================================== --- branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-03-24 16:05:40 UTC (rev 8227) +++ branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-03-24 16:42:55 UTC (rev 8228) @@ -213,9 +213,15 @@ ;; genx86_64-vm) + # Xen if [ -f /sys/hypervisor/type ] && grep -q 'xen' /sys/hypervisor/type; then modprobe xen-netfront fi + # Hyper-V + if lscpu | grep -q -i '^hypervisor vendor: *microsoft'; then + modprobe hv_netvsc + modprobe hv_utils + fi ;; esac This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |