[aadk-commits] qwell: branch uClinux/upstreamsync r304 - in
/uClinux/branches/upstreamsync/u...
aadk-commits at lists.digium.com
aadk-commits at lists.digium.com
Mon Apr 2 15:38:22 MST 2007
Author: qwell
Date: Mon Apr 2 17:38:22 2007
New Revision: 304
URL: http://svn.digium.com/view/aadk?view=rev&rev=304
Log:
Pull in the rest of the recent changes/fixes from trunk
Modified:
uClinux/branches/upstreamsync/uClinux-dist/config/.config
uClinux/branches/upstreamsync/uClinux-dist/config/Configure.help
uClinux/branches/upstreamsync/uClinux-dist/config/config.in
uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/manager.conf
uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/users.conf
uClinux/branches/upstreamsync/uClinux-dist/user/Makefile
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config
uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config.mkconfig
uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/Makefile
uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x
uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/index.html
uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/save_config
Modified: uClinux/branches/upstreamsync/uClinux-dist/config/.config
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/config/.config?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/config/.config (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/config/.config Mon Apr 2 17:38:22 2007
@@ -203,8 +203,9 @@
# CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT is not set
# CONFIG_USER_NTPCLIENT_NTPCLIENT is not set
# CONFIG_USER_NTPCLIENT_ADJTIMEX is not set
-# CONFIG_USER_NTPD_NTPD is not set
-# CONFIG_USER_NTPD_NTPDATE is not set
+CONFIG_USER_NTPD_NTPD=y
+# CONFIG_USER_NTPD_NTPDC is not set
+CONFIG_USER_NTPD_NTPDATE=y
# CONFIG_USER_NTPD_NTPQ is not set
# CONFIG_USER_OPENSSL_APPS is not set
# CONFIG_USER_PING_PING is not set
@@ -229,6 +230,7 @@
# CONFIG_USER_SNORT_SNORT is not set
# CONFIG_USER_SPEEDTOUCH_MODEM_RUN is not set
# CONFIG_USER_STUNNEL_STUNNEL is not set
+CONFIG_USER_SMTP_SSMTP=y
# CONFIG_USER_SSLWRAP_SSLWRAP is not set
# CONFIG_USER_SQUID_SQUID is not set
# CONFIG_USER_SSH_SSH is not set
@@ -653,7 +655,8 @@
# CONFIG_USER_BUSYBOX_MKFS_MINIX is not set
CONFIG_USER_BUSYBOX_GETOPT=y
# CONFIG_USER_BUSYBOX_HEXDUMP is not set
-# CONFIG_USER_BUSYBOX_HWCLOCK is not set
+CONFIG_USER_BUSYBOX_HWCLOCK=y
+# CONFIG_USER_BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS is not set
# CONFIG_USER_BUSYBOX_IPCRM is not set
# CONFIG_USER_BUSYBOX_IPCS is not set
CONFIG_USER_BUSYBOX_LOSETUP=y
Modified: uClinux/branches/upstreamsync/uClinux-dist/config/Configure.help
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/config/Configure.help?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/config/Configure.help (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/config/Configure.help Mon Apr 2 17:38:22 2007
@@ -1428,6 +1428,9 @@
CONFIG_USER_SMTP_SMTPCLIENT
Client which allows mail to be sent to other hosts that support SMTP
+CONFIG_USER_SMTP_SSMTP
+ Sendmail compatible client which allows mail to be sent to other hosts that support SMTP
+
CONFIG_USER_SNMPD_SNMPD
SNMP daemon
Approx. binary size: 20k with no modules
Modified: uClinux/branches/upstreamsync/uClinux-dist/config/config.in
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/config/config.in?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/config/config.in (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/config/config.in Mon Apr 2 17:38:22 2007
@@ -552,6 +552,7 @@
fi
bool 'speedtouch modem_run' CONFIG_USER_SPEEDTOUCH_MODEM_RUN
bool 'stunnel' CONFIG_USER_STUNNEL_STUNNEL
+bool 'ssmtp' CONFIG_USER_SMTP_SSMTP
bool 'sslwrap' CONFIG_USER_SSLWRAP_SSLWRAP
bool 'squid' CONFIG_USER_SQUID_SQUID
Modified: uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/manager.conf
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/manager.conf?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/manager.conf (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/manager.conf Mon Apr 2 17:38:22 2007
@@ -23,7 +23,7 @@
;displayconnects = yes
[admin]
-secret = mysecret
+secret = password
;deny=0.0.0.0/0.0.0.0
;permit=209.16.236.73/255.255.255.0
;
Modified: uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/users.conf
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/users.conf?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/users.conf (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/defaults/etc/asterisk/users.conf Mon Apr 2 17:38:22 2007
@@ -105,7 +105,7 @@
group =
[6004]
-fullname = Analog User 4 - IAXtel access
+fullname = Analog User 4 with IAXtel access
secret = 6004
email =
cid_number =
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/Makefile?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/Makefile (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/Makefile Mon Apr 2 17:38:22 2007
@@ -310,6 +310,7 @@
dir_$(CONFIG_USER_SNORT_SNORT) += snort
dir_$(CONFIG_USER_SPEEDTOUCH_MODEM_RUN) += speedtouch/src
dir_$(CONFIG_USER_STUNNEL_STUNNEL) += stunnel
+dir_$(CONFIG_USER_SMTP_SSMTP) += ssmtp
dir_$(CONFIG_USER_SSLWRAP_SSLWRAP) += sslwrap
dir_$(CONFIG_USER_SQUID_SQUID) += squid
dir_$(CONFIG_USER_SSH_SSHD) += ssh
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config Mon Apr 2 17:38:22 2007
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Busybox version: 1.4.1
-# Fri Mar 30 15:21:29 2007
+# Mon Apr 2 16:40:16 2007
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -406,7 +406,7 @@
# CONFIG_FEATURE_MINIX2 is not set
CONFIG_GETOPT=y
# CONFIG_HEXDUMP is not set
-# CONFIG_HWCLOCK is not set
+CONFIG_HWCLOCK=y
# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
# CONFIG_IPCRM is not set
Modified: uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config.mkconfig
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config.mkconfig?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config.mkconfig (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/user/busybox/.config.mkconfig Mon Apr 2 17:38:22 2007
@@ -528,8 +528,9 @@
# CONFIG_FEATURE_MINIX2 is not set
CONFIG_GETOPT=y
# CONFIG_HEXDUMP is not set
-# CONFIG_HWCLOCK is not set
+CONFIG_HWCLOCK=y
# CONFIG_FEATURE_HWCLOCK_LONGOPTIONS is not set
+# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
CONFIG_LOSETUP=y
# CONFIG_MKSWAP is not set
CONFIG_MORE=y
Modified: uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/Makefile
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/Makefile?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/Makefile (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/Makefile Mon Apr 2 17:38:22 2007
@@ -18,7 +18,7 @@
BLOCKS = 14336
INODES = 1024
-ROMFS_DIRS = bin dev etc etc/dhcpc etc/network ramfs home lib mnt proc sys usr var root home tmp /etc/config var/run var/log var/lock var/lib var/lib/asterisk/static-http var/spool var/spool/asterisk var/spool/asterisk/outgoing
+ROMFS_DIRS = bin dev etc etc/dhcpc etc/network ramfs home lib mnt proc sys usr var root home tmp etc/config etc/ssmtp var/run var/log var/lock var/lib var/lib/asterisk/static-http var/spool var/spool/asterisk var/spool/asterisk/outgoing
#ROMFS_DIRS += var/run var/lib/misc var/log/boa etc/boa home/httpd home/httpd/cgi-bin
all:
Modified: uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/config.vendor-2.6.x Mon Apr 2 17:38:22 2007
@@ -203,8 +203,9 @@
# CONFIG_USER_NETSTAT_NAT_NETSTAT_NAT is not set
# CONFIG_USER_NTPCLIENT_NTPCLIENT is not set
# CONFIG_USER_NTPCLIENT_ADJTIMEX is not set
-# CONFIG_USER_NTPD_NTPD is not set
-# CONFIG_USER_NTPD_NTPDATE is not set
+CONFIG_USER_NTPD_NTPD=y
+# CONFIG_USER_NTPD_NTPDC is not set
+CONFIG_USER_NTPD_NTPDATE=y
# CONFIG_USER_NTPD_NTPQ is not set
# CONFIG_USER_OPENSSL_APPS is not set
# CONFIG_USER_PING_PING is not set
@@ -229,6 +230,7 @@
# CONFIG_USER_SNORT_SNORT is not set
# CONFIG_USER_SPEEDTOUCH_MODEM_RUN is not set
# CONFIG_USER_STUNNEL_STUNNEL is not set
+CONFIG_USER_SMTP_SSMTP=y
# CONFIG_USER_SSLWRAP_SSLWRAP is not set
# CONFIG_USER_SQUID_SQUID is not set
# CONFIG_USER_SSH_SSH is not set
@@ -653,7 +655,8 @@
# CONFIG_USER_BUSYBOX_MKFS_MINIX is not set
CONFIG_USER_BUSYBOX_GETOPT=y
# CONFIG_USER_BUSYBOX_HEXDUMP is not set
-# CONFIG_USER_BUSYBOX_HWCLOCK is not set
+CONFIG_USER_BUSYBOX_HWCLOCK=y
+# CONFIG_USER_BUSYBOX_FEATURE_HWCLOCK_ADJTIME_FHS is not set
# CONFIG_USER_BUSYBOX_IPCRM is not set
# CONFIG_USER_BUSYBOX_IPCS is not set
CONFIG_USER_BUSYBOX_LOSETUP=y
Modified: uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/index.html
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/index.html?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/index.html (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/index.html Mon Apr 2 17:38:22 2007
@@ -1,8 +1,14 @@
-<title>AADK</title>
+<HEAD>
+<title>Asterisk Configuration</title>
+<META
+ HTTP-EQUIV="Refresh"
+ CONTENT="3; URL=config/cfgbasic.html">
+</HEAD>
<body>
- Your telephony technology has been atomically incremented...
- <br>
- now wasn't that exciting.
- <br>
- <a href="config/cfgappliance.html">click here</a>
+
+Your browser should automatically go to the configuration page.
+<br>
+Or you can <a href="config/cfgbasic.html">click here</a>
+<br>
+
</body>
Modified: uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/save_config
URL: http://svn.digium.com/view/aadk/uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/save_config?view=diff&rev=304&r1=303&r2=304
==============================================================================
--- uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/save_config (original)
+++ uClinux/branches/upstreamsync/uClinux-dist/vendors/Digium/S800I/scripts/save_config Mon Apr 2 17:38:22 2007
@@ -1,7 +1,7 @@
#!/bin/sh
PID=$$
ROOT="/"
-SUBDIRS="etc/config etc/asterisk etc/passwd etc/zaptel.conf.* etc/dropbear etc/network"
+SUBDIRS="etc/config etc/asterisk etc/passwd etc/zaptel.conf.* etc/dropbear etc/network etc/ssmtp"
cd ${ROOT}
tar czf /tmp/etc-${PID}.tgz ${SUBDIRS}
echo -n "Saving config..."
More information about the aadk-commits
mailing list