Menu
▾
▴
astlinux-commits — Commits to the AstLinux SVN repository
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(6) |
Jul
(14) |
Aug
(156) |
Sep
(35) |
Oct
(48) |
Nov
(55) |
Dec
(16) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(24) |
Feb
(154) |
Mar
(139) |
Apr
(175) |
May
(87) |
Jun
(34) |
Jul
(42) |
Aug
(68) |
Sep
(41) |
Oct
(76) |
Nov
(77) |
Dec
(50) |
| 2008 |
Jan
(98) |
Feb
(43) |
Mar
(102) |
Apr
(27) |
May
(55) |
Jun
(13) |
Jul
(58) |
Aug
(62) |
Sep
(61) |
Oct
(43) |
Nov
(87) |
Dec
(134) |
| 2009 |
Jan
(175) |
Feb
(106) |
Mar
(58) |
Apr
(41) |
May
(74) |
Jun
(123) |
Jul
(252) |
Aug
(192) |
Sep
(69) |
Oct
(38) |
Nov
(117) |
Dec
(95) |
| 2010 |
Jan
(146) |
Feb
(76) |
Mar
(90) |
Apr
(60) |
May
(23) |
Jun
(19) |
Jul
(208) |
Aug
(140) |
Sep
(103) |
Oct
(114) |
Nov
(50) |
Dec
(47) |
| 2011 |
Jan
(59) |
Feb
(47) |
Mar
(61) |
Apr
(58) |
May
(41) |
Jun
(11) |
Jul
(17) |
Aug
(49) |
Sep
(34) |
Oct
(166) |
Nov
(38) |
Dec
(70) |
| 2012 |
Jan
(87) |
Feb
(37) |
Mar
(28) |
Apr
(25) |
May
(29) |
Jun
(30) |
Jul
(43) |
Aug
(27) |
Sep
(46) |
Oct
(27) |
Nov
(51) |
Dec
(70) |
| 2013 |
Jan
(92) |
Feb
(34) |
Mar
(58) |
Apr
(37) |
May
(46) |
Jun
(9) |
Jul
(38) |
Aug
(22) |
Sep
(28) |
Oct
(42) |
Nov
(44) |
Dec
(34) |
| 2014 |
Jan
(63) |
Feb
(39) |
Mar
(48) |
Apr
(31) |
May
(21) |
Jun
(43) |
Jul
(36) |
Aug
(69) |
Sep
(53) |
Oct
(56) |
Nov
(46) |
Dec
(49) |
| 2015 |
Jan
(63) |
Feb
(35) |
Mar
(30) |
Apr
(38) |
May
(27) |
Jun
(42) |
Jul
(42) |
Aug
(63) |
Sep
(18) |
Oct
(45) |
Nov
(65) |
Dec
(71) |
| 2016 |
Jan
(54) |
Feb
(79) |
Mar
(59) |
Apr
(38) |
May
(32) |
Jun
(46) |
Jul
(42) |
Aug
(30) |
Sep
(58) |
Oct
(33) |
Nov
(98) |
Dec
(59) |
| 2017 |
Jan
(79) |
Feb
(12) |
Mar
(43) |
Apr
(32) |
May
(76) |
Jun
(59) |
Jul
(44) |
Aug
(14) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <abe...@us...> - 2016-08-12 16:23:18
|
Revision: 7795
http://sourceforge.net/p/astlinux/code/7795
Author: abelbeck
Date: 2016-08-12 16:23:17 +0000 (Fri, 12 Aug 2016)
Log Message:
-----------
linux kernel, security fix: CVE-2016-5696 - Off-path TCP attack, make challenge acks less predictable
Ref: Ref: https://git.kernel.org/cgit/linux/kernel/git/bwh/linux-stable-queue.git/plain/queue-3.2/tcp-make-challenge-acks-less-predictable.patch?id=4da02c7fa853f92087e972f6b821bc7b7f7d4a99
Added Paths:
-----------
branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch
Added: branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch
===================================================================
--- branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch (rev 0)
+++ branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch 2016-08-12 16:23:17 UTC (rev 7795)
@@ -0,0 +1,76 @@
+From: Eric Dumazet <edu...@go...>
+Date: Sun, 10 Jul 2016 10:04:02 +0200
+Subject: tcp: make challenge acks less predictable
+
+commit 75ff39ccc1bd5d3c455b6822ab09e533c551f758 upstream.
+
+Yue Cao claims that current host rate limiting of challenge ACKS
+(RFC 5961) could leak enough information to allow a patient attacker
+to hijack TCP sessions. He will soon provide details in an academic
+paper.
+
+This patch increases the default limit from 100 to 1000, and adds
+some randomization so that the attacker can no longer hijack
+sessions without spending a considerable amount of probes.
+
+Based on initial analysis and patch from Linus.
+
+Note that we also have per socket rate limiting, so it is tempting
+to remove the host limit in the future.
+
+v2: randomize the count of challenge acks per second, not the period.
+
+Fixes: 282f23c6ee34 ("tcp: implement RFC 5961 3.2")
+Reported-by: Yue Cao <yc...@uc...>
+Signed-off-by: Eric Dumazet <edu...@go...>
+Suggested-by: Linus Torvalds <tor...@li...>
+Cc: Yuchung Cheng <yc...@go...>
+Cc: Neal Cardwell <nca...@go...>
+Acked-by: Neal Cardwell <nca...@go...>
+Acked-by: Yuchung Cheng <yc...@go...>
+Signed-off-by: David S. Miller <da...@da...>
+[bwh: Backported to 3.2:
+ - Adjust context
+ - Use ACCESS_ONCE() instead of {READ,WRITE}_ONCE()
+ - Open-code prandom_u32_max()]
+Signed-off-by: Ben Hutchings <be...@de...>
+---
+ net/ipv4/tcp_input.c | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+--- a/net/ipv4/tcp_input.c
++++ b/net/ipv4/tcp_input.c
+@@ -87,7 +87,7 @@ int sysctl_tcp_adv_win_scale __read_most
+ EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);
+
+ /* rfc5961 challenge ack rate limiting */
+-int sysctl_tcp_challenge_ack_limit = 100;
++int sysctl_tcp_challenge_ack_limit = 1000;
+
+ int sysctl_tcp_stdurg __read_mostly;
+ int sysctl_tcp_rfc1337 __read_mostly;
+@@ -3715,13 +3715,20 @@ static void tcp_send_challenge_ack(struc
+ /* unprotected vars, we dont care of overwrites */
+ static u32 challenge_timestamp;
+ static unsigned int challenge_count;
+- u32 now = jiffies / HZ;
++ u32 count, now = jiffies / HZ;
+
+ if (now != challenge_timestamp) {
++ u32 half = (sysctl_tcp_challenge_ack_limit + 1) >> 1;
++
+ challenge_timestamp = now;
+- challenge_count = 0;
+- }
+- if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
++ ACCESS_ONCE(challenge_count) =
++ half + (u32)(
++ ((u64) random32() * sysctl_tcp_challenge_ack_limit)
++ >> 32);
++ }
++ count = ACCESS_ONCE(challenge_count);
++ if (count > 0) {
++ ACCESS_ONCE(challenge_count) = count - 1;
+ NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
+ tcp_send_ack(sk);
+ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-08 13:11:37
|
Revision: 7794
http://sourceforge.net/p/astlinux/code/7794
Author: abelbeck
Date: 2016-08-08 13:11:34 +0000 (Mon, 08 Aug 2016)
Log Message:
-----------
iproute2, use @D instead of IPROUTE2_DIR
Modified Paths:
--------------
branches/1.0/package/iproute2/iproute2.mk
Modified: branches/1.0/package/iproute2/iproute2.mk
===================================================================
--- branches/1.0/package/iproute2/iproute2.mk 2016-08-07 15:23:47 UTC (rev 7793)
+++ branches/1.0/package/iproute2/iproute2.mk 2016-08-08 13:11:34 UTC (rev 7794)
@@ -22,8 +22,8 @@
IPROUTE2_DEPENDENCIES += iptables
define IPROUTE2_WITH_IPTABLES
# Makefile is busted so it never passes IPT_LIB_DIR properly
- $(SED) "s/-DIPT/-DXT/" $(IPROUTE2_DIR)/tc/Makefile
- echo "TC_CONFIG_XT:=y" >>$(IPROUTE2_DIR)/Config
+ $(SED) "s/-DIPT/-DXT/" $(@D)/tc/Makefile
+ echo "TC_CONFIG_XT:=y" >>$(@D)/Config
endef
endif
@@ -32,8 +32,8 @@
$(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure
cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure
# arpd needs berkeleydb
- $(SED) "/^TARGETS=/s: arpd : :" $(IPROUTE2_DIR)/misc/Makefile
- echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config
+ $(SED) "/^TARGETS=/s: arpd : :" $(@D)/misc/Makefile
+ echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(@D)/Config
$(IPROUTE2_WITH_IPTABLES)
endef
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-07 15:23:49
|
Revision: 7793
http://sourceforge.net/p/astlinux/code/7793
Author: abelbeck
Date: 2016-08-07 15:23:47 +0000 (Sun, 07 Aug 2016)
Log Message:
-----------
msmtp, mail script, add support for multiple -a, --mime and -S options on the command line
Modified Paths:
--------------
branches/1.0/package/msmtp/mail.sh
Modified: branches/1.0/package/msmtp/mail.sh
===================================================================
--- branches/1.0/package/msmtp/mail.sh 2016-08-06 16:08:57 UTC (rev 7792)
+++ branches/1.0/package/msmtp/mail.sh 2016-08-07 15:23:47 UTC (rev 7793)
@@ -21,8 +21,8 @@
Usage: mail [options...] to_addr
Options:
- -a file Attach the given file to the message.
- --mime type Optionally define the MIME Type of the attached file.
+ -a file Attach the given file to the message. (Multiple allowed)
+ --mime type Optionally define the MIME Type of each attached file. (Multiple allowed)
-b address Send blind carbon copies to a comma-separated list of email addresses.
-c address Send carbon copies to a comma-separated list of email addresses.
-e Check if mail is present. (Always exit status of "1")
@@ -97,11 +97,11 @@
if [ -n "$from_addr" ]; then
echo "From: $from_addr"
fi
- if [ -n "$set_var" ]; then
- set_var_header "$set_var"
- fi
+ for x in ${!SETVAR[*]}; do
+ set_var_header "${SETVAR[$x]}"
+ done
echo "Subject: $subject"
- if [ -n "$attach_file" ]; then
+ if [ -n "$BOUNDARY" ]; then
mime_header
fi
@@ -148,6 +148,8 @@
mime_data()
{
+ local attach_file="$1" mime_type="$2"
+
echo ""
echo ""
echo "--$BOUNDARY"
@@ -157,7 +159,10 @@
echo ""
openssl base64 -in "$attach_file"
+}
+mime_footer()
+{
echo ""
echo "--$BOUNDARY--"
echo "."
@@ -173,14 +178,14 @@
fi
eval set -- $ARGS
-attach_file=""
-mime_type=""
+unset FILE
+unset MIME
bcc_addr=""
cc_addr=""
exists_mail=0
headers=0
from_addr=""
-set_var=""
+unset SETVAR
subject=""
message_recipients=0
mail_user=""
@@ -188,8 +193,8 @@
verbose=0
while [ $# -gt 0 ]; do
case "$1" in
- -a) attach_file="$2"; shift ;;
- --mime) mime_type="$2"; shift ;;
+ -a) FILE[${#FILE[*]}]="$2"; shift ;;
+ --mime) MIME[${#MIME[*]}]="$2"; shift ;;
-b) bcc_addr="$2"; shift ;;
-c) cc_addr="$2"; shift ;;
-e) exists_mail=1 ;;
@@ -198,7 +203,7 @@
-h) shift ;;
-q) shift ;;
-r) from_addr="$2"; shift ;;
- -S) set_var="$2"; shift ;;
+ -S) SETVAR[${#SETVAR[*]}]="$2"; shift ;;
-s) subject="$2"; shift ;;
-T) shift ;;
-t) message_recipients=1 ;;
@@ -232,21 +237,26 @@
exit $?
fi
-if [ -n "$attach_file" ]; then
- if [ ! -f "$attach_file" ]; then
- echo "mail: Attachment file not found: $attach_file" >&2
- exit 1
- fi
+if [ ${#FILE[*]} -gt 0 ]; then
if [ $message_recipients -eq 1 ]; then
echo "mail: The '-t' option is not compatible with the '-a file' option." >&2
exit 1
fi
- if [ -z "$mime_type" ]; then
- mime_type="$(mime_content_type "$attach_file")"
- fi
+ for x in ${!FILE[*]}; do
+ if [ ! -f "${FILE[$x]}" ]; then
+ echo "mail: Attachment file not found: ${FILE[$x]}" >&2
+ exit 1
+ fi
+ if [ -z "${MIME[$x]}" ]; then
+ MIME[$x]="$(mime_content_type "${FILE[$x]}")"
+ fi
+ done
+
BOUNDARY="$(date "+%s" | md5sum | cut -b1-32)"
+else
+ BOUNDARY=""
fi
# Check if this is an interactive session
@@ -263,8 +273,11 @@
(
gen_message_header
cat # copy stdin to stdout until ^D (EOT)
- if [ -n "$attach_file" ]; then
- mime_data
+ if [ -n "$BOUNDARY" ]; then
+ for x in ${!FILE[*]}; do
+ mime_data "${FILE[$x]}" "${MIME[$x]}"
+ done
+ mime_footer
fi
) | sendmail -t
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-06 16:08:59
|
Revision: 7792
http://sourceforge.net/p/astlinux/code/7792
Author: abelbeck
Date: 2016-08-06 16:08:57 +0000 (Sat, 06 Aug 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-08-06 02:46:47 UTC (rev 7791)
+++ branches/1.0/docs/ChangeLog.txt 2016-08-06 16:08:57 UTC (rev 7792)
@@ -52,8 +52,12 @@
-- iperf, version bump to 2.0.9, now using maintained iperf2 project
--- msmtp, an undefined SMTP_CA rc.conf variable will now default to the system ca-bundle.crt .
+-- msmtp, add a functional "/bin/mail" script to emulate mail/mailx for sending email via sendmail.
+ Particularly useful for sending a file attachment via email. Issue "mail --help" for details.
+ Example (end of iOS section): http://doc.astlinux.org/userdoc:tt_asterisk-fop2-ssl
+-- msmtp, an undefined SMTP_CA rc.conf variable will now default to the system ca-bundle.crt
+
** Asterisk
-- Asterisk 1.8.32.3 (no change), 11.23.0 (version bump) and 13.10.0 (version bump)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-06 02:46:49
|
Revision: 7791
http://sourceforge.net/p/astlinux/code/7791
Author: abelbeck
Date: 2016-08-06 02:46:47 +0000 (Sat, 06 Aug 2016)
Log Message:
-----------
msmtp, add a functional '/bin/mail' script to emulate mail/mailx for sending mail, replace the previous NoOp script
Modified Paths:
--------------
branches/1.0/package/msmtp/msmtp.mk
Added Paths:
-----------
branches/1.0/package/msmtp/mail.sh
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/bin/mail
Added: branches/1.0/package/msmtp/mail.sh
===================================================================
--- branches/1.0/package/msmtp/mail.sh (rev 0)
+++ branches/1.0/package/msmtp/mail.sh 2016-08-06 02:46:47 UTC (rev 7791)
@@ -0,0 +1,270 @@
+#!/bin/bash
+##
+## mail
+##
+## Simple wrapper to emulate 'mail' or 'mailx'
+##
+## Only sending mail is supported
+##
+## Copyright (C) 2016 Lonnie Abelbeck
+##
+## This is free software, licensed under the GNU General Public License
+## version 3 as published by the Free Software Foundation; you can
+## redistribute it and/or modify it under the terms of the GNU
+## General Public License; and comes with ABSOLUTELY NO WARRANTY.
+
+VERSION="12.5 7/5/10"
+
+usage()
+{
+ echo '
+Usage: mail [options...] to_addr
+
+Options:
+ -a file Attach the given file to the message.
+ --mime type Optionally define the MIME Type of the attached file.
+ -b address Send blind carbon copies to a comma-separated list of email addresses.
+ -c address Send carbon copies to a comma-separated list of email addresses.
+ -e Check if mail is present. (Always exit status of "1")
+ -H Print header summaries for all messages and exit. (Always no mail)
+ -r address Define the From address.
+ -S var=val Sets the internal option variable, from= and replyto= are supported.
+ -s subject Define the subject text.
+ -t The sending message is expected to contain "To:", "Cc:" or "Bcc:" fields.
+ -u user Reads the mailbox of the given user name. (Always no mail)
+ -V Print version and exit.
+ -v Verbose mode.
+ --help Show this help text
+ Note: Additional mail/mailx options are silently ignored for compatibility.
+'
+ exit 1
+}
+
+check_mailbox()
+{
+ local user="${1:-$USER}"
+
+ echo "No mail for $user"
+ return 1
+}
+
+address_header()
+{
+ local header="$1" addresses="$2" address IFS
+
+ IFS=','
+ for address in $addresses; do
+ echo "$header $address"
+ done
+}
+
+set_var_header()
+{
+ local var="$1" header="" addresses="" address IFS
+
+ case "$var" in
+ from=*) header="From:" ; addresses="${var#from=}" ;;
+ replyto=*) header="Reply-To:" ; addresses="${var#replyto=}" ;;
+ esac
+
+ IFS=','
+ for address in $addresses; do
+ echo "$header $address"
+ done
+}
+
+mime_header()
+{
+ echo "MIME-Version: 1.0"
+ echo "Content-Type: multipart/mixed; boundary=\"$BOUNDARY\""
+ echo ""
+ echo ""
+ echo "This is a multi-part message in MIME format."
+ echo ""
+ echo "--$BOUNDARY"
+ echo "Content-Type: text/plain; charset=ISO-8859-1; format=flowed"
+ echo "Content-Transfer-Encoding: 7bit"
+ echo "Content-Disposition: inline"
+}
+
+gen_message_header()
+{
+ if [ $message_recipients -eq 0 ]; then
+ address_header "To:" "$to_addr"
+ address_header "Cc:" "$cc_addr"
+ address_header "Bcc:" "$bcc_addr"
+ fi
+ if [ -n "$from_addr" ]; then
+ echo "From: $from_addr"
+ fi
+ if [ -n "$set_var" ]; then
+ set_var_header "$set_var"
+ fi
+ echo "Subject: $subject"
+ if [ -n "$attach_file" ]; then
+ mime_header
+ fi
+
+ if [ $message_recipients -eq 0 ]; then
+ echo ""
+ fi
+}
+
+mime_content_type()
+{
+ local filename="$1" suffix mime
+
+ suffix="${filename##*/}"
+ suffix="${suffix##*.}"
+ suffix="$(echo "$suffix" | tr '[:upper:]' '[:lower:]')"
+
+ case $suffix in
+ txt|text|conf|log|cpp|c|asc) mime="text/plain" ;;
+ pdf) mime="application/pdf" ;;
+ sig) mime="application/pgp-signature" ;;
+ ps) mime="application/postscript" ;;
+ gz) mime="application/x-gzip" ;;
+ tgz) mime="application/x-tgz" ;;
+ tar) mime="application/x-tar" ;;
+ zip) mime="application/zip" ;;
+ bz2) mime="application/x-bzip" ;;
+ tbz) mime="application/x-bzip-compressed-tar" ;;
+ crt|der) mime="application/x-x509-ca-cert" ;;
+ wav) mime="audio/x-wav" ;;
+ gif) mime="image/gif" ;;
+ tiff|tif) mime="image/tiff" ;;
+ jpeg|jpg) mime="image/jpeg" ;;
+ png) mime="image/png" ;;
+ css) mime="text/css" ;;
+ html|htm) mime="text/html" ;;
+ js) mime="text/javascript" ;;
+ xml|dtd) mime="text/xml" ;;
+ mpeg|mpg) mime="video/mpeg" ;;
+ *) mime="application/octet-stream" ;;
+ esac
+
+ echo "$mime"
+}
+
+mime_data()
+{
+ echo ""
+ echo ""
+ echo "--$BOUNDARY"
+ echo "Content-Type: $mime_type; name=\"${attach_file##*/}\""
+ echo "Content-Transfer-Encoding: base64"
+ echo "Content-Disposition: attachment; filename=\"${attach_file##*/}\""
+ echo ""
+
+ openssl base64 -in "$attach_file"
+
+ echo ""
+ echo "--$BOUNDARY--"
+ echo "."
+ echo ""
+}
+
+ARGS="$(getopt --name mail \
+ --long mime:,help \
+ --options Aa:Bb:c:DdEeFf:Hh:IilNnq:Rr:S:s:T:tu:vV \
+ -- "$@")"
+if [ $? -ne 0 ]; then
+ usage
+fi
+eval set -- $ARGS
+
+attach_file=""
+mime_type=""
+bcc_addr=""
+cc_addr=""
+exists_mail=0
+headers=0
+from_addr=""
+set_var=""
+subject=""
+message_recipients=0
+mail_user=""
+version=0
+verbose=0
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -a) attach_file="$2"; shift ;;
+ --mime) mime_type="$2"; shift ;;
+ -b) bcc_addr="$2"; shift ;;
+ -c) cc_addr="$2"; shift ;;
+ -e) exists_mail=1 ;;
+ -f) shift ;;
+ -H) headers=1 ;;
+ -h) shift ;;
+ -q) shift ;;
+ -r) from_addr="$2"; shift ;;
+ -S) set_var="$2"; shift ;;
+ -s) subject="$2"; shift ;;
+ -T) shift ;;
+ -t) message_recipients=1 ;;
+ -u) mail_user="$2"; shift ;;
+ -V) version=1 ;;
+ -v) verbose=1 ;;
+ --help) usage ;;
+ --) shift; break ;;
+ esac
+ shift
+done
+to_addr="$1"
+
+if [ $version -eq 1 ]; then
+ echo "$VERSION"
+ exit 0
+fi
+
+if [ $headers -eq 1 ]; then
+ check_mailbox "$mail_user"
+ exit 0
+fi
+
+if [ $exists_mail -eq 1 ]; then
+ check_mailbox "$mail_user" >/dev/null
+ exit $?
+fi
+
+if [ -z "$to_addr" -o "$to_addr" = "--" ] && [ $message_recipients -eq 0 ]; then
+ check_mailbox "$mail_user"
+ exit $?
+fi
+
+if [ -n "$attach_file" ]; then
+ if [ ! -f "$attach_file" ]; then
+ echo "mail: Attachment file not found: $attach_file" >&2
+ exit 1
+ fi
+ if [ $message_recipients -eq 1 ]; then
+ echo "mail: The '-t' option is not compatible with the '-a file' option." >&2
+ exit 1
+ fi
+
+ if [ -z "$mime_type" ]; then
+ mime_type="$(mime_content_type "$attach_file")"
+ fi
+
+ BOUNDARY="$(date "+%s" | md5sum | cut -b1-32)"
+fi
+
+# Check if this is an interactive session
+if tty -s; then
+ interactive=1
+else
+ interactive=0
+fi
+
+if [ $interactive -eq 1 -a -z "$subject" ]; then
+ read -p "Subject: " subject
+fi
+
+(
+ gen_message_header
+ cat # copy stdin to stdout until ^D (EOT)
+ if [ -n "$attach_file" ]; then
+ mime_data
+ fi
+) | sendmail -t
+
Property changes on: branches/1.0/package/msmtp/mail.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/package/msmtp/msmtp.mk
===================================================================
--- branches/1.0/package/msmtp/msmtp.mk 2016-08-04 00:29:38 UTC (rev 7790)
+++ branches/1.0/package/msmtp/msmtp.mk 2016-08-06 02:46:47 UTC (rev 7791)
@@ -24,6 +24,8 @@
$(INSTALL) -m 0755 -D package/msmtp/sendmail.sh $(TARGET_DIR)/usr/sbin/sendmail
$(INSTALL) -m 0755 -D package/msmtp/testmail.sh $(TARGET_DIR)/usr/sbin/testmail
$(INSTALL) -m 0755 -D package/msmtp/mime-pack.sh $(TARGET_DIR)/usr/sbin/mime-pack
+ $(INSTALL) -m 0755 -D package/msmtp/mail.sh $(TARGET_DIR)/bin/mail
+ ln -sf ../../bin/mail $(TARGET_DIR)/usr/bin/mail
ln -sf /tmp/etc/msmtprc $(TARGET_DIR)/etc/msmtprc
endef
@@ -34,6 +36,8 @@
rm $(TARGET_DIR)/usr/sbin/sendmail
rm $(TARGET_DIR)/usr/sbin/testmail
rm $(TARGET_DIR)/usr/sbin/mime-pack
+ rm $(TARGET_DIR)/bin/mail
+ rm $(TARGET_DIR)/usr/bin/mail
rm $(TARGET_DIR)/etc/msmtprc
endef
Deleted: branches/1.0/project/astlinux/target_skeleton/bin/mail
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/bin/mail 2016-08-04 00:29:38 UTC (rev 7790)
+++ branches/1.0/project/astlinux/target_skeleton/bin/mail 2016-08-06 02:46:47 UTC (rev 7791)
@@ -1,4 +0,0 @@
-#!/bin/sh
-#Mail wrapper for things that insist on calling /bin/mail...
-#For now, just /dev/null everything
-echo -n ""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-04 00:29:41
|
Revision: 7790
http://sourceforge.net/p/astlinux/code/7790
Author: abelbeck
Date: 2016-08-04 00:29:38 +0000 (Thu, 04 Aug 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-08-04 00:12:44 UTC (rev 7789)
+++ branches/1.0/docs/ChangeLog.txt 2016-08-04 00:29:38 UTC (rev 7790)
@@ -16,6 +16,8 @@
** System
+-- e1000e version bump to 3.3.5 Intel PCI-Express PRO/1000 Ethernet Linux driver
+
-- php, major version bump to 5.6.24, bug and security fixes
-- perl, version bump to 5.24.0 using perlcross 1.0.3
@@ -26,8 +28,12 @@
-- nano, version bump to 2.6.2
+-- logrotate, version bump to 3.10.0
+
-- screen, version bump to 4.4.0
+-- libsodium, version bump to 1.0.11
+
-- Time Zone Database update, tzdata2016f and php-timezonedb-2016.6
** Networking
@@ -36,12 +42,18 @@
-- arnofw (AIF), version bump to 2.0.1g-RC1
--- libcurl (curl) version bump to 7.50.0
+-- libcurl (curl) version bump to 7.50.1, security fixes: CVE-2016-5419, CVE-2016-5420, CVE-2016-5421
+-- lighttpd, version bump to 1.4.41
+
-- stunnel, version bump to 5.35
+-- dnscrypt-proxy, version bump to 1.7.0
+
-- iperf, version bump to 2.0.9, now using maintained iperf2 project
+-- msmtp, an undefined SMTP_CA rc.conf variable will now default to the system ca-bundle.crt .
+
** Asterisk
-- Asterisk 1.8.32.3 (no change), 11.23.0 (version bump) and 13.10.0 (version bump)
@@ -58,7 +70,9 @@
-- Network -> Firewall sub-tab, add "Deny LAN to DMZ" option for specified LAN Interfaces.
+-- Network tab, SMTP Mail Relay, allow an empty "SMTP Cert File" which will default to the system ca-bundle.crt .
+
Additions for AstLinux 1.2.7:
=============================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-04 00:12:46
|
Revision: 7789
http://sourceforge.net/p/astlinux/code/7789
Author: abelbeck
Date: 2016-08-04 00:12:44 +0000 (Thu, 04 Aug 2016)
Log Message:
-----------
msmtp, allow an empty 'SMTP Cert File' (SMTP_CA) which will default to the system ca-bundle.crt
Modified Paths:
--------------
branches/1.0/package/msmtp/msmtp.init
branches/1.0/package/webinterface/altweb/admin/network.php
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/msmtp/msmtp.init
===================================================================
--- branches/1.0/package/msmtp/msmtp.init 2016-08-03 17:35:08 UTC (rev 7788)
+++ branches/1.0/package/msmtp/msmtp.init 2016-08-04 00:12:44 UTC (rev 7789)
@@ -2,6 +2,8 @@
. /etc/rc.conf
+CA_BUNDLE="/usr/lib/ssl/certs/ca-bundle.crt"
+
ALIASES_FILE="/mnt/kd/msmtp-aliases.conf"
gen_msmtp_config() {
@@ -33,13 +35,16 @@
echo "tls_starttls $SMTP_STARTTLS"
fi
- if [ -n "$SMTP_CA" ]; then
- echo "tls_trust_file $SMTP_CA"
- fi
+ if [ "$SMTP_CERTCHECK" = "off" ]; then
+ echo "tls_certcheck off"
+ else
+ echo "tls_certcheck on"
- # may be 'off' or 'on'... use default if unset.
- if [ -n "$SMTP_CERTCHECK" ]; then
- echo "tls_certcheck $SMTP_CERTCHECK"
+ if [ -n "$SMTP_CA" ] && [ -f "$SMTP_CA" ]; then
+ echo "tls_trust_file $SMTP_CA"
+ else
+ echo "tls_trust_file $CA_BUNDLE"
+ fi
fi
fi
Modified: branches/1.0/package/webinterface/altweb/admin/network.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/network.php 2016-08-03 17:35:08 UTC (rev 7788)
+++ branches/1.0/package/webinterface/altweb/admin/network.php 2016-08-04 00:12:44 UTC (rev 7789)
@@ -1765,9 +1765,7 @@
putHtml('<option value="on"'.$sel.'>Check Cert</option>');
putHtml('</select>');
putHtml('</td><td style="text-align: left;" colspan="3">');
- if (($value = getVARdef($db, 'SMTP_CA', $cur_db)) === '') {
- $value = '/mnt/kd/ssl/ca-smtp.pem';
- }
+ $value = getVARdef($db, 'SMTP_CA', $cur_db);
putHtml('SMTP Cert File:<input type="text" size="24" maxlength="64" value="'.$value.'" name="smtp_ca_cert" /></td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: left;" colspan="3">');
$value = getVARdef($db, 'SMTP_USER', $cur_db);
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-08-03 17:35:08 UTC (rev 7788)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-08-04 00:12:44 UTC (rev 7789)
@@ -460,22 +460,21 @@
## The From: of SMTP messages.
#SMTP_FROM="us...@my...d"
##
-## If SMTP_TLS is defined, we will use TLS. You should have a trusted cert list and
-## define its location with SMTP_CA. Optionally, you can turn off the certificate
-## verification. This is a security risk!
-#SMTP_TLS=yes
+## Enable TLS by setting SMTP_TLS to "yes"
+#SMTP_TLS="yes"
## SMTP_STARTTLS 'on' (default) For TLS/STARTTLS, commonly TCP port 587
## SMTP_STARTTLS 'off' For SMTP over SSL, commonly TCP port 465
-#SMTP_STARTTLS=off
-## SMTP_CA file, one or more certificates of trusted CA's in PEM format
+#SMTP_STARTTLS="on"
+## SMTP_CA file, one or more certificates of trusted CA's in PEM format.
+## If SMTP_CA is not defined, the system ca-bundle.crt will be used by default.
#SMTP_CA="/mnt/kd/ssl/ca-smtp.pem"
-## SMTP_CERTCHECK 'off' or 'on' (default), must be 'off' if SMTP_CA is not defined
-#SMTP_CERTCHECK=off
+## SMTP_CERTCHECK 'off' or 'on' (default)
+#SMTP_CERTCHECK="on"
## The username and password for communicating with the SMTP server.
-#SMTP_USER=username
-#SMTP_PASS=password
+#SMTP_USER="username"
+#SMTP_PASS="password"
## The SMTP login method (plain or login are supported)
-#SMTP_AUTH=plain
+#SMTP_AUTH="plain"
## SMTP port to connect to SMTP_SERVER on. Defaults to 25
#SMTP_PORT="25"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-03 17:35:10
|
Revision: 7788
http://sourceforge.net/p/astlinux/code/7788
Author: abelbeck
Date: 2016-08-03 17:35:08 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
e1000e, version bump to 3.3.5
Modified Paths:
--------------
branches/1.0/package/e1000e/e1000e.mk
Modified: branches/1.0/package/e1000e/e1000e.mk
===================================================================
--- branches/1.0/package/e1000e/e1000e.mk 2016-08-03 16:52:15 UTC (rev 7787)
+++ branches/1.0/package/e1000e/e1000e.mk 2016-08-03 17:35:08 UTC (rev 7788)
@@ -4,7 +4,7 @@
#
#############################################################
-E1000E_VERSION = 3.3.1
+E1000E_VERSION = 3.3.5
E1000E_SOURCE:=e1000e-$(E1000E_VERSION).tar.gz
E1000E_SITE = http://downloads.sourceforge.net/project/e1000/e1000e%20stable/$(E1000E_VERSION)
E1000E_DEPENDENCIES = linux
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-03 16:52:18
|
Revision: 7787
http://sourceforge.net/p/astlinux/code/7787
Author: abelbeck
Date: 2016-08-03 16:52:15 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
libcurl, version bump to 7.50.1
Modified Paths:
--------------
branches/1.0/package/libcurl/libcurl.mk
Modified: branches/1.0/package/libcurl/libcurl.mk
===================================================================
--- branches/1.0/package/libcurl/libcurl.mk 2016-08-03 16:36:19 UTC (rev 7786)
+++ branches/1.0/package/libcurl/libcurl.mk 2016-08-03 16:52:15 UTC (rev 7787)
@@ -3,7 +3,7 @@
# libcurl
#
#############################################################
-LIBCURL_VERSION = 7.50.0
+LIBCURL_VERSION = 7.50.1
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...> - 2016-08-03 16:36:21
|
Revision: 7786
http://sourceforge.net/p/astlinux/code/7786
Author: abelbeck
Date: 2016-08-03 16:36:19 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
dnscrypt-proxy version bump to 1.7.0, libsodium version bump to 1.0.11
Modified Paths:
--------------
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk
branches/1.0/package/libsodium/libsodium.mk
Modified: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk 2016-08-03 14:46:33 UTC (rev 7785)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk 2016-08-03 16:36:19 UTC (rev 7786)
@@ -3,14 +3,16 @@
# dnscrypt-proxy
#
#############################################################
-DNSCRYPT_PROXY_VERSION = 1.6.1
-DNSCRYPT_PROXY_SOURCE = dnscrypt-proxy-$(DNSCRYPT_PROXY_VERSION).tar.gz
-DNSCRYPT_PROXY_SITE = http://download.dnscrypt.org/dnscrypt-proxy
-#DNSCRYPT_PROXY_SOURCE = dnscrypt-proxy-$(DNSCRYPT_PROXY_VERSION).tar.bz2
-#DNSCRYPT_PROXY_SITE = https://github.com/jedisct1/dnscrypt-proxy/releases/download/$(DNSCRYPT_PROXY_VERSION)
+DNSCRYPT_PROXY_VERSION = 1.7.0
+DNSCRYPT_PROXY_SOURCE = dnscrypt-proxy-$(DNSCRYPT_PROXY_VERSION).tar.bz2
+DNSCRYPT_PROXY_SITE = https://github.com/jedisct1/dnscrypt-proxy/releases/download/$(DNSCRYPT_PROXY_VERSION)
DNSCRYPT_PROXY_DEPENDENCIES += libsodium
+DNSCRYPT_PROXY_CONF_OPT = \
+ --without-systemd \
+ --disable-plugins
+
# libltdl (libtool)
ifeq ($(BR2_PACKAGE_LIBTOOL),y)
DNSCRYPT_PROXY_DEPENDENCIES += libtool
Modified: branches/1.0/package/libsodium/libsodium.mk
===================================================================
--- branches/1.0/package/libsodium/libsodium.mk 2016-08-03 14:46:33 UTC (rev 7785)
+++ branches/1.0/package/libsodium/libsodium.mk 2016-08-03 16:36:19 UTC (rev 7786)
@@ -3,14 +3,14 @@
# libsodium
#
#############################################################
-LIBSODIUM_VERSION = 1.0.10
+LIBSODIUM_VERSION = 1.0.11
LIBSODIUM_SOURCE = libsodium-$(LIBSODIUM_VERSION).tar.gz
LIBSODIUM_SITE = https://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)
-#LIBSODIUM_SITE = https://download.dnscrypt.org/libsodium/releases
LIBSODIUM_INSTALL_STAGING = YES
-LIBSODIUM_CONF_OPT = --enable-minimal
+LIBSODIUM_CONF_OPT = \
+ --enable-minimal
define LIBSODIUM_INSTALL_TARGET_CMDS
cp -a $(STAGING_DIR)/usr/lib/libsodium.so* $(TARGET_DIR)/usr/lib/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-03 14:46:36
|
Revision: 7785
http://sourceforge.net/p/astlinux/code/7785
Author: abelbeck
Date: 2016-08-03 14:46:33 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
lighttpd, version bump to 1.4.41
Modified Paths:
--------------
branches/1.0/package/lighttpd/lighttpd.mk
Modified: branches/1.0/package/lighttpd/lighttpd.mk
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.mk 2016-08-03 13:38:07 UTC (rev 7784)
+++ branches/1.0/package/lighttpd/lighttpd.mk 2016-08-03 14:46:33 UTC (rev 7785)
@@ -4,7 +4,7 @@
#
#############################################################
-LIGHTTPD_VERSION = 1.4.39
+LIGHTTPD_VERSION = 1.4.41
LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-1.4.x
LIGHTTPD_DEPENDENCIES = host-pkg-config
LIGHTTPD_CONF_OPT = \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-08-03 13:38:10
|
Revision: 7784
http://sourceforge.net/p/astlinux/code/7784
Author: abelbeck
Date: 2016-08-03 13:38:07 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
logrotate, version bump to 3.10.0, moved to GitHub and now has configure script
Modified Paths:
--------------
branches/1.0/package/logrotate/logrotate.mk
Removed Paths:
-------------
branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch
Deleted: branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch
===================================================================
--- branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch 2016-07-31 23:03:03 UTC (rev 7783)
+++ branches/1.0/package/logrotate/logrotate-0001-make-autoreconfable.patch 2016-08-03 13:38:07 UTC (rev 7784)
@@ -1,20 +0,0 @@
-Make the package autoreconfigurable
-
-Adjust a minor detail in configure.ac in order to make the package
-compatible with the autoconf/automake versions we are using in
-Buildroot.
-
-Signed-off-by: Benoît Thébaudeau <ben...@gm...>
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,5 +2,5 @@
-
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([foreign])
- AC_DEFINE(_GNU_SOURCE)
-
- AM_EXTRA_RECURSIVE_TARGETS([test])
-
Modified: branches/1.0/package/logrotate/logrotate.mk
===================================================================
--- branches/1.0/package/logrotate/logrotate.mk 2016-07-31 23:03:03 UTC (rev 7783)
+++ branches/1.0/package/logrotate/logrotate.mk 2016-08-03 13:38:07 UTC (rev 7784)
@@ -3,15 +3,12 @@
# logrotate
#
#############################################################
-LOGROTATE_VERSION = 3.9.1
+LOGROTATE_VERSION = 3.10.0
LOGROTATE_SOURCE = logrotate-$(LOGROTATE_VERSION).tar.gz
-LOGROTATE_SITE = https://www.fedorahosted.org/releases/l/o/logrotate
+LOGROTATE_SITE = https://github.com/logrotate/logrotate/releases/download/$(LOGROTATE_VERSION)
LOGROTATE_DEPENDENCIES = popt host-pkg-config
-# tarball does not have a generated configure script
-LOGROTATE_AUTORECONF = YES
-
LOGROTATE_CONF_OPT = --without-selinux
ifeq ($(BR2_PACKAGE_ACL),y)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-31 23:03:05
|
Revision: 7783
http://sourceforge.net/p/astlinux/code/7783
Author: abelbeck
Date: 2016-07-31 23:03:03 +0000 (Sun, 31 Jul 2016)
Log Message:
-----------
host-makedevs, specify MAKEDEVS_VERSION to something better than the default 'undefined'
Modified Paths:
--------------
branches/1.0/package/makedevs/makedevs.mk
Modified: branches/1.0/package/makedevs/makedevs.mk
===================================================================
--- branches/1.0/package/makedevs/makedevs.mk 2016-07-31 20:14:04 UTC (rev 7782)
+++ branches/1.0/package/makedevs/makedevs.mk 2016-07-31 23:03:03 UTC (rev 7783)
@@ -8,13 +8,15 @@
MAKEDEVS_SOURCE =
HOST_MAKEDEVS_SOURCE =
+MAKEDEVS_VERSION = buildroot-$(BR2_VERSION)
+
define MAKEDEVS_BUILD_CMDS
$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \
package/makedevs/makedevs.c -o $(@D)/makedevs
endef
define MAKEDEVS_INSTALL_TARGET_CMDS
- install -D -m 755 $(@D)/makedevs $(TARGET_DIR)/usr/sbin/makedevs
+ $(INSTALL) -D -m 755 $(@D)/makedevs $(TARGET_DIR)/usr/sbin/makedevs
endef
define MAKEDEVS_UNINSTALL_TARGET_CMDS
@@ -28,7 +30,7 @@
endef
define HOST_MAKEDEVS_INSTALL_CMDS
- install -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs
+ $(INSTALL) -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs
endef
$(eval $(call GENTARGETS,package,makedevs))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-31 20:14:06
|
Revision: 7782
http://sourceforge.net/p/astlinux/code/7782
Author: abelbeck
Date: 2016-07-31 20:14:04 +0000 (Sun, 31 Jul 2016)
Log Message:
-----------
Set BR2_VERSION to something more meaningful
Modified Paths:
--------------
branches/1.0/Makefile
Modified: branches/1.0/Makefile
===================================================================
--- branches/1.0/Makefile 2016-07-31 19:29:29 UTC (rev 7781)
+++ branches/1.0/Makefile 2016-07-31 20:14:04 UTC (rev 7782)
@@ -24,7 +24,7 @@
#--------------------------------------------------------------
# Set and export the version string
-export BR2_VERSION:=2011.08
+export BR2_VERSION:=astlinux-1.x
# This top-level Makefile can *not* be executed in parallel
.NOTPARALLEL:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-31 19:29:32
|
Revision: 7781
http://sourceforge.net/p/astlinux/code/7781
Author: abelbeck
Date: 2016-07-31 19:29:29 +0000 (Sun, 31 Jul 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-07-31 19:26:25 UTC (rev 7780)
+++ branches/1.0/docs/ChangeLog.txt 2016-07-31 19:29:29 UTC (rev 7781)
@@ -10,6 +10,10 @@
Released @TBD@
+** Build System
+
+-- host-squashfs, version bump to 4.3, only build what we need (gzip)
+
** System
-- php, major version bump to 5.6.24, bug and security fixes
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-31 19:26:27
|
Revision: 7780
http://sourceforge.net/p/astlinux/code/7780
Author: abelbeck
Date: 2016-07-31 19:26:25 +0000 (Sun, 31 Jul 2016)
Log Message:
-----------
host-squashfs, version bump to 4.3, only build what we need (gzip)
Modified Paths:
--------------
branches/1.0/package/squashfs/Config.in
branches/1.0/package/squashfs/squashfs.mk
Removed Paths:
-------------
branches/1.0/package/squashfs/squashfs-4.2-no-gzip-fix.patch
Modified: branches/1.0/package/squashfs/Config.in
===================================================================
--- branches/1.0/package/squashfs/Config.in 2016-07-31 13:21:32 UTC (rev 7779)
+++ branches/1.0/package/squashfs/Config.in 2016-07-31 19:26:25 UTC (rev 7780)
@@ -10,29 +10,29 @@
if BR2_PACKAGE_SQUASHFS
config BR2_PACKAGE_SQUASHFS_GZIP
- bool "gzip support"
- default y
- select BR2_PACKAGE_ZLIB
- help
- Support GZIP compression algorithm
+ bool "gzip support"
+ default y
+ select BR2_PACKAGE_ZLIB
+ help
+ Support GZIP compression algorithm
config BR2_PACKAGE_SQUASHFS_LZMA
- bool "lzma support"
- select BR2_PACKAGE_XZ
- help
- Support LZMA compression algorithm
+ bool "lzma support"
+ select BR2_PACKAGE_XZ
+ help
+ Support LZMA compression algorithm
config BR2_PACKAGE_SQUASHFS_LZO
- bool "lzo support"
- select BR2_PACKAGE_LZO
- help
- Support LZO compression algorithm
+ bool "lzo support"
+ select BR2_PACKAGE_LZO
+ help
+ Support LZO compression algorithm
config BR2_PACKAGE_SQUASHFS_XZ
- bool "xz support"
- select BR2_PACKAGE_XZ
- help
- Support XZ compression algorithm
+ bool "xz support"
+ select BR2_PACKAGE_XZ
+ help
+ Support XZ compression algorithm
endif
Deleted: branches/1.0/package/squashfs/squashfs-4.2-no-gzip-fix.patch
===================================================================
--- branches/1.0/package/squashfs/squashfs-4.2-no-gzip-fix.patch 2016-07-31 13:21:32 UTC (rev 7779)
+++ branches/1.0/package/squashfs/squashfs-4.2-no-gzip-fix.patch 2016-07-31 19:26:25 UTC (rev 7780)
@@ -1,26 +0,0 @@
-[PATCH] squashfs-tools: unbreak builds without gzip support
-
-The initialization of gzip_comp_ops if gzip support is disabled is
-missing 2 null pointers, causing the id element to be initialized to 0
-rather than ZLIB_COMPRESSION, which breaks all the compressor functions
-as they loop until finding the correct element or id = 0.
-
-Signed-off-by: Peter Korsgaard <ja...@su...>
----
- squashfs-tools/compressor.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: squashfs4.2/squashfs-tools/compressor.c
-===================================================================
---- squashfs4.2.orig/squashfs-tools/compressor.c
-+++ squashfs4.2/squashfs-tools/compressor.c
-@@ -27,7 +27,8 @@
-
- #ifndef GZIP_SUPPORT
- static struct compressor gzip_comp_ops = {
-- NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION, "gzip", 0
-+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, ZLIB_COMPRESSION,
-+ "gzip", 0
- };
- #else
- extern struct compressor gzip_comp_ops;
Modified: branches/1.0/package/squashfs/squashfs.mk
===================================================================
--- branches/1.0/package/squashfs/squashfs.mk 2016-07-31 13:21:32 UTC (rev 7779)
+++ branches/1.0/package/squashfs/squashfs.mk 2016-07-31 19:26:25 UTC (rev 7780)
@@ -1,10 +1,17 @@
-SQUASHFS_VERSION=4.2
-SQUASHFS_SOURCE=squashfs$(SQUASHFS_VERSION).tar.gz
-SQUASHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/squashfs
+################################################################################
+#
+# squashfs
+#
+################################################################################
-# no libattr in BR
+SQUASHFS_VERSION = 4.3
+SQUASHFS_SOURCE = squashfs$(SQUASHFS_VERSION).tar.gz
+SQUASHFS_SITE = http://downloads.sourceforge.net/project/squashfs/squashfs/squashfs$(SQUASHFS_VERSION)
+
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=0
+SQUASHFS_MAKE_ARGS += LZ4_SUPPORT=0
+
ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
SQUASHFS_DEPENDENCIES += xz
SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=1 COMP_DEFAULT=lzma
@@ -33,43 +40,43 @@
SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
endif
+# AstLinux only uses BR2_TARGET_ROOTFS_SQUASHFS4_GZIP=y
+HOST_SQUASHFS_DEPENDENCIES = host-zlib
-HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lzo host-xz
-
-# no libattr/xz in BR
HOST_SQUASHFS_MAKE_ARGS = \
XATTR_SUPPORT=0 \
- XZ_SUPPORT=1 \
- GZIP_SUPPORT=1 \
- LZO_SUPPORT=1 \
- LZMA_XZ_SUPPORT=1
+ XZ_SUPPORT=0 \
+ GZIP_SUPPORT=1 COMP_DEFAULT=gzip \
+ LZ4_SUPPORT=0 \
+ LZO_SUPPORT=0 \
+ LZMA_XZ_SUPPORT=0
define SQUASHFS_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) \
- CC="$(TARGET_CC)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
- EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
- $(SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/
+ $(TARGET_MAKE_ENV) $(MAKE) \
+ CC="$(TARGET_CC)" \
+ EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
+ EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+ $(SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/
endef
define SQUASHFS_INSTALL_TARGET_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
+ $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
endef
define HOST_SQUASHFS_BUILD_CMDS
- $(HOST_MAKE_ENV) $(MAKE) \
- CC="$(HOSTCC)" \
- EXTRA_CFLAGS="$(HOST_CFLAGS)" \
- EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
- $(HOST_SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/
+ $(HOST_MAKE_ENV) $(MAKE) \
+ CC="$(HOSTCC)" \
+ EXTRA_CFLAGS="$(HOST_CFLAGS)" \
+ EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
+ $(HOST_SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/
endef
define HOST_SQUASHFS_INSTALL_CMDS
- $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
- -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
+ $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
+ -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install
endef
$(eval $(call GENTARGETS,package,squashfs))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-31 13:21:34
|
Revision: 7779
http://sourceforge.net/p/astlinux/code/7779
Author: abelbeck
Date: 2016-07-31 13:21:32 +0000 (Sun, 31 Jul 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-07-31 13:10:01 UTC (rev 7778)
+++ branches/1.0/docs/ChangeLog.txt 2016-07-31 13:21:32 UTC (rev 7779)
@@ -20,7 +20,7 @@
-- sudo, version bump to 1.8.17p1
--- nano, version bump to 2.6.1
+-- nano, version bump to 2.6.2
-- screen, version bump to 4.4.0
@@ -36,6 +36,8 @@
-- stunnel, version bump to 5.35
+-- iperf, version bump to 2.0.9, now using maintained iperf2 project
+
** Asterisk
-- Asterisk 1.8.32.3 (no change), 11.23.0 (version bump) and 13.10.0 (version bump)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-31 13:10:04
|
Revision: 7778
http://sourceforge.net/p/astlinux/code/7778
Author: abelbeck
Date: 2016-07-31 13:10:01 +0000 (Sun, 31 Jul 2016)
Log Message:
-----------
nano, version bump to 2.6.2
Modified Paths:
--------------
branches/1.0/package/nano/nano.mk
Modified: branches/1.0/package/nano/nano.mk
===================================================================
--- branches/1.0/package/nano/nano.mk 2016-07-31 13:02:31 UTC (rev 7777)
+++ branches/1.0/package/nano/nano.mk 2016-07-31 13:10:01 UTC (rev 7778)
@@ -4,7 +4,7 @@
#
#############################################################
-NANO_VERSION = 2.6.1
+NANO_VERSION = 2.6.2
NANO_SITE = http://www.nano-editor.org/dist/v2.6
NANO_MAKE_ENV = CURSES_LIB="-lncurses"
NANO_CONF_ENV = ac_cv_prog_NCURSESW_CONFIG=false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-31 13:02:32
|
Revision: 7777
http://sourceforge.net/p/astlinux/code/7777
Author: abelbeck
Date: 2016-07-31 13:02:31 +0000 (Sun, 31 Jul 2016)
Log Message:
-----------
iperf, version bump to 2.0.9, using maintained iperf2 project
Ref: https://git.busybox.net/buildroot/commit/?id=11cc12eefd9bb656cca84771685f31940f4bdbdb
Ref: https://git.busybox.net/buildroot/commit/?id=04bf807173d388e48eb98e2e42d32e77ab940447
Modified Paths:
--------------
branches/1.0/package/iperf/Config.in
branches/1.0/package/iperf/iperf.mk
Added Paths:
-----------
branches/1.0/package/iperf/iperf-0002-fix-speed-display-in-csv-report.patch
Modified: branches/1.0/package/iperf/Config.in
===================================================================
--- branches/1.0/package/iperf/Config.in 2016-07-25 20:29:33 UTC (rev 7776)
+++ branches/1.0/package/iperf/Config.in 2016-07-31 13:02:31 UTC (rev 7777)
@@ -5,7 +5,7 @@
Internet Protocol bandwidth measuring tool for measuring
TCP/UDP performance.
- http://dast.nlanr.net/projects/iperf/
+ https://sourceforge.net/projects/iperf2/
comment "iperf requires a toolchain with C++ support enabled"
depends on !BR2_INSTALL_LIBSTDCPP
Added: branches/1.0/package/iperf/iperf-0002-fix-speed-display-in-csv-report.patch
===================================================================
--- branches/1.0/package/iperf/iperf-0002-fix-speed-display-in-csv-report.patch (rev 0)
+++ branches/1.0/package/iperf/iperf-0002-fix-speed-display-in-csv-report.patch 2016-07-31 13:02:31 UTC (rev 7777)
@@ -0,0 +1,38 @@
+From f035e70b72d4285dcdbd393e680777a927cb9da4 Mon Sep 17 00:00:00 2001
+From: Matt Weber <mat...@ro...>
+Date: Thu, 28 Jul 2016 19:04:01 -0500
+Subject: [PATCH] perf: fix "speed" display in csv report
+
+Some parameters displayed in the CSV reports are declared
+as uint64_t, but the printf format doesn't reflect this.
+
+Submitted bug: https://sourceforge.net/p/iperf/bugs/66/
+
+Signed-off-by: Matt Poduska <mat...@ro...>
+Signed-off-by: Atul Singh <atu...@gm...>
+Signed-off-by: Matthew Weber <mat...@ro...>
+---
+ src/Locale.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/Locale.c b/src/Locale.c
+index b5d42b1..7b924fa 100644
+--- a/src/Locale.c
++++ b/src/Locale.c
+@@ -330,11 +330,12 @@ const char reportCSV_bw_format[] =
+ const char reportCSV_bw_jitter_loss_format[] =
+ "%s,%s,%d,%.1f-%.1f,%I64d,%I64d,%.3f,%d,%d,%.3f,%d\n";
+ #else
++#include "inttypes.h"
+ const char reportCSV_bw_format[] =
+-"%s,%s,%d,%.1f-%.1f,%d,%d\n";
++"%s,%s,%d,%.1f-%.1f,%" PRId64 ",%" PRId64 "\n";
+
+ const char reportCSV_bw_jitter_loss_format[] =
+-"%s,%s,%d,%.1f-%.1f,%d,%d,%.3f,%d,%d,%.3f,%d\n";
++"%s,%s,%d,%.1f-%.1f,%" PRId64 ",%" PRId64 ",%.3f,%d,%d,%.3f,%d\n";
+ #endif //WIN32
+ #endif //HAVE_QUAD_SUPPORT
+ /* -------------------------------------------------------------------
+--
+1.9.1
Modified: branches/1.0/package/iperf/iperf.mk
===================================================================
--- branches/1.0/package/iperf/iperf.mk 2016-07-25 20:29:33 UTC (rev 7776)
+++ branches/1.0/package/iperf/iperf.mk 2016-07-31 13:02:31 UTC (rev 7777)
@@ -3,19 +3,12 @@
# iperf
#
#############################################################
-IPERF_VERSION = 2.0.5
+IPERF_VERSION = 2.0.9
IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
-IPERF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
+IPERF_SITE = http://downloads.sourceforge.net/project/iperf2
-IPERF_AUTORECONF = NO
-
-IPERF_INSTALL_STAGING = NO
-IPERF_INSTALL_TARGET = YES
-
IPERF_CONF_ENV = \
- ac_cv_func_malloc_0_nonnull=yes \
- ac_cv_type_bool=yes \
- ac_cv_sizeof_bool=1
+ ac_cv_func_malloc_0_nonnull=yes
IPERF_CONF_OPT = \
--disable-dependency-tracking \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-25 20:29:35
|
Revision: 7776
http://sourceforge.net/p/astlinux/code/7776
Author: abelbeck
Date: 2016-07-25 20:29:33 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-07-25 20:28:20 UTC (rev 7775)
+++ branches/1.0/docs/ChangeLog.txt 2016-07-25 20:29:33 UTC (rev 7776)
@@ -34,6 +34,8 @@
-- libcurl (curl) version bump to 7.50.0
+-- stunnel, version bump to 5.35
+
** Asterisk
-- Asterisk 1.8.32.3 (no change), 11.23.0 (version bump) and 13.10.0 (version bump)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-25 20:28:22
|
Revision: 7775
http://sourceforge.net/p/astlinux/code/7775
Author: abelbeck
Date: 2016-07-25 20:28:20 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
stunnel, version bump to 5.35
Fixes:
TLS session caching memory leak
Malfunctioning 'verify = 4'
Modified Paths:
--------------
branches/1.0/package/stunnel/stunnel.mk
Modified: branches/1.0/package/stunnel/stunnel.mk
===================================================================
--- branches/1.0/package/stunnel/stunnel.mk 2016-07-25 17:27:02 UTC (rev 7774)
+++ branches/1.0/package/stunnel/stunnel.mk 2016-07-25 20:28:20 UTC (rev 7775)
@@ -4,7 +4,7 @@
#
#############################################################
-STUNNEL_VERSION = 5.31
+STUNNEL_VERSION = 5.35
STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/5.x
STUNNEL_DEPENDENCIES = openssl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-25 17:27:04
|
Revision: 7774
http://sourceforge.net/p/astlinux/code/7774
Author: abelbeck
Date: 2016-07-25 17:27:02 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-07-25 17:25:20 UTC (rev 7773)
+++ branches/1.0/docs/ChangeLog.txt 2016-07-25 17:27:02 UTC (rev 7774)
@@ -12,7 +12,7 @@
** System
--- php, version bump to 5.5.38, bug and security fixes
+-- php, major version bump to 5.6.24, bug and security fixes
-- perl, version bump to 5.24.0 using perlcross 1.0.3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-25 17:25:22
|
Revision: 7773
http://sourceforge.net/p/astlinux/code/7773
Author: abelbeck
Date: 2016-07-25 17:25:20 +0000 (Mon, 25 Jul 2016)
Log Message:
-----------
php, major version bump to 5.6.24
Modified Paths:
--------------
branches/1.0/package/php/php.mk
Added Paths:
-----------
branches/1.0/package/php/php-0000-gcc-version-test.patch
branches/1.0/package/php/php-0001-ditch-unset.patch
branches/1.0/package/php/php-0002-no-iconv-search.patch
branches/1.0/package/php/php-0003-disable-pharcmd.patch
branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch
Removed Paths:
-------------
branches/1.0/package/php/php-0000-gcc-version-test.patch
branches/1.0/package/php/php-0001-no-iconv-search.patch
branches/1.0/package/php/php-0002-dlopen.patch
branches/1.0/package/php/php-0003-disable-pharcmd.patch
Deleted: branches/1.0/package/php/php-0000-gcc-version-test.patch
===================================================================
--- branches/1.0/package/php/php-0000-gcc-version-test.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0000-gcc-version-test.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -1,11 +0,0 @@
---- php-5.3.22/configure.orig 2013-03-17 14:56:49.000000000 -0500
-+++ php-5.3.22/configure 2013-03-17 14:58:16.000000000 -0500
-@@ -5457,7 +5457,7 @@
- GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([0-9]+)\.[0-9]+\..*/\1/;1p'`
- ;;
- *)
-- GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[^0-9]*//;1s/\..*//;1p'`
-+ GCC_MAJOR_VERSION=`$CC -dumpversion | cut -d'.' -f1`
- ;;
- esac
- if test $GCC_MAJOR_VERSION -ge 4; then
Added: branches/1.0/package/php/php-0000-gcc-version-test.patch
===================================================================
--- branches/1.0/package/php/php-0000-gcc-version-test.patch (rev 0)
+++ branches/1.0/package/php/php-0000-gcc-version-test.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,11 @@
+--- php-5.6.24/configure.in.orig 2016-07-25 10:47:22.942680457 -0500
++++ php-5.6.24/configure.in 2016-07-25 10:48:07.381446344 -0500
+@@ -292,7 +292,7 @@
+ GCC_MAJOR_VERSION=`$CC -dumpversion | /usr/bin/sed -nE '1s/([[0-9]]+)\.[[0-9]]+\..*/\1/;1p'`
+ ;;
+ *)
+- GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*//;1s/\..*//;1p'`
++ GCC_MAJOR_VERSION=`$CC -dumpversion | cut -d'.' -f1`
+ ;;
+ esac
+ if test $GCC_MAJOR_VERSION -ge 4; then
Added: branches/1.0/package/php/php-0001-ditch-unset.patch
===================================================================
--- branches/1.0/package/php/php-0001-ditch-unset.patch (rev 0)
+++ branches/1.0/package/php/php-0001-ditch-unset.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,26 @@
+Unsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache.
+Terminate them with extreme prejudice.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura php-5.6.8.orig/acinclude.m4 php-5.6.8/acinclude.m4
+--- php-5.6.8.orig/acinclude.m4 2015-04-15 20:05:57.000000000 +0200
++++ php-5.6.8/acinclude.m4 2015-05-18 20:03:50.833099001 +0200
+@@ -1897,8 +1897,6 @@
+ dnl
+ AC_DEFUN([PHP_CHECK_FUNC_LIB],[
+ ifelse($2,,:,[
+- unset ac_cv_lib_$2[]_$1
+- unset ac_cv_lib_$2[]___$1
+ unset found
+ AC_CHECK_LIB($2, $1, [found=yes], [
+ AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
+@@ -1930,8 +1928,6 @@
+ dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS.
+ dnl
+ AC_DEFUN([PHP_CHECK_FUNC],[
+- unset ac_cv_func_$1
+- unset ac_cv_func___$1
+ unset found
+
+ AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ])
Deleted: branches/1.0/package/php/php-0001-no-iconv-search.patch
===================================================================
--- branches/1.0/package/php/php-0001-no-iconv-search.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0001-no-iconv-search.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -1,65 +0,0 @@
-Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not
-PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use
-test instead of AC_TRY_LINK to find headers which is bad,
-specially when adding /usr and /usr/local to the mix.
-Do basically the same with ext/iconv/config.m4 by tweaking
-PHP_ICONV_H_PATH which, again, uses test and absolute paths.
-And all this directly in configure since autoreconf isn't
-happy with php.
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
-
-diff -Nura php-5.5.11.orig/configure php-5.5.11/configure
---- php-5.5.11.orig/configure 2014-04-16 14:55:52.300838499 -0300
-+++ php-5.5.11/configure 2014-04-22 21:54:01.499097295 -0300
-@@ -45944,12 +45944,6 @@
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "INCLUDEPATH$unique=set"
-
-- if test ""; then
-- INCLUDES="-I$ai_p $INCLUDES"
-- else
-- INCLUDES="$INCLUDES -I$ai_p"
-- fi
--
- fi
-
- fi
-@@ -45979,14 +45973,7 @@
- PHP_ICONV_PREFIX="$ICONV_DIR"
- fi
-
-- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
-- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
--
-- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
-- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
-- else
-- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
-- fi
-+ PHP_ICONV_H_PATH="iconv.h"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
- $as_echo_n "checking if iconv is glibc's... " >&6; }
-@@ -46446,8 +46433,6 @@
- ext_builddir=ext/iconv
- ext_srcdir=$abs_srcdir/ext/iconv
-
-- ac_extra=`echo "-I\"$PHP_ICONV_PREFIX/include\""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
--
- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
- PHP_ICONV_SHARED=no
-
-@@ -97775,12 +97760,6 @@
- if test -n "$unique" && test "`eval $cmd`" = "" ; then
- eval "INCLUDEPATH$unique=set"
-
-- if test ""; then
-- INCLUDES="-I$ai_p $INCLUDES"
-- else
-- INCLUDES="$INCLUDES -I$ai_p"
-- fi
--
- fi
-
- fi
Deleted: branches/1.0/package/php/php-0002-dlopen.patch
===================================================================
--- branches/1.0/package/php/php-0002-dlopen.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0002-dlopen.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -1,25 +0,0 @@
-PHP can't be AUTORECONF with any modern autotools and the dl tests are
-pretty bad for cross-compilation, so just kill the needed ac_cv value unsets
-so they can flow through from the package makefile.
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
-
-diff -Nura php-5.5.8.orig/configure php-5.5.8/configure
---- php-5.5.8.orig/configure 2014-01-28 17:41:33.943851727 -0300
-+++ php-5.5.8/configure 2014-01-28 17:42:53.785493795 -0300
-@@ -17156,7 +17156,6 @@
-
-
-
-- unset ac_cv_func_dlopen
- unset ac_cv_func___dlopen
- unset found
-
-@@ -17184,7 +17183,6 @@
-
- *)
-
-- unset ac_cv_lib_dl_dlopen
- unset ac_cv_lib_dl___dlopen
- unset found
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
Added: branches/1.0/package/php/php-0002-no-iconv-search.patch
===================================================================
--- branches/1.0/package/php/php-0002-no-iconv-search.patch (rev 0)
+++ branches/1.0/package/php/php-0002-no-iconv-search.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,55 @@
+Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not
+PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use
+test instead of AC_TRY_LINK to find headers which is bad,
+specially when adding /usr and /usr/local to the mix.
+Do basically the same with ext/iconv/config.m4 by tweaking
+PHP_ICONV_H_PATH which, again, uses test and absolute paths.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+[Gustavo: convert to nice m4 instead of patching configure]
+[Gustavo: update for 5.6.10]
+
+diff -Nura php-5.6.10.orig/acinclude.m4 php-5.6.10/acinclude.m4
+--- php-5.6.10.orig/acinclude.m4 2015-06-12 16:09:06.274355813 -0300
++++ php-5.6.10/acinclude.m4 2015-06-12 16:10:10.884544865 -0300
+@@ -2470,7 +2470,7 @@
+ dnl
+ if test "$found_iconv" = "no"; then
+
+- for i in $PHP_ICONV /usr/local /usr; do
++ for i in $PHP_ICONV; do
+ if test -r $i/include/giconv.h; then
+ AC_DEFINE(HAVE_GICONV_H, 1, [ ])
+ ICONV_DIR=$i
+diff -Nura php-5.6.10.orig/ext/iconv/config.m4 php-5.6.10/ext/iconv/config.m4
+--- php-5.6.10.orig/ext/iconv/config.m4 2015-06-12 16:09:07.792407246 -0300
++++ php-5.6.10/ext/iconv/config.m4 2015-06-12 16:11:07.752471600 -0300
+@@ -14,28 +14,6 @@
+ ])
+
+ if test "$iconv_avail" != "no"; then
+- if test -z "$ICONV_DIR"; then
+- for i in /usr/local /usr; do
+- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then
+- PHP_ICONV_PREFIX="$i"
+- break
+- fi
+- done
+- if test -z "$PHP_ICONV_PREFIX"; then
+- PHP_ICONV_PREFIX="/usr"
+- fi
+- else
+- PHP_ICONV_PREFIX="$ICONV_DIR"
+- fi
+-
+- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS"
+- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS"
+-
+- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then
+- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
+- else
+- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
+- fi
+
+ AC_MSG_CHECKING([if iconv is glibc's])
+ AC_TRY_LINK([#include <gnu/libc-version.h>],[gnu_get_libc_version();],
Deleted: branches/1.0/package/php/php-0003-disable-pharcmd.patch
===================================================================
--- branches/1.0/package/php/php-0003-disable-pharcmd.patch 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php-0003-disable-pharcmd.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -1,26 +0,0 @@
-Disable the 'phar' command-line tool build/installation since it requires
-php to run and pack up phar itself in phar format. This would require
-a host-php instance and really probably nobody needs the phar tool
-on the target.
-
-Signed-off-by: Gustavo Zacarias <gu...@za...>
-
-diff -Nura php-5.5.14.orig/configure php-5.5.14/configure
---- php-5.5.14.orig/configure 2014-07-08 09:52:52.657753194 -0300
-+++ php-5.5.14/configure 2014-07-08 09:53:07.610243933 -0300
-@@ -113259,13 +113259,8 @@
- INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
- CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
-
--if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
-- pharcmd=pharcmd
-- pharcmd_install=install-pharcmd
--else
-- pharcmd=
-- pharcmd_install=
--fi;
-+pharcmd=
-+pharcmd_install=
-
- all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
- install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
Added: branches/1.0/package/php/php-0003-disable-pharcmd.patch
===================================================================
--- branches/1.0/package/php/php-0003-disable-pharcmd.patch (rev 0)
+++ branches/1.0/package/php/php-0003-disable-pharcmd.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,27 @@
+Disable the 'phar' command-line tool build/installation since it requires
+php to run and pack up phar itself in phar format. This would require
+a host-php instance and really probably nobody needs the phar tool
+on the target.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+[Gustavo: update for autoreconf/configure.in]
+
+diff -Nura php-5.6.7.orig/configure.in php-5.6.7/configure.in
+--- php-5.6.7.orig/configure.in 2015-04-08 11:08:10.815835010 -0300
++++ php-5.6.7/configure.in 2015-04-08 11:16:20.460467444 -0300
+@@ -1437,13 +1437,8 @@
+ INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
+ CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
+
+-if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
+- pharcmd=pharcmd
+- pharcmd_install=install-pharcmd
+-else
+- pharcmd=
+- pharcmd_install=
+-fi;
++pharcmd=
++pharcmd_install=
+
+ all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd"
+ install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install"
Added: branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch
===================================================================
--- branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch (rev 0)
+++ branches/1.0/package/php/php-0005-ac-cache-strcasestr.patch 2016-07-25 17:25:20 UTC (rev 7773)
@@ -0,0 +1,24 @@
+Allow cache answer for strcasestr discovery.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura php-5.6.7.orig/ext/fileinfo/config.m4 php-5.6.7/ext/fileinfo/config.m4
+--- php-5.6.7.orig/ext/fileinfo/config.m4 2015-04-08 22:19:45.798770792 -0300
++++ php-5.6.7/ext/fileinfo/config.m4 2015-04-08 22:26:33.110654338 -0300
+@@ -14,6 +14,7 @@
+ libmagic/readcdf.c libmagic/softmagic.c"
+
+ AC_MSG_CHECKING([for strcasestr])
++ AC_CACHE_VAL(ac_cv_func_strcasestr,
+ AC_TRY_RUN([
+ #include <string.h>
+ #include <strings.h>
+@@ -46,7 +47,7 @@
+ AC_MSG_RESULT(no)
+ AC_MSG_NOTICE(using libmagic strcasestr implementation)
+ libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
+- ])
++ ]))
+
+ PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
+ PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2016-07-22 13:58:56 UTC (rev 7772)
+++ branches/1.0/package/php/php.mk 2016-07-25 17:25:20 UTC (rev 7773)
@@ -4,7 +4,7 @@
#
#############################################################
-PHP_VERSION = 5.5.38
+PHP_VERSION = 5.6.24
PHP_SITE = http://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
@@ -41,8 +41,17 @@
--localstatedir=/var \
--disable-rpath
-PHP_CONF_ENV = EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
+PHP_CONF_ENV = \
+ ac_cv_func_strcasestr=yes \
+ EXTRA_LIBS="$(PHP_EXTRA_LIBS)"
+# PHP can't be AUTORECONFed the standard way unfortunately
+PHP_DEPENDENCIES += host-autoconf host-automake host-libtool
+define PHP_BUILDCONF
+ cd $(@D) ; $(TARGET_MAKE_ENV) ./buildconf --force
+endef
+PHP_PRE_CONFIGURE_HOOKS += PHP_BUILDCONF
+
ifeq ($(BR2_ENDIAN),"BIG")
PHP_CONF_ENV += ac_cv_c_bigendian_php=yes
else
@@ -160,7 +169,7 @@
define PHP_INSTALL_FIXUP
mv $(TARGET_DIR)/usr/bin/php-cgi $(TARGET_DIR)/usr/bin/php
- rm -rf $(TARGET_DIR)/usr/lib/php
+ rm -rf $(TARGET_DIR)/usr/lib/php/build
rm -f $(TARGET_DIR)/usr/bin/phpize
rm -f $(TARGET_DIR)/usr/bin/php-config
ln -sf /tmp/etc/php.ini $(TARGET_DIR)/etc/php.ini
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-22 13:58:59
|
Revision: 7772
http://sourceforge.net/p/astlinux/code/7772
Author: abelbeck
Date: 2016-07-22 13:58:56 +0000 (Fri, 22 Jul 2016)
Log Message:
-----------
update ChangeLog
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-07-22 13:51:37 UTC (rev 7771)
+++ branches/1.0/docs/ChangeLog.txt 2016-07-22 13:58:56 UTC (rev 7772)
@@ -36,12 +36,14 @@
** Asterisk
--- Asterisk 1.8.32.3 (no change), 11.22.0 (no change) and 13.9.1 (no change)
+-- Asterisk 1.8.32.3 (no change), 11.23.0 (version bump) and 13.10.0 (version bump)
-- DAHDI, dahdi-linux 2.8.0.1 (no change) and dahdi-tools 2.8.0 (no change)
--- pjsip 2.4.5 (no change)
+-- pjsip 2.5 (version bump)
+-- SILK CODEC, version bump to 1.0.2, now supports Asterisk 13 as well as Asterisk 11
+
** Web Interface
-- Network tab, add 4th LAN Interface. Added 4th LAN support to Firewall sub-tab and PhoneProv tab.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-07-22 13:51:40
|
Revision: 7771
http://sourceforge.net/p/astlinux/code/7771
Author: abelbeck
Date: 2016-07-22 13:51:37 +0000 (Fri, 22 Jul 2016)
Log Message:
-----------
asterisk, version bump to 11.23.0, 13.10.0, add SILK CODEC support to Asterisk 13
Modified Paths:
--------------
branches/1.0/astlinux-ast13.config
branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
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/x86_64-configs/astlinux-ast13.config
Added Paths:
-----------
branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch
Removed Paths:
-------------
branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/astlinux-ast13.config 2016-07-22 13:51:37 UTC (rev 7771)
@@ -169,7 +169,7 @@
# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
#
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-# BR2_PACKAGE_ASTERISK_CODEC_SILK is not set
+BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
Deleted: branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-app_queue-segfault-fix.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=apps%2Fapp_queue.c;h=fa432cb76f5e41ad1168b73d3cd415daf3c851c3;hp=4a8029080d4b88a34a84f8d2b20491ba1dcbf6f0;hb=32b4320d620ffff5c55f111fc22f22fdb07f8c60;hpb=981ed6091e513bc81d4863d409762638495c2ed1
-
-diff --git a/apps/app_queue.c b/apps/app_queue.c
-index 4a80290..fa432cb 100644
---- a/apps/app_queue.c
-+++ b/apps/app_queue.c
-@@ -3641,7 +3641,7 @@ static int can_ring_entry(struct queue_ent *qe, struct callattempt *call)
- return 0;
- }
-
-- if (call->member->in_call && call->lastqueue->wrapuptime) {
-+ if (call->member->in_call && call->lastqueue && call->lastqueue->wrapuptime) {
- ast_debug(1, "%s is in call, so not available (wrapuptime %d)\n",
- call->interface, call->lastqueue->wrapuptime);
- return 0;
Modified: branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-configure-cross-fix.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2474,11 +2474,13 @@
+@@ -2473,11 +2473,13 @@
AC_OUTPUT
${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
Modified: branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-extension-changed-verbosity-chan_sip.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -16781,7 +16781,7 @@
+@@ -16799,7 +16799,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-11-voicemail-multiple-recipients.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-11.16.0/apps/app_voicemail.c.orig 2015-01-23 08:51:03.000000000 -0600
+++ asterisk-11.16.0/apps/app_voicemail.c 2015-02-10 09:58:04.000000000 -0600
-@@ -751,7 +751,7 @@
+@@ -753,7 +753,7 @@
char mailbox[AST_MAX_EXTENSION]; /*!< Mailbox id, unique within vm context */
char password[80]; /*!< Secret pin code, numbers only */
char fullname[80]; /*!< Full name, for directory app */
@@ -9,7 +9,7 @@
char *emailsubject; /*!< E-mail subject */
char *emailbody; /*!< E-mail body */
char pager[80]; /*!< E-mail address to pager (no attachment) */
-@@ -1194,6 +1194,8 @@
+@@ -1196,6 +1196,8 @@
vmu->maxdeletedmsg = maxdeletedmsg;
}
vmu->volgain = volgain;
@@ -18,7 +18,7 @@
ast_free(vmu->emailsubject);
vmu->emailsubject = NULL;
ast_free(vmu->emailbody);
-@@ -1505,7 +1507,8 @@
+@@ -1507,7 +1509,8 @@
} else if (!strcasecmp(var->name, "pager")) {
ast_copy_string(retval->pager, var->value, sizeof(retval->pager));
} else if (!strcasecmp(var->name, "email")) {
@@ -28,25 +28,26 @@
} else if (!strcasecmp(var->name, "fullname")) {
ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
} else if (!strcasecmp(var->name, "context")) {
-@@ -1642,6 +1645,7 @@
- if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
+@@ -1644,7 +1647,9 @@
+ if ((vmu = (ivm ? ivm : ast_calloc(1, sizeof(*vmu))))) {
++ ast_free(vmu->email);
+ ast_free(vmu->emailbody);
+ ast_free(vmu->emailsubject);
*vmu = *cur;
- if (!ivm) {
-+ vmu->email = ast_strdup(cur->email);
- vmu->emailbody = ast_strdup(cur->emailbody);
- vmu->emailsubject = ast_strdup(cur->emailsubject);
- }
-@@ -1924,6 +1928,9 @@
- {
- if (ast_test_flag(vmu, VM_ALLOCED)) {
++ vmu->email = ast_strdup(cur->email);
+ vmu->emailbody = ast_strdup(cur->emailbody);
+ vmu->emailsubject = ast_strdup(cur->emailsubject);
+ ast_set2_flag(vmu, !ivm, VM_ALLOCED);
+@@ -1928,6 +1932,8 @@
+ return;
+ }
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
-+
- ast_free(vmu->emailbody);
- vmu->emailbody = NULL;
-
-@@ -2571,7 +2578,7 @@
++ ast_free(vmu->email);
++ vmu->email = NULL;
+ ast_free(vmu->emailbody);
+ vmu->emailbody = NULL;
+ ast_free(vmu->emailsubject);
+@@ -2583,7 +2589,7 @@
* of this function, we will revert back to an empty string if tempcopy
* is 1.
*/
@@ -55,7 +56,7 @@
tempcopy = 1;
}
-@@ -2583,8 +2590,10 @@
+@@ -2595,8 +2601,10 @@
command hangs. */
if (!(p = vm_mkftemp(tmp))) {
ast_log(AST_LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
@@ -68,7 +69,7 @@
return -1;
}
-@@ -4929,6 +4938,9 @@
+@@ -4947,6 +4955,9 @@
struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
char *greeting_attachment;
char filename[256];
@@ -78,7 +79,7 @@
if (!str1 || !str2) {
ast_free(str1);
-@@ -4970,7 +4982,7 @@
+@@ -4988,7 +4999,7 @@
ast_str_substitute_variables(&str1, 0, ast, fromstring);
if (check_mime(ast_str_buffer(str1))) {
@@ -87,7 +88,7 @@
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
*ptr = '\0';
-@@ -4991,20 +5003,25 @@
+@@ -5009,20 +5020,25 @@
fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
}
@@ -126,7 +127,7 @@
}
if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -5014,7 +5031,7 @@
+@@ -5032,7 +5048,7 @@
prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, category, flag);
ast_str_substitute_variables(&str1, 0, ast, e_subj);
if (check_mime(ast_str_buffer(str1))) {
@@ -135,7 +136,7 @@
char *ptr;
ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -11766,7 +11783,7 @@
+@@ -11802,7 +11818,7 @@
ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
}
if (stringp && (s = strsep(&stringp, ","))) {
@@ -144,7 +145,7 @@
}
if (stringp && (s = strsep(&stringp, ","))) {
ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -14035,7 +14052,7 @@
+@@ -14084,7 +14100,7 @@
}
populate_defaults(vmu);
Added: branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch (rev 0)
+++ branches/1.0/package/asterisk/asterisk-13-SILK-CODEC-support.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -0,0 +1,346 @@
+From 28501051b47e6bb8968bb016abf0b3493c05fa21 Mon Sep 17 00:00:00 2001
+From: Mark Michelson <mmi...@di...>
+Date: Thu, 30 Jun 2016 15:58:53 -0500
+Subject: [PATCH] Update support for SILK format.
+
+This commit adds scaffolding in order to support the SILK audio format
+on calls. Roughly, this is what is added:
+
+* Cached silk formats. One for each possible sample rate.
+* ast_codec structures for each possible sample rate.
+* RTP payload mappings for "SILK".
+
+In addition, this change overhauls the res_format_attr_silk file in the
+following ways:
+
+* The "samplerate" attribute is scrapped. That's native to the format.
+* There are far more checks to ensure that attributes have been
+ allocated before attempting to reference them.
+* We do not SDP fmtp lines for attributes set to 0.
+
+These changes make way to be able to install a codec_silk module and
+have it actually work. It also should allow for passthrough silk calls
+in Asterisk.
+
+Change-Id: Ieeb39c95a9fecc9246bcfd3c45a6c9b51c59380e
+---
+ include/asterisk/format_cache.h | 8 +++++
+ main/codec_builtin.c | 63 ++++++++++++++++++++++++++++++++++++++
+ main/format_cache.c | 20 ++++++++++++
+ main/rtp_engine.c | 10 ++++++
+ res/res_format_attr_silk.c | 64 ++++++++++++++++++++-------------------
+ 5 files changed, 134 insertions(+), 31 deletions(-)
+
+diff --git a/include/asterisk/format_cache.h b/include/asterisk/format_cache.h
+index 9f4e06a..ff03bb4 100644
+--- a/include/asterisk/format_cache.h
++++ b/include/asterisk/format_cache.h
+@@ -224,6 +224,14 @@ extern struct ast_format *ast_format_t140_red;
+ extern struct ast_format *ast_format_none;
+
+ /*!
++ * \brief Built-in SILK format.
++ */
++extern struct ast_format *ast_format_silk8;
++extern struct ast_format *ast_format_silk12;
++extern struct ast_format *ast_format_silk16;
++extern struct ast_format *ast_format_silk24;
++
++/*!
+ * \brief Initialize format cache support within the core.
+ *
+ * \retval 0 success
+diff --git a/main/codec_builtin.c b/main/codec_builtin.c
+index d3f6517..1d329bc 100644
+--- a/main/codec_builtin.c
++++ b/main/codec_builtin.c
+@@ -772,6 +772,65 @@ static struct ast_codec t140 = {
+ .type = AST_MEDIA_TYPE_TEXT,
+ };
+
++static int silk_samples(struct ast_frame *frame)
++{
++ /* XXX This is likely not at all what's intended from this callback. However,
++ * since SILK is variable bit rate, I have no idea how to take a frame of data
++ * and determine the number of samples present. Instead, we base this on the
++ * sample rate of the codec and the expected number of samples to receive in 20ms.
++ * In testing, this has worked just fine.
++ */
++ return ast_format_get_sample_rate(frame->subclass.format) / 50;
++}
++
++static struct ast_codec silk8 = {
++ .name = "silk",
++ .description = "SILK Codec (8 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 8000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 160,
++ .samples_count = silk_samples
++};
++
++static struct ast_codec silk12 = {
++ .name = "silk",
++ .description = "SILK Codec (12 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 12000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 240,
++ .samples_count = silk_samples
++};
++
++static struct ast_codec silk16 = {
++ .name = "silk",
++ .description = "SILK Codec (16 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 16000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 320,
++ .samples_count = silk_samples
++};
++
++static struct ast_codec silk24 = {
++ .name = "silk",
++ .description = "SILK Codec (24 KHz)",
++ .type = AST_MEDIA_TYPE_AUDIO,
++ .sample_rate = 24000,
++ .minimum_ms = 20,
++ .maximum_ms = 100,
++ .default_ms = 20,
++ .minimum_bytes = 480,
++ .samples_count = silk_samples
++};
++
+ #define CODEC_REGISTER_AND_CACHE(codec) \
+ ({ \
+ int __res_ ## __LINE__ = 0; \
+@@ -843,6 +902,10 @@ int ast_codec_builtin_init(void)
+ res |= CODEC_REGISTER_AND_CACHE(t140red);
+ res |= CODEC_REGISTER_AND_CACHE(t140);
+ res |= CODEC_REGISTER_AND_CACHE(none);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk8", silk8);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk12", silk12);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk16", silk16);
++ res |= CODEC_REGISTER_AND_CACHE_NAMED("silk24", silk24);
+
+ return res;
+ }
+diff --git a/main/format_cache.c b/main/format_cache.c
+index 6638a78..74ebfe8 100644
+--- a/main/format_cache.c
++++ b/main/format_cache.c
+@@ -232,6 +232,14 @@ struct ast_format *ast_format_t140_red;
+ */
+ struct ast_format *ast_format_none;
+
++/*!
++ * \brief Built-in "silk" format
++ */
++struct ast_format *ast_format_silk8;
++struct ast_format *ast_format_silk12;
++struct ast_format *ast_format_silk16;
++struct ast_format *ast_format_silk24;
++
+ /*! \brief Number of buckets to use for the media format cache (should be prime for performance reasons) */
+ #define CACHE_BUCKETS 53
+
+@@ -331,6 +339,10 @@ static void format_cache_shutdown(void)
+ ao2_replace(ast_format_t140_red, NULL);
+ ao2_replace(ast_format_t140, NULL);
+ ao2_replace(ast_format_none, NULL);
++ ao2_replace(ast_format_silk8, NULL);
++ ao2_replace(ast_format_silk12, NULL);
++ ao2_replace(ast_format_silk16, NULL);
++ ao2_replace(ast_format_silk24, NULL);
+ }
+
+ int ast_format_cache_init(void)
+@@ -426,6 +438,14 @@ static void set_cached_format(const char *name, struct ast_format *format)
+ ao2_replace(ast_format_t140, format);
+ } else if (!strcmp(name, "none")) {
+ ao2_replace(ast_format_none, format);
++ } else if (!strcmp(name, "silk8")) {
++ ao2_replace(ast_format_silk8, format);
++ } else if (!strcmp(name, "silk12")) {
++ ao2_replace(ast_format_silk12, format);
++ } else if (!strcmp(name, "silk16")) {
++ ao2_replace(ast_format_silk16, format);
++ } else if (!strcmp(name, "silk24")) {
++ ao2_replace(ast_format_silk24, format);
+ }
+ }
+
+diff --git a/main/rtp_engine.c b/main/rtp_engine.c
+index 462d4c5..8d46bfd 100644
+--- a/main/rtp_engine.c
++++ b/main/rtp_engine.c
+@@ -2198,6 +2198,11 @@ int ast_rtp_engine_init(void)
+ /* Opus and VP8 */
+ set_next_mime_type(ast_format_opus, 0, "audio", "opus", 48000);
+ set_next_mime_type(ast_format_vp8, 0, "video", "VP8", 90000);
++ /* DA SILK */
++ set_next_mime_type(ast_format_silk8, 0, "audio", "silk", 8000);
++ set_next_mime_type(ast_format_silk12, 0, "audio", "silk", 12000);
++ set_next_mime_type(ast_format_silk16, 0, "audio", "silk", 16000);
++ set_next_mime_type(ast_format_silk24, 0, "audio", "silk", 24000);
+
+ /* Define the static rtp payload mappings */
+ add_static_payload(0, ast_format_ulaw, 0);
+@@ -2243,6 +2248,11 @@ int ast_rtp_engine_init(void)
+ add_static_payload(100, ast_format_vp8, 0);
+ add_static_payload(107, ast_format_opus, 0);
+
++ add_static_payload(108, ast_format_silk8, 0);
++ add_static_payload(109, ast_format_silk12, 0);
++ add_static_payload(113, ast_format_silk16, 0);
++ add_static_payload(114, ast_format_silk24, 0);
++
+ return 0;
+ }
+
+diff --git a/res/res_format_attr_silk.c b/res/res_format_attr_silk.c
+index dcbbe4c..d52ec74 100644
+--- a/res/res_format_attr_silk.c
++++ b/res/res_format_attr_silk.c
+@@ -40,7 +40,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ * \note The only attribute that affects compatibility here is the sample rate.
+ */
+ struct silk_attr {
+- unsigned int samplerate;
+ unsigned int maxbitrate;
+ unsigned int dtx;
+ unsigned int fec;
+@@ -54,10 +53,15 @@ static void silk_destroy(struct ast_format *format)
+ ast_free(attr);
+ }
+
++static void attr_init(struct silk_attr *attr)
++{
++ memset(attr, 0, sizeof(*attr));
++}
++
+ static int silk_clone(const struct ast_format *src, struct ast_format *dst)
+ {
+ struct silk_attr *original = ast_format_get_attribute_data(src);
+- struct silk_attr *attr = ast_calloc(1, sizeof(*attr));
++ struct silk_attr *attr = ast_malloc(sizeof(*attr));
+
+ if (!attr) {
+ return -1;
+@@ -65,6 +69,8 @@ static int silk_clone(const struct ast_format *src, struct ast_format *dst)
+
+ if (original) {
+ *attr = *original;
++ } else {
++ attr_init(attr);
+ }
+
+ ast_format_set_attribute_data(dst, attr);
+@@ -109,17 +115,17 @@ static void silk_generate_sdp_fmtp(const struct ast_format *format, unsigned int
+ ast_str_append(str, 0, "a=fmtp:%u maxaveragebitrate=%u\r\n", payload, attr->maxbitrate);
+ }
+
+- ast_str_append(str, 0, "a=fmtp:%u usedtx=%u\r\n", payload, attr->dtx);
+- ast_str_append(str, 0, "a=fmtp:%u useinbandfec=%u\r\n", payload, attr->fec);
++ if (attr->dtx) {
++ ast_str_append(str, 0, "a=fmtp:%u usedtx=%u\r\n", payload, attr->dtx);
++ }
++ if (attr->fec) {
++ ast_str_append(str, 0, "a=fmtp:%u useinbandfec=%u\r\n", payload, attr->fec);
++ }
+ }
+
+ static enum ast_format_cmp_res silk_cmp(const struct ast_format *format1, const struct ast_format *format2)
+ {
+- struct silk_attr *attr1 = ast_format_get_attribute_data(format1);
+- struct silk_attr *attr2 = ast_format_get_attribute_data(format2);
+-
+- if (((!attr1 || !attr1->samplerate) && (!attr2 || !attr2->samplerate)) ||
+- (attr1->samplerate == attr2->samplerate)) {
++ if (ast_format_get_sample_rate(format1) == ast_format_get_sample_rate(format2)) {
+ return AST_FORMAT_CMP_EQUAL;
+ }
+
+@@ -130,13 +136,10 @@ static struct ast_format *silk_getjoint(const struct ast_format *format1, const
+ {
+ struct silk_attr *attr1 = ast_format_get_attribute_data(format1);
+ struct silk_attr *attr2 = ast_format_get_attribute_data(format2);
+- unsigned int samplerate;
+ struct ast_format *jointformat;
+ struct silk_attr *attr_res;
+
+- samplerate = attr1->samplerate & attr2->samplerate;
+- /* sample rate is the only attribute that has any bearing on if joint capabilities exist or not */
+- if (samplerate) {
++ if (ast_format_get_sample_rate(format1) != ast_format_get_sample_rate(format2)) {
+ return NULL;
+ }
+
+@@ -145,22 +148,25 @@ static struct ast_format *silk_getjoint(const struct ast_format *format1, const
+ return NULL;
+ }
+ attr_res = ast_format_get_attribute_data(jointformat);
+- attr_res->samplerate = samplerate;
+
+- /* Take the lowest max bitrate */
+- attr_res->maxbitrate = MIN(attr1->maxbitrate, attr2->maxbitrate);
++ if (!attr1 || !attr2) {
++ attr_init(attr_res);
++ } else {
++ /* Take the lowest max bitrate */
++ attr_res->maxbitrate = MIN(attr1->maxbitrate, attr2->maxbitrate);
+
+- /* Only do dtx if both sides want it. DTX is a trade off between
+- * computational complexity and bandwidth. */
+- attr_res->dtx = attr1->dtx && attr2->dtx ? 1 : 0;
++ /* Only do dtx if both sides want it. DTX is a trade off between
++ * computational complexity and bandwidth. */
++ attr_res->dtx = attr1->dtx && attr2->dtx ? 1 : 0;
+
+- /* Only do FEC if both sides want it. If a peer specifically requests not
+- * to receive with FEC, it may be a waste of bandwidth. */
+- attr_res->fec = attr1->fec && attr2->fec ? 1 : 0;
++ /* Only do FEC if both sides want it. If a peer specifically requests not
++ * to receive with FEC, it may be a waste of bandwidth. */
++ attr_res->fec = attr1->fec && attr2->fec ? 1 : 0;
+
+- /* Use the maximum packetloss percentage between the two attributes. This affects how
+- * much redundancy is used in the FEC. */
+- attr_res->packetloss_percentage = MAX(attr1->packetloss_percentage, attr2->packetloss_percentage);
++ /* Use the maximum packetloss percentage between the two attributes. This affects how
++ * much redundancy is used in the FEC. */
++ attr_res->packetloss_percentage = MAX(attr1->packetloss_percentage, attr2->packetloss_percentage);
++ }
+
+ return jointformat;
+ }
+@@ -183,9 +189,7 @@ static struct ast_format *silk_set(const struct ast_format *format, const char *
+ }
+ attr = ast_format_get_attribute_data(cloned);
+
+- if (!strcasecmp(name, "sample_rate")) {
+- attr->samplerate = val;
+- } else if (!strcasecmp(name, "max_bitrate")) {
++ if (!strcasecmp(name, "max_bitrate")) {
+ attr->maxbitrate = val;
+ } else if (!strcasecmp(name, "dtx")) {
+ attr->dtx = val;
+@@ -205,9 +209,7 @@ static const void *silk_get(const struct ast_format *format, const char *name)
+ struct silk_attr *attr = ast_format_get_attribute_data(format);
+ unsigned int *val;
+
+- if (!strcasecmp(name, "sample_rate")) {
+- val = &attr->samplerate;
+- } else if (!strcasecmp(name, "max_bitrate")) {
++ if (!strcasecmp(name, "max_bitrate")) {
+ val = &attr->maxbitrate;
+ } else if (!strcasecmp(name, "dtx")) {
+ val = &attr->dtx;
+--
+1.7.9.5
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 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-13-configure-menuselect-cross-fix.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-13.1.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
+++ asterisk-13.1.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2630,11 +2630,13 @@
+@@ -2636,11 +2636,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 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch 2016-07-22 13:51:37 UTC (rev 7771)
@@ -1,6 +1,6 @@
--- asterisk-11.17.1/channels/chan_sip.c.orig 2015-04-23 10:22:04.000000000 -0500
+++ asterisk-11.17.1/channels/chan_sip.c 2015-04-23 10:22:40.000000000 -0500
-@@ -17333,7 +17333,7 @@
+@@ -17351,7 +17351,7 @@
}
if (!force) {
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-07-22 13:51:37 UTC (rev 7771)
@@ -7,9 +7,9 @@
ASTERISK_VERSION := 1.8.32.3
else
ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.22.0
+ASTERISK_VERSION := 11.23.0
else
-ASTERISK_VERSION := 13.9.1
+ASTERISK_VERSION := 13.10.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-07-21 21:45:19 UTC (rev 7770)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-07-22 13:51:37 UTC (rev 7771)
@@ -150,7 +150,7 @@
# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
#
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-# BR2_PACKAGE_ASTERISK_CODEC_SILK is not set
+BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
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.
