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...> - 2017-05-12 15:58:06
|
Revision: 8302
http://sourceforge.net/p/astlinux/code/8302
Author: abelbeck
Date: 2017-05-12 15:58:04 +0000 (Fri, 12 May 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-05-12 15:54:52 UTC (rev 8301)
+++ branches/1.0/docs/ChangeLog.txt 2017-05-12 15:58:04 UTC (rev 8302)
@@ -67,7 +67,8 @@
-- 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
+-- OpenVPN, version bump to 2.4.2, security fixes: CVE-2017-7478, CVE-2017-7479
+ Add rc.conf variable OVPNC_REMOTE_CERT_TLS to replace deprecated OVPNC_NSCERTTYPE
-- libcurl (curl) version bump to 7.54.0, security fixes: CVE-2017-2629, CVE-2017-7468
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-12 15:54:54
|
Revision: 8301
http://sourceforge.net/p/astlinux/code/8301
Author: abelbeck
Date: 2017-05-12 15:54:52 +0000 (Fri, 12 May 2017)
Log Message:
-----------
openvpn, version bump to 2.4.2, security fixes: CVE-2017-7478 and CVE-2017-7479
Modified Paths:
--------------
branches/1.0/package/openvpn/openvpn.mk
Modified: branches/1.0/package/openvpn/openvpn.mk
===================================================================
--- branches/1.0/package/openvpn/openvpn.mk 2017-05-12 14:25:02 UTC (rev 8300)
+++ branches/1.0/package/openvpn/openvpn.mk 2017-05-12 15:54:52 UTC (rev 8301)
@@ -4,7 +4,7 @@
#
#############################################################
-OPENVPN_VERSION = 2.4.1
+OPENVPN_VERSION = 2.4.2
OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
OPENVPN_DEPENDENCIES = host-pkg-config openssl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-12 14:25:04
|
Revision: 8300
http://sourceforge.net/p/astlinux/code/8300
Author: abelbeck
Date: 2017-05-12 14:25:02 +0000 (Fri, 12 May 2017)
Log Message:
-----------
network, try to wait (up to 10secs) for the DHCPv6 response to be received on startup, always create /var/db/dhcp6c_cache file even if a user script is not defined
Modified Paths:
--------------
branches/1.0/package/wide-dhcpv6/dhcp6c.script
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Modified: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-11 23:53:44 UTC (rev 8299)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-12 14:25:02 UTC (rev 8300)
@@ -128,8 +128,11 @@
fi
}
+## Setup environmental variables
+## Create dhcp6c_cache file
+setup_env
+
if [ -x $SCRIPTFILE ]; then
- setup_env
export dhcp6c_interface dhcp6c_address dhcp6c_changed
export dhcp6c_prefix_interfaces dhcp6c_prefix_addresses
export dhcp6c_prefix dhcp6c_prefix_base dhcp6c_prefix_len
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-05-11 23:53:44 UTC (rev 8299)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-05-12 14:25:02 UTC (rev 8300)
@@ -62,7 +62,6 @@
interface $interface {
send ia-na 1;
send rapid-commit;
- script \"/etc/dhcp6c.script\";
};
id-assoc na 1 { };"
@@ -645,7 +644,7 @@
fi
if [ "$IPV6" = "yes" ]; then
if [ "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
- up_delay=4
+ up_delay=10
init_dhcp6c extif $EXTIF
ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/dhcp6c.action
fi
@@ -656,9 +655,10 @@
fi
fi
ip link set dev $EXTIF up
- if [ $up_delay -gt 0 ]; then
- sleep $up_delay
- fi
+ while [ $up_delay -gt 0 ] && [ ! -f /var/db/dhcp6c_cache ]; do
+ up_delay=$((up_delay - 1))
+ sleep 1
+ done
;;
esac
@@ -702,14 +702,20 @@
#DHCP
if [ -n "$EXTIF" -a -z "$EXTIP" ] && ! isextppp extif; then
+ up_delay=0
ip link set dev $EXTIF up
sleep 4
if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ up_delay=10
init_dhcp6c extif $EXTIF
dhcp6c -c /etc/wide-dhcpv6/dhcp6c-$EXTIF.conf -p /var/run/dhcp6c-$EXTIF.pid $EXTIF
fi
udhcpc -b -T2 -t6 -S -s /etc/udhcpc.script -H $HOSTNAME -p /var/run/udhcpc-$EXTIF.pid -i $EXTIF
ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/udhcpc.action
+ while [ $up_delay -gt 0 ] && [ ! -f /var/db/dhcp6c_cache ]; do
+ up_delay=$((up_delay - 1))
+ sleep 1
+ done
# No DHCPv6 - Static IPv6 if defined
if [ "$IPV6" = "yes" ] && [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-11 23:53:47
|
Revision: 8299
http://sourceforge.net/p/astlinux/code/8299
Author: abelbeck
Date: 2017-05-11 23:53:44 +0000 (Thu, 11 May 2017)
Log Message:
-----------
network, tweak Static IPv4 and DHCPv6 special case on startup
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-05-11 21:24:35 UTC (rev 8298)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-05-11 23:53:44 UTC (rev 8299)
@@ -638,22 +638,26 @@
ip link set dev $EXTIF up
;;
*)
+ up_delay=0
ip addr add $EXTIP/$EXTNM brd + dev $EXTIF
if [ -n "$EXTIP_ALIAS" ]; then
alias_interface add $EXTIF "$EXTIP_ALIAS"
fi
- if [ "$IPV6" = "yes" ] && [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
- if [ -n "$EXTIPV6" ]; then
- ip -6 addr add $EXTIPV6 dev $EXTIF
+ if [ "$IPV6" = "yes" ]; then
+ if [ "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ up_delay=4
+ init_dhcp6c extif $EXTIF
+ ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/dhcp6c.action
fi
+ if [ "$DHCPV6_CLIENT_ENABLE" != "yes" -o "$DHCPV6_CLIENT_REQUEST_ADDRESS" = "no" ]; then
+ if [ -n "$EXTIPV6" ]; then
+ ip -6 addr add $EXTIPV6 dev $EXTIF
+ fi
+ fi
fi
ip link set dev $EXTIF up
- if [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
- sleep 4
- init_dhcp6c extif $EXTIF
- dhcp6c -c /etc/wide-dhcpv6/dhcp6c-$EXTIF.conf -p /var/run/dhcp6c-$EXTIF.pid $EXTIF
- ifplugd -apq -t2 -u3 -d3 -i $EXTIF -r /etc/ifplugd/dhcp6c.action
- sleep 2
+ if [ $up_delay -gt 0 ]; then
+ sleep $up_delay
fi
;;
esac
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-11 21:24:37
|
Revision: 8298
http://sourceforge.net/p/astlinux/code/8298
Author: abelbeck
Date: 2017-05-11 21:24:35 +0000 (Thu, 11 May 2017)
Log Message:
-----------
wide-dhcpv6, dhcp6c.script, add 'dhcp6c_cache' file and 'dhcp6c_changed' exported env variable
Modified Paths:
--------------
branches/1.0/package/wide-dhcpv6/dhcp6c.script
Modified: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-11 15:24:04 UTC (rev 8297)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-11 21:24:35 UTC (rev 8298)
@@ -6,6 +6,8 @@
SCRIPTFILE="/mnt/kd/dhcp6c.script"
+CACHEFILE="/var/db/dhcp6c_cache"
+
get_ipv6_global_addr()
{
local interface="$1"
@@ -41,6 +43,32 @@
esac
}
+update_cache()
+{
+ local changed
+
+ echo "## dhcp6c cache
+dhcp6c_interface=$dhcp6c_interface
+dhcp6c_address=$dhcp6c_address
+dhcp6c_prefix_interfaces=$dhcp6c_prefix_interfaces
+dhcp6c_prefix_addresses=$dhcp6c_prefix_addresses" > "$CACHEFILE.new"
+ chmod 600 "$CACHEFILE.new"
+
+ if [ -f "$CACHEFILE" ] && cmp -s "$CACHEFILE" "$CACHEFILE.new"; then
+ changed="no"
+ rm -f "$CACHEFILE.new"
+ else
+ if [ -f "$CACHEFILE" ]; then
+ changed="yes"
+ else
+ changed=""
+ fi
+ mv "$CACHEFILE.new" "$CACHEFILE"
+ fi
+
+ echo "$changed"
+}
+
setup_env()
{
local conffile pd_1 prefix_len prefix_if interface ipv6 ipv6_ex cut_chars prefix_label IFS
@@ -48,6 +76,7 @@
## Globals to export
dhcp6c_interface=""
dhcp6c_address=""
+ dhcp6c_changed=""
dhcp6c_prefix_interfaces=""
dhcp6c_prefix_addresses=""
dhcp6c_prefix=""
@@ -77,6 +106,8 @@
dhcp6c_prefix_interfaces="${dhcp6c_prefix_interfaces#,}"
dhcp6c_prefix_addresses="${dhcp6c_prefix_addresses#,}"
+ dhcp6c_changed="$(update_cache)"
+
if [ -z "$dhcp6c_prefix_addresses" ]; then
return
fi
@@ -99,7 +130,7 @@
if [ -x $SCRIPTFILE ]; then
setup_env
- export dhcp6c_interface dhcp6c_address
+ export dhcp6c_interface dhcp6c_address dhcp6c_changed
export dhcp6c_prefix_interfaces dhcp6c_prefix_addresses
export dhcp6c_prefix dhcp6c_prefix_base dhcp6c_prefix_len
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-11 15:24:07
|
Revision: 8297
http://sourceforge.net/p/astlinux/code/8297
Author: abelbeck
Date: 2017-05-11 15:24:04 +0000 (Thu, 11 May 2017)
Log Message:
-----------
wide-dhcpv6, dhcp6c.script, minor simplification, no functional change
Modified Paths:
--------------
branches/1.0/package/wide-dhcpv6/dhcp6c.script
Modified: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-10 21:08:19 UTC (rev 8296)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-11 15:24:04 UTC (rev 8297)
@@ -43,7 +43,7 @@
setup_env()
{
- local conffile pd_1 prefix_len prefix_if first_if interface ipv6 ipv6_ex cut_chars prefix_label IFS
+ local conffile pd_1 prefix_len prefix_if interface ipv6 ipv6_ex cut_chars prefix_label IFS
## Globals to export
dhcp6c_interface=""
@@ -67,25 +67,21 @@
prefix_len="$(echo "$pd_1" | sed -n -r -e 's/^ +prefix +::\/([0-9]+) .*$/\1/p')"
prefix_if="$(echo "$pd_1" | sed -n -r -e 's/^ +prefix-interface +([^ ]+) .*$/\1/p')"
- first_if=""
unset IFS
for interface in $prefix_if; do
dhcp6c_prefix_interfaces="$dhcp6c_prefix_interfaces,$interface"
dhcp6c_prefix_addresses="$dhcp6c_prefix_addresses,$(get_ipv6_global_addr $interface)"
- if [ -z "$first_if" ]; then
- first_if="$interface"
- fi
done
# remove leading comma, this method keeps the pairs comma-aligned
dhcp6c_prefix_interfaces="${dhcp6c_prefix_interfaces#,}"
dhcp6c_prefix_addresses="${dhcp6c_prefix_addresses#,}"
- if [ -z "$first_if" ]; then
+ if [ -z "$dhcp6c_prefix_addresses" ]; then
return
fi
- ipv6="$(get_ipv6_global_addr $first_if)"
+ ipv6="$(echo "$dhcp6c_prefix_addresses" | cut -d',' -f1)"
if [ -n "$ipv6" ]; then
ipv6_ex="$(netcalc "$ipv6" | sed -n -r -e 's/^Expanded IPv6 *: *([0-9a-fA-F:]+).*$/\1/p')"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-10 21:08:22
|
Revision: 8296
http://sourceforge.net/p/astlinux/code/8296
Author: abelbeck
Date: 2017-05-10 21:08:19 +0000 (Wed, 10 May 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-05-10 20:59:40 UTC (rev 8295)
+++ branches/1.0/docs/ChangeLog.txt 2017-05-10 21:08:19 UTC (rev 8296)
@@ -76,7 +76,7 @@
-- gntp-send, version 0.3.4, new package, CLI tool for sending Growl (GNTP) notifications.
More info: http://doc.astlinux-project.org/userdoc:tt_asterisk_call_notify
--- sngrep, version 1.4.2, new package, tool for displaying SIP call message flows from a terminal.
+-- sngrep, version 1.4.3, new package, tool for displaying SIP call message flows from a terminal.
-- ddclient, switch to ddclient-curl version 3.8.3-03, adds IPv6 and Hurricane Electric support
Cloudflare, FreeDNS, and HE Free DNS (Hurricane Electric) now support mixed IPv4/IPv6 DNS updates.
@@ -97,6 +97,7 @@
disabled by default. Example: PHYETH_DISABLE_OFFLOAD="tso gso gro"
-- wide-dhcpv6, add support for optional script '/mnt/kd/dhcp6c.script', enabled if it exists and is executable.
+ More info: http://doc.astlinux-project.org/userdoc:tt-dhcpv6-prefix-delegation#dhcpv6_client_action_script
-- chrony, version bump to 3.1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-10 20:59:42
|
Revision: 8295
http://sourceforge.net/p/astlinux/code/8295
Author: abelbeck
Date: 2017-05-10 20:59:40 +0000 (Wed, 10 May 2017)
Log Message:
-----------
sngrep, version bump to 1.4.3, enable EEP/HEP support
Modified Paths:
--------------
branches/1.0/package/sngrep/sngrep.mk
Removed Paths:
-------------
branches/1.0/package/sngrep/sngrep-0001-upstream-add-SNGREPRC-env-support.patch
branches/1.0/package/sngrep/sngrep-0002-upstream-F8-help-text.patch
branches/1.0/package/sngrep/sngrep-0003-upstream-getenv-malloc.patch
branches/1.0/package/sngrep/sngrep-0004-upstream-silence-clang-warnings.patch
Deleted: branches/1.0/package/sngrep/sngrep-0001-upstream-add-SNGREPRC-env-support.patch
===================================================================
--- branches/1.0/package/sngrep/sngrep-0001-upstream-add-SNGREPRC-env-support.patch 2017-05-10 17:50:03 UTC (rev 8294)
+++ branches/1.0/package/sngrep/sngrep-0001-upstream-add-SNGREPRC-env-support.patch 2017-05-10 20:59:40 UTC (rev 8295)
@@ -1,164 +0,0 @@
-diff --git a/src/curses/ui_column_select.c b/src/curses/ui_column_select.c
-index 5fe6436..86d7ba1 100644
---- a/src/curses/ui_column_select.c
-+++ b/src/curses/ui_column_select.c
-@@ -373,21 +373,24 @@ column_select_save_columns(ui_t *ui)
- FILE *fi, *fo;
- char columnopt[128];
- char line[1024];
-- char *home = getenv("HOME");
-+ char *rcfile;
- char userconf[128], tmpfile[128];
-
-- // No home dir...
-- if (!home)
-+ // Use current $SNGREPRC or $HOME/.sngreprc file
-+ if (rcfile = getenv("SNGREPRC")) {
-+ sprintf(userconf, "%s", rcfile);
-+ sprintf(tmpfile, "%s.old", rcfile);
-+ } else if (rcfile = getenv("HOME")) {
-+ sprintf(userconf, "%s/.sngreprc", rcfile);
-+ sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
-+ } else {
- return;
--
-- // Read current $HOME/.sngreprc file
-- sprintf(userconf, "%s/.sngreprc", home);
-- sprintf(tmpfile, "%s/.sngreprc.old", home);
-+ }
-
- // Remove old config file
- unlink(tmpfile);
-
-- // Move home file to temporal dir
-+ // Move user conf file to temporal file
- rename(userconf, tmpfile);
-
- // Create a new user conf file
-@@ -403,7 +406,7 @@ column_select_save_columns(ui_t *ui)
- while (fgets(line, 1024, fi) != NULL) {
- // Ignore lines starting with set (but keep settings)
- if (strncmp(line, "set ", 4) || strncmp(line, "set cl.column", 13)) {
-- // Put everyting in new .sngreprc file
-+ // Put everyting in new user conf file
- fputs(line, fo);
- }
- }
-diff --git a/src/curses/ui_column_select.h b/src/curses/ui_column_select.h
-index 4181f33..83600d2 100644
---- a/src/curses/ui_column_select.h
-+++ b/src/curses/ui_column_select.h
-@@ -164,7 +164,7 @@ column_select_update_columns(ui_t *ui);
- * @brief Save selected columns to user config file
- *
- * Remove previously configurated columns from user's
-- * $HOME/.sngreprc and add new ones
-+ * $SNGREPRC or $HOME/.sngreprc and add new ones
- *
- * @param ui UI structure pointer
- */
-diff --git a/src/curses/ui_settings.c b/src/curses/ui_settings.c
-index d765f0b..48c9f11 100644
---- a/src/curses/ui_settings.c
-+++ b/src/curses/ui_settings.c
-@@ -452,7 +452,7 @@ ui_settings_save(ui_t *ui)
- int i;
- FILE *fi, *fo;
- char line[1024];
-- char *home = getenv("HOME");
-+ char *rcfile;
- char userconf[128], tmpfile[128];
- char field_value[180];
- settings_entry_t *entry;
-@@ -460,20 +460,22 @@ ui_settings_save(ui_t *ui)
- // Get panel information
- settings_info_t *info = settings_info(ui);
-
-- // No home dir...
-- if (!home) {
-- dialog_run("Unable to save configuration. User has no $HOME dir.");
-+ // Use current $SNGREPRC or $HOME/.sngreprc file
-+ if (rcfile = getenv("SNGREPRC")) {
-+ sprintf(userconf, "%s", rcfile);
-+ sprintf(tmpfile, "%s.old", rcfile);
-+ } else if (rcfile = getenv("HOME")) {
-+ sprintf(userconf, "%s/.sngreprc", rcfile);
-+ sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
-+ } else {
-+ dialog_run("Unable to save configuration. User has no $SNGREPRC or $HOME dir.");
- return;
- }
-
-- // Read current $HOME/.sngreprc file
-- sprintf(userconf, "%s/.sngreprc", home);
-- sprintf(tmpfile, "%s/.sngreprc.old", home);
--
- // Remove old config file
- unlink(tmpfile);
-
-- // Move home file to temporal dir
-+ // Move user conf file to temporal file
- rename(userconf, tmpfile);
-
- // Create a new user conf file
-@@ -487,7 +489,7 @@ ui_settings_save(ui_t *ui)
- while (fgets(line, 1024, fi) != NULL) {
- // Ignore lines starting with set (but keep set column ones)
- if (strncmp(line, "set ", 4) || !strncmp(line, "set cl.column", 13)) {
-- // Put everyting in new .sngreprc file
-+ // Put everyting in new user conf file
- fputs(line, fo);
- }
- }
-diff --git a/src/option.c b/src/option.c
-index e6e3145..b1efa08 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -51,7 +51,7 @@ init_options()
- {
- // Custom user conf file
- char userconf[128];
-- char *home = getenv("HOME");
-+ char *rcfile;
- char pwd[MAX_SETTING_LEN];
-
- // Defualt savepath is current directory
-@@ -75,9 +75,11 @@ init_options()
- // Read options from configuration files
- read_options("/etc/sngreprc");
- read_options("/usr/local/etc/sngreprc");
-- // Get user homedir configuration
-- if (home) {
-- sprintf(userconf, "%s/.sngreprc", home);
-+ // Get user configuration
-+ if (rcfile = getenv("SNGREPRC")) {
-+ read_options(rcfile);
-+ } else if (rcfile = getenv("HOME")) {
-+ sprintf(userconf, "%s/.sngreprc", rcfile);
- read_options(userconf);
- }
-
-diff --git a/src/option.h b/src/option.h
-index 3f8fea4..58d8245 100644
---- a/src/option.h
-+++ b/src/option.h
-@@ -32,6 +32,7 @@
- * - Initialization
- * - \@sysdir\@/sngreprc
- * - $HOME/.sngreprc
-+ * - $SNGREPRC
- *
- * This is a basic approach to configuration, but at least a minimun is required
- * for those who can not see all the list columns or want to disable colours in
-diff --git a/src/setting.h b/src/setting.h
-index 492a9a7..20c197c 100644
---- a/src/setting.h
-+++ b/src/setting.h
-@@ -32,6 +32,7 @@
- * - Initialization
- * - \@sysdir\@/sngreprc
- * - $HOME/.sngreprc
-+ * - $SNGREPRC
- *
- * This is a basic approach to configuration, but at least a minimun is required
- * for those who can not see all the list columns or want to disable colours in
Deleted: branches/1.0/package/sngrep/sngrep-0002-upstream-F8-help-text.patch
===================================================================
--- branches/1.0/package/sngrep/sngrep-0002-upstream-F8-help-text.patch 2017-05-10 17:50:03 UTC (rev 8294)
+++ branches/1.0/package/sngrep/sngrep-0002-upstream-F8-help-text.patch 2017-05-10 20:59:40 UTC (rev 8295)
@@ -1,13 +0,0 @@
-diff --git a/src/curses/ui_call_list.c b/src/curses/ui_call_list.c
-index 9d854fc..043d2d1 100644
---- a/src/curses/ui_call_list.c
-+++ b/src/curses/ui_call_list.c
-@@ -933,7 +933,7 @@ call_list_help(ui_t *ui)
- mvwprintw(help_win, 17, 2, "F5/Ctrl-L Clear call list (can not be undone!)");
- mvwprintw(help_win, 18, 2, "F6/R Show selected call messages in raw mode");
- mvwprintw(help_win, 19, 2, "F7/F Show filter options");
-- mvwprintw(help_win, 20, 2, "F8/c Turn on/off window colours");
-+ mvwprintw(help_win, 20, 2, "F8/o Show Settings");
- mvwprintw(help_win, 21, 2, "F10/t Select displayed columns");
- mvwprintw(help_win, 22, 2, "i/I Set display filter to invite");
- mvwprintw(help_win, 23, 2, "p Stop/Resume packet capture");
Deleted: branches/1.0/package/sngrep/sngrep-0003-upstream-getenv-malloc.patch
===================================================================
--- branches/1.0/package/sngrep/sngrep-0003-upstream-getenv-malloc.patch 2017-05-10 17:50:03 UTC (rev 8294)
+++ branches/1.0/package/sngrep/sngrep-0003-upstream-getenv-malloc.patch 2017-05-10 20:59:40 UTC (rev 8295)
@@ -1,169 +0,0 @@
-diff --git a/src/curses/ui_column_select.c b/src/curses/ui_column_select.c
-index 86d7ba1..d76be47 100644
---- a/src/curses/ui_column_select.c
-+++ b/src/curses/ui_column_select.c
-@@ -374,15 +374,34 @@ column_select_save_columns(ui_t *ui)
- char columnopt[128];
- char line[1024];
- char *rcfile;
-- char userconf[128], tmpfile[128];
-+ char *userconf = NULL;
-+ char *tmpfile = NULL;
-
- // Use current $SNGREPRC or $HOME/.sngreprc file
- if (rcfile = getenv("SNGREPRC")) {
-- sprintf(userconf, "%s", rcfile);
-- sprintf(tmpfile, "%s.old", rcfile);
-+ if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ sprintf(userconf, "%s", rcfile);
-+ sprintf(tmpfile, "%s.old", rcfile);
-+ } else {
-+ sng_free(userconf);
-+ return;
-+ }
-+ } else {
-+ return;
-+ }
- } else if (rcfile = getenv("HOME")) {
-- sprintf(userconf, "%s/.sngreprc", rcfile);
-- sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
-+ if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ sprintf(userconf, "%s/.sngreprc", rcfile);
-+ sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
-+ } else {
-+ sng_free(userconf);
-+ return;
-+ }
-+ } else {
-+ return;
-+ }
- } else {
- return;
- }
-@@ -396,6 +415,8 @@ column_select_save_columns(ui_t *ui)
- // Create a new user conf file
- if (!(fo = fopen(userconf, "w"))) {
- dialog_run("Unable to open %s: %s", userconf, strerror(errno));
-+ sng_free(userconf);
-+ sng_free(tmpfile);
- return;
- }
-
-@@ -430,6 +451,9 @@ column_select_save_columns(ui_t *ui)
-
- // Show a information dialog
- dialog_run("Column layout successfully saved to %s", userconf);
-+
-+ sng_free(userconf);
-+ sng_free(tmpfile);
- }
-
-
-diff --git a/src/curses/ui_settings.c b/src/curses/ui_settings.c
-index 48c9f11..2c7fe39 100644
---- a/src/curses/ui_settings.c
-+++ b/src/curses/ui_settings.c
-@@ -453,7 +453,8 @@ ui_settings_save(ui_t *ui)
- FILE *fi, *fo;
- char line[1024];
- char *rcfile;
-- char userconf[128], tmpfile[128];
-+ char *userconf = NULL;
-+ char *tmpfile = NULL;
- char field_value[180];
- settings_entry_t *entry;
-
-@@ -462,11 +463,29 @@ ui_settings_save(ui_t *ui)
-
- // Use current $SNGREPRC or $HOME/.sngreprc file
- if (rcfile = getenv("SNGREPRC")) {
-- sprintf(userconf, "%s", rcfile);
-- sprintf(tmpfile, "%s.old", rcfile);
-+ if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ sprintf(userconf, "%s", rcfile);
-+ sprintf(tmpfile, "%s.old", rcfile);
-+ } else {
-+ sng_free(userconf);
-+ return;
-+ }
-+ } else {
-+ return;
-+ }
- } else if (rcfile = getenv("HOME")) {
-- sprintf(userconf, "%s/.sngreprc", rcfile);
-- sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
-+ if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ sprintf(userconf, "%s/.sngreprc", rcfile);
-+ sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
-+ } else {
-+ sng_free(userconf);
-+ return;
-+ }
-+ } else {
-+ return;
-+ }
- } else {
- dialog_run("Unable to save configuration. User has no $SNGREPRC or $HOME dir.");
- return;
-@@ -480,6 +499,8 @@ ui_settings_save(ui_t *ui)
-
- // Create a new user conf file
- if (!(fo = fopen(userconf, "w"))) {
-+ sng_free(userconf);
-+ sng_free(tmpfile);
- return;
- }
-
-@@ -510,4 +531,7 @@ ui_settings_save(ui_t *ui)
- fclose(fo);
-
- dialog_run("Settings successfully saved to %s", userconf);
-+
-+ sng_free(userconf);
-+ sng_free(tmpfile);
- }
-diff --git a/src/option.c b/src/option.c
-index b1efa08..641321a 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -50,7 +50,7 @@ int
- init_options()
- {
- // Custom user conf file
-- char userconf[128];
-+ char *userconf = NULL;
- char *rcfile;
- char pwd[MAX_SETTING_LEN];
-
-@@ -79,8 +79,11 @@ init_options()
- if (rcfile = getenv("SNGREPRC")) {
- read_options(rcfile);
- } else if (rcfile = getenv("HOME")) {
-- sprintf(userconf, "%s/.sngreprc", rcfile);
-- read_options(userconf);
-+ if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ sprintf(userconf, "%s/.sngreprc", rcfile);
-+ read_options(userconf);
-+ sng_free(userconf);
-+ }
- }
-
- return 0;
-diff --git a/src/setting.h b/src/setting.h
-index 20c197c..65d7341 100644
---- a/src/setting.h
-+++ b/src/setting.h
-@@ -45,6 +45,9 @@
- //! Max setting value
- #define MAX_SETTING_LEN 1024
-
-+//! Max extra length needed for "/.sngreprc.old"
-+#define RCFILE_EXTRA_LEN 16
-+
- //! Shorter declarartion of setting_option struct
- typedef struct setting_option setting_t;
-
Deleted: branches/1.0/package/sngrep/sngrep-0004-upstream-silence-clang-warnings.patch
===================================================================
--- branches/1.0/package/sngrep/sngrep-0004-upstream-silence-clang-warnings.patch 2017-05-10 17:50:03 UTC (rev 8294)
+++ branches/1.0/package/sngrep/sngrep-0004-upstream-silence-clang-warnings.patch 2017-05-10 20:59:40 UTC (rev 8295)
@@ -1,78 +0,0 @@
-diff --git a/src/curses/ui_column_select.c b/src/curses/ui_column_select.c
-index d76be47..7bc8e71 100644
---- a/src/curses/ui_column_select.c
-+++ b/src/curses/ui_column_select.c
-@@ -378,9 +378,9 @@ column_select_save_columns(ui_t *ui)
- char *tmpfile = NULL;
-
- // Use current $SNGREPRC or $HOME/.sngreprc file
-- if (rcfile = getenv("SNGREPRC")) {
-- if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-- if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ if ((rcfile = getenv("SNGREPRC"))) {
-+ if ((userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
-+ if ((tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
- sprintf(userconf, "%s", rcfile);
- sprintf(tmpfile, "%s.old", rcfile);
- } else {
-@@ -390,9 +390,9 @@ column_select_save_columns(ui_t *ui)
- } else {
- return;
- }
-- } else if (rcfile = getenv("HOME")) {
-- if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-- if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ } else if ((rcfile = getenv("HOME"))) {
-+ if ((userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
-+ if ((tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
- sprintf(userconf, "%s/.sngreprc", rcfile);
- sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
- } else {
-diff --git a/src/curses/ui_settings.c b/src/curses/ui_settings.c
-index 2c7fe39..3aba988 100644
---- a/src/curses/ui_settings.c
-+++ b/src/curses/ui_settings.c
-@@ -462,9 +462,9 @@ ui_settings_save(ui_t *ui)
- settings_info_t *info = settings_info(ui);
-
- // Use current $SNGREPRC or $HOME/.sngreprc file
-- if (rcfile = getenv("SNGREPRC")) {
-- if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-- if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ if ((rcfile = getenv("SNGREPRC"))) {
-+ if ((userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
-+ if ((tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
- sprintf(userconf, "%s", rcfile);
- sprintf(tmpfile, "%s.old", rcfile);
- } else {
-@@ -474,9 +474,9 @@ ui_settings_save(ui_t *ui)
- } else {
- return;
- }
-- } else if (rcfile = getenv("HOME")) {
-- if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-- if (tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ } else if ((rcfile = getenv("HOME"))) {
-+ if ((userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
-+ if ((tmpfile = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
- sprintf(userconf, "%s/.sngreprc", rcfile);
- sprintf(tmpfile, "%s/.sngreprc.old", rcfile);
- } else {
-diff --git a/src/option.c b/src/option.c
-index 641321a..77bdc3b 100644
---- a/src/option.c
-+++ b/src/option.c
-@@ -76,10 +76,10 @@ init_options()
- read_options("/etc/sngreprc");
- read_options("/usr/local/etc/sngreprc");
- // Get user configuration
-- if (rcfile = getenv("SNGREPRC")) {
-+ if ((rcfile = getenv("SNGREPRC"))) {
- read_options(rcfile);
-- } else if (rcfile = getenv("HOME")) {
-- if (userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN)) {
-+ } else if ((rcfile = getenv("HOME"))) {
-+ if ((userconf = sng_malloc(strlen(rcfile) + RCFILE_EXTRA_LEN))) {
- sprintf(userconf, "%s/.sngreprc", rcfile);
- read_options(userconf);
- sng_free(userconf);
Modified: branches/1.0/package/sngrep/sngrep.mk
===================================================================
--- branches/1.0/package/sngrep/sngrep.mk 2017-05-10 17:50:03 UTC (rev 8294)
+++ branches/1.0/package/sngrep/sngrep.mk 2017-05-10 20:59:40 UTC (rev 8295)
@@ -4,16 +4,16 @@
#
################################################################################
-SNGREP_VERSION = 1.4.2
+SNGREP_VERSION = 1.4.3
SNGREP_SOURCE = sngrep-$(SNGREP_VERSION).tar.gz
-SNGREP_SITE = http://files.astlinux-project.org
-#SNGREP_SITE = https://github.com/irontec/sngrep/releases
+SNGREP_SITE = https://github.com/irontec/sngrep/releases/download/v$(SNGREP_VERSION)
SNGREP_AUTORECONF = YES
SNGREP_DEPENDENCIES = libpcap ncurses
SNGREP_CONF_OPT = \
--disable-unicode \
- --enable-ipv6
+ --enable-ipv6 \
+ --enable-eep
# openssl and gnutls can't be enabled at the same time.
ifeq ($(BR2_PACKAGE_OPENSSL),y)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-10 17:50:05
|
Revision: 8294
http://sourceforge.net/p/astlinux/code/8294
Author: abelbeck
Date: 2017-05-10 17:50:03 +0000 (Wed, 10 May 2017)
Log Message:
-----------
wide-dhcpv6, rewrite the '/etc/dhcp6c.script' script to parse the dhcp6c config file instead of using /etc/rc.conf variables, and add a few more exported env variables.
Ref: https://doc.astlinux-project.org/userdoc:tt-dhcpv6-prefix-delegation#dhcpv6_client_action_script
Modified Paths:
--------------
branches/1.0/package/wide-dhcpv6/dhcp6c.script
Modified: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-09 22:28:10 UTC (rev 8293)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-10 17:50:03 UTC (rev 8294)
@@ -6,50 +6,20 @@
SCRIPTFILE="/mnt/kd/dhcp6c.script"
-find_first_autoconfig_if()
+get_ipv6_global_addr()
{
- local interface="" iname IFS
+ local interface="$1"
- unset IFS
- for iname in $IPV6_AUTOCONF; do
- case $iname in
- INTIF)
- if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" ]; then
- interface="$INTIF"
- fi
- ;;
- INT2IF)
- if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" ]; then
- interface="$INT2IF"
- fi
- ;;
- INT3IF)
- if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" ]; then
- interface="$INT3IF"
- fi
- ;;
- INT4IF)
- if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" ]; then
- interface="$INT4IF"
- fi
- ;;
- DMZIF)
- if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
- interface="$DMZIF"
- fi
- ;;
- esac
- if [ -n "$interface" ]; then
- break
- fi
- done
-
- echo "$interface"
+ ip -6 -o addr show dev $interface scope global 2>/dev/null | \
+ sed -n -r -e 's|^.* inet6 ([0-9a-fA-F:]+)/.*$|\1|p' | \
+ head -n1
}
-find_prefix_len()
+use_prefix_len()
{
- case "${DHCPV6_CLIENT_PREFIX_LEN:-60}" in
+ local len="$1"
+
+ case $len in
64) cut_chars="1-19"
prefix_label="::/64"
;;
@@ -73,26 +43,59 @@
setup_env()
{
- local ipv6 ipv6_ex cut_chars prefix_label
+ local conffile pd_1 prefix_len prefix_if first_if interface ipv6 ipv6_ex cut_chars prefix_label IFS
- dhcp6c_interface="$(find_first_autoconfig_if)"
+ ## Globals to export
+ dhcp6c_interface=""
+ dhcp6c_address=""
+ dhcp6c_prefix_interfaces=""
+ dhcp6c_prefix_addresses=""
dhcp6c_prefix=""
dhcp6c_prefix_base=""
+ dhcp6c_prefix_len=""
+ ##
- if [ -n "$dhcp6c_interface" ]; then
- ipv6="$(ip -6 -o addr show dev $dhcp6c_interface scope global 2>/dev/null | \
- sed -n -r -e 's|^.* inet6 ([0-9a-fA-F:]+)/.*$|\1|p' | \
- head -n1)"
+ conffile="/etc/wide-dhcpv6/dhcp6c-${EXTIF}.conf"
+ if [ ! -f "$conffile" ]; then
+ return
+ fi
- if [ -n "$ipv6" ]; then
- ipv6_ex="$(netcalc "$ipv6" | sed -n -r -e 's/^Expanded IPv6 *: *([0-9a-fA-F:]+).*$/\1/p')"
+ dhcp6c_interface="$EXTIF"
+ dhcp6c_address="$(get_ipv6_global_addr $dhcp6c_interface)"
- find_prefix_len
- if [ -n "$cut_chars" -a -n "$prefix_label" ]; then
- dhcp6c_prefix_base="$(echo "$ipv6_ex" | cut -c $cut_chars)"
- if [ -n "$dhcp6c_prefix_base" ]; then
- dhcp6c_prefix="$dhcp6c_prefix_base$prefix_label"
- fi
+ pd_1="$(cat "$conffile" | sed -n '/^id-assoc pd 1 /,/^};/ p')"
+
+ prefix_len="$(echo "$pd_1" | sed -n -r -e 's/^ +prefix +::\/([0-9]+) .*$/\1/p')"
+ prefix_if="$(echo "$pd_1" | sed -n -r -e 's/^ +prefix-interface +([^ ]+) .*$/\1/p')"
+ first_if=""
+
+ unset IFS
+ for interface in $prefix_if; do
+ dhcp6c_prefix_interfaces="$dhcp6c_prefix_interfaces,$interface"
+ dhcp6c_prefix_addresses="$dhcp6c_prefix_addresses,$(get_ipv6_global_addr $interface)"
+ if [ -z "$first_if" ]; then
+ first_if="$interface"
+ fi
+ done
+ # remove leading comma, this method keeps the pairs comma-aligned
+ dhcp6c_prefix_interfaces="${dhcp6c_prefix_interfaces#,}"
+ dhcp6c_prefix_addresses="${dhcp6c_prefix_addresses#,}"
+
+ if [ -z "$first_if" ]; then
+ return
+ fi
+
+ ipv6="$(get_ipv6_global_addr $first_if)"
+
+ if [ -n "$ipv6" ]; then
+ ipv6_ex="$(netcalc "$ipv6" | sed -n -r -e 's/^Expanded IPv6 *: *([0-9a-fA-F:]+).*$/\1/p')"
+
+ use_prefix_len "$prefix_len"
+ if [ -n "$cut_chars" -a -n "$prefix_label" ]; then
+ dhcp6c_prefix_len="$prefix_len"
+ dhcp6c_prefix_base="$(echo "$ipv6_ex" | cut -c $cut_chars)"
+ if [ -n "$dhcp6c_prefix_base" ]; then
+ dhcp6c_prefix="$dhcp6c_prefix_base$prefix_label"
fi
fi
fi
@@ -100,7 +103,9 @@
if [ -x $SCRIPTFILE ]; then
setup_env
- export dhcp6c_interface dhcp6c_prefix dhcp6c_prefix_base
+ export dhcp6c_interface dhcp6c_address
+ export dhcp6c_prefix_interfaces dhcp6c_prefix_addresses
+ export dhcp6c_prefix dhcp6c_prefix_base dhcp6c_prefix_len
$SCRIPTFILE >/dev/null 2>&1 &
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-09 22:28:11
|
Revision: 8293
http://sourceforge.net/p/astlinux/code/8293
Author: abelbeck
Date: 2017-05-09 22:28:10 +0000 (Tue, 09 May 2017)
Log Message:
-----------
wide-dhcpv6, add env variables passed to the optional /mnt/kd/dhcp6c.script, dhcp6c_interface, dhcp6c_prefix_base and dhcp6c_prefix
Modified Paths:
--------------
branches/1.0/package/wide-dhcpv6/dhcp6c.script
Modified: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-09 14:14:08 UTC (rev 8292)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-09 22:28:10 UTC (rev 8293)
@@ -1,10 +1,107 @@
#!/bin/bash
+. /etc/rc.conf
+
export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
SCRIPTFILE="/mnt/kd/dhcp6c.script"
+find_first_autoconfig_if()
+{
+ local interface="" iname IFS
+
+ unset IFS
+ for iname in $IPV6_AUTOCONF; do
+ case $iname in
+ INTIF)
+ if [ -n "$INTIF" -a "$INTIF" != "none" -a -n "$INTIP" -a -n "$INTNM" ]; then
+ interface="$INTIF"
+ fi
+ ;;
+ INT2IF)
+ if [ -n "$INT2IF" -a "$INT2IF" != "none" -a -n "$INT2IP" -a -n "$INT2NM" ]; then
+ interface="$INT2IF"
+ fi
+ ;;
+ INT3IF)
+ if [ -n "$INT3IF" -a "$INT3IF" != "none" -a -n "$INT3IP" -a -n "$INT3NM" ]; then
+ interface="$INT3IF"
+ fi
+ ;;
+ INT4IF)
+ if [ -n "$INT4IF" -a "$INT4IF" != "none" -a -n "$INT4IP" -a -n "$INT4NM" ]; then
+ interface="$INT4IF"
+ fi
+ ;;
+ DMZIF)
+ if [ -n "$DMZIF" -a "$DMZIF" != "none" -a -n "$DMZIP" -a -n "$DMZNM" ]; then
+ interface="$DMZIF"
+ fi
+ ;;
+ esac
+ if [ -n "$interface" ]; then
+ break
+ fi
+ done
+
+ echo "$interface"
+}
+
+find_prefix_len()
+{
+ case "${DHCPV6_CLIENT_PREFIX_LEN:-60}" in
+ 64) cut_chars="1-19"
+ prefix_label="::/64"
+ ;;
+ 60) cut_chars="1-18"
+ prefix_label="0::/60"
+ ;;
+ 56) cut_chars="1-17"
+ prefix_label="00::/56"
+ ;;
+ 52) cut_chars="1-16"
+ prefix_label="000::/52"
+ ;;
+ 48) cut_chars="1-15"
+ prefix_label="0000::/48"
+ ;;
+ *) cut_chars=""
+ prefix_label=""
+ ;;
+ esac
+}
+
+setup_env()
+{
+ local ipv6 ipv6_ex cut_chars prefix_label
+
+ dhcp6c_interface="$(find_first_autoconfig_if)"
+ dhcp6c_prefix=""
+ dhcp6c_prefix_base=""
+
+ if [ -n "$dhcp6c_interface" ]; then
+ ipv6="$(ip -6 -o addr show dev $dhcp6c_interface scope global 2>/dev/null | \
+ sed -n -r -e 's|^.* inet6 ([0-9a-fA-F:]+)/.*$|\1|p' | \
+ head -n1)"
+
+ if [ -n "$ipv6" ]; then
+ ipv6_ex="$(netcalc "$ipv6" | sed -n -r -e 's/^Expanded IPv6 *: *([0-9a-fA-F:]+).*$/\1/p')"
+
+ find_prefix_len
+ if [ -n "$cut_chars" -a -n "$prefix_label" ]; then
+ dhcp6c_prefix_base="$(echo "$ipv6_ex" | cut -c $cut_chars)"
+ if [ -n "$dhcp6c_prefix_base" ]; then
+ dhcp6c_prefix="$dhcp6c_prefix_base$prefix_label"
+ fi
+ fi
+ fi
+ fi
+}
+
if [ -x $SCRIPTFILE ]; then
+ setup_env
+ export dhcp6c_interface dhcp6c_prefix dhcp6c_prefix_base
+
$SCRIPTFILE >/dev/null 2>&1 &
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-09 14:14:10
|
Revision: 8292
http://sourceforge.net/p/astlinux/code/8292
Author: abelbeck
Date: 2017-05-09 14:14:08 +0000 (Tue, 09 May 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-05-09 14:07:42 UTC (rev 8291)
+++ branches/1.0/docs/ChangeLog.txt 2017-05-09 14:14:08 UTC (rev 8292)
@@ -96,6 +96,8 @@
-- network, add PHYETH_DISABLE_OFFLOAD rc.conf variable to disable hardware network interface offloading,
disabled by default. Example: PHYETH_DISABLE_OFFLOAD="tso gso gro"
+-- wide-dhcpv6, add support for optional script '/mnt/kd/dhcp6c.script', enabled if it exists and is executable.
+
-- chrony, version bump to 3.1
-- miniupnpd, version bump to 2.0.20170421
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-09 14:07:45
|
Revision: 8291
http://sourceforge.net/p/astlinux/code/8291
Author: abelbeck
Date: 2017-05-09 14:07:42 +0000 (Tue, 09 May 2017)
Log Message:
-----------
arnofw, add support for EXT_IF_DHCPV6_IPV6 config variable, AIF Issue #34
Modified Paths:
--------------
branches/1.0/package/arnofw/arnofw.wrapper
Added Paths:
-----------
branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch
Added: branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch
===================================================================
--- branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch (rev 0)
+++ branches/1.0/package/arnofw/arnofw-0002-EXT_IF_DHCPV6_IPV6.patch 2017-05-09 14:07:42 UTC (rev 8291)
@@ -0,0 +1,39 @@
+diff --git a/bin/arno-iptables-firewall b/bin/arno-iptables-firewall
+index 50b024c..1ee713f 100755
+--- a/bin/arno-iptables-firewall
++++ b/bin/arno-iptables-firewall
+@@ -2698,9 +2698,11 @@ setup_ext_input_chain()
+ echo " Enabling support for DHCP-assigned-IP (DHCP client)"
+ # Allow this host to be an DHCP client:
+ ip4tables -A EXT_INPUT_CHAIN -p udp --sport 67 --dport 68 -j ACCEPT
++ fi
++ if [ "$EXT_IF_DHCP_IP" = "1" -o "$EXT_IF_DHCPV6_IPV6" = "1" ]; then
+ if [ "$IPV6_SUPPORT" = "1" ]; then
+ # Allow this host to be an DHCPv6 client:
+- ip6tables -A EXT_INPUT_CHAIN -p udp --sport 547 --dport 546 -j ACCEPT
++ ip6tables -A EXT_INPUT_CHAIN -s fe80::/10 -p udp --sport 547 --dport 546 -j ACCEPT
+ fi
+ fi
+
+diff --git a/etc/arno-iptables-firewall/firewall.conf b/etc/arno-iptables-firewall/firewall.conf
+index e3c8894..766cbdd 100644
+--- a/etc/arno-iptables-firewall/firewall.conf
++++ b/etc/arno-iptables-firewall/firewall.conf
+@@ -39,10 +39,16 @@
+ EXT_IF=""
+
+ # Enable if THIS machines (dynamically) obtains its IP through (IPv4) DHCP
+-# and/or (IPv6) DHCPv6 (from your ISP)
++# and possibly (IPv6) DHCPv6 (from your ISP)
+ # ------------------------------------------------------------------------------
+ EXT_IF_DHCP_IP=0
+
++# Enable if THIS machines (dynamically) obtains its IP through (IPv6) DHCPv6
++# and not (IPv4) DHCP. Applies only when EXT_IF_DHCP_IP is set to "0".
++# (IPv6 Only)
++# ------------------------------------------------------------------------------
++EXT_IF_DHCPV6_IPV6=0
++
+ # (EXPERT SETTING!) Here you can override your external(!) IPv4 subnet(s).
+ # Normally these are (attempted to be) autodetected, so leaving this empty
+ # should work for most scenarios. This setting is used when eg. running a DHCP
Modified: branches/1.0/package/arnofw/arnofw.wrapper
===================================================================
--- branches/1.0/package/arnofw/arnofw.wrapper 2017-05-09 00:57:44 UTC (rev 8290)
+++ branches/1.0/package/arnofw/arnofw.wrapper 2017-05-09 14:07:42 UTC (rev 8291)
@@ -222,11 +222,20 @@
fi
EXT_IF_DHCP_IP=0
- if [ -n "$EXTIF" -a -z "$EXTIP" ] && [ "$EXTIF" != "ppp0" -o -z "$PPPOEIF" ]; then
- EXT_IF_DHCP_IP=1
+ EXT_IF_DHCPV6_IPV6=0
+ if [ -n "$EXTIF" ] && [ "$EXTIF" != "ppp0" -o -z "$PPPOEIF" ]; then
+ if [ -z "$EXTIP" ]; then
+ EXT_IF_DHCP_IP=1
+ elif [ "$IPV6" = "yes" -a "$DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ EXT_IF_DHCPV6_IPV6=1
+ fi
fi
- if [ -n "$EXT2IF" -a -z "$EXT2IP" ] && [ "$EXT2IF" != "ppp0" -o -z "$PPPOEIF" ]; then
- EXT_IF_DHCP_IP=1
+ if [ -n "$EXT2IF" ] && [ "$EXT2IF" != "ppp0" -o -z "$PPPOEIF" ]; then
+ if [ -z "$EXT2IP" ]; then
+ EXT_IF_DHCP_IP=1
+ elif [ "$IPV6" = "yes" -a "$EXT2DHCPV6_CLIENT_ENABLE" = "yes" ]; then
+ EXT_IF_DHCPV6_IPV6=1
+ fi
fi
if [ "$EXTDHCP" = "yes" -a -n "$EXTIP" -a -n "$EXTGW" -a -z "$EXT2IF" -a -z "$PPPOEIF" ]; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-09 00:57:46
|
Revision: 8290
http://sourceforge.net/p/astlinux/code/8290
Author: abelbeck
Date: 2017-05-09 00:57:44 +0000 (Tue, 09 May 2017)
Log Message:
-----------
wide-dhcpv6, add optional script '/mnt/kd/dhcp6c.script' if exists and executable and add support in core network init.d
Modified Paths:
--------------
branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Added Paths:
-----------
branches/1.0/package/wide-dhcpv6/dhcp6c.script
Added: branches/1.0/package/wide-dhcpv6/dhcp6c.script
===================================================================
--- branches/1.0/package/wide-dhcpv6/dhcp6c.script (rev 0)
+++ branches/1.0/package/wide-dhcpv6/dhcp6c.script 2017-05-09 00:57:44 UTC (rev 8290)
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export PATH="/usr/bin:/bin:/usr/sbin:/sbin"
+
+SCRIPTFILE="/mnt/kd/dhcp6c.script"
+
+if [ -x $SCRIPTFILE ]; then
+ $SCRIPTFILE >/dev/null 2>&1 &
+fi
+
+exit 0
Modified: branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk
===================================================================
--- branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk 2017-05-07 21:31:33 UTC (rev 8289)
+++ branches/1.0/package/wide-dhcpv6/wide-dhcpv6.mk 2017-05-09 00:57:44 UTC (rev 8290)
@@ -18,6 +18,7 @@
define WIDE_DHCPV6_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/dhcp6c $(TARGET_DIR)/usr/sbin/
+ $(INSTALL) -D -m 0755 package/wide-dhcpv6/dhcp6c.script $(TARGET_DIR)/etc/dhcp6c.script
ln -sf /tmp/etc/wide-dhcpv6 $(TARGET_DIR)/etc/wide-dhcpv6
endef
@@ -25,6 +26,7 @@
define WIDE_DHCPV6_UNINSTALL_TARGET_CMDS
rm -f $(TARGET_DIR)/usr/sbin/dhcp6c
+ rm -f $(TARGET_DIR)/etc/dhcp6c.script
rm -f $(TARGET_DIR)/etc/wide-dhcpv6
endef
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-05-07 21:31:33 UTC (rev 8289)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-05-09 00:57:44 UTC (rev 8290)
@@ -62,6 +62,7 @@
interface $interface {
send ia-na 1;
send rapid-commit;
+ script \"/etc/dhcp6c.script\";
};
id-assoc na 1 { };"
@@ -88,6 +89,7 @@
echo " send ia-pd 1;"
fi
echo " send rapid-commit;"
+ echo " script \"/etc/dhcp6c.script\";"
echo "};"
if [ "$DHCPV6_CLIENT_REQUEST_ADDRESS" != "no" ]; then
@@ -494,6 +496,14 @@
ip link set dev $INT4IF up
fi
+ if [ -n "$DMZIF" -a -n "$DMZIP" -a -n "$DMZNM" -a "$DMZIF" != "none" ]; then
+ ip addr add $DMZIP/$DMZNM brd + dev $DMZIF
+ if [ "$IPV6" = "yes" -a -n "$DMZIPV6" ]; then
+ ip -6 addr add $DMZIPV6 dev $DMZIF
+ fi
+ ip link set dev $DMZIF up
+ fi
+
if [ -n "$WANDELAY" ]; then
echo "Sleeping for $WANDELAY seconds before I bring up $EXTIF..."
sleep $WANDELAY
@@ -711,15 +721,6 @@
fi
fi
- ##DMZ Network
- if [ -n "$DMZIF" -a -n "$DMZIP" -a -n "$DMZNM" -a "$DMZIF" != "none" ]; then
- ip addr add $DMZIP/$DMZNM brd + dev $DMZIF
- if [ "$IPV6" = "yes" -a -n "$DMZIPV6" ]; then
- ip -6 addr add $DMZIPV6 dev $DMZIF
- fi
- ip link set dev $DMZIF up
- fi
-
##IPv6 Tunnel
if [ "$IPV6" = "yes" -a -n "$IPV6_TUNNEL" ]; then
ipv6_tunnel start
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-07 21:31:34
|
Revision: 8289
http://sourceforge.net/p/astlinux/code/8289
Author: abelbeck
Date: 2017-05-07 21:31:33 +0000 (Sun, 07 May 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-05-05 13:00:07 UTC (rev 8288)
+++ branches/1.0/docs/ChangeLog.txt 2017-05-07 21:31:33 UTC (rev 8289)
@@ -25,6 +25,7 @@
-- core system, usbtty, automatically spawn getty for selected usb tty serial devices.
Supported USB-serial adapters include FTDI and PL2303 and must register as /dev/ttyUSB0, ttyUSB1, etc.
New rc.conf variables: USBTTY, USBTTY_BAUD_RATE and USBTTY_TERM_TYPE
+ More info: http://doc.astlinux-project.org/userdoc:usbtty_serial_login
-- 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).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-05 13:00:09
|
Revision: 8288
http://sourceforge.net/p/astlinux/code/8288
Author: abelbeck
Date: 2017-05-05 13:00:07 +0000 (Fri, 05 May 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-05-05 12:58:22 UTC (rev 8287)
+++ branches/1.0/docs/ChangeLog.txt 2017-05-05 13:00:07 UTC (rev 8288)
@@ -77,7 +77,7 @@
-- sngrep, version 1.4.2, new package, tool for displaying SIP call message flows from a terminal.
--- ddclient, switch to ddclient-curl version 3.8.3-02, adds IPv6 and Hurricane Electric support
+-- ddclient, switch to ddclient-curl version 3.8.3-03, 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-05 12:58:25
|
Revision: 8287
http://sourceforge.net/p/astlinux/code/8287
Author: abelbeck
Date: 2017-05-05 12:58:22 +0000 (Fri, 05 May 2017)
Log Message:
-----------
ddclient-curl, version bump to 3.8.3-03
Modified Paths:
--------------
branches/1.0/package/ddclient/ddclient.mk
Removed Paths:
-------------
branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch
Deleted: branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch 2017-05-01 19:19:16 UTC (rev 8286)
+++ branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch 2017-05-05 12:58:22 UTC (rev 8287)
@@ -1,232 +0,0 @@
-From 4da69be41f1d5bf64b8e3d1fad66c9da86fac837 Mon Sep 17 00:00:00 2001
-From: David Kerr <da...@ke...>
-Date: Sat, 22 Apr 2017 10:20:43 -0400
-Subject: [PATCH 1/2] Record update status of IPv6 separate from IPv4 (ie,
- don't use same variable for both).
-
----
- ddclient | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/ddclient b/ddclient
-index cfd6f6a..443b4e9 100755
---- a/ddclient
-+++ b/ddclient
-@@ -416,6 +416,7 @@ my %variables = (
- 'mtime' => setv(T_NUMBER, 0, 1, 0, 0, undef),
- 'atime' => setv(T_NUMBER, 0, 1, 0, 0, undef),
- 'status' => setv(T_ANY, 0, 1, 0, '', undef),
-+ 'status-ipv6' => setv(T_ANY, 0, 1, 0, '', undef),
- 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('30s'), 0),
- 'max-interval' => setv(T_DELAY, 0, 0, 1, interval('25d'), 0),
- 'min-error-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),
-@@ -2478,7 +2479,7 @@ sub nic_updateable {
-
- } elsif ((defined($config{$host}{'usev6'}) && ($config{$host}{'usev6'} ne 'no') ) &&
- ((!exists($cache{$host}{'ipv6'})) || ("$cache{$host}{'ipv6'}" ne "$ipv6"))) {
-- if (($cache{$host}{'status'} eq 'good') &&
-+ if (($cache{$host}{'status-ipv6'} eq 'good') &&
- !interval_expired($host, 'mtime', 'min-interval')) {
- warning("skipping update of %s from %s to %s.\nlast updated %s.\nWait at least %s between update attempts.",
- $host,
-@@ -2490,7 +2491,7 @@ sub nic_updateable {
- if opt('verbose') || !define($cache{$host}{'warned-min-interval'}, 0);
- $cache{$host}{'warned-min-interval'} = $now;
-
-- } elsif (($cache{$host}{'status'} ne 'good') && !interval_expired($host, 'atime', 'min-error-interval')) {
-+ } elsif (($cache{$host}{'status-ipv6'} ne 'good') && !interval_expired($host, 'atime', 'min-error-interval')) {
- warning("skipping update of %s from %s to %s.\nlast updated %s but last attempt on %s failed.\nWait at least %s between update attempts.",
- $host,
- ($cache{$host}{'ipv6'} ? $cache{$host}{'ipv6'} : '<nothing>'),
-@@ -2530,6 +2531,7 @@ sub nic_updateable {
- }
- }
- $config{$host}{'status'} = define($cache{$host}{'status'},'');
-+ $config{$host}{'status-ipv6'} = define($cache{$host}{'status-ipv6'},'');
- $config{$host}{'update'} = $update;
- if ($update) {
- $config{$host}{'status'} = 'noconnect';
-@@ -3855,7 +3857,7 @@ sub nic_freedns_update {
- if($ipv6 eq $freedns_hosts_ipv6{$h}->[1]) {
- $config{$h}{'ipv6'} = $ipv6;
- $config{$h}{'mtime'} = $now;
-- $config{$h}{'status'} = 'good';
-+ $config{$h}{'status-ipv6'} = 'good';
- success("update not necessary %s: good: IPv6 address already set to %s", $h, $ipv6);
- } else {
- debug("Update: %s", $freedns_hosts_ipv6{$h}->[2]."&address=".$ipv6);
-@@ -3868,10 +3870,10 @@ sub nic_freedns_update {
- if($reply =~ /Updated.*$h.*to.*$ipv6/) {
- $config{$h}{'ipv6'} = $ipv6;
- $config{$h}{'mtime'} = $now;
-- $config{$h}{'status'} = 'good';
-+ $config{$h}{'status-ipv6'} = 'good';
- success("updating %s: good: IPv6 address set to %s", $h, $ipv6);
- } else {
-- $config{$h}{'status'} = 'failed';
-+ $config{$h}{'status-ipv6'} = 'failed';
- warning("SENT: %s", $freedns_hosts_ipv6{$h}->[2]) unless opt('verbose');
- warning("REPLIED: %s", $reply);
- failed("updating %s: Invalid reply.", $h);
-@@ -4441,7 +4443,7 @@ sub nic_cloudflare_update {
- # Cache
- $config{$key}{'ipv6'} = $ipv6;
- $config{$key}{'mtime'} = $now;
-- $config{$key}{'status'} = 'good';
-+ $config{$key}{'status-ipv6'} = 'good';
- }
- }
- }
-@@ -4654,7 +4656,7 @@ sub nic_he_update {
- foreach my $line (@reply) {
- my ($status, $ipv6_ignore) = split / /, lc $line;
-
-- $config{$host}{'status'} = $status;
-+ $config{$host}{'status-ipv6'} = $status;
- if ($status eq 'good') {
- success("updating %s: IPv6 address set to %s", $host, $ipv6);
- $config{$host}{'ipv6'} = $ipv6;
-@@ -4665,7 +4667,7 @@ sub nic_he_update {
- warning("updating %s: No DNS 'AAAA' record update required; %s", $host, $errors{$status});
- $config{$host}{'ipv6'} = $ipv6;
- $config{$host}{'mtime'} = $now;
-- $config{$host}{'status'} = 'good';
-+ $config{$host}{'status-ipv6'} = 'good';
-
- } else {
- failed("updating %s: %s: %s", $host, $status, $errors{$status});
-
-From 549bcb66f2c3eb9f3a52445f6d11d0c37e0e55dd Mon Sep 17 00:00:00 2001
-From: David Kerr <da...@ke...>
-Date: Sat, 22 Apr 2017 10:22:44 -0400
-Subject: [PATCH 2/2] Add command line option "-max-warn" to configure the
- maximum number of times a warning message should be logged. When in daemon
- mode and an IP address is not found for some reason (e.g. using a cmd to
- query a host and that host has gone offline) ddclient would fill up syslog
- with the same warning every couple of minutes. We now default to logging the
- message only once but you can specify number of times you would like it
- logged with e.g. "-max-warn 9" which would log the warning 9 times (you can
- specify any number).
-
----
- ddclient | 65 ++++++++++++++++++++++++++++++++++++++++++----------------------
- 1 file changed, 43 insertions(+), 22 deletions(-)
-
-diff --git a/ddclient b/ddclient
-index 443b4e9..ea1d50d 100755
---- a/ddclient
-+++ b/ddclient
-@@ -734,6 +734,7 @@ my @opt = (
- [ "retry", "!", "-{no}retry : retry failed updates." ],
- [ "force", "!", "-{no}force : force an update even if the update may be unnecessary" ],
- [ "timeout", "=i", "-timeout max : wait at most 'max' seconds for the host to respond" ],
-+ [ "max-warn", "=i", "-max-warn max : maximum nubmer of warning messages for undefined IP address" ],
-
- [ "syslog", "!", "-{no}syslog : log messages to syslog" ],
- [ "facility", "=s", "-facility {type} : log messages to syslog to facility {type}" ],
-@@ -763,6 +764,8 @@ my ($result, %config, %globals, %cache);
- my $saved_cache = '';
- my %saved_opt = %opt;
- $result = 'OK';
-+my (%warned_ipv4, %warned_ipv6);
-+my $inv_ip_warn_count = define(opt('max-warn'),1);
-
- test_geturl(opt('geturl')) if opt('geturl');
-
-@@ -2415,6 +2418,14 @@ sub nic_updateable {
- my $ip = $config{$host}{'wantip'};
- my $ipv6 = $config{$host}{'wantipv6'};
-
-+ if (defined($config{$host}{'use'}) && ($config{$host}{'use'} ne 'no') && define($ipv6,0) && define($warned_ipv6{$host},0) ) {
-+ $warned_ipv6{$host} = 0;
-+ warning("IPv6 address for %s valid: %s. Reset warning count", $host, $ipv6);
-+ }
-+ if (defined($config{$host}{'usev6'}) && ($config{$host}{'usev6'} ne 'no') && define($ip,0) && define($warned_ipv4{$host},0) ) {
-+ $warned_ipv4{$host} = 0;
-+ warning("IP address for %s valid: %s. Reset warning count", $host, $ip);
-+ }
- if ($config{$host}{'login'} eq '') {
- warning("null login name specified for host %s.", $host);
-
-@@ -2462,16 +2473,21 @@ sub nic_updateable {
-
- } elsif (($cache{$host}{'status'} ne 'good') && !interval_expired($host, 'atime', 'min-error-interval')) {
-
-- warning("skipping update of %s from %s to %s.\nlast updated %s but last attempt on %s failed.\nWait at least %s between update attempts.",
-- $host,
-- ($cache{$host}{'ip'} ? $cache{$host}{'ip'} : '<nothing>'),
-- $ip,
-- ($cache{$host}{'mtime'} ? prettytime($cache{$host}{'mtime'}) : '<never>'),
-- ($cache{$host}{'atime'} ? prettytime($cache{$host}{'atime'}) : '<never>'),
-- prettyinterval($config{$host}{'min-error-interval'})
-- )
-- if opt('verbose') || !define($cache{$host}{'warned-min-error-interval'}, 0);
-- $cache{$host}{'warned-min-error-interval'} = $now;
-+ if (opt('verbose') || (!define($cache{$host}{'warned-min-error-interval'}, 0) && (define($warned_ipv4{$host}, 0) < $inv_ip_warn_count) )) {
-+ warning("skipping update of %s from %s to %s.\nlast updated %s but last attempt on %s failed.\nWait at least %s between update attempts.",
-+ $host,
-+ ($cache{$host}{'ip'} ? $cache{$host}{'ip'} : '<nothing>'),
-+ $ip,
-+ ($cache{$host}{'mtime'} ? prettytime($cache{$host}{'mtime'}) : '<never>'),
-+ ($cache{$host}{'atime'} ? prettytime($cache{$host}{'atime'}) : '<never>'),
-+ prettyinterval($config{$host}{'min-error-interval'})
-+ );
-+ if (!define($ip,0) && !opt('verbose')) {
-+ $warned_ipv4{$host} = define($warned_ipv4{$host}, 0) + 1;
-+ warning ("IP address for %s undefined. Warned %s times, suppressing further warnings", $host, $inv_ip_warn_count) if ($warned_ipv4{$host} >= $inv_ip_warn_count);
-+ }
-+ }
-+ $cache{$host}{'warned-min-error-interval'} = $now;
-
- } else {
- $update = 1;
-@@ -2492,16 +2508,21 @@ sub nic_updateable {
- $cache{$host}{'warned-min-interval'} = $now;
-
- } elsif (($cache{$host}{'status-ipv6'} ne 'good') && !interval_expired($host, 'atime', 'min-error-interval')) {
-- warning("skipping update of %s from %s to %s.\nlast updated %s but last attempt on %s failed.\nWait at least %s between update attempts.",
-- $host,
-- ($cache{$host}{'ipv6'} ? $cache{$host}{'ipv6'} : '<nothing>'),
-- $ipv6,
-- ($cache{$host}{'mtime'} ? prettytime($cache{$host}{'mtime'}) : '<never>'),
-- ($cache{$host}{'atime'} ? prettytime($cache{$host}{'atime'}) : '<never>'),
-- prettyinterval($config{$host}{'min-error-interval'})
-- )
-- if opt('verbose') || !define($cache{$host}{'warned-min-error-interval'}, 0);
-- $cache{$host}{'warned-min-error-interval'} = $now;
-+ if (opt('verbose') || (!define($cache{$host}{'warned-min-error-interval'}, 0) && (define($warned_ipv6{$host}, 0) < $inv_ip_warn_count) )) {
-+ warning("skipping update of %s from %s to %s.\nlast updated %s but last attempt on %s failed.\nWait at least %s between update attempts.",
-+ $host,
-+ ($cache{$host}{'ipv6'} ? $cache{$host}{'ipv6'} : '<nothing>'),
-+ $ipv6,
-+ ($cache{$host}{'mtime'} ? prettytime($cache{$host}{'mtime'}) : '<never>'),
-+ ($cache{$host}{'atime'} ? prettytime($cache{$host}{'atime'}) : '<never>'),
-+ prettyinterval($config{$host}{'min-error-interval'})
-+ );
-+ if (!define($ipv6,0) && !opt('verbose')) {
-+ $warned_ipv6{$host} = define($warned_ipv6{$host}, 0) + 1;
-+ warning ("IPv6 address for %s undefined. Warned %s times, suppressing further warnings", $host, $inv_ip_warn_count) if ($warned_ipv6{$host} >= $inv_ip_warn_count);
-+ }
-+ }
-+ $cache{$host}{'warned-min-error-interval'} = $now;
-
- } else {
- $update = 1;
-@@ -3825,7 +3846,7 @@ sub nic_freedns_update {
- $config{$h}{'ip'} = $ip;
- $config{$h}{'mtime'} = $now;
- $config{$h}{'status'} = 'good';
-- success("update not necessary %s: good: IPv4 address already set to %s", $h, $ip);
-+ success("update not necessary %s: good: IPv4 address already set to %s", $h, $ip) if (!$daemon || opt('verbose'));
- } else {
- debug("Update: %s", $freedns_hosts{$h}->[2]."&address=".$ip);
- my $reply = geturl(opt('proxy'), $freedns_hosts{$h}->[2]."&address=".$ip);
-@@ -3858,7 +3879,7 @@ sub nic_freedns_update {
- $config{$h}{'ipv6'} = $ipv6;
- $config{$h}{'mtime'} = $now;
- $config{$h}{'status-ipv6'} = 'good';
-- success("update not necessary %s: good: IPv6 address already set to %s", $h, $ipv6);
-+ success("update not necessary %s: good: IPv6 address already set to %s", $h, $ipv6) if (!$daemon || opt('verbose'));
- } else {
- debug("Update: %s", $freedns_hosts_ipv6{$h}->[2]."&address=".$ipv6);
- my $reply = geturl(opt('proxy'), $freedns_hosts_ipv6{$h}->[2]."&address=".$ipv6);
Modified: branches/1.0/package/ddclient/ddclient.mk
===================================================================
--- branches/1.0/package/ddclient/ddclient.mk 2017-05-01 19:19:16 UTC (rev 8286)
+++ branches/1.0/package/ddclient/ddclient.mk 2017-05-05 12:58:22 UTC (rev 8287)
@@ -3,7 +3,7 @@
# ddclient
#
#############################################################
-DDCLIENT_VERSION = 3.8.3-02
+DDCLIENT_VERSION = 3.8.3-03
DDCLIENT_SOURCE = ddclient-curl-$(DDCLIENT_VERSION).tar.gz
DDCLIENT_SITE = https://github.com/astlinux-project/ddclient-curl/releases/download/$(DDCLIENT_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-01 19:19:18
|
Revision: 8286
http://sourceforge.net/p/astlinux/code/8286
Author: abelbeck
Date: 2017-05-01 19:19:16 +0000 (Mon, 01 May 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-05-01 19:15:04 UTC (rev 8285)
+++ branches/1.0/docs/ChangeLog.txt 2017-05-01 19:19:16 UTC (rev 8286)
@@ -92,6 +92,9 @@
-- When a Static IPv6 external interface is defined (EXTIPV6) with an undefined IPv6 Gateway entry (EXTGWIPV6),
now automatically use Router Advertisements to set the default route.
+-- network, add PHYETH_DISABLE_OFFLOAD rc.conf variable to disable hardware network interface offloading,
+ disabled by default. Example: PHYETH_DISABLE_OFFLOAD="tso gso gro"
+
-- chrony, version bump to 3.1
-- miniupnpd, version bump to 2.0.20170421
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-05-01 19:15:06
|
Revision: 8285
http://sourceforge.net/p/astlinux/code/8285
Author: abelbeck
Date: 2017-05-01 19:15:04 +0000 (Mon, 01 May 2017)
Log Message:
-----------
network, add new PHYETH_DISABLE_OFFLOAD rc.conf variable to disable hardware network interface offloading, disabled by default
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-04-29 16:30:20 UTC (rev 8284)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2017-05-01 19:15:04 UTC (rev 8285)
@@ -247,6 +247,24 @@
esac
}
+phyeth_disable_offload()
+{
+ local eth off off_list="$1" IFS
+
+ logger -s -t network -p kern.info "Disabling \"$off_list\" offload on all configured ethernet interfaces."
+
+ unset IFS
+ for eth in $EXTIF $EXT2IF $PPPOEIF $INTIF $INT2IF $INT3IF $INT4IF $DMZIF $BRIDGE0 $BRIDGE1 $BRIDGE2; do
+ case $eth in
+ eth*)
+ for off in $off_list; do
+ ethtool -K $eth $off off 2>/dev/null
+ done
+ ;;
+ esac
+ done
+}
+
init () {
mkdir -p /tmp/etc/wide-dhcpv6
@@ -436,6 +454,10 @@
done
fi
+ if [ -n "$PHYETH_DISABLE_OFFLOAD" ]; then
+ phyeth_disable_offload "$PHYETH_DISABLE_OFFLOAD"
+ fi
+
if [ -n "$INTIF" -a -n "$INTIP" -a -n "$INTNM" -a "$INTIF" != "none" ]; then
ip addr add $INTIP/$INTNM brd + dev $INTIF
if [ "$IPV6" = "yes" -a -n "$INTIPV6" ]; then
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2017-04-29 16:30:20 UTC (rev 8284)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2017-05-01 19:15:04 UTC (rev 8285)
@@ -958,16 +958,18 @@
## IFRENAME Support
## If for some reason you need to move your interfaces around before
## they are configured, you can do that here if you built your system
-## with wireless-tools enabled (it's included by default.
+## with wireless-tools enabled (not included by default).
#IFRENAME="eth0:8139too:i10 eth1:8139too:i12 eth2:8139too:i11"
## Physical Ethernet Configuration
## If you need to manually specify any speed and duplex settings, you can
## do that here NOTE: This will disable auto-negotiation for any devices
-## you enable it for. You CANNOT use variables like $EXTIF, $INTIF, etc.
-## Note that this code runs AFTER the ifrename support above.
+## you enable it for.
## INTERFACE:speed:duplex
#PHYETH="eth0:10:half eth1:100:half"
+## Disable hardware network interface offloading for the specified offload types.
+## Note: This applies to all configured ethernet interfaces and VLAN's.
+#PHYETH_DISABLE_OFFLOAD="tso gso gro"
## Change EXTIF's MAC address here (for some cable connections)
#EXTIFMAC="01:02:03:04:05:06"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-29 16:30:23
|
Revision: 8284
http://sourceforge.net/p/astlinux/code/8284
Author: abelbeck
Date: 2017-04-29 16:30:20 +0000 (Sat, 29 Apr 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-04-29 16:25:34 UTC (rev 8283)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-29 16:30:20 UTC (rev 8284)
@@ -45,6 +45,8 @@
-- busybox, syslogd: increase SYSLOGD_READ_BUFFER_SIZE from 256 to 512 to support longer log entries.
+-- logrotate, version bump to 3.12.1
+
-- nano, version bump to 2.7.5
-- screen, version bump to 4.5.1
@@ -92,6 +94,8 @@
-- chrony, version bump to 3.1
+-- miniupnpd, version bump to 2.0.20170421
+
-- fping, version bump to 3.16
-- ipset, version bump to 6.32
@@ -100,7 +104,7 @@
-- stunnel, version bump to 5.40
--- unbound (host), version bump to 1.6.1
+-- unbound (host), version bump to 1.6.2
-- whois, version bump to 5.2.15
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-29 16:25:35
|
Revision: 8283
http://sourceforge.net/p/astlinux/code/8283
Author: abelbeck
Date: 2017-04-29 16:25:34 +0000 (Sat, 29 Apr 2017)
Log Message:
-----------
miniupnpd, version bump to 2.0.20170421
Modified Paths:
--------------
branches/1.0/package/miniupnpd/miniupnpd.mk
Modified: branches/1.0/package/miniupnpd/miniupnpd.mk
===================================================================
--- branches/1.0/package/miniupnpd/miniupnpd.mk 2017-04-29 15:56:32 UTC (rev 8282)
+++ branches/1.0/package/miniupnpd/miniupnpd.mk 2017-04-29 16:25:34 UTC (rev 8283)
@@ -4,7 +4,7 @@
#
#############################################################
-MINIUPNPD_VERSION = 2.0.20161216
+MINIUPNPD_VERSION = 2.0.20170421
MINIUPNPD_SOURCE = miniupnpd-$(MINIUPNPD_VERSION).tar.gz
MINIUPNPD_SITE = http://miniupnp.free.fr/files
MINIUPNPD_DEPENDENCIES = host-pkg-config linux iptables openssl util-linux
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-29 15:56:35
|
Revision: 8282
http://sourceforge.net/p/astlinux/code/8282
Author: abelbeck
Date: 2017-04-29 15:56:32 +0000 (Sat, 29 Apr 2017)
Log Message:
-----------
logrotate, version bump to 3.12.1, plus upstream build fixes
Modified Paths:
--------------
branches/1.0/package/logrotate/logrotate.mk
Added Paths:
-----------
branches/1.0/package/logrotate/logrotate-0001-upstream-werror-fixes.patch
Added: branches/1.0/package/logrotate/logrotate-0001-upstream-werror-fixes.patch
===================================================================
--- branches/1.0/package/logrotate/logrotate-0001-upstream-werror-fixes.patch (rev 0)
+++ branches/1.0/package/logrotate/logrotate-0001-upstream-werror-fixes.patch 2017-04-29 15:56:32 UTC (rev 8282)
@@ -0,0 +1,71 @@
+From b66a2c2586875a334fc3f0aa35310ffd0ec6f55d Mon Sep 17 00:00:00 2001
+From: Bert van Hall <ber...@av...>
+Date: Fri, 21 Apr 2017 16:26:02 +0200
+Subject: [PATCH] fix unused function error when building without ACL
+
+Since -Werror is set, building without ACL makes the then unused
+is_acl_well_supported function halt the build. Guard it as it is done
+with every call of it.
+
+Signed-off-by: Bert van Hall <ber...@av...>
+Closes #119
+---
+ logrotate.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/logrotate.c b/logrotate.c
+index 066c4f7..b0be177 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -442,6 +442,7 @@ static int runScript(struct logInfo *log, char *logfn, char *script)
+ return rc;
+ }
+
++#ifdef WITH_ACL
+ static int is_acl_well_supported(int err)
+ {
+ switch (err) {
+@@ -454,6 +455,7 @@ static int is_acl_well_supported(int err)
+ return 1;
+ }
+ }
++#endif /* WITH_ACL */
+
+ static int createOutputFile(char *fileName, int flags, struct stat *sb,
+ acl_type acl, int force_mode)
+From 4c00581c83e112dc83bc55b0ed5daba2fdaf0790 Mon Sep 17 00:00:00 2001
+From: Steven Williamson <st...@fr...>
+Date: Mon, 6 Mar 2017 12:29:22 +0000
+Subject: [PATCH] Fixes GCC sentinel error.
+
+The last argument for sentinel value functions should be a NULL pointer
+not just a NULL value. Otherwise GCC 4.x will error with "error:
+missing sentinel in function call [-Werror=format=]"
+
+Closes #108
+---
+ logrotate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/logrotate.c b/logrotate.c
+index b0be177..dcf1076 100644
+--- a/logrotate.c
++++ b/logrotate.c
+@@ -434,7 +434,7 @@ static int runScript(struct logInfo *log, char *logfn, char *script)
+ exit(1);
+ }
+ }
+- execl("/bin/sh", "sh", "-c", script, "logrotate_script", logfn, NULL);
++ execl("/bin/sh", "sh", "-c", script, "logrotate_script", logfn, (char *) NULL);
+ exit(1);
+ }
+
+@@ -816,7 +816,7 @@ static int mailLog(struct logInfo *log, char *logFile, const char *mailComm,
+ exit(1);
+ }
+
+- execlp(uncompressCommand, uncompressCommand, NULL);
++ execlp(uncompressCommand, uncompressCommand, (char *) NULL);
+ exit(1);
+ }
+
Modified: branches/1.0/package/logrotate/logrotate.mk
===================================================================
--- branches/1.0/package/logrotate/logrotate.mk 2017-04-29 15:23:45 UTC (rev 8281)
+++ branches/1.0/package/logrotate/logrotate.mk 2017-04-29 15:56:32 UTC (rev 8282)
@@ -3,7 +3,7 @@
# logrotate
#
#############################################################
-LOGROTATE_VERSION = 3.11.0
+LOGROTATE_VERSION = 3.12.1
LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-29 15:23:47
|
Revision: 8281
http://sourceforge.net/p/astlinux/code/8281
Author: abelbeck
Date: 2017-04-29 15:23:45 +0000 (Sat, 29 Apr 2017)
Log Message:
-----------
unbound, version bump to 1.6.2
Modified Paths:
--------------
branches/1.0/package/unbound/unbound.mk
Modified: branches/1.0/package/unbound/unbound.mk
===================================================================
--- branches/1.0/package/unbound/unbound.mk 2017-04-28 15:38:45 UTC (rev 8280)
+++ branches/1.0/package/unbound/unbound.mk 2017-04-29 15:23:45 UTC (rev 8281)
@@ -4,7 +4,7 @@
#
#############################################################
-UNBOUND_VERSION = 1.6.1
+UNBOUND_VERSION = 1.6.2
UNBOUND_SITE = https://www.unbound.net/downloads
UNBOUND_SOURCE = unbound-$(UNBOUND_VERSION).tar.gz
UNBOUND_INSTALL_STAGING = YES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-28 15:38:48
|
Revision: 8280
http://sourceforge.net/p/astlinux/code/8280
Author: abelbeck
Date: 2017-04-28 15:38:45 +0000 (Fri, 28 Apr 2017)
Log Message:
-----------
linux kernel, enable 'CONFIG_PCIEASPM=y' to allow BIOS settings for ASPM (Active State Power Management) to sync with the kernel
Modified Paths:
--------------
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
branches/1.0/project/astlinux/genx86_64/linux-smp.config
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2017-04-26 21:04:44 UTC (rev 8279)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2017-04-28 15:38:45 UTC (rev 8280)
@@ -458,7 +458,8 @@
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2017-04-26 21:04:44 UTC (rev 8279)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2017-04-28 15:38:45 UTC (rev 8280)
@@ -437,7 +437,8 @@
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG is not set
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp.config 2017-04-26 21:04:44 UTC (rev 8279)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp.config 2017-04-28 15:38:45 UTC (rev 8280)
@@ -418,7 +418,8 @@
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
-# CONFIG_PCIEASPM is not set
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
# CONFIG_PCI_DEBUG 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-04-26 21:04:46
|
Revision: 8279
http://sourceforge.net/p/astlinux/code/8279
Author: abelbeck
Date: 2017-04-26 21:04:44 +0000 (Wed, 26 Apr 2017)
Log Message:
-----------
core system, usbtty, sanity check USBTTY_BAUD_RATE value and tweak logger text
Modified Paths:
--------------
branches/1.0/package/udev/usbtty/usb-getty
branches/1.0/package/udev/usbtty/usb-getty-background
Modified: branches/1.0/package/udev/usbtty/usb-getty
===================================================================
--- branches/1.0/package/udev/usbtty/usb-getty 2017-04-26 16:27:16 UTC (rev 8278)
+++ branches/1.0/package/udev/usbtty/usb-getty 2017-04-26 21:04:44 UTC (rev 8279)
@@ -26,4 +26,21 @@
term_type="${USBTTY_TERM_TYPE:-vt100}"
+# Sanity check Baud Rate
+case $baud_rate in
+ 9600) ;;
+ 19200) ;;
+ 38400) ;;
+ 57600) ;;
+ 115200) ;;
+ 230400) ;;
+ 460800) ;;
+ 500000) ;;
+ 576000) ;;
+ 921600) ;;
+ *) baud_rate="115200"
+ logger -t usbtty -p kern.info "Unknown Baud Rate, defaulting to: $baud_rate"
+ ;;
+esac
+
/usr/share/usbtty/usb-getty-background "$devname" "$baud_rate" "$term_type" >/dev/null 2>&1 &
Modified: branches/1.0/package/udev/usbtty/usb-getty-background
===================================================================
--- branches/1.0/package/udev/usbtty/usb-getty-background 2017-04-26 16:27:16 UTC (rev 8278)
+++ branches/1.0/package/udev/usbtty/usb-getty-background 2017-04-26 21:04:44 UTC (rev 8279)
@@ -12,10 +12,10 @@
LOCKFILE="/var/lock/usbtty-${devname##*/}.lock"
if ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
- logger -t usbtty -p kern.info "Connected: devname=$devname baud_rate=$baud_rate term_type=$term_type"
+ logger -t usbtty -p kern.info "Connected: $devname baud_rate=$baud_rate term_type=$term_type"
while [ -c "$devname" ]; do
/sbin/getty -L "$baud_rate" "$devname" "$term_type"
done
- logger -t usbtty -p kern.info "Disconnected: devname=$devname"
+ logger -t usbtty -p kern.info "Disconnected: $devname"
rm -f "$LOCKFILE"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-26 16:27:17
|
Revision: 8278
http://sourceforge.net/p/astlinux/code/8278
Author: abelbeck
Date: 2017-04-26 16:27:16 +0000 (Wed, 26 Apr 2017)
Log Message:
-----------
core system, /etc/profile, call 'resize' for /dev/ttyUSB* devices to export LINES and COLUMNS variables
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/etc/profile
Modified: branches/1.0/project/astlinux/target_skeleton/etc/profile
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/profile 2017-04-25 16:32:53 UTC (rev 8277)
+++ branches/1.0/project/astlinux/target_skeleton/etc/profile 2017-04-26 16:27:16 UTC (rev 8278)
@@ -34,6 +34,13 @@
stty erase ^?
fi
+# Set LINES and COLUMNS for USB TTY serial devices
+if [ -x /usr/bin/resize ]; then
+ case $(tty) in
+ /dev/ttyUSB*) resize >/dev/null ;;
+ esac
+fi
+
PS1='\[\033[01;31m\]\h \[\033[01;34m\]\W \$ \[\033[00m\]'
PS2='> '
PS4='+ '
@@ -45,7 +52,7 @@
alias rd='rmdir'
# prefer less over more
-if [ -f /usr/bin/less ]; then
+if [ -x /usr/bin/less ]; then
alias more=less
export PAGER=less
fi
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.
