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-04-25 16:32:56
|
Revision: 8277
http://sourceforge.net/p/astlinux/code/8277
Author: abelbeck
Date: 2017-04-25 16:32:53 +0000 (Tue, 25 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-25 16:24:55 UTC (rev 8276)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-25 16:32:53 UTC (rev 8277)
@@ -22,6 +22,10 @@
-- netcalc, version 2.1.2, new command, IPv4 and IPv6 network calculator. Also used by dnsmasq init.d script.
+-- 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
+
-- 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-04-25 16:24:58
|
Revision: 8276
http://sourceforge.net/p/astlinux/code/8276
Author: abelbeck
Date: 2017-04-25 16:24:55 +0000 (Tue, 25 Apr 2017)
Log Message:
-----------
core system, usbtty, automatically spawn getty for selected usb tty serial devices. New rc.conf variables: USBTTY, USBTTY_BAUD_RATE, USBTTY_TERM_TYPE
Modified Paths:
--------------
branches/1.0/package/udev/udev.mk
branches/1.0/project/astlinux/target_skeleton/etc/rc
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/udev/usbtty/
branches/1.0/package/udev/usbtty/usb-getty
branches/1.0/package/udev/usbtty/usb-getty-background
branches/1.0/package/udev/usbtty/usbtty.rules
Modified: branches/1.0/package/udev/udev.mk
===================================================================
--- branches/1.0/package/udev/udev.mk 2017-04-24 16:39:29 UTC (rev 8275)
+++ branches/1.0/package/udev/udev.mk 2017-04-25 16:24:55 UTC (rev 8276)
@@ -31,7 +31,13 @@
define UDEV_INSTALL_INITSCRIPT
echo 'udev_run="/var/run/udev"' >> $(TARGET_DIR)/etc/udev/udev.conf
endef
-
UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_INITSCRIPT
+define UDEV_INSTALL_USBTTY
+ $(INSTALL) -m 0644 -D package/udev/usbtty/usbtty.rules $(TARGET_DIR)/etc/udev/rules.d/usbtty.rules
+ $(INSTALL) -m 0755 -D package/udev/usbtty/usb-getty $(TARGET_DIR)/usr/share/usbtty/usb-getty
+ $(INSTALL) -m 0755 -D package/udev/usbtty/usb-getty-background $(TARGET_DIR)/usr/share/usbtty/usb-getty-background
+endef
+UDEV_POST_INSTALL_TARGET_HOOKS += UDEV_INSTALL_USBTTY
+
$(eval $(call AUTOTARGETS,package,udev))
Added: branches/1.0/package/udev/usbtty/usb-getty
===================================================================
--- branches/1.0/package/udev/usbtty/usb-getty (rev 0)
+++ branches/1.0/package/udev/usbtty/usb-getty 2017-04-25 16:24:55 UTC (rev 8276)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+devname="$2"
+
+if [ "$1" != "udev" -o -z "$devname" ]; then
+ echo "usb-getty: Only to be called via udev" >&2
+ exit 0
+fi
+
+if [ ! -f /etc/rc.conf ]; then
+ exit 0
+fi
+
+. /etc/rc.conf
+
+if [ "$USBTTY" != "yes" ]; then
+ exit 0
+fi
+
+if [ ! -c "$devname" ]; then
+ logger -t usbtty -p kern.info "Device not found: $devname"
+ exit 0
+fi
+
+baud_rate="${USBTTY_BAUD_RATE:-115200}"
+
+term_type="${USBTTY_TERM_TYPE:-vt100}"
+
+/usr/share/usbtty/usb-getty-background "$devname" "$baud_rate" "$term_type" >/dev/null 2>&1 &
Property changes on: branches/1.0/package/udev/usbtty/usb-getty
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/udev/usbtty/usb-getty-background
===================================================================
--- branches/1.0/package/udev/usbtty/usb-getty-background (rev 0)
+++ branches/1.0/package/udev/usbtty/usb-getty-background 2017-04-25 16:24:55 UTC (rev 8276)
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+devname="$1"
+baud_rate="$2"
+term_type="$3"
+
+if [ -z "$devname" -o -z "$baud_rate" -o -z "$term_type" ]; then
+ echo "usb-getty-background: Invalid args" >&2
+ exit 0
+fi
+
+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"
+ while [ -c "$devname" ]; do
+ /sbin/getty -L "$baud_rate" "$devname" "$term_type"
+ done
+ logger -t usbtty -p kern.info "Disconnected: devname=$devname"
+ rm -f "$LOCKFILE"
+fi
Property changes on: branches/1.0/package/udev/usbtty/usb-getty-background
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/udev/usbtty/usbtty.rules
===================================================================
--- branches/1.0/package/udev/usbtty/usbtty.rules (rev 0)
+++ branches/1.0/package/udev/usbtty/usbtty.rules 2017-04-25 16:24:55 UTC (rev 8276)
@@ -0,0 +1,3 @@
+# Spawn getty for selected usb tty serial devices:
+SUBSYSTEM=="tty", ACTION=="add", ENV{ID_BUS}=="usb", ENV{DEVNAME}=="ttyUSB[0-9]", \
+ RUN+="/usr/share/usbtty/usb-getty udev $env{DEVNAME}"
Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-04-24 16:39:29 UTC (rev 8275)
+++ branches/1.0/project/astlinux/target_skeleton/etc/rc 2017-04-25 16:24:55 UTC (rev 8276)
@@ -402,6 +402,9 @@
fi
done
+ if [ "$USBTTY" = "yes" ]; then
+ /sbin/udevadm trigger --action=add --subsystem-match=tty --sysname-match='ttyUSB[0-9]'
+ fi
}
shutdown() {
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-24 16:39:29 UTC (rev 8275)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2017-04-25 16:24:55 UTC (rev 8276)
@@ -893,6 +893,13 @@
## Useful for boards with smaller high frequency piezo-speakers or noisy environments.
#ALERT_SOUNDS_OCTAVE="2"
+## USB TTY serial login
+## 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.
+#USBTTY="yes" # Enable with "yes", defaults to "no"
+#USBTTY_BAUD_RATE="19200" # Set Baud Rate, defaults to "115200"
+#USBTTY_TERM_TYPE="vt102" # Set Terminal Type, defaults to "vt100"
+
## I/O Scheduler configuration
## The Linux kernel has several I/O schedulers available.
## It is important to optimize everything you can in an embedded system
@@ -899,22 +906,6 @@
## AstLinux lets you use this variable to change the I/O scheduler per device
#IOSCHED="sda:noop"
-## APC UPS Support via apcupsd (Deprecated) ####
-## Specify the UPS type and UPS cable. The UPS device string must be empty for usb.
-##
-## UPSTYPE: usb, net, pcnet, snmp, apcsmart, dumb
-##UPSTYPE="usb"
-## UPSCABLE: usb, ether, smart, simple
-##UPSCABLE="usb"
-## UPSDEVICE: [usb], leave empty
-##UPSDEVICE=""
-## UPSDEVICE: [ether], for net and snmp, specify IPv4 address, port, etc.
-##UPSDEVICE="10.10.50.10:3551"
-##UPSDEVICE="10.10.50.10:161:APC:private"
-## UPSDEVICE: [smart] or [simple], specify serial device
-##UPSDEVICE="/dev/ttyS1"
-############################## (Deprecated) ####
-
## Network UPS Tools (NUT)
## Monitor an attached UPS and optionally also serve UPS status over the network.
## UPS events can generate notifications, system shutdowns and other actions.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-24 16:39:30
|
Revision: 8275
http://sourceforge.net/p/astlinux/code/8275
Author: abelbeck
Date: 2017-04-24 16:39:29 +0000 (Mon, 24 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-24 16:34:31 UTC (rev 8274)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-24 16:39:29 UTC (rev 8275)
@@ -64,6 +64,8 @@
-- libcurl (curl) version bump to 7.54.0, security fixes: CVE-2017-2629, CVE-2017-7468
+-- lighttpd, add runtime configuration 'server.stream-response-body = 2' to prevent buffering in /var/tmp/ .
+
-- 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-24 16:34:34
|
Revision: 8274
http://sourceforge.net/p/astlinux/code/8274
Author: abelbeck
Date: 2017-04-24 16:34:31 +0000 (Mon, 24 Apr 2017)
Log Message:
-----------
lighttpd, fix an issue introduced with lighttpd 1.4.40 where PHP backend streams are buffered using /var/tmp/ . This commit adds the runtime configuration option 'server.stream-response-body = 2' which does not use buffer tempfiles. Previously any PHP generated downloads would fail if larger than the avalable space on /var which is about 9 MB by default.
Ref: https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/18a7b2be37041987c5bde264d03a7ee7440ae788
Ref: https://redmine.lighttpd.net/projects/lighttpd/repository/revisions/e4bb56222fa7c1e315ea7d05cb4ea2f0de781534
Modified Paths:
--------------
branches/1.0/package/lighttpd/lighttpd.conf
Added Paths:
-----------
branches/1.0/package/lighttpd/lighttpd-0001-upstream-fix-stream-response-body.patch
Added: branches/1.0/package/lighttpd/lighttpd-0001-upstream-fix-stream-response-body.patch
===================================================================
--- branches/1.0/package/lighttpd/lighttpd-0001-upstream-fix-stream-response-body.patch (rev 0)
+++ branches/1.0/package/lighttpd/lighttpd-0001-upstream-fix-stream-response-body.patch 2017-04-24 16:34:31 UTC (rev 8274)
@@ -0,0 +1,143 @@
+commit e4bb56222fa7c1e315ea7d05cb4ea2f0de781534
+Author: Glenn Strauss <gst...@gl...>
+Date: Fri Mar 10 02:46:56 2017 -0500
+
+ [mod_cgi,fastcgi,scgi,proxy] fix streaming response (fixes #2796)
+
+ fix streaming response when server.stream-response-body = 2
+ and client catches up to stream from backend
+
+ (thx horgh)
+
+ x-ref:
+ "mod_fastcgi can fail to read entire response from server"
+ https://redmine.lighttpd.net/issues/2796
+
+diff --git a/src/mod_cgi.c b/src/mod_cgi.c
+index 2a50fd3..47196c9 100644
+--- a/src/mod_cgi.c
++++ b/src/mod_cgi.c
+@@ -409,7 +409,6 @@ static int cgi_demux_response(server *srv, handler_ctx *hctx) {
+ if (-1 == (n = read(hctx->fd, hctx->response->ptr, hctx->response->size - 1))) {
+ if (errno == EAGAIN || errno == EINTR) {
+ /* would block, wait for signal */
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ return FDEVENT_HANDLED_NOT_FINISHED;
+ }
+ /* error */
+@@ -1442,9 +1441,10 @@ SUBREQUEST_FUNC(mod_cgi_handle_subrequest) {
+ if (chunkqueue_length(con->write_queue) > 65536 - 4096) {
+ fdevent_event_clr(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ } else if (!(fdevent_event_get_interest(srv->ev, hctx->fd) & FDEVENT_IN)) {
+- /* optimistic read from backend, which might re-enable FDEVENT_IN */
++ /* optimistic read from backend */
+ handler_t rc = cgi_recv_response(srv, hctx); /*(might invalidate hctx)*/
+ if (rc != HANDLER_GO_ON) return rc; /*(unless HANDLER_GO_ON)*/
++ fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ }
+ }
+
+diff --git a/src/mod_fastcgi.c b/src/mod_fastcgi.c
+index cd84338..b52d493 100644
+--- a/src/mod_fastcgi.c
++++ b/src/mod_fastcgi.c
+@@ -2378,7 +2378,6 @@ static int fcgi_demux_response(server *srv, handler_ctx *hctx) {
+ #if !defined(_WIN32) && !defined(__CYGWIN__)
+ if (ioctl(hctx->fd, FIONREAD, &toread)) {
+ if (errno == EAGAIN) {
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ return 0;
+ }
+ log_error_write(srv, __FILE__, __LINE__, "sd",
+@@ -2411,7 +2410,6 @@ static int fcgi_demux_response(server *srv, handler_ctx *hctx) {
+
+ if (-1 == r) {
+ if (errno == EAGAIN) {
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ return 0;
+ }
+ log_error_write(srv, __FILE__, __LINE__, "sds",
+@@ -2421,6 +2419,7 @@ static int fcgi_demux_response(server *srv, handler_ctx *hctx) {
+ }
+ }
+ if (0 == r) {
++ if (!(fdevent_event_get_interest(srv->ev, hctx->fd) & FDEVENT_IN)) return 0;
+ log_error_write(srv, __FILE__, __LINE__, "ssdsb",
+ "unexpected end-of-file (perhaps the fastcgi process died):",
+ "pid:", proc->pid,
+@@ -3004,9 +3003,10 @@ SUBREQUEST_FUNC(mod_fastcgi_handle_subrequest) {
+ if (chunkqueue_length(con->write_queue) > 65536 - 4096) {
+ fdevent_event_clr(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ } else if (!(fdevent_event_get_interest(srv->ev, hctx->fd) & FDEVENT_IN)) {
+- /* optimistic read from backend, which might re-enable FDEVENT_IN */
++ /* optimistic read from backend */
+ handler_t rc = fcgi_recv_response(srv, hctx); /*(might invalidate hctx)*/
+ if (rc != HANDLER_GO_ON) return rc; /*(unless HANDLER_GO_ON)*/
++ fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ }
+ }
+
+diff --git a/src/mod_proxy.c b/src/mod_proxy.c
+index 85279df..241d24e 100644
+--- a/src/mod_proxy.c
++++ b/src/mod_proxy.c
+@@ -843,7 +843,6 @@ static int proxy_demux_response(server *srv, handler_ctx *hctx) {
+ #if !defined(_WIN32) && !defined(__CYGWIN__)
+ if (ioctl(hctx->fd, FIONREAD, &b)) {
+ if (errno == EAGAIN) {
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ return 0;
+ }
+ log_error_write(srv, __FILE__, __LINE__, "sd",
+@@ -882,7 +881,6 @@ static int proxy_demux_response(server *srv, handler_ctx *hctx) {
+
+ if (-1 == (r = read(hctx->fd, hctx->response->ptr + buffer_string_length(hctx->response), buffer_string_space(hctx->response)))) {
+ if (errno == EAGAIN) {
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ return 0;
+ }
+ log_error_write(srv, __FILE__, __LINE__, "sds",
+@@ -955,6 +953,7 @@ static int proxy_demux_response(server *srv, handler_ctx *hctx) {
+ buffer_reset(hctx->response);
+ }
+ } else {
++ if (!(fdevent_event_get_interest(srv->ev, hctx->fd) & FDEVENT_IN)) return 0;
+ /* reading from upstream done */
+ fin = 1;
+ }
+@@ -1183,9 +1182,10 @@ SUBREQUEST_FUNC(mod_proxy_handle_subrequest) {
+ if (chunkqueue_length(con->write_queue) > 65536 - 4096) {
+ fdevent_event_clr(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ } else if (!(fdevent_event_get_interest(srv->ev, hctx->fd) & FDEVENT_IN)) {
+- /* optimistic read from backend, which might re-enable FDEVENT_IN */
++ /* optimistic read from backend */
+ handler_t rc = proxy_recv_response(srv, hctx); /*(might invalidate hctx)*/
+ if (rc != HANDLER_GO_ON) return rc; /*(unless HANDLER_GO_ON)*/
++ fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ }
+ }
+
+diff --git a/src/mod_scgi.c b/src/mod_scgi.c
+index ef6ab98..5da4f55 100644
+--- a/src/mod_scgi.c
++++ b/src/mod_scgi.c
+@@ -1781,7 +1781,6 @@ static int scgi_demux_response(server *srv, handler_ctx *hctx) {
+ if (-1 == (n = read(hctx->fd, hctx->response->ptr, hctx->response->size - 1))) {
+ if (errno == EAGAIN || errno == EINTR) {
+ /* would block, wait for signal */
+- fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ return 0;
+ }
+ /* error */
+@@ -2443,9 +2442,10 @@ SUBREQUEST_FUNC(mod_scgi_handle_subrequest) {
+ if (chunkqueue_length(con->write_queue) > 65536 - 4096) {
+ fdevent_event_clr(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ } else if (!(fdevent_event_get_interest(srv->ev, hctx->fd) & FDEVENT_IN)) {
+- /* optimistic read from backend, which might re-enable FDEVENT_IN */
++ /* optimistic read from backend */
+ handler_t rc = scgi_recv_response(srv, hctx); /*(might invalidate hctx)*/
+ if (rc != HANDLER_GO_ON) return rc; /*(unless HANDLER_GO_ON)*/
++ fdevent_event_add(srv->ev, &(hctx->fde_ndx), hctx->fd, FDEVENT_IN);
+ }
+ }
+
Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf 2017-04-23 12:58:53 UTC (rev 8273)
+++ branches/1.0/package/lighttpd/lighttpd.conf 2017-04-24 16:34:31 UTC (rev 8274)
@@ -12,6 +12,7 @@
server.document-root = "@HTTPDIR@"
server.errorlog-use-syslog = "enable"
+server.stream-response-body = 2
index-file.names = ( "index.php", "index.html",
"index.htm", "default.htm" )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-23 12:58:55
|
Revision: 8273
http://sourceforge.net/p/astlinux/code/8273
Author: abelbeck
Date: 2017-04-23 12:58:53 +0000 (Sun, 23 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-23 12:56:04 UTC (rev 8272)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-23 12:58:53 UTC (rev 8273)
@@ -20,7 +20,7 @@
-- 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.
+-- netcalc, version 2.1.2, 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).
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-23 12:56:05
|
Revision: 8272
http://sourceforge.net/p/astlinux/code/8272
Author: abelbeck
Date: 2017-04-23 12:56:04 +0000 (Sun, 23 Apr 2017)
Log Message:
-----------
netcalc, version bump to 2.1.2
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-04-22 17:20:46 UTC (rev 8271)
+++ branches/1.0/package/netcalc/netcalc.mk 2017-04-23 12:56:04 UTC (rev 8272)
@@ -4,7 +4,7 @@
#
################################################################################
-NETCALC_VERSION = 2.1.1
+NETCALC_VERSION = 2.1.2
NETCALC_SOURCE = netcalc-$(NETCALC_VERSION).tar.gz
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-04-22 17:20:48
|
Revision: 8271
http://sourceforge.net/p/astlinux/code/8271
Author: abelbeck
Date: 2017-04-22 17:20:46 +0000 (Sat, 22 Apr 2017)
Log Message:
-----------
ddclient, add upstream features by David Kerr
Ref: https://github.com/astlinux-project/ddclient-curl/compare/bdb05a876fb0...549bcb66f2c3
Added Paths:
-----------
branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch
Added: branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch (rev 0)
+++ branches/1.0/package/ddclient/ddclient-0001-upstream-4da69be-549bcb6.patch 2017-04-22 17:20:46 UTC (rev 8271)
@@ -0,0 +1,232 @@
+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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-21 21:30:01
|
Revision: 8270
http://sourceforge.net/p/astlinux/code/8270
Author: abelbeck
Date: 2017-04-21 21:29:59 +0000 (Fri, 21 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-21 21:25:55 UTC (rev 8269)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-21 21:29:59 UTC (rev 8270)
@@ -31,6 +31,10 @@
-- Fossil, version bump to 2.0, adds a hardened SHA1 implementation and understands SHA3-256 hashes.
+-- Monit, version bump to 5.22.0
+
+-- zabbix, version bump to 2.2.18
+
-- pcre, version bump to 8.40, security fixes: CVE-2017-6004, CVE-2017-7186
-- e2fsprogs, version bump to 1.43.4
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-21 21:25:57
|
Revision: 8269
http://sourceforge.net/p/astlinux/code/8269
Author: abelbeck
Date: 2017-04-21 21:25:55 +0000 (Fri, 21 Apr 2017)
Log Message:
-----------
zabbix, version bump from 2.2.15 to 2.2.18 (LTS)
Modified Paths:
--------------
branches/1.0/package/zabbix/zabbix.mk
Modified: branches/1.0/package/zabbix/zabbix.mk
===================================================================
--- branches/1.0/package/zabbix/zabbix.mk 2017-04-21 20:49:47 UTC (rev 8268)
+++ branches/1.0/package/zabbix/zabbix.mk 2017-04-21 21:25:55 UTC (rev 8269)
@@ -4,7 +4,7 @@
#
#############################################################
-ZABBIX_VERSION = 2.2.15
+ZABBIX_VERSION = 2.2.18
ZABBIX_SOURCE = zabbix-$(ZABBIX_VERSION).tar.gz
ZABBIX_SITE = http://downloads.sourceforge.net/sourceforge/zabbix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-21 20:49:50
|
Revision: 8268
http://sourceforge.net/p/astlinux/code/8268
Author: abelbeck
Date: 2017-04-21 20:49:47 +0000 (Fri, 21 Apr 2017)
Log Message:
-----------
monit, version bump to 5.22.0
Modified Paths:
--------------
branches/1.0/package/monit/monit-0001-no-force-static.patch
branches/1.0/package/monit/monit-0110-http-base-url.patch
branches/1.0/package/monit/monit-0120-style-sheet.patch
branches/1.0/package/monit/monit.mk
Modified: branches/1.0/package/monit/monit-0001-no-force-static.patch
===================================================================
--- branches/1.0/package/monit/monit-0001-no-force-static.patch 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit-0001-no-force-static.patch 2017-04-21 20:49:47 UTC (rev 8268)
@@ -11,7 +11,7 @@
+++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200
@@ -91,7 +91,7 @@
src/terminal/Color.c
-
+
monit_LDADD = libmonit/libmonit.la
-monit_LDFLAGS = -static $(EXTLDFLAGS)
+monit_LDFLAGS = $(EXTLDFLAGS)
Modified: branches/1.0/package/monit/monit-0110-http-base-url.patch
===================================================================
--- branches/1.0/package/monit/monit-0110-http-base-url.patch 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit-0110-http-base-url.patch 2017-04-21 20:49:47 UTC (rev 8268)
@@ -9,7 +9,7 @@
#ifdef HAVE_STDIO_H
#include <stdio.h>
#endif
-@@ -548,6 +550,11 @@
+@@ -549,6 +551,11 @@
internal_error(S, SC_BAD_REQUEST, "[error] URL too long");
return NULL;
}
Modified: branches/1.0/package/monit/monit-0120-style-sheet.patch
===================================================================
--- branches/1.0/package/monit/monit-0120-style-sheet.patch 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit-0120-style-sheet.patch 2017-04-21 20:49:47 UTC (rev 8268)
@@ -1,6 +1,6 @@
--- monit-5.10/src/http/cervlet.c.orig 2014-12-18 15:56:05.000000000 -0600
+++ monit-5.10/src/http/cervlet.c 2014-12-18 15:57:08.000000000 -0600
-@@ -519,10 +519,10 @@
+@@ -571,10 +571,10 @@
" a:hover {text-decoration: none;} "\
" a {text-decoration: underline;color:#222} "\
" table {border-collapse:collapse; border:0;} "\
@@ -15,8 +15,8 @@
" .gray-text {color:#999999;} "\
" .blue-text {color:#0000ff;} "\
" .yellow-text {color:#ffff00;} "\
-@@ -533,16 +533,16 @@
- " /*Opera Fix*/body:before {content:\"\";height:100%%;float:left;width:0;margin-top:-32767px;/} "\
+@@ -589,16 +589,16 @@
+ " /*Opera Fix*/body:before {content:\"\";height:100%%;float:left;width:0;margin-top:-32767px;} "\
" #footer {position: relative;margin-top: -50px; height: 50px; clear:both; font-size:11px;color:#777;text-align:center;} "\
" #footer a {color:#333;} #footer a:hover {text-decoration: none;} "\
- " #nav {background:#ddd;font:normal normal normal 14px/0px 'HelveticaNeue', Helvetica;} "\
Modified: branches/1.0/package/monit/monit.mk
===================================================================
--- branches/1.0/package/monit/monit.mk 2017-04-21 19:52:26 UTC (rev 8267)
+++ branches/1.0/package/monit/monit.mk 2017-04-21 20:49:47 UTC (rev 8268)
@@ -4,7 +4,7 @@
#
################################################################################
-MONIT_VERSION = 5.20.0
+MONIT_VERSION = 5.22.0
MONIT_SITE = https://mmonit.com/monit/dist
MONIT_DEPENDENCIES = host-bison host-flex
#
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-21 19:52:29
|
Revision: 8267
http://sourceforge.net/p/astlinux/code/8267
Author: abelbeck
Date: 2017-04-21 19:52:26 +0000 (Fri, 21 Apr 2017)
Log Message:
-----------
web interface, System tab, set password, increase the 'maxlength' of the password fields. Only related when the 'root' password is at it's default and automatically set to match, as such .htpasswd only matches the first 8 chars (DSA) but the system matches all chars (MD5). Thanks Michael
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/system.php
Modified: branches/1.0/package/webinterface/altweb/admin/system.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/system.php 2017-04-20 16:33:24 UTC (rev 8266)
+++ branches/1.0/package/webinterface/altweb/admin/system.php 2017-04-21 19:52:26 UTC (rev 8267)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2016 Lonnie Abelbeck
+// Copyright (C) 2008-2017 Lonnie Abelbeck
// This is free software, licensed under the GNU General Public License
// version 3 as published by the Free Software Foundation; you can
// redistribute it and/or modify it under the terms of the GNU
@@ -575,7 +575,7 @@
<tr><td style="text-align: center;" colspan="3">
<h2>Set Management Passwords:</h2>
</td></tr><tr><td class="dialogText" style="text-align: right;">
- New Password:<input type="password" size="18" maxlength="15" name="pass1" />
+ New Password:<input type="password" size="18" maxlength="32" name="pass1" />
</td><td width="30"> </td><td style="text-align: center;">
<select name="user_pass">
<option value="admin">Username: admin</option>
@@ -582,7 +582,7 @@
<option value="staff">Username: staff</option>
</select>
</td></tr><tr><td class="dialogText" style="text-align: right;">
- Confirm Password:<input type="password" size="18" maxlength="15" name="pass2" />
+ Confirm Password:<input type="password" size="18" maxlength="32" name="pass2" />
</td><td> </td><td style="text-align: center;">
<input type="submit" value="Set Password" name="submit_password" />
</td></tr></table>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-20 16:33:26
|
Revision: 8266
http://sourceforge.net/p/astlinux/code/8266
Author: abelbeck
Date: 2017-04-20 16:33:24 +0000 (Thu, 20 Apr 2017)
Log Message:
-----------
linux kernel, increase 'kernel log buffer size' CONFIG_LOG_BUF_SHIFT from 14 to 16 which translates from 16K to 64K bytes, this allows the generated '/var/run/dmesg.boot' to contain the complete kernel boot log via dmesg. This change is applied to all SMP enabled kernel configs.
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-19 17:07:19 UTC (rev 8265)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2017-04-20 16:33:24 UTC (rev 8266)
@@ -106,7 +106,7 @@
# CONFIG_RCU_BOOST is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=16
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_CGROUPS is not set
# CONFIG_NAMESPACES 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-19 17:07:19 UTC (rev 8265)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2017-04-20 16:33:24 UTC (rev 8266)
@@ -108,7 +108,7 @@
# CONFIG_RCU_BOOST is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=16
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_CGROUPS is not set
# CONFIG_NAMESPACES 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-19 17:07:19 UTC (rev 8265)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp.config 2017-04-20 16:33:24 UTC (rev 8266)
@@ -108,7 +108,7 @@
# CONFIG_RCU_BOOST is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=16
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_CGROUPS is not set
# CONFIG_NAMESPACES 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-19 17:07:22
|
Revision: 8265
http://sourceforge.net/p/astlinux/code/8265
Author: abelbeck
Date: 2017-04-19 17:07:19 +0000 (Wed, 19 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-19 17:04:31 UTC (rev 8264)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-19 17:07:19 UTC (rev 8265)
@@ -58,7 +58,7 @@
-- 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
+-- libcurl (curl) version bump to 7.54.0, security fixes: CVE-2017-2629, CVE-2017-7468
-- 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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-19 17:04:33
|
Revision: 8264
http://sourceforge.net/p/astlinux/code/8264
Author: abelbeck
Date: 2017-04-19 17:04:31 +0000 (Wed, 19 Apr 2017)
Log Message:
-----------
libcurl, version bump to 7.54.0
Modified Paths:
--------------
branches/1.0/package/libcurl/libcurl.mk
Modified: branches/1.0/package/libcurl/libcurl.mk
===================================================================
--- branches/1.0/package/libcurl/libcurl.mk 2017-04-15 13:02:27 UTC (rev 8263)
+++ branches/1.0/package/libcurl/libcurl.mk 2017-04-19 17:04:31 UTC (rev 8264)
@@ -3,7 +3,7 @@
# libcurl
#
#############################################################
-LIBCURL_VERSION = 7.53.1
+LIBCURL_VERSION = 7.54.0
LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.gz
LIBCURL_SITE = https://curl.haxx.se/download
LIBCURL_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-15 13:02:30
|
Revision: 8263
http://sourceforge.net/p/astlinux/code/8263
Author: abelbeck
Date: 2017-04-15 13:02:27 +0000 (Sat, 15 Apr 2017)
Log Message:
-----------
pjsip, remove unneeded asterisk-config_site.h PJMEDIA_HAS_WEBRTC_AEC def's with --disable-libwebrtc, related ASTERISK-26930
Modified Paths:
--------------
branches/1.0/package/pjsip/asterisk-config_site.h
Modified: branches/1.0/package/pjsip/asterisk-config_site.h
===================================================================
--- branches/1.0/package/pjsip/asterisk-config_site.h 2017-04-08 15:34:03 UTC (rev 8262)
+++ branches/1.0/package/pjsip/asterisk-config_site.h 2017-04-15 13:02:27 UTC (rev 8263)
@@ -12,13 +12,6 @@
*/
#define PJMEDIA_HAS_SRTP 0
-/*
- * Defining PJMEDIA_HAS_WEBRTC_AEC to 0 does NOT disable Asterisk's ability to use
- * webrtc. It only disables the pjmedia webrtc transport which Asterisk doesn't use.
- */
-#undef PJMEDIA_HAS_WEBRTC_AEC
-#define PJMEDIA_HAS_WEBRTC_AEC 0
-
#define PJ_HAS_IPV6 1
#define NDEBUG 1
#define PJ_MAX_HOSTNAME (256)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-08 15:34:06
|
Revision: 8262
http://sourceforge.net/p/astlinux/code/8262
Author: abelbeck
Date: 2017-04-08 15:34:03 +0000 (Sat, 08 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-08 15:32:41 UTC (rev 8261)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-08 15:34:03 UTC (rev 8262)
@@ -12,7 +12,7 @@
** System
--- Linux Kernel 3.2.87 (minor bump)
+-- Linux Kernel 3.2.88 (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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-08 15:32:44
|
Revision: 8261
http://sourceforge.net/p/astlinux/code/8261
Author: abelbeck
Date: 2017-04-08 15:32:41 +0000 (Sat, 08 Apr 2017)
Log Message:
-----------
Linux version bump from linux-3.2.87 to linux-3.2.88
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
branches/1.0/crosstool-ng-src/get-files.sh
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/geni586/linux.config
branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
branches/1.0/project/astlinux/genx86_64/linux-smp.config
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/project/runnix-iso/geni586/linux.config
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
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/astlinux-ast11.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -916,7 +916,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.87.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.88.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/astlinux-ast13.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -916,7 +916,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.87.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.88.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -219,7 +219,7 @@
# CT_KERNEL_V_2_6_31 is not set
# CT_KERNEL_V_2_6_27 is not set
CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.87.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.88.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -219,7 +219,7 @@
# CT_KERNEL_V_2_6_31 is not set
# CT_KERNEL_V_2_6_27 is not set
CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.87.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.88.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/get-files.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-files.sh 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/crosstool-ng-src/get-files.sh 2017-04-08 15:32:41 UTC (rev 8261)
@@ -4,7 +4,7 @@
TARBALLS=".build/tarballs"
-LINUX_KERNEL="linux-3.2.87.tar.gz"
+LINUX_KERNEL="linux-3.2.88.tar.gz"
EGLIBC="eglibc-2_18.tar.bz2"
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.87 Kernel Configuration
+# Linux/i386 3.2.88 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/astlinux/geni586/linux.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/project/astlinux/geni586/linux.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.87 Kernel Configuration
+# Linux/i386 3.2.88 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
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-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.87 Kernel Configuration
+# Linux/x86_64 3.2.88 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 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-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.87 Kernel Configuration
+# Linux/x86_64 3.2.88 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/project/runnix/geni586/linux.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.87 Kernel Configuration
+# Linux/i386 3.2.88 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/runnix-iso/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix-iso/geni586/linux.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/project/runnix-iso/geni586/linux.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.87 Kernel Configuration
+# Linux/i386 3.2.88 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/runnix-iso.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -817,7 +817,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.87.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.88.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/runnix.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -818,7 +818,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.87.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.88.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -897,7 +897,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.87.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.88.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2017-04-08 04:37:11 UTC (rev 8260)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-04-08 15:32:41 UTC (rev 8261)
@@ -897,7 +897,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.87.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.88.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG 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-08 04:37:13
|
Revision: 8260
http://sourceforge.net/p/astlinux/code/8260
Author: abelbeck
Date: 2017-04-08 04:37:11 +0000 (Sat, 08 Apr 2017)
Log Message:
-----------
pjsip, properly disable webrtc, without fully disabling libwebrtc the builtin assumes SSE2 instruction set which our i586 toolchain does not support and fails to build.
Incorrect Asterisk commit for 'third-party/pjproject/Makefile.rules'
Ref: http://git.asterisk.org/gitweb/?p=asterisk/asterisk.git;a=commit;h=9c05ddbdddb80d46a0621b519858b37d2e7c01fb
and unneeded addition to 'third-party/pjproject/patches/config_site.h'
Modified Paths:
--------------
branches/1.0/package/pjsip/pjsip.mk
Modified: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk 2017-04-07 14:18:44 UTC (rev 8259)
+++ branches/1.0/package/pjsip/pjsip.mk 2017-04-08 04:37:11 UTC (rev 8260)
@@ -38,13 +38,13 @@
--disable-oss \
--disable-sdl \
--disable-libyuv \
+ --disable-libwebrtc \
--disable-resample \
--disable-ffmpeg \
--disable-openh264 \
--disable-ipp \
--without-external-pa \
- --without-external-srtp \
- --without-external-webrtc
+ --without-external-srtp
ifeq ($(BR2_PACKAGE_OPENSSL),y)
PJSIP_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-07 14:18:46
|
Revision: 8259
http://sourceforge.net/p/astlinux/code/8259
Author: abelbeck
Date: 2017-04-07 14:18:44 +0000 (Fri, 07 Apr 2017)
Log Message:
-----------
asterisk, rename version 13.15.0-rc3 to official 13.15.0
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.mk
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2017-04-05 16:44:32 UTC (rev 8258)
+++ branches/1.0/package/asterisk/asterisk.mk 2017-04-07 14:18:44 UTC (rev 8259)
@@ -7,7 +7,7 @@
ASTERISK_VERSION := 11.25.1
else
ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
-ASTERISK_VERSION := 13.15.0-rc3
+ASTERISK_VERSION := 13.15.0
else
ASTERISK_VERSION := 15.0.0
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-05 16:44:34
|
Revision: 8258
http://sourceforge.net/p/astlinux/code/8258
Author: abelbeck
Date: 2017-04-05 16:44:32 +0000 (Wed, 05 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-05 16:39:15 UTC (rev 8257)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-05 16:44:32 UTC (rev 8258)
@@ -106,13 +106,13 @@
** Asterisk
--- Asterisk 11.25.1 (no change) and 13.14.0 (version bump)
+-- Asterisk 11.25.1 (no change) and 13.15.0 (version bump)
-- Asterisk 11 and 13, backport Asterisk 14 "followme" application feature "enable_callee_prompt".
-- DAHDI, dahdi-linux 2.8.0.1 (no change) and dahdi-tools 2.8.0 (no change)
--- pjsip 2.5.5 (no change)
+-- pjsip 2.6 (version bump)
-- libpri, version bump to 1.6.0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-05 16:39:18
|
Revision: 8257
http://sourceforge.net/p/astlinux/code/8257
Author: abelbeck
Date: 2017-04-05 16:39:15 +0000 (Wed, 05 Apr 2017)
Log Message:
-----------
pjsip version bump to 2.6 and Asterisk 13.15.0-rc3
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/pjsip/Config.in
branches/1.0/package/pjsip/asterisk-config_site.h
branches/1.0/package/pjsip/pjsip.mk
Added Paths:
-----------
branches/1.0/package/pjsip/pjsip-0000-remove-third-party.patch
branches/1.0/package/pjsip/pjsip-0000-set_apps_initial_log_level.patch
branches/1.0/package/pjsip/pjsip-0010-evsub-Add-pjsip_evsub_set_uas_timeout.patch
branches/1.0/package/pjsip/pjsip-0011-r5554-svn-backport-Increase-SENDER_WIDTH-column-size.patch
branches/1.0/package/pjsip/pjsip-0013-r5559-svn-backport-Fix-to-resolve-DNS-SRV-crashes.patch
Removed Paths:
-------------
branches/1.0/package/pjsip/pjsip-0001-r5397-pjsip_generic_array_max_count.patch
branches/1.0/package/pjsip/pjsip-0001-r5400-pjsip_tx_data_dec_ref.patch
branches/1.0/package/pjsip/pjsip-0002-Fix-1946-Avoid-deinitialization-of-uninitialized-cli.patch
branches/1.0/package/pjsip/pjsip-0002-r5435-add-pjsip_inv_session-ref_cnt.patch
branches/1.0/package/pjsip/pjsip-0003-r5403-pjsip_IPV6_V6ONLY.patch
branches/1.0/package/pjsip/pjsip-0004-resolver.c-Prevent-SERVFAIL-from-marking-name-server.patch
branches/1.0/package/pjsip/pjsip-0005-Re-1969-Fix-crash-on-using-an-already-destroyed-SSL-.patch
branches/1.0/package/pjsip/pjsip-0006-r5471-svn-backport-Various-fixes-for-DNS-IPv6.patch
branches/1.0/package/pjsip/pjsip-0006-r5473-svn-backport-Fix-pending-query.patch
branches/1.0/package/pjsip/pjsip-0006-r5475-svn-backport-Remove-DNS-cache-entry.patch
branches/1.0/package/pjsip/pjsip-0006-r5477-svn-backport-Fix-DNS-write-on-freed-memory.patch
Modified: branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,6 +1,6 @@
--- asterisk-13/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-13/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2668,11 +2668,13 @@
+@@ -2670,11 +2670,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,6 +1,6 @@
--- asterisk-13/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-13/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -17368,7 +17368,7 @@
+@@ -17449,7 +17449,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/asterisk/asterisk.mk 2017-04-05 16:39:15 UTC (rev 8257)
@@ -7,7 +7,7 @@
ASTERISK_VERSION := 11.25.1
else
ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
-ASTERISK_VERSION := 13.14.0
+ASTERISK_VERSION := 13.15.0-rc3
else
ASTERISK_VERSION := 15.0.0
endif
Modified: branches/1.0/package/pjsip/Config.in
===================================================================
--- branches/1.0/package/pjsip/Config.in 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/Config.in 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,6 +1,5 @@
config BR2_PACKAGE_PJSIP
bool "pjsip"
- select BR2_PACKAGE_LIBSRTP
help
PJSIP is a free and open source multimedia communication library
written in C language implementing standard based protocols such as:
Modified: branches/1.0/package/pjsip/asterisk-config_site.h
===================================================================
--- branches/1.0/package/pjsip/asterisk-config_site.h 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/asterisk-config_site.h 2017-04-05 16:39:15 UTC (rev 8257)
@@ -12,6 +12,13 @@
*/
#define PJMEDIA_HAS_SRTP 0
+/*
+ * Defining PJMEDIA_HAS_WEBRTC_AEC to 0 does NOT disable Asterisk's ability to use
+ * webrtc. It only disables the pjmedia webrtc transport which Asterisk doesn't use.
+ */
+#undef PJMEDIA_HAS_WEBRTC_AEC
+#define PJMEDIA_HAS_WEBRTC_AEC 0
+
#define PJ_HAS_IPV6 1
#define NDEBUG 1
#define PJ_MAX_HOSTNAME (256)
Added: branches/1.0/package/pjsip/pjsip-0000-remove-third-party.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0000-remove-third-party.patch (rev 0)
+++ branches/1.0/package/pjsip/pjsip-0000-remove-third-party.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -0,0 +1,124 @@
+diff --git a/build.mak.in b/build.mak.in
+index eb28663..83024ef 100644
+--- a/build.mak.in
++++ b/build.mak.in
+@@ -28,19 +27,6 @@ export APP_THIRD_PARTY_EXT :=
+ export APP_THIRD_PARTY_LIBS :=
+ export APP_THIRD_PARTY_LIB_FILES :=
+
+-ifeq (@ac_external_srtp@,1)
+-# External SRTP library
+-APP_THIRD_PARTY_EXT += -lsrtp
+-else
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lsrtp-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lsrtp
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libsrtp.$(SHLIB_SUFFIX)
+-endif
+-endif
+-
+ ifeq (@ac_pjmedia_resample@,libresample)
+ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX)
+ ifeq ($(PJ_SHARED_LIBRARIES),)
+@@ -57,99 +43,6 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libresample.$(SHLIB_SUFFI
+ endif
+ endif
+
+-ifneq (@ac_no_gsm_codec@,1)
+-ifeq (@ac_external_gsm@,1)
+-# External GSM library
+-APP_THIRD_PARTY_EXT += -lgsm
+-else
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lgsmcodec
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libgsmcodec.$(SHLIB_SUFFIX)
+-endif
+-endif
+-endif
+-
+-ifneq (@ac_no_speex_codec@,1)
+-ifeq (@ac_external_speex@,1)
+-APP_THIRD_PARTY_EXT += -lspeex -lspeexdsp
+-else
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lspeex
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libspeex.$(SHLIB_SUFFIX)
+-endif
+-endif
+-endif
+-
+-ifneq (@ac_no_ilbc_codec@,1)
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lilbccodec
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libilbccodec.$(SHLIB_SUFFIX)
+-endif
+-endif
+-
+-ifneq (@ac_no_g7221_codec@,1)
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lg7221codec-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lg7221codec
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libg7221codec.$(SHLIB_SUFFIX)
+-endif
+-endif
+-
+-ifneq ($(findstring pa,@ac_pjmedia_snd@),)
+-ifeq (@ac_external_pa@,1)
+-# External PA
+-APP_THIRD_PARTY_EXT += -lportaudio
+-else
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lportaudio
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libportaudio.$(SHLIB_SUFFIX)
+-endif
+-endif
+-endif
+-
+-ifneq (@ac_no_yuv@,1)
+-ifeq (@ac_external_yuv@,1)
+-APP_THIRD_PARTY_EXT += -lyuv
+-else
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lyuv-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lyuv
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libyuv.$(SHLIB_SUFFIX)
+-endif
+-endif
+-endif
+-
+-ifneq (@ac_no_webrtc@,1)
+-ifeq (@ac_external_webrtc@,1)
+-APP_THIRD_PARTY_EXT += -lwebrtc
+-else
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc-$(LIB_SUFFIX)
+-ifeq ($(PJ_SHARED_LIBRARIES),)
+-APP_THIRD_PARTY_LIBS += -lwebrtc-$(TARGET_NAME)
+-else
+-APP_THIRD_PARTY_LIBS += -lwebrtc
+-APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX).$(PJ_VERSION_MAJOR) $(PJ_DIR)/third_party/lib/libwebrtc.$(SHLIB_SUFFIX)
+-endif
+-endif
+-endif
+-
+-
+ # Additional flags
+ @ac_build_mak_vars@
+
Added: branches/1.0/package/pjsip/pjsip-0000-set_apps_initial_log_level.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0000-set_apps_initial_log_level.patch (rev 0)
+++ branches/1.0/package/pjsip/pjsip-0000-set_apps_initial_log_level.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -0,0 +1,39 @@
+diff --git a/pjsip-apps/src/pjsua/main.c b/pjsip-apps/src/pjsua/main.c
+index 2baaf82..11831f2 100644
+--- a/pjsip-apps/src/pjsua/main.c
++++ b/pjsip-apps/src/pjsua/main.c
+@@ -126,5 +126,7 @@ int main_func(int argc, char *argv[])
+
+ int main(int argc, char *argv[])
+ {
++ pj_log_set_level(1);
++
+ return pj_run_app(&main_func, argc, argv, 0);
+ }
+diff --git a/pjsip-apps/src/pjsystest/main_console.c b/pjsip-apps/src/pjsystest/main_console.c
+index 122cdc7..dc79eab 100644
+--- a/pjsip-apps/src/pjsystest/main_console.c
++++ b/pjsip-apps/src/pjsystest/main_console.c
+@@ -133,6 +133,8 @@ void gui_sleep(unsigned sec)
+
+ int main()
+ {
++ pj_log_set_level(1);
++
+ if (systest_init() != PJ_SUCCESS)
+ return 1;
+
+diff --git a/pjsip-apps/src/python/_pjsua.c b/pjsip-apps/src/python/_pjsua.c
+index fb80e23..c9b21d8 100644
+--- a/pjsip-apps/src/python/_pjsua.c
++++ b/pjsip-apps/src/python/_pjsua.c
+@@ -4437,7 +4437,8 @@ init_pjsua(void)
+ PyObject* m = NULL;
+ #define ADD_CONSTANT(mod,name) PyModule_AddIntConstant(mod,#name,name)
+
+-
++ pj_log_set_level(1);
++
+ PyEval_InitThreads();
+
+ if (PyType_Ready(&PyTyp_pjsua_callback) < 0)
Deleted: branches/1.0/package/pjsip/pjsip-0001-r5397-pjsip_generic_array_max_count.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0001-r5397-pjsip_generic_array_max_count.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0001-r5397-pjsip_generic_array_max_count.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,58 +0,0 @@
-This patch updates array limit checks and docs
-in pjsip_evsub_register_pkg() and pjsip_endpt_add_capability().
-
-Index: pjsip/include/pjsip/sip_endpoint.h
-===================================================================
---- a/pjsip/include/pjsip/sip_endpoint.h (revision 5396)
-+++ b/pjsip/include/pjsip/sip_endpoint.h (revision 5397)
-@@ -583,7 +583,8 @@
- * @param hname If htype specifies PJSIP_H_OTHER, then the header name
- * must be supplied in this argument. Otherwise the value
- * must be set to NULL.
-- * @param count The number of tags in the array.
-+ * @param count The number of tags in the array. The value must not
-+ * be greater than PJSIP_GENERIC_ARRAY_MAX_COUNT.
- * @param tags Array of tags describing the capabilities or extensions
- * to be added to the appropriate header.
- *
-Index: pjsip/include/pjsip-simple/evsub.h
-===================================================================
---- a/pjsip/include/pjsip-simple/evsub.h (revision 5396)
-+++ b/pjsip/include/pjsip-simple/evsub.h (revision 5397)
-@@ -246,7 +246,8 @@
- * registered.
- * @param event_name Event package identification.
- * @param expires Default subscription expiration time, in seconds.
-- * @param accept_cnt Number of strings in Accept array.
-+ * @param accept_cnt Number of strings in Accept array. The value must
-+ * not be greater than PJSIP_GENERIC_ARRAY_MAX_COUNT.
- * @param accept Array of Accept value.
- *
- * @return PJ_SUCCESS on success.
-Index: pjsip/src/pjsip/sip_endpoint.c
-===================================================================
---- a/pjsip/src/pjsip/sip_endpoint.c (revision 5396)
-+++ b/pjsip/src/pjsip/sip_endpoint.c (revision 5397)
-@@ -371,6 +371,7 @@
-
- /* Check arguments. */
- PJ_ASSERT_RETURN(endpt!=NULL && count>0 && tags, PJ_EINVAL);
-+ PJ_ASSERT_RETURN(count <= PJSIP_GENERIC_ARRAY_MAX_COUNT, PJ_ETOOMANY);
- PJ_ASSERT_RETURN(htype==PJSIP_H_ACCEPT ||
- htype==PJSIP_H_ALLOW ||
- htype==PJSIP_H_SUPPORTED,
-Index: pjsip/src/pjsip-simple/evsub.c
-===================================================================
---- a/pjsip/src/pjsip-simple/evsub.c (revision 5396)
-+++ b/pjsip/src/pjsip-simple/evsub.c (revision 5397)
-@@ -412,7 +412,9 @@
- unsigned i;
-
- PJ_ASSERT_RETURN(pkg_mod && event_name, PJ_EINVAL);
-- PJ_ASSERT_RETURN(accept_cnt < PJ_ARRAY_SIZE(pkg->pkg_accept->values),
-+
-+ /* Make sure accept_cnt < PJ_ARRAY_SIZE(pkg->pkg_accept->values) */
-+ PJ_ASSERT_RETURN(accept_cnt <= PJSIP_GENERIC_ARRAY_MAX_COUNT,
- PJ_ETOOMANY);
-
- /* Make sure evsub module has been initialized */
Deleted: branches/1.0/package/pjsip/pjsip-0001-r5400-pjsip_tx_data_dec_ref.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0001-r5400-pjsip_tx_data_dec_ref.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0001-r5400-pjsip_tx_data_dec_ref.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,24 +0,0 @@
-This patch fixes the issue in pjsip_tx_data_dec_ref()
-when tx_data_destroy can be called more than once,
-and checks if invalid value (e.g. NULL) is passed to.
-
-Index: pjsip/src/pjsip/sip_transport.c
-===================================================================
---- a/pjsip/src/pjsip/sip_transport.c (revision 5399)
-+++ b/pjsip/src/pjsip/sip_transport.c (revision 5400)
-@@ -491,8 +491,13 @@
- */
- PJ_DEF(pj_status_t) pjsip_tx_data_dec_ref( pjsip_tx_data *tdata )
- {
-- pj_assert( pj_atomic_get(tdata->ref_cnt) > 0);
-- if (pj_atomic_dec_and_get(tdata->ref_cnt) <= 0) {
-+ pj_atomic_value_t ref_cnt;
-+
-+ PJ_ASSERT_RETURN(tdata && tdata->ref_cnt, PJ_EINVAL);
-+
-+ ref_cnt = pj_atomic_dec_and_get(tdata->ref_cnt);
-+ pj_assert( ref_cnt >= 0);
-+ if (ref_cnt == 0) {
- tx_data_destroy(tdata);
- return PJSIP_EBUFDESTROYED;
- } else {
Deleted: branches/1.0/package/pjsip/pjsip-0002-Fix-1946-Avoid-deinitialization-of-uninitialized-cli.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0002-Fix-1946-Avoid-deinitialization-of-uninitialized-cli.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0002-Fix-1946-Avoid-deinitialization-of-uninitialized-cli.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,55 +0,0 @@
-From 33fd755e819dc85a96718abc0ae26a9b46f14800 Mon Sep 17 00:00:00 2001
-From: nanang <nanang@localhost>
-Date: Thu, 28 Jul 2016 08:21:45 +0000
-Subject: [PATCH 2/3] Fix #1946: Avoid deinitialization of uninitialized client
- auth session.
-
----
- pjsip/src/pjsip/sip_dialog.c | 18 ++++++------------
- 1 file changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/pjsip/src/pjsip/sip_dialog.c b/pjsip/src/pjsip/sip_dialog.c
-index f03885d..421ddc4 100644
---- a/pjsip/src/pjsip/sip_dialog.c
-+++ b/pjsip/src/pjsip/sip_dialog.c
-@@ -92,6 +92,12 @@ static pj_status_t create_dialog( pjsip_user_agent *ua,
- pj_list_init(&dlg->inv_hdr);
- pj_list_init(&dlg->rem_cap_hdr);
-
-+ /* Init client authentication session. */
-+ status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt,
-+ dlg->pool, 0);
-+ if (status != PJ_SUCCESS)
-+ goto on_error;
-+
- status = pj_mutex_create_recursive(pool, dlg->obj_name, &dlg->mutex_);
- if (status != PJ_SUCCESS)
- goto on_error;
-@@ -283,12 +289,6 @@ PJ_DEF(pj_status_t) pjsip_dlg_create_uac( pjsip_user_agent *ua,
- /* Initial route set is empty. */
- pj_list_init(&dlg->route_set);
-
-- /* Init client authentication session. */
-- status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt,
-- dlg->pool, 0);
-- if (status != PJ_SUCCESS)
-- goto on_error;
--
- /* Register this dialog to user agent. */
- status = pjsip_ua_register_dlg( ua, dlg );
- if (status != PJ_SUCCESS)
-@@ -506,12 +506,6 @@ pj_status_t create_uas_dialog( pjsip_user_agent *ua,
- }
- dlg->route_set_frozen = PJ_TRUE;
-
-- /* Init client authentication session. */
-- status = pjsip_auth_clt_init(&dlg->auth_sess, dlg->endpt,
-- dlg->pool, 0);
-- if (status != PJ_SUCCESS)
-- goto on_error;
--
- /* Increment the dialog's lock since tsx may cause the dialog to be
- * destroyed prematurely (such as in case of transport error).
- */
---
-2.7.4
Deleted: branches/1.0/package/pjsip/pjsip-0002-r5435-add-pjsip_inv_session-ref_cnt.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0002-r5435-add-pjsip_inv_session-ref_cnt.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0002-r5435-add-pjsip_inv_session-ref_cnt.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,212 +0,0 @@
-When a transport error occured on an INVITE session
-the stack calls on_tsx_state_changed with new state
-PJSIP_INV_STATE_DISCONNECTED and immediately destroys
-the INVITE session.
-At the same time this INVITE session could being processed
-on another thread. This thread could use the session's
-memory pools which were already freed, so we get segfault.
-
-This patch adds a reference counter and new functions:
-pjsip_inv_add_ref and pjsip_inv_dec_ref.
-The INVITE session is destroyed only when the reference
-counter has reached zero.
-
-To avoid race condition an application should call
-pjsip_inv_add_ref/pjsip_inv_dec_ref.
-
-Index: pjsip/include/pjsip-ua/sip_inv.h
-===================================================================
---- a/pjsip/include/pjsip-ua/sip_inv.h (revision 5434)
-+++ b/pjsip/include/pjsip-ua/sip_inv.h (revision 5435)
-@@ -383,6 +383,11 @@
- * Other applications that want to use these pools must understand
- * that the flip-flop pool's lifetimes are synchronized to the
- * SDP offer-answer negotiation.
-+ *
-+ * The lifetime of this session is controlled by the reference counter in this
-+ * structure, which is manipulated by calling #pjsip_inv_add_ref and
-+ * #pjsip_inv_dec_ref. When the reference counter has reached zero, then
-+ * this session will be destroyed.
- */
- struct pjsip_inv_session
- {
-@@ -412,6 +417,7 @@
- struct pjsip_timer *timer; /**< Session Timers. */
- pj_bool_t following_fork; /**< Internal, following
- forked media? */
-+ pj_atomic_t *ref_cnt; /**< Reference counter. */
- };
-
-
-@@ -631,6 +637,30 @@
-
-
- /**
-+ * Add reference counter to the INVITE session. The reference counter controls
-+ * the life time of the session, ie. when the counter reaches zero, then it
-+ * will be destroyed.
-+ *
-+ * @param inv The INVITE session.
-+ * @return PJ_SUCCESS if the INVITE session reference counter
-+ * was increased.
-+ */
-+PJ_DECL(pj_status_t) pjsip_inv_add_ref( pjsip_inv_session *inv );
-+
-+/**
-+ * Decrement reference counter of the INVITE session.
-+ * When the session is no longer used, it will be destroyed and
-+ * caller is informed with PJ_EGONE return status.
-+ *
-+ * @param inv The INVITE session.
-+ * @return PJ_SUCCESS if the INVITE session reference counter
-+ * was decreased. A status PJ_EGONE will be returned to
-+ * inform that session is destroyed.
-+ */
-+PJ_DECL(pj_status_t) pjsip_inv_dec_ref( pjsip_inv_session *inv );
-+
-+
-+/**
- * Forcefully terminate and destroy INVITE session, regardless of
- * the state of the session. Note that this function should only be used
- * when there is failure in the INVITE session creation. After the
-Index: pjsip/src/pjsip-ua/sip_inv.c
-===================================================================
---- a/pjsip/src/pjsip-ua/sip_inv.c (revision 5434)
-+++ b/pjsip/src/pjsip-ua/sip_inv.c (revision 5435)
-@@ -195,6 +195,65 @@
- }
-
- /*
-+ * Add reference to INVITE session.
-+ */
-+PJ_DEF(pj_status_t) pjsip_inv_add_ref( pjsip_inv_session *inv )
-+{
-+ PJ_ASSERT_RETURN(inv && inv->ref_cnt, PJ_EINVAL);
-+
-+ pj_atomic_inc(inv->ref_cnt);
-+
-+ return PJ_SUCCESS;
-+}
-+
-+static void inv_session_destroy(pjsip_inv_session *inv)
-+{
-+ if (inv->last_ack) {
-+ pjsip_tx_data_dec_ref(inv->last_ack);
-+ inv->last_ack = NULL;
-+ }
-+ if (inv->invite_req) {
-+ pjsip_tx_data_dec_ref(inv->invite_req);
-+ inv->invite_req = NULL;
-+ }
-+ if (inv->pending_bye) {
-+ pjsip_tx_data_dec_ref(inv->pending_bye);
-+ inv->pending_bye = NULL;
-+ }
-+ pjsip_100rel_end_session(inv);
-+ pjsip_timer_end_session(inv);
-+ pjsip_dlg_dec_session(inv->dlg, &mod_inv.mod);
-+
-+ /* Release the flip-flop pools */
-+ pj_pool_release(inv->pool_prov);
-+ inv->pool_prov = NULL;
-+ pj_pool_release(inv->pool_active);
-+ inv->pool_active = NULL;
-+
-+ pj_atomic_destroy(inv->ref_cnt);
-+ inv->ref_cnt = NULL;
-+}
-+
-+/*
-+ * Decrease INVITE session reference, destroy it when the reference count
-+ * reaches zero.
-+ */
-+PJ_DEF(pj_status_t) pjsip_inv_dec_ref( pjsip_inv_session *inv )
-+{
-+ pj_atomic_value_t ref_cnt;
-+
-+ PJ_ASSERT_RETURN(inv && inv->ref_cnt, PJ_EINVAL);
-+
-+ ref_cnt = pj_atomic_dec_and_get(inv->ref_cnt);
-+ pj_assert( ref_cnt >= 0);
-+ if (ref_cnt == 0) {
-+ inv_session_destroy(inv);
-+ return PJ_EGONE;
-+ }
-+ return PJ_SUCCESS;
-+}
-+
-+/*
- * Set session state.
- */
- static void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state,
-@@ -261,27 +320,7 @@
- if (inv->state == PJSIP_INV_STATE_DISCONNECTED &&
- prev_state != PJSIP_INV_STATE_DISCONNECTED)
- {
-- if (inv->last_ack) {
-- pjsip_tx_data_dec_ref(inv->last_ack);
-- inv->last_ack = NULL;
-- }
-- if (inv->invite_req) {
-- pjsip_tx_data_dec_ref(inv->invite_req);
-- inv->invite_req = NULL;
-- }
-- if (inv->pending_bye) {
-- pjsip_tx_data_dec_ref(inv->pending_bye);
-- inv->pending_bye = NULL;
-- }
-- pjsip_100rel_end_session(inv);
-- pjsip_timer_end_session(inv);
-- pjsip_dlg_dec_session(inv->dlg, &mod_inv.mod);
--
-- /* Release the flip-flop pools */
-- pj_pool_release(inv->pool_prov);
-- inv->pool_prov = NULL;
-- pj_pool_release(inv->pool_active);
-- inv->pool_active = NULL;
-+ pjsip_inv_dec_ref(inv);
- }
- }
-
-@@ -838,6 +877,12 @@
- inv = PJ_POOL_ZALLOC_T(dlg->pool, pjsip_inv_session);
- pj_assert(inv != NULL);
-
-+ status = pj_atomic_create(dlg->pool, 0, &inv->ref_cnt);
-+ if (status != PJ_SUCCESS) {
-+ pjsip_dlg_dec_lock(dlg);
-+ return status;
-+ }
-+
- inv->pool = dlg->pool;
- inv->role = PJSIP_ROLE_UAC;
- inv->state = PJSIP_INV_STATE_NULL;
-@@ -881,6 +926,7 @@
- pjsip_100rel_attach(inv);
-
- /* Done */
-+ pjsip_inv_add_ref(inv);
- *p_inv = inv;
-
- pjsip_dlg_dec_lock(dlg);
-@@ -1471,6 +1517,12 @@
- inv = PJ_POOL_ZALLOC_T(dlg->pool, pjsip_inv_session);
- pj_assert(inv != NULL);
-
-+ status = pj_atomic_create(dlg->pool, 0, &inv->ref_cnt);
-+ if (status != PJ_SUCCESS) {
-+ pjsip_dlg_dec_lock(dlg);
-+ return status;
-+ }
-+
- inv->pool = dlg->pool;
- inv->role = PJSIP_ROLE_UAS;
- inv->state = PJSIP_INV_STATE_NULL;
-@@ -1540,6 +1592,7 @@
- }
-
- /* Done */
-+ pjsip_inv_add_ref(inv);
- pjsip_dlg_dec_lock(dlg);
- *p_inv = inv;
-
Deleted: branches/1.0/package/pjsip/pjsip-0003-r5403-pjsip_IPV6_V6ONLY.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0003-r5403-pjsip_IPV6_V6ONLY.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0003-r5403-pjsip_IPV6_V6ONLY.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,13 +0,0 @@
---- a/pjlib/src/pj/sock_bsd.c
-+++ b/pjlib/src/pj/sock_bsd.c
-@@ -539,6 +539,10 @@
- pj_sock_setsockopt(*sock, pj_SOL_SOCKET(), pj_SO_NOSIGPIPE(),
- &val, sizeof(val));
- }
-+ if (af != PJ_AF_INET) { /* Linux Kernel 2.4.21; June 2003 */
-+ pj_sock_setsockopt(*sock, PJ_SOL_IPV6, IPV6_V6ONLY,
-+ &val, sizeof(val));
-+ }
- #if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
- PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT!=0
- if (type == pj_SOCK_DGRAM()) {
Deleted: branches/1.0/package/pjsip/pjsip-0004-resolver.c-Prevent-SERVFAIL-from-marking-name-server.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0004-resolver.c-Prevent-SERVFAIL-from-marking-name-server.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0004-resolver.c-Prevent-SERVFAIL-from-marking-name-server.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,48 +0,0 @@
-From a5efddbe9151e9ad99279e59566c86f8bc27d3a9 Mon Sep 17 00:00:00 2001
-From: George Joseph <gj...@di...>
-Date: Wed, 7 Sep 2016 13:10:57 -0600
-Subject: [PATCH] resolver.c: Prevent SERVFAIL from marking name server bad
-
-A name server that returns "Server Failure" is indicating only that
-the server couldn't process that particular request. We should NOT
-assume that the name server is incapable of serving other requests.
-
-Here's the scenario we've been encountering...
-
-* 2 local name servers configured in resolv.conf.
-* An OPTIONS request causes a request for A and AAAA records to go out
- to both nameservers.
-* The A responses both come back successfully resolved.
-* Because of an issue at some upstream nameserver, the AAAA responses
- for that particular query come back as "SERVFAIL" from both local
- name servers.
-* Both local servers are marked as bad and no further queries can be
- sent until the 60 second ttl expires. Only previously cached results
- can be used.
-* In this case, 60 seconds is just enough time for another OPTIONS
- request to go out to the same host so the cycle repeats.
-
-We could set the bad ttl really low but that also affects REFUSED and
-NOTAUTH which probably DO signal a real server issue. Besides, even
-a really low bad ttl would be an issue on a pbx.
----
- pjlib-util/src/pjlib-util/resolver.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c
-index d277e4f..540f88f 100644
---- a/pjlib-util/src/pjlib-util/resolver.c
-+++ b/pjlib-util/src/pjlib-util/resolver.c
-@@ -1384,8 +1384,7 @@ static void report_nameserver_status(pj_dns_resolver *resolver,
- q_id = (pj_uint32_t)-1;
- }
-
-- if (!pkt || rcode == PJ_DNS_RCODE_SERVFAIL ||
-- rcode == PJ_DNS_RCODE_REFUSED ||
-+ if (!pkt || rcode == PJ_DNS_RCODE_REFUSED ||
- rcode == PJ_DNS_RCODE_NOTAUTH)
- {
- is_good = PJ_FALSE;
---
-2.7.4
-
Deleted: branches/1.0/package/pjsip/pjsip-0005-Re-1969-Fix-crash-on-using-an-already-destroyed-SSL-.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0005-Re-1969-Fix-crash-on-using-an-already-destroyed-SSL-.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0005-Re-1969-Fix-crash-on-using-an-already-destroyed-SSL-.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,164 +0,0 @@
-From 9e67e0d5c3fdc747530a956038b374fca4748b76 Mon Sep 17 00:00:00 2001
-From: riza <riza@localhost>
-Date: Thu, 13 Oct 2016 09:02:50 +0000
-Subject: [PATCH 1/4] Re #1969: Fix crash on using an already destroyed SSL
- socket.
-
----
- pjlib/src/pj/ssl_sock_ossl.c | 66 ++++++++++++++++++++++++++++----------------
- 1 file changed, 42 insertions(+), 24 deletions(-)
-
-diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c
-index fa0db2d..ceab67a 100644
---- a/pjlib/src/pj/ssl_sock_ossl.c
-+++ b/pjlib/src/pj/ssl_sock_ossl.c
-@@ -822,7 +822,10 @@ static void close_sockets(pj_ssl_sock_t *ssock)
- pj_lock_acquire(ssock->write_mutex);
- asock = ssock->asock;
- if (asock) {
-- ssock->asock = NULL;
-+ // Don't set ssock->asock to NULL, as it may trigger assertion in
-+ // send operation. This should be safe as active socket will simply
-+ // return PJ_EINVALIDOP on any operation if it is already closed.
-+ //ssock->asock = NULL;
- ssock->sock = PJ_INVALID_SOCKET;
- }
- sock = ssock->sock;
-@@ -841,9 +844,9 @@ static void close_sockets(pj_ssl_sock_t *ssock)
- /* Reset SSL socket state */
- static void reset_ssl_sock_state(pj_ssl_sock_t *ssock)
- {
-+ pj_lock_acquire(ssock->write_mutex);
- ssock->ssl_state = SSL_STATE_NULL;
--
-- destroy_ssl(ssock);
-+ pj_lock_release(ssock->write_mutex);
-
- close_sockets(ssock);
-
-@@ -1612,6 +1615,21 @@ static pj_status_t do_handshake(pj_ssl_sock_t *ssock)
- return PJ_EPENDING;
- }
-
-+static void ssl_on_destroy(void *arg)
-+{
-+ pj_pool_t *pool = NULL;
-+ pj_ssl_sock_t *ssock = (pj_ssl_sock_t*)arg;
-+
-+ destroy_ssl(ssock);
-+
-+ pj_lock_destroy(ssock->write_mutex);
-+
-+ pool = ssock->pool;
-+ ssock->pool = NULL;
-+ if (pool)
-+ pj_pool_release(pool);
-+}
-+
-
- /*
- *******************************************************************
-@@ -1830,7 +1848,7 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
-
- /* Create new SSL socket instance */
- status = pj_ssl_sock_create(ssock_parent->pool,
-- &ssock_parent->newsock_param, &ssock);
-+ &ssock_parent->newsock_param, &ssock);
- if (status != PJ_SUCCESS)
- goto on_return;
-
-@@ -1906,12 +1924,10 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
- if (status != PJ_SUCCESS)
- goto on_return;
-
-- /* Temporarily add ref the group lock until active socket creation,
-- * to make sure that group lock is destroyed if the active socket
-- * creation fails.
-- */
- pj_grp_lock_add_ref(glock);
- asock_cfg.grp_lock = ssock->param.grp_lock = glock;
-+ pj_grp_lock_add_handler(ssock->param.grp_lock, ssock->pool, ssock,
-+ ssl_on_destroy);
- }
-
- pj_bzero(&asock_cb, sizeof(asock_cb));
-@@ -1927,11 +1943,6 @@ static pj_bool_t asock_on_accept_complete (pj_activesock_t *asock,
- ssock,
- &ssock->asock);
-
-- /* This will destroy the group lock if active socket creation fails */
-- if (asock_cfg.grp_lock) {
-- pj_grp_lock_dec_ref(asock_cfg.grp_lock);
-- }
--
- if (status != PJ_SUCCESS)
- goto on_return;
-
-@@ -2251,17 +2262,26 @@ PJ_DEF(pj_status_t) pj_ssl_sock_create (pj_pool_t *pool,
- /* Create secure socket mutex */
- status = pj_lock_create_recursive_mutex(pool, pool->obj_name,
- &ssock->write_mutex);
-- if (status != PJ_SUCCESS)
-+ if (status != PJ_SUCCESS) {
-+ pj_pool_release(pool);
- return status;
-+ }
-
- /* Init secure socket param */
- pj_ssl_sock_param_copy(pool, &ssock->param, param);
-+
-+ if (ssock->param.grp_lock) {
-+ pj_grp_lock_add_ref(ssock->param.grp_lock);
-+ pj_grp_lock_add_handler(ssock->param.grp_lock, pool, ssock,
-+ ssl_on_destroy);
-+ }
-+
- ssock->param.read_buffer_size = ((ssock->param.read_buffer_size+7)>>3)<<3;
- if (!ssock->param.timer_heap) {
- PJ_LOG(3,(ssock->pool->obj_name, "Warning: timer heap is not "
- "available. It is recommended to supply one to avoid "
-- "a race condition if more than one worker threads "
-- "are used."));
-+ "a race condition if more than one worker threads "
-+ "are used."));
- }
-
- /* Finally */
-@@ -2277,8 +2297,6 @@ PJ_DEF(pj_status_t) pj_ssl_sock_create (pj_pool_t *pool,
- */
- PJ_DEF(pj_status_t) pj_ssl_sock_close(pj_ssl_sock_t *ssock)
- {
-- pj_pool_t *pool;
--
- PJ_ASSERT_RETURN(ssock, PJ_EINVAL);
-
- if (!ssock->pool)
-@@ -2290,12 +2308,11 @@ PJ_DEF(pj_status_t) pj_ssl_sock_close(pj_ssl_sock_t *ssock)
- }
-
- reset_ssl_sock_state(ssock);
-- pj_lock_destroy(ssock->write_mutex);
--
-- pool = ssock->pool;
-- ssock->pool = NULL;
-- if (pool)
-- pj_pool_release(pool);
-+ if (ssock->param.grp_lock) {
-+ pj_grp_lock_dec_ref(ssock->param.grp_lock);
-+ } else {
-+ ssl_on_destroy(ssock);
-+ }
-
- return PJ_SUCCESS;
- }
-@@ -2782,6 +2799,7 @@ pj_ssl_sock_start_accept2(pj_ssl_sock_t *ssock,
-
- /* Start accepting */
- pj_ssl_sock_param_copy(pool, &ssock->newsock_param, newsock_param);
-+ ssock->newsock_param.grp_lock = NULL;
- status = pj_activesock_start_accept(ssock->asock, pool);
- if (status != PJ_SUCCESS)
- goto on_error;
---
-2.7.4
-
Deleted: branches/1.0/package/pjsip/pjsip-0006-r5471-svn-backport-Various-fixes-for-DNS-IPv6.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0006-r5471-svn-backport-Various-fixes-for-DNS-IPv6.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0006-r5471-svn-backport-Various-fixes-for-DNS-IPv6.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,134 +0,0 @@
-From 2ab7a9f67caf73be3f2215473f72882cfaef4972 Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmu...@di...>
-Date: Fri, 28 Oct 2016 12:11:30 -0500
-Subject: [PATCH 1/3] r5471 svn backport Various fixes for DNS IPv6
-
-Fixed #1974: Various fixes for DNS IPv6
----
- pjlib-util/src/pjlib-util/resolver.c | 11 +++++------
- pjlib-util/src/pjlib-util/srv_resolver.c | 17 +++++++++++++++--
- pjsip/src/pjsip/sip_resolve.c | 14 +++++++-------
- 3 files changed, 27 insertions(+), 15 deletions(-)
-
-diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c
-index e5e1bed..d24ef9d 100644
---- a/pjlib-util/src/pjlib-util/resolver.c
-+++ b/pjlib-util/src/pjlib-util/resolver.c
-@@ -835,7 +835,7 @@ PJ_DEF(pj_status_t) pj_dns_resolver_start_query( pj_dns_resolver *resolver,
- pj_time_val now;
- struct res_key key;
- struct cached_res *cache;
-- pj_dns_async_query *q;
-+ pj_dns_async_query *q, *p_q = NULL;
- pj_uint32_t hval;
- pj_status_t status = PJ_SUCCESS;
-
-@@ -849,9 +849,6 @@ PJ_DEF(pj_status_t) pj_dns_resolver_start_query( pj_dns_resolver *resolver,
- /* Check type */
- PJ_ASSERT_RETURN(type > 0 && type < 0xFFFF, PJ_EINVAL);
-
-- if (p_query)
-- *p_query = NULL;
--
- /* Build resource key for looking up hash tables */
- init_res_key(&key, type, name);
-
-@@ -970,10 +967,12 @@ PJ_DEF(pj_status_t) pj_dns_resolver_start_query( pj_dns_resolver *resolver,
- pj_hash_set_np(resolver->hquerybyres, &q->key, sizeof(q->key),
- 0, q->hbufkey, q);
-
-- if (p_query)
-- *p_query = q;
-+ p_q = q;
-
- on_return:
-+ if (p_query)
-+ *p_query = p_q;
-+
- pj_mutex_unlock(resolver->mutex);
- return status;
- }
-diff --git a/pjlib-util/src/pjlib-util/srv_resolver.c b/pjlib-util/src/pjlib-util/srv_resolver.c
-index 02672aa..ff9c979 100644
---- a/pjlib-util/src/pjlib-util/srv_resolver.c
-+++ b/pjlib-util/src/pjlib-util/srv_resolver.c
-@@ -187,9 +187,12 @@ PJ_DEF(pj_status_t) pj_dns_srv_cancel_query(pj_dns_srv_async_query *query,
- has_pending = PJ_TRUE;
- }
- if (srv->q_aaaa) {
-- pj_dns_resolver_cancel_query(srv->q_aaaa, PJ_FALSE);
-+ /* Check if it is a dummy query. */
-+ if (srv->q_aaaa != (pj_dns_async_query*)0x1) {
-+ pj_dns_resolver_cancel_query(srv->q_aaaa, PJ_FALSE);
-+ has_pending = PJ_TRUE;
-+ }
- srv->q_aaaa = NULL;
-- has_pending = PJ_TRUE;
- }
- }
-
-@@ -485,12 +488,22 @@ static pj_status_t resolve_hostnames(pj_dns_srv_async_query *query_job)
- srv->common.type = PJ_DNS_TYPE_A;
- srv->common_aaaa.type = PJ_DNS_TYPE_AAAA;
- srv->parent = query_job;
-+ srv->q_a = NULL;
-+ srv->q_aaaa = NULL;
-
- status = PJ_SUCCESS;
-
- /* Start DNA A record query */
- if ((query_job->option & PJ_DNS_SRV_RESOLVE_AAAA_ONLY) == 0)
- {
-+ if ((query_job->option & PJ_DNS_SRV_RESOLVE_AAAA) != 0) {
-+ /* If there will be DNS AAAA query too, let's setup
-+ * a dummy one here, otherwise app callback may be called
-+ * immediately (before DNS AAAA query is sent) when
-+ * DNS A record is available in the cache.
-+ */
-+ srv->q_aaaa = (pj_dns_async_query*)0x1;
-+ }
- status = pj_dns_resolver_start_query(query_job->resolver,
- &srv->target_name,
- PJ_DNS_TYPE_A, 0,
-diff --git a/pjsip/src/pjsip/sip_resolve.c b/pjsip/src/pjsip/sip_resolve.c
-index ed326ba..3f3654d 100644
---- a/pjsip/src/pjsip/sip_resolve.c
-+++ b/pjsip/src/pjsip/sip_resolve.c
-@@ -452,7 +452,7 @@ PJ_DEF(void) pjsip_resolve( pjsip_resolver_t *resolver,
- }
-
- /* Resolve DNS AAAA record if address family is not fixed to IPv4 */
-- if (af != pj_AF_INET()) {
-+ if (af != pj_AF_INET() && status == PJ_SUCCESS) {
- status = pj_dns_resolver_start_query(resolver->res,
- &query->naptr[0].name,
- PJ_DNS_TYPE_AAAA, 0,
-@@ -530,9 +530,9 @@ static void dns_a_callback(void *user_data,
-
- ++srv->count;
- }
--
-- } else {
--
-+ }
-+
-+ if (status != PJ_SUCCESS) {
- char errmsg[PJ_ERR_MSG_SIZE];
-
- /* Log error */
-@@ -593,9 +593,9 @@ static void dns_aaaa_callback(void *user_data,
-
- ++srv->count;
- }
--
-- } else {
--
-+ }
-+
-+ if (status != PJ_SUCCESS) {
- char errmsg[PJ_ERR_MSG_SIZE];
-
- /* Log error */
---
-1.7.9.5
-
Deleted: branches/1.0/package/pjsip/pjsip-0006-r5473-svn-backport-Fix-pending-query.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0006-r5473-svn-backport-Fix-pending-query.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0006-r5473-svn-backport-Fix-pending-query.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,28 +0,0 @@
-From 509d4339747f11cfbde3a0acc447ef5d521eea93 Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmu...@di...>
-Date: Fri, 28 Oct 2016 12:12:28 -0500
-Subject: [PATCH 2/3] r5473 svn backport Fix pending query
-
-Re #1974:
-If there is a pending query, set the return value to that query (instead of NULL)
-
-Thanks to Richard Mudgett for the patch.
----
- pjlib-util/src/pjlib-util/resolver.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c
-index d24ef9d..fe687b7 100644
---- a/pjlib-util/src/pjlib-util/resolver.c
-+++ b/pjlib-util/src/pjlib-util/resolver.c
-@@ -940,6 +940,7 @@ PJ_DEF(pj_status_t) pj_dns_resolver_start_query( pj_dns_resolver *resolver,
- /* Done. This child query will be notified once the "parent"
- * query completes.
- */
-+ p_q = nq;
- status = PJ_SUCCESS;
- goto on_return;
- }
---
-1.7.9.5
-
Deleted: branches/1.0/package/pjsip/pjsip-0006-r5475-svn-backport-Remove-DNS-cache-entry.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0006-r5475-svn-backport-Remove-DNS-cache-entry.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0006-r5475-svn-backport-Remove-DNS-cache-entry.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,70 +0,0 @@
-From 46e1cfa18853a38b7fcdebad782710c5db676657 Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmu...@di...>
-Date: Fri, 28 Oct 2016 12:15:44 -0500
-Subject: [PATCH 3/3] r5475 svn backport Remove DNS cache entry
-
-Re #1974: Remove DNS cache entry from resolver's hash table when app callback has a reference.
-
-Thanks to Richard Mudgett for the patch.
----
- pjlib-util/src/pjlib-util/resolver.c | 29 +++++++++++++++--------------
- 1 file changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c
-index fe687b7..52b7655 100644
---- a/pjlib-util/src/pjlib-util/resolver.c
-+++ b/pjlib-util/src/pjlib-util/resolver.c
-@@ -1444,10 +1444,12 @@ static void update_res_cache(pj_dns_resolver *resolver,
- if (ttl > resolver->settings.cache_max_ttl)
- ttl = resolver->settings.cache_max_ttl;
-
-+ /* Get a cache response entry */
-+ cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key,
-+ sizeof(*key), &hval);
-+
- /* If TTL is zero, clear the same entry in the hash table */
- if (ttl == 0) {
-- cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key,
-- sizeof(*key), &hval);
- /* Remove the entry before releasing its pool (see ticket #1710) */
- pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
-
-@@ -1457,24 +1459,23 @@ static void update_res_cache(pj_dns_resolver *resolver,
- return;
- }
-
-- /* Get a cache response entry */
-- cache = (struct cached_res *) pj_hash_get(resolver->hrescache, key,
-- sizeof(*key), &hval);
- if (cache == NULL) {
- cache = alloc_entry(resolver);
-- } else if (cache->ref_cnt > 1) {
-- /* When cache entry is being used by callback (to app), just decrement
-- * ref_cnt so it will be freed after the callback returns and allocate
-- * new entry.
-- */
-- cache->ref_cnt--;
-- cache = alloc_entry(resolver);
- } else {
- /* Remove the entry before resetting its pool (see ticket #1710) */
- pj_hash_set(NULL, resolver->hrescache, key, sizeof(*key), hval, NULL);
-
-- /* Reset cache to avoid bloated cache pool */
-- reset_entry(&cache);
-+ if (cache->ref_cnt > 1) {
-+ /* When cache entry is being used by callback (to app),
-+ * just decrement ref_cnt so it will be freed after
-+ * the callback returns and allocate new entry.
-+ */
-+ cache->ref_cnt--;
-+ cache = alloc_entry(resolver);
-+ } else {
-+ /* Reset cache to avoid bloated cache pool */
-+ reset_entry(&cache);
-+ }
- }
-
- /* Duplicate the packet.
---
-1.7.9.5
-
Deleted: branches/1.0/package/pjsip/pjsip-0006-r5477-svn-backport-Fix-DNS-write-on-freed-memory.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0006-r5477-svn-backport-Fix-DNS-write-on-freed-memory.patch 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip-0006-r5477-svn-backport-Fix-DNS-write-on-freed-memory.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -1,33 +0,0 @@
-From 732a997010d60fe93a7453e809672386749b0afc Mon Sep 17 00:00:00 2001
-From: Richard Mudgett <rmu...@di...>
-Date: Tue, 1 Nov 2016 12:55:31 -0500
-Subject: [PATCH] r5477 svn backport Fix DNS write on freed memory.
-
-Re #1974: Fix DNS write on freed memory.
-Thanks to Richard Mudgett for the patch.
----
- pjlib-util/src/pjlib-util/resolver.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/pjlib-util/src/pjlib-util/resolver.c b/pjlib-util/src/pjlib-util/resolver.c
-index 52b7655..365772e 100644
---- a/pjlib-util/src/pjlib-util/resolver.c
-+++ b/pjlib-util/src/pjlib-util/resolver.c
-@@ -908,7 +908,13 @@ PJ_DEF(pj_status_t) pj_dns_resolver_start_query( pj_dns_resolver *resolver,
- /* Must return PJ_SUCCESS */
- status = PJ_SUCCESS;
-
-- goto on_return;
-+ /*
-+ * We cannot write to *p_query after calling cb because what
-+ * p_query points to may have been freed by cb.
-+ * Refer to ticket #1974.
-+ */
-+ pj_mutex_unlock(resolver->mutex);
-+ return status;
- }
-
- /* At this point, we have a cached entry, but this entry has expired.
---
-1.7.9.5
-
Added: branches/1.0/package/pjsip/pjsip-0010-evsub-Add-pjsip_evsub_set_uas_timeout.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0010-evsub-Add-pjsip_evsub_set_uas_timeout.patch (rev 0)
+++ branches/1.0/package/pjsip/pjsip-0010-evsub-Add-pjsip_evsub_set_uas_timeout.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -0,0 +1,84 @@
+From b7af9e6639f29feb4db6d0866c98e552b025ec96 Mon Sep 17 00:00:00 2001
+From: George Joseph <gj...@di...>
+Date: Mon, 6 Feb 2017 15:39:29 -0700
+Subject: [PATCH] evsub: Add pjsip_evsub_set_uas_timeout.
+
+A UAS which needs to recreate incoming subscriptions from a persistent
+store can call pjsip_dlg_create_uas_and_inc_lock and
+pjsip_evsub_create_uas as long as they've persisted the
+correct data but since the timer is triggered by an incoming subscribe,
+it's never set and the subscription never expires.
+
+* Add pjsip_evsub_set_uas_timeout which is just a wrapper around
+ evsub.c:set_timeout(sub, TIMER_TYPE_UAS_TIMEOUT, seconds)
+
+* Also, fixed copy-paste error in pjsip_sub_state_hdr_print when
+ printing retry-after parameter.
+---
+ pjsip/include/pjsip-simple/evsub.h | 14 ++++++++++++++
+ pjsip/src/pjsip-simple/evsub.c | 10 ++++++++++
+ pjsip/src/pjsip-simple/evsub_msg.c | 2 +-
+ 3 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/pjsip/include/pjsip-simple/evsub.h b/pjsip/include/pjsip-simple/evsub.h
+index 82e0a7c..45e6411 100644
+--- a/pjsip/include/pjsip-simple/evsub.h
++++ b/pjsip/include/pjsip-simple/evsub.h
+@@ -511,6 +511,20 @@ PJ_DEF(pj_status_t) pjsip_evsub_add_ref(pjsip_evsub *sub);
+ PJ_DEF(pj_status_t) pjsip_evsub_dec_ref(pjsip_evsub *sub);
+
+
++/**
++ * Sets, resets or cancels the UAS subscription timeout.
++ *
++ * If there is an existing timer, it is cancelled before any
++ * other action.
++ *
++ * A timeout of 0 is ignored except that any existing timer
++ * is cancelled.
++ *
++ * @param sub The server subscription instance.
++ * @param seconds The new timeout.
++ */
++PJ_DEF(void) pjsip_evsub_set_uas_timeout(pjsip_evsub *sub, pj_int32_t seconds);
++
+
+ PJ_END_DECL
+
+diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c
+index 3fe4b49..6918a8c 100644
+--- a/pjsip/src/pjsip-simple/evsub.c
++++ b/pjsip/src/pjsip-simple/evsub.c
+@@ -530,6 +530,16 @@ static void set_timer( pjsip_evsub *sub, int timer_id,
+
+
+ /*
++ * Set event subscription UAS timout.
++ */
++PJ_DEF(void) pjsip_evsub_set_uas_timeout(pjsip_evsub *sub, pj_int32_t seconds)
++{
++ PJ_ASSERT_RETURN(sub != NULL, PJ_EINVAL);
++ set_timer(sub, TIMER_TYPE_UAS_TIMEOUT, seconds);
++}
++
++
++/*
+ * Destructor.
+ */
+ static void evsub_on_destroy(void *obj)
+diff --git a/pjsip/src/pjsip-simple/evsub_msg.c b/pjsip/src/pjsip-simple/evsub_msg.c
+index b44a715..b37db1c 100644
+--- a/pjsip/src/pjsip-simple/evsub_msg.c
++++ b/pjsip/src/pjsip-simple/evsub_msg.c
+@@ -179,7 +179,7 @@ static int pjsip_sub_state_hdr_print(pjsip_sub_state_hdr *hdr,
+ }
+ if (hdr->retry_after >= 0) {
+ pj_memcpy(p, ";retry-after=", 13);
+- p += 9;
++ p += 13;
+ printed = pj_utoa(hdr->retry_after, p);
+ p += printed;
+ }
+--
+2.9.3
+
Added: branches/1.0/package/pjsip/pjsip-0011-r5554-svn-backport-Increase-SENDER_WIDTH-column-size.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0011-r5554-svn-backport-Increase-SENDER_WIDTH-column-size.patch (rev 0)
+++ branches/1.0/package/pjsip/pjsip-0011-r5554-svn-backport-Increase-SENDER_WIDTH-column-size.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -0,0 +1,77 @@
+From df1ceb301c8a17969c467e3cf00246cfc28d1732 Mon Sep 17 00:00:00 2001
+From: Richard Mudgett <rmu...@di...>
+Date: Mon, 20 Feb 2017 12:19:05 -0600
+Subject: [PATCH 1/5] r5554 svn backport Increase SENDER_WIDTH column size for
+ 64-bit systems.
+
+Re #1994 (misc): Make the log's sender and thread width a compile-time configurable setting.
+
+Thanks to Richard Mudgett for the suggestion.
+---
+ pjlib/include/pj/config.h | 27 +++++++++++++++++++++++++++
+ pjlib/src/pj/log.c | 4 ++--
+ 2 files changed, 29 insertions(+), 2 deletions(-)
+
+diff --git a/pjlib/include/pj/config.h b/pjlib/include/pj/config.h
+index 079d69b..3523f50 100644
+--- a/pjlib/include/pj/config.h
++++ b/pjlib/include/pj/config.h
+@@ -472,6 +472,33 @@
+ #endif
+
+ /**
++ * Log sender width.
++ *
++ * Default: 22 (for 64-bit machines), 14 otherwise
++ */
++#ifndef PJ_LOG_SENDER_WIDTH
++# if PJ_HAS_STDINT_H
++# include <stdint.h>
++# if (UINTPTR_MAX == 0xffffffffffffffff)
++# define PJ_LOG_SENDER_WIDTH 22
++# else
++# define PJ_LOG_SENDER_WIDTH 14
++# endif
++# else
++# define PJ_LOG_SENDER_WIDTH 14
++# endif
++#endif
++
++/**
++ * Log thread name width.
++ *
++ * Default: 12
++ */
++#ifndef PJ_LOG_THREAD_WIDTH
++# define PJ_LOG_THREAD_WIDTH 12
++#endif
++
++/**
+ * Colorfull terminal (for logging etc).
+ *
+ * Default: 1
+diff --git a/pjlib/src/pj/log.c b/pjlib/src/pj/log.c
+index 293ad46..cf7ac37 100644
+--- a/pjlib/src/pj/log.c
++++ b/pjlib/src/pj/log.c
+@@ -380,7 +380,7 @@ PJ_DEF(void) pj_log( const char *sender, int level,
+ pre += pj_utoa_pad(ptime.msec, pre, 3, '0');
+ }
+ if (log_decor & PJ_LOG_HAS_SENDER) {
+- enum { SENDER_WIDTH = 14 };
++ enum { SENDER_WIDTH = PJ_LOG_SENDER_WIDTH };
+ pj_size_t sender_len = strlen(sender);
+ if (pre!=log_buffer) *pre++ = ' ';
+ if (sender_len <= SENDER_WIDTH) {
+@@ -395,7 +395,7 @@ PJ_DEF(void) pj_log( const char *sender, int level,
+ }
+ }
+ if (log_decor & PJ_LOG_HAS_THREAD_ID) {
+- enum { THREAD_WIDTH = 12 };
++ enum { THREAD_WIDTH = PJ_LOG_THREAD_WIDTH };
+ const char *thread_name = pj_thread_get_name(pj_thread_this());
+ pj_size_t thread_len = strlen(thread_name);
+ *pre++ = ' ';
+--
+2.7.4
+
Added: branches/1.0/package/pjsip/pjsip-0013-r5559-svn-backport-Fix-to-resolve-DNS-SRV-crashes.patch
===================================================================
--- branches/1.0/package/pjsip/pjsip-0013-r5559-svn-backport-Fix-to-resolve-DNS-SRV-crashes.patch (rev 0)
+++ branches/1.0/package/pjsip/pjsip-0013-r5559-svn-backport-Fix-to-resolve-DNS-SRV-crashes.patch 2017-04-05 16:39:15 UTC (rev 8257)
@@ -0,0 +1,112 @@
+From d9d52f005f6d0242ea84e7c59ad6b25f052c8485 Mon Sep 17 00:00:00 2001
+From: Richard Mudgett <rmu...@di...>
+Date: Mon, 20 Feb 2017 12:05:32 -0600
+Subject: [PATCH 3/5] r5559 svn backport Fix to resolve DNS SRV crashes.
+
+Re #1994 (misc): Don't try to resolve a DNS SRV query that is already considered resolved.
+Thanks to Richard Mudgett for the patch.
+
+srv_resolver.c: Don't try to send query if already considered resolved.
+
+* In resolve_hostnames() don't try to resolve a query that is already
+considered resolved.
+
+* In resolve_hostnames() fix DNS typo in comments.
+
+* In build_server_entries() move a common expression assigning to cnt
+earlier.
+
+sip_transport.c: Fix tdata object name to actually contain the pointer.
+
+It helps if the logs referencing a tdata object buffer actually have
+a name that includes the correct pointer as part of the name. Also
+since the tdata has its own pool it helps if any logs referencing the
+pool have the same name as the tdata object. This change brings tdata
+logging in line with how tsx objects are named.
+---
+ pjlib-util/src/pjlib-util/srv_resolver.c | 18 +++++++++++++-----
+ pjsip/src/pjsip/sip_transport.c | 3 ++-
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/pjlib-util/src/pjlib-util/srv_resolver.c b/pjlib-util/src/pjlib-util/srv_resolver.c
+index 8a2f7e1..84ad3f6 100644
+--- a/pjlib-util/src/pjlib-util/srv_resolver.c
++++ b/pjlib-util/src/pjlib-util/srv_resolver.c
+@@ -407,8 +407,9 @@ static void build_server_entries(pj_dns_srv_async_query *query_job,
+ for (i=0; i<query_job->srv_cnt; ++i) {
+ pj_in_addr addr;
+ pj_in6_addr addr6;
++ unsigned cnt = query_job->srv[i].addr_cnt;
+
+- if (query_job->srv[i].addr_cnt != 0) {
++ if (cnt != 0) {
+ /* IP address already resolved */
+ continue;
+ }
+@@ -417,7 +418,6 @@ static void build_server_entries(pj_dns_srv_async_query *query_job,
+ pj_inet_pton(pj_AF_INET(), &query_job->srv[i].target_name,
+ &addr) == PJ_SUCCESS)
+ {
+- unsigned cnt = query_job->srv[i].addr_cnt;
+ pj_sockaddr_init(pj_AF_INET(), &query_job->srv[i].addr[cnt],
+ NULL, query_job->srv[i].port);
+ query_job->srv[i].addr[cnt].ipv4.sin_addr = addr;
+@@ -427,7 +427,6 @@ static void build_server_entries(pj_dns_srv_async_query *query_job,
+ pj_inet_pton(pj_AF_INET6(), &query_job->srv[i].target_name,
+ &addr6) == PJ_SUCCESS)
+ {
+- unsigned cnt = query_job->srv[i].addr_cnt;
+ pj_sockaddr_init(pj_AF_INET6(), &query_job->srv[i].addr[cnt],
+ NULL, query_job->srv[i].port);
+ query_job->srv[i].addr[cnt].ipv6.sin6_addr = addr6;
+@@ -480,6 +479,15 @@ static pj_status_t resolve_hostnames(pj_dns_srv_async_query *query_job)
+ for (i=0; i<query_job->srv_cnt; ++i) {
+ struct srv_target *srv = &query_job->srv[i];
+
++ if (srv->addr_cnt != 0) {
++ /*
++ * This query is already counted as resolved because of the
++ * additional records in the SRV response or the target name
++ * is an IP address exception in build_server_entries().
++ */
++ continue;
++ }
++
+ PJ_LOG(5, (query_job->objname,
+ "Starting async DNS A query_job for %.*s",
+ (int)srv->target_name.slen,
+@@ -493,7 +501,7 @@ static pj_status_t resolve_hostnames(pj_dns_srv_async_query *query_job)
+
+ status = PJ_SUCCESS;
+
+- /* Start DNA A record query */
++ /* Start DNS A record query */
+ if ((query_job->option & PJ_DNS_SRV_RESOLVE_AAAA_ONLY) == 0)
+ {
+ if ((query_job->option & PJ_DNS_SRV_RESOLVE_AAAA) != 0) {
+@@ -511,7 +519,7 @@ static pj_status_t resolve_hostnames(pj_dns_srv_async_query *query_job)
+ &srv->common, &srv->q_a);
+ }
+
+- /* Start DNA AAAA record query */
++ /* Start DNS AAAA record query */
+ if (status == PJ_SUCCESS &&
+ (query_job->option & PJ_DNS_SRV_RESOLVE_AAAA) != 0)
+ {
+diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
+index d672a6d..6dd14d1 100644
+--- a/pjsip/src/pjsip/sip_transport.c
++++ b/pjsip/src/pjsip/sip_transport.c
+@@ -422,7 +422,8 @@ PJ_DEF(pj_status_t) pjsip_tx_data_create( pjsip_tpmgr *mgr,
+ tdata = PJ_POOL_ZALLOC_T(pool, pjsip_tx_data);
+ tdata->pool = pool;
+ tdata->mgr = mgr;
+- pj_memcpy(tdata->obj_name, pool->obj_name, PJ_MAX_OBJ_NAME);
++ pj_ansi_snprintf(tdata->obj_name, sizeof(tdata->obj_name), "tdta%p", tdata);
++ pj_memcpy(pool->obj_name, tdata->obj_name, sizeof(pool->obj_name));
+
+ status = pj_atomic_create(tdata->pool, 0, &tdata->ref_cnt);
+ if (status != PJ_SUCCESS) {
+--
+2.7.4
+
Modified: branches/1.0/package/pjsip/pjsip.mk
===================================================================
--- branches/1.0/package/pjsip/pjsip.mk 2017-04-02 13:30:34 UTC (rev 8256)
+++ branches/1.0/package/pjsip/pjsip.mk 2017-04-05 16:39:15 UTC (rev 8257)
@@ -4,13 +4,11 @@
#
################################################################################
-PJSIP_VERSION = 2.5.5
+PJSIP_VERSION = 2.6
PJSIP_SOURCE = pjproject-$(PJSIP_VERSION).tar.bz2
PJSIP_SITE = http://www.pjsip.org/release/$(PJSIP_VERSION)
PJSIP_INSTALL_STAGING = YES
-PJSIP_DEPENDENCIES = libsrtp
-
define PJSIP_CUSTOM_CONFIG
cp package/pjsip/asterisk-config_site.h $(@D)/pjlib/include/pj/config_site.h
endef
@@ -31,7 +29,6 @@
--disable-g722-codec \
--disable-g7221-codec \
--disable-opencore-amr \
- --disable-webrtc \
--disable-silk \
--disable-opus \
--disable-video \
@@ -46,7 +43,8 @@
--disable-openh264 \
--disable-ipp \
--without-external-pa \
- --with-external-srtp
+ --without-external-srtp \
+ --without-external-webrtc
ifeq ($(BR2_PACKAGE_OPENSSL),y)
PJSIP_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-02 13:30:35
|
Revision: 8256
http://sourceforge.net/p/astlinux/code/8256
Author: abelbeck
Date: 2017-04-02 13:30:34 +0000 (Sun, 02 Apr 2017)
Log Message:
-----------
Remove stale, unused grub files. Thanks Michael
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/boot/grub/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-02 12:59:15
|
Revision: 8255
http://sourceforge.net/p/astlinux/code/8255
Author: abelbeck
Date: 2017-04-02 12:59:12 +0000 (Sun, 02 Apr 2017)
Log Message:
-----------
web interface, Update Prefs tab's Follow-Me Tab (info)
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/common/topics.info
Modified: branches/1.0/package/webinterface/altweb/common/topics.info
===================================================================
--- branches/1.0/package/webinterface/altweb/common/topics.info 2017-04-01 21:40:24 UTC (rev 8254)
+++ branches/1.0/package/webinterface/altweb/common/topics.info 2017-04-02 12:59:12 UTC (rev 8255)
@@ -8,7 +8,7 @@
The Follow-Me tab uses Asterisk's internal database (astdb) to maintain a list of
Follow-Me numbers and their state.
-In particular, Asterisk 1.4 supports a Follow-Me application, which makes adding this feature
+In particular, Asterisk supports a Follow-Me application, which makes adding this feature
into your dialplan about as easy as it gets.
Credit: Darrick Hartman
@@ -18,8 +18,8 @@
exten => s,1,GotoIf($[${DB_EXISTS(followme/${ARG1})}=0]?nofollow)
exten => s,n,GotoIf($[${DB_RESULT:0:1}=0]?nofollow:follow)
exten => s,n(follow),Dial(SIP/${ARG1},20)
-exten => s,n,Followme(${ARG1},san)
-exten => s,n,Goto(s-${DIALSTATUS},1)
+exten => s,n,Followme(${ARG1},sn)
+exten => s,n,Goto(s-NOANSWER,1)
exten => s,n(nofollow),Dial(SIP/${ARG1},20)
exten => s,n,Goto(s-${DIALSTATUS},1)
exten => s-NOANSWER,1,Voicemail(${ARG1},u) ; If unavailable, send to voicemail
@@ -81,13 +81,13 @@
All three security levels are supported by the Follow-Me tab: admin, staff and 'numbered' user.
The non-admin 'numbered' user can only edit the status of their Follow-Me numbers.
-Finally, it is suggested in the Prefs tab to have
+Note that when the web interface, Follow-Me -> Dial Numbers: [ Single number without callee prompt ]
+is selected, the Followme() application immediately handles the number using the specified dialplan context.
+For this "without callee prompt" case, the Followme() application does not return, any NOANSWER or BUSY
+Dial() ${DIALSTATUS} values either need to be handled in your dialplan when dialing Follow-Me numbers,
+or use the destination device (Cell/Mobile Phone Voicemail) to handle exceptions.
-_X_ Use Asterisk Manager Interface for Asterisk Commands
-checked, since the performance of the Follow-Me tab will be greatly improved.
-
-
[[sysdial-dialplan]]
Speed Dial Tab:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-04-01 21:40:27
|
Revision: 8254
http://sourceforge.net/p/astlinux/code/8254
Author: abelbeck
Date: 2017-04-01 21:40:24 +0000 (Sat, 01 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-01 21:32:04 UTC (rev 8253)
+++ branches/1.0/docs/ChangeLog.txt 2017-04-01 21:40:24 UTC (rev 8254)
@@ -27,11 +27,11 @@
-- bash, add support for the loadable builtin 'sleep', automatically used in various background scripts.
--- sqlite, version bump to 3.17.0
+-- sqlite, version bump to 3.18.0
-- Fossil, version bump to 2.0, adds a hardened SHA1 implementation and understands SHA3-256 hashes.
--- pcre, version bump to 8.40
+-- pcre, version bump to 8.40, security fixes: CVE-2017-6004, CVE-2017-7186
-- e2fsprogs, version bump to 1.43.4
@@ -108,6 +108,8 @@
-- Asterisk 11.25.1 (no change) and 13.14.0 (version bump)
+-- Asterisk 11 and 13, backport Asterisk 14 "followme" application feature "enable_callee_prompt".
+
-- DAHDI, dahdi-linux 2.8.0.1 (no change) and dahdi-tools 2.8.0 (no change)
-- pjsip 2.5.5 (no change)
@@ -139,7 +141,9 @@
-- Network -> OpenVPN Client sub-tab, generate OVPNC_REMOTE_CERT_TLS instead of the deprecated OVPNC_NSCERTTYPE
+-- Follow-Me tab, add support for enable_callee_prompt, adding "Single number without callee prompt" dial method.
+
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-04-01 21:32:07
|
Revision: 8253
http://sourceforge.net/p/astlinux/code/8253
Author: abelbeck
Date: 2017-04-01 21:32:04 +0000 (Sat, 01 Apr 2017)
Log Message:
-----------
web interface, Follow-Me tab, add support for enable_callee_prompt
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/followme.php
Modified: branches/1.0/package/webinterface/altweb/admin/followme.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/followme.php 2017-03-31 16:30:31 UTC (rev 8252)
+++ branches/1.0/package/webinterface/altweb/admin/followme.php 2017-04-01 21:32:04 UTC (rev 8253)
@@ -1,6 +1,6 @@
<?php
-// Copyright (C) 2008-2016 Lonnie Abelbeck
+// Copyright (C) 2008-2017 Lonnie Abelbeck
// This is free software, licensed under the GNU General Public License
// version 3 as published by the Free Software Foundation; you can
// redistribute it and/or modify it under the terms of the GNU
@@ -8,6 +8,7 @@
// followme.php for AstLinux
// 12-05-2008
+// 04-01-2017, Add enable_callee_prompt support
//
// -- extensions.conf snippet --
// [macro-local-followme]
@@ -148,14 +149,20 @@
global $global_prefs;
global $MAXNUM;
+ for ($i = 0; $i < $MAXNUM; $i++) {
+ $my_enabled[$i] = '0';
+ }
+
$count = 0;
for ($i = 0; $i < $MAXNUM; $i++) {
- $my_enabled[$i] = '0';
foreach ($enabled as $val) {
if ($val == $i) {
if ($number[$i] !== '') {
$my_enabled[$i] = '1';
$count++;
+ if ($method == 4) { // Only one number allowed with "enable_callee_prompt=>false"
+ break 2;
+ }
}
break;
}
@@ -175,6 +182,8 @@
if (isFMextension($key, $fname)) {
shell('sed -i "/^\['.$key.'\]/,/^\[/ s/^number.*/;deleted;&/" '.$fname.' >/dev/null', $status);
shell('sed -i "/^;deleted;number/ d" '.$fname.' >/dev/null', $status);
+ shell('sed -i "/^\['.$key.'\]/,/^\[/ s/^enable_callee_prompt.*/;deleted;&/" '.$fname.' >/dev/null', $status);
+ shell('sed -i "/^;deleted;enable_callee_prompt/ d" '.$fname.' >/dev/null', $status);
if ($count > 0) {
if ($method == 1) {
$cmd = 'a'.chr(92).chr(10).'number=>';
@@ -194,6 +203,8 @@
}
}
}
+ $value = ($method == 4) ? 'false' : 'true';
+ $cmd .= 'a'.chr(92).chr(10).'enable_callee_prompt=>'.$value.chr(10);
shell('sed -i "/^\['.$key.'\]/ {'.chr(10).$cmd.'}" '.$fname.' >/dev/null', $status);
}
} elseif ($count > 0) {
@@ -215,6 +226,8 @@
}
}
}
+ $value = ($method == 4) ? 'false' : 'true';
+ $cmd .= 'enable_callee_prompt=>'.$value.chr(10);
if (($value = tuq(getPREFdef($global_prefs, 'followme_number_context_cmdstr'))) !== '') {
$cmd .= 'context=>'.$value.chr(10);
}
@@ -406,19 +419,27 @@
putHtml('<input type="text" size="5" maxlength="3" name="timeout'.$i.'" value="'.$ldata['timeout'][$i].'" />');
putHtml('secs</td></tr>');
}
- if ($MAXNUM != 1) {
- putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="2">');
- putHtml('<strong>Dial Method:</strong>');
- putHtml('</td></tr>');
- putHtml('<tr class="dtrow1"><td> </td><td>');
- putHtml('Dial Numbers:');
- putHtml('<select name="method">');
- putHtml('<option value="0">One at a Time</option>');
+
+ putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="2">');
+ putHtml('<strong>Dial Method:</strong>');
+ putHtml('</td></tr>');
+ putHtml('<tr class="dtrow1"><td> </td><td>');
+ putHtml('Dial Numbers:');
+ putHtml('<select name="method">');
+ if ($MAXNUM == 1) {
+ putHtml('<option value="0">With callee prompt</option>');
+ $sel = ($ldata['method'] === '4') ? ' selected="selected"' : '';
+ putHtml('<option value="4"'.$sel.'>Without callee prompt</option>');
+ } else {
+ putHtml('<option value="0">One at a Time with callee prompt</option>');
$sel = ($ldata['method'] === '1') ? ' selected="selected"' : '';
- putHtml('<option value="1"'.$sel.'>All at Once</option>');
- putHtml('</select>');
- putHtml('</td></tr>');
+ putHtml('<option value="1"'.$sel.'>All at Once with callee prompt</option>');
+ $sel = ($ldata['method'] === '4') ? ' selected="selected"' : '';
+ putHtml('<option value="4"'.$sel.'>Single number without callee prompt</option>');
}
+ putHtml('</select>');
+ putHtml('</td></tr>');
+
if (($value = getPREFdef($global_prefs, 'followme_schedule_menu_cmdstr')) !== '') {
$menu = explode('~', $value);
putHtml('<tr class="dtrow0"><td class="dialogText" style="text-align: left;" colspan="2">');
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.
