Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2012-08-14 03:05:06
|
Revision: 5633
http://astlinux.svn.sourceforge.net/astlinux/?rev=5633&view=rev
Author: abelbeck
Date: 2012-08-14 03:04:59 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
asterisk, Config.in tweak
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/asterisk/Config.in
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-08-13 22:58:42 UTC (rev 5632)
+++ branches/1.0/astlinux.config 2012-08-14 03:04:59 UTC (rev 5633)
@@ -159,7 +159,7 @@
BR2_PACKAGE_ASTERISK_v1_4=y
# BR2_PACKAGE_ASTERISK_v1_6 is not set
# BR2_PACKAGE_ASTERISK_v1_8 is not set
-# BR2_PACKAGE_ASTERISK_v10_0 is not set
+# BR2_PACKAGE_ASTERISK_v11 is not set
#
# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-08-13 22:58:42 UTC (rev 5632)
+++ branches/1.0/astlinux18.config 2012-08-14 03:04:59 UTC (rev 5633)
@@ -159,7 +159,7 @@
# BR2_PACKAGE_ASTERISK_v1_4 is not set
# BR2_PACKAGE_ASTERISK_v1_6 is not set
BR2_PACKAGE_ASTERISK_v1_8=y
-# BR2_PACKAGE_ASTERISK_v10_0 is not set
+# BR2_PACKAGE_ASTERISK_v11 is not set
#
# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2012-08-13 22:58:42 UTC (rev 5632)
+++ branches/1.0/package/asterisk/Config.in 2012-08-14 03:04:59 UTC (rev 5633)
@@ -31,8 +31,8 @@
help
Asterisk Long Term Stable Release.
- config BR2_PACKAGE_ASTERISK_v11_0
- bool "Asterisk v11.0.x"
+ config BR2_PACKAGE_ASTERISK_v11
+ bool "Asterisk v11.x"
help
Asterisk Long Term Release.
endchoice
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-08-25 22:43:50
|
Revision: 5640
http://astlinux.svn.sourceforge.net/astlinux/?rev=5640&view=rev
Author: abelbeck
Date: 2012-08-25 22:43:42 +0000 (Sat, 25 Aug 2012)
Log Message:
-----------
msmtp, version bump to 1.4.28, add new variable SMTP_HOST_DOMAIN which when defined sets the hostname used by the SMTP EHLO (or LMTP LHLO) command, the default is to use 'localhost'.
Modified Paths:
--------------
branches/1.0/package/msmtp/msmtp.init
branches/1.0/package/msmtp/msmtp.mk
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 2012-08-25 20:07:23 UTC (rev 5639)
+++ branches/1.0/package/msmtp/msmtp.init 2012-08-25 22:43:42 UTC (rev 5640)
@@ -19,10 +19,6 @@
DOMAIN="$SMTP_DOMAIN"
fi
- if [ -n "$SMTP_HOSTNAME" ]; then
- HOSTNAME="$SMTP_HOSTNAME"
- fi
-
PORT="${SMTP_PORT:-25}"
# MSMTP config generate...
@@ -34,6 +30,10 @@
timeout 30
maildomain $DOMAIN" > /tmp/etc/msmtprc
+ if [ -n "$SMTP_HOST_DOMAIN" ]; then
+ echo "domain $SMTP_HOST_DOMAIN" >> /tmp/etc/msmtprc
+ fi
+
if [ -n "$SMTP_FROM" ]; then
echo "auto_from off
from $SMTP_FROM" >> /tmp/etc/msmtprc
Modified: branches/1.0/package/msmtp/msmtp.mk
===================================================================
--- branches/1.0/package/msmtp/msmtp.mk 2012-08-25 20:07:23 UTC (rev 5639)
+++ branches/1.0/package/msmtp/msmtp.mk 2012-08-25 22:43:42 UTC (rev 5640)
@@ -4,9 +4,9 @@
#
#############################################################
-MSMTP_VERSION = 1.4.27
+MSMTP_VERSION = 1.4.28
MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.bz2
-MSMTP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/msmtp/
+MSMTP_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/msmtp
MSMTP_DEPENDENCIES = openssl
MSMTP_CONF_OPT += \
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-08-25 20:07:23 UTC (rev 5639)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-08-25 22:43:42 UTC (rev 5640)
@@ -347,9 +347,11 @@
## The from domain of SMTP messages.
#SMTP_DOMAIN="mysite.com"
##
-## SMTP_HOSTNAME
-## The from hostname of SMTP messages.
-#SMTP_HOSTNAME="pbx"
+## SMTP_HOST_DOMAIN
+## Not required in most cases, the default is to use 'localhost'.
+## Try changeing the default if mails get rejected due to anti-SPAM measures.
+## Defines the hostname used by the SMTP EHLO (or LMTP LHLO) command.
+#SMTP_HOST_DOMAIN="pbx.astlinux.org"
##
## SMTP_FROM
## Not required in most cases, generated automatically if not defined
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dha...@us...> - 2012-08-28 16:25:06
|
Revision: 5646
http://astlinux.svn.sourceforge.net/astlinux/?rev=5646&view=rev
Author: dhartman
Date: 2012-08-28 16:25:00 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
update zabbix to 2.0.2; add menuconfig option for zabbix_proxy, disabled by default
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/zabbix/Config.in
branches/1.0/package/zabbix/zabbix-configure.patch
branches/1.0/package/zabbix/zabbix.mk
Removed Paths:
-------------
branches/1.0/package/zabbix/zabbix-configure-long-long.patch
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/astlinux.config 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5615-dirty Configuration
-# Tue Jul 17 18:01:18 2012
+# Buildroot 2011.08-svn5644-dirty Configuration
+# Tue Aug 28 11:23:58 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -421,6 +421,7 @@
# BR2_PACKAGE_WIPE is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_PACKAGE_ZABBIX=y
+# BR2_PACKAGE_ZABBIX_PROXY is not set
#
# Interpreter languages and scripting
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/astlinux18.config 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5615-dirty Configuration
-# Tue Jul 17 18:01:20 2012
+# Buildroot 2011.08-svn5644-dirty Configuration
+# Tue Aug 28 11:23:20 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -415,6 +415,7 @@
# BR2_PACKAGE_WIPE is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_PACKAGE_ZABBIX=y
+# BR2_PACKAGE_ZABBIX_PROXY is not set
#
# Interpreter languages and scripting
Modified: branches/1.0/package/zabbix/Config.in
===================================================================
--- branches/1.0/package/zabbix/Config.in 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/Config.in 2012-08-28 16:25:00 UTC (rev 5646)
@@ -5,3 +5,13 @@
Zabbix agent to be used with Zabbix Monitoring Solution
http://www.zabbix.com
+
+config BR2_PACKAGE_ZABBIX_PROXY
+ bool "zabbix_proxy"
+ depends on BR2_PACKAGE_ZABBIX
+ default n
+ help
+ Zabbix proxy to be used with Zabbix Monitoring Solution
+
+ http://www.zabbix.com
+
Deleted: branches/1.0/package/zabbix/zabbix-configure-long-long.patch
===================================================================
--- branches/1.0/package/zabbix/zabbix-configure-long-long.patch 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/zabbix-configure-long-long.patch 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,13 +0,0 @@
---- zabbix-1.8.8/configure.in.orig 2011-10-21 14:29:24.000000000 -0500
-+++ zabbix-1.8.8/configure.in 2011-10-21 14:30:34.000000000 -0500
-@@ -886,7 +886,9 @@
- ],
- AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.])
- AC_MSG_RESULT(yes),
--AC_MSG_RESULT(no))
-+AC_MSG_RESULT(no),
-+AC_DEFINE(HAVE_LONG_LONG_QU, 1 ,[Define to 1 if format '%qu' exists.])
-+AC_MSG_RESULT(yes))
-
- dnl option -rdynamic is needed for readable backtraces
- AC_MSG_CHECKING(for -rdynamic linking option)
Modified: branches/1.0/package/zabbix/zabbix-configure.patch
===================================================================
--- branches/1.0/package/zabbix/zabbix-configure.patch 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/zabbix-configure.patch 2012-08-28 16:25:00 UTC (rev 5646)
@@ -1,20 +1,12 @@
-*** zabbix-1.8.8/configure.orig 2011-10-21 12:40:33.840598621 -0500
---- zabbix-1.8.8/configure 2011-10-21 12:41:11.622596475 -0500
-***************
-*** 6791,6798 ****
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-- as_fn_error $? "cannot run test program while cross compiling
-- See \`config.log' for more details" "$LINENO" 5 ; }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
---- 6791,6797 ----
- if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+ }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+--- zabbix-2.0.2/configure.orig 2012-08-28 09:37:42.195997578 -0500
++++ zabbix-2.0.2/configure 2012-08-28 09:40:27.803997480 -0500
+@@ -6982,8 +6982,7 @@
+ if test "$cross_compiling" = yes; then :
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++}
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
Modified: branches/1.0/package/zabbix/zabbix.mk
===================================================================
--- branches/1.0/package/zabbix/zabbix.mk 2012-08-28 05:24:19 UTC (rev 5645)
+++ branches/1.0/package/zabbix/zabbix.mk 2012-08-28 16:25:00 UTC (rev 5646)
@@ -4,13 +4,18 @@
#
#############################################################
-ZABBIX_VERSION = 1.8.10
+ZABBIX_VERSION = 2.0.2
ZABBIX_SOURCE = zabbix-$(ZABBIX_VERSION).tar.gz
ZABBIX_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/zabbix
ZABBIX_CONF_OPT = \
- --enable-agent --enable-proxy
+ --enable-agent
+ifeq ($(strip $(BR2_PACKAGE_ZABBIX_PROXY)),Y)
+ZABBIX_CONF_OPT+= \
+ --enable-proxy
+endif
+
ifeq ($(strip $(BR2_PACKAGE_CURL)),y)
ZABBIX_CONF_OPT+= \
--with-libcurl="$(STAGING_DIR)/usr/bin/curl-config"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-08-29 19:12:41
|
Revision: 5651
http://astlinux.svn.sourceforge.net/astlinux/?rev=5651&view=rev
Author: abelbeck
Date: 2012-08-29 19:12:35 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
zabbix, add proxy support to zabbix.init, three new variables: ZABBIX_PROXY, ZABBIX_PROXY_AGENT and ZABBIX_PROXY_HOSTNAME
Modified Paths:
--------------
branches/1.0/package/zabbix/zabbix.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init 2012-08-29 16:20:13 UTC (rev 5650)
+++ branches/1.0/package/zabbix/zabbix.init 2012-08-29 19:12:35 UTC (rev 5651)
@@ -9,6 +9,9 @@
if [ -f /tmp/etc/zabbix_agentd.conf ]; then
rm /tmp/etc/zabbix_agentd.conf
fi
+ if [ -f /tmp/etc/zabbix_proxy.conf ]; then
+ rm /tmp/etc/zabbix_proxy.conf
+ fi
exit
fi
@@ -17,6 +20,15 @@
exit
fi
+ proxy_enabled=0
+ if [ "$ZABBIX_PROXY" = "yes" ] || [ -f /mnt/kd/zabbix_proxy.conf ]; then
+ if [ -x /usr/bin/zabbix_proxy ]; then
+ proxy_enabled=1
+ else
+ echo "zabbix: zabbix_proxy not installed."
+ fi
+ fi
+
# Allow space/comma in ZABBIX_SERVER, but zabbix requires comma's
IFS=' ,'
for i in $ZABBIX_SERVER; do
@@ -30,7 +42,50 @@
startagents="${ZABBIX_STARTAGENTS:-3}"
debuglevel="${ZABBIX_DEBUGLEVEL:-3}"
timeout="${ZABBIX_TIMEOUT:-3}"
+ proxyhostname="${ZABBIX_PROXY_HOSTNAME:-proxy-$HOSTNAME}"
+ proxylistenport=$(($listenport + 1))
+ if [ $proxy_enabled -eq 1 ]; then
+
+ # Generate /etc/zabbix_proxy.conf configuration file
+ if [ -f /mnt/kd/zabbix_proxy.conf ]; then
+ echo "# Autogenerated. Edit /mnt/kd/zabbix_proxy.conf file.
+" >/tmp/etc/zabbix_proxy.conf
+ cat /mnt/kd/zabbix_proxy.conf >>/tmp/etc/zabbix_proxy.conf
+ else
+ echo "# Autogenerated. Do not edit.
+# A manually generated zabbix_proxy config will use /mnt/kd/zabbix_proxy.conf if it exists.
+Server=$server
+ServerPort=$serverport
+Hostname=$proxyhostname
+ListenPort=$proxylistenport
+DebugLevel=$debuglevel
+Timeout=$timeout
+DBName=/var/db/zabbix/zabbix_proxy.db
+PidFile=/var/run/zabbix_proxy.pid
+LogFile=/var/log/zabbix_proxy.log
+" >/tmp/etc/zabbix_proxy.conf
+ fi
+ chown zabbix:zabbix /tmp/etc/zabbix_proxy.conf
+
+ if [ ! -d /var/db/zabbix ]; then
+ mkdir /var/db/zabbix
+ chown zabbix:zabbix /var/db/zabbix
+ fi
+
+ touch /var/log/zabbix_proxy.log
+ chown zabbix:zabbix /var/log/zabbix_proxy.log
+
+ # Set zabbix_agentd server to localhost unless ZABBIX_PROXY_AGENT="no"
+ if [ "$ZABBIX_PROXY_AGENT" != "no" ]; then
+ server="127.0.0.1"
+ fi
+ else
+ if [ -f /tmp/etc/zabbix_proxy.conf ]; then
+ rm /tmp/etc/zabbix_proxy.conf
+ fi
+ fi
+
# Generate /etc/zabbix_agentd.conf configuration file
if [ -f /mnt/kd/zabbix_agentd.conf ]; then
echo "# Autogenerated. Edit /mnt/kd/zabbix_agentd.conf file.
@@ -40,7 +95,6 @@
echo "# Autogenerated. Do not edit.
# A manually generated zabbix_agentd config will use /mnt/kd/zabbix_agentd.conf if it exists.
Server=$server
-ServerPort=$serverport
Hostname=$hostname
ListenPort=$listenport
StartAgents=$startagents
@@ -59,6 +113,15 @@
start () {
+ if [ -f /etc/zabbix_proxy.conf ]; then
+ echo "Starting Zabbix Proxy..."
+
+ touch /var/run/zabbix_proxy.pid
+ chown zabbix:zabbix /var/run/zabbix_proxy.pid
+
+ zabbix_proxy -c /etc/zabbix_proxy.conf
+ fi
+
if [ -f /etc/zabbix_agentd.conf ]; then
echo "Starting Zabbix Agent Daemon..."
@@ -77,6 +140,13 @@
kill $(cat /var/run/zabbix_agentd.pid) >/dev/null 2>&1
rm -f /var/run/zabbix_agentd.pid
fi
+
+ if [ -f /var/run/zabbix_proxy.pid ]; then
+ echo "Stopping Zabbix Proxy..."
+
+ kill $(cat /var/run/zabbix_proxy.pid) >/dev/null 2>&1
+ rm -f /var/run/zabbix_proxy.pid
+ fi
}
case $1 in
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-08-29 16:20:13 UTC (rev 5650)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-08-29 19:12:35 UTC (rev 5651)
@@ -917,12 +917,15 @@
## Zabbix Agent Daemon
## Zabbix is enabled if ZABBIX_SERVER is defined.
#ZABBIX_SERVER="" # Comma/space separated list of IP addresses or hostnames for zabbix servers
-#ZABBIX_SERVER_PORT="10051" # TCP port used for retrieving/sending active check data
+#ZABBIX_SERVER_PORT="10051" # TCP port used for retrieving/sending active check data (proxy-only)
#ZABBIX_HOSTNAME="" # Unique, case sensitive hostname, required for active checks
-#ZABBIX_LISTENPORT="10050" # TCP port that zabbix_agentd listens on locally
+#ZABBIX_LISTENPORT="10050" # TCP port that zabbix_agentd listens on locally, proxy if enabled uses one port higher
#ZABBIX_STARTAGENTS="3" # Number of pre-forked instances of zabbix_agentd, must be between 1-16
#ZABBIX_DEBUGLEVEL="3" # "0" is no debug, "1" is critical, "2" is errors, "3" is warnings, "4" is full debugging
#ZABBIX_TIMEOUT="3" # Processing limit in seconds, must be between 1-30
+#ZABBIX_PROXY="yes" # "yes" is to enable proxy, disabled by default
+#ZABBIX_PROXY_AGENT="no" # By default the zabbix_agentd is routed via the proxy if enabled, set to "no" to disable
+#ZABBIX_PROXY_HOSTNAME="" # Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server.
## NFS Server support (read only exports)
#NFS_EXPORTS_RO="/tftpboot"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-08-30 04:47:17
|
Revision: 5652
http://astlinux.svn.sourceforge.net/astlinux/?rev=5652&view=rev
Author: abelbeck
Date: 2012-08-30 04:47:10 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
fping, new package, required for zabbix_proxy
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/zabbix/Config.in
branches/1.0/package/zabbix/zabbix.mk
branches/1.0/project/astlinux/target_skeleton/etc/protocols
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/fping/
branches/1.0/package/fping/Config.in
branches/1.0/package/fping/fping.mk
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/astlinux.config 2012-08-30 04:47:10 UTC (rev 5652)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5644-dirty Configuration
-# Tue Aug 28 11:23:58 2012
+# Buildroot 2011.08-svn5651-dirty Configuration
+# Wed Aug 29 23:41:25 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -658,6 +658,7 @@
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_EBTABLES is not set
BR2_PACKAGE_ETHTOOL=y
+# BR2_PACKAGE_FPING is not set
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/astlinux18.config 2012-08-30 04:47:10 UTC (rev 5652)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5644-dirty Configuration
-# Tue Aug 28 11:23:20 2012
+# Buildroot 2011.08-svn5651-dirty Configuration
+# Wed Aug 29 23:41:26 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -652,6 +652,7 @@
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_EBTABLES is not set
BR2_PACKAGE_ETHTOOL=y
+# BR2_PACKAGE_FPING is not set
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/initrd.config 2012-08-30 04:47:10 UTC (rev 5652)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5615-dirty Configuration
-# Tue Jul 17 18:01:28 2012
+# Buildroot 2011.08-svn5651-dirty Configuration
+# Wed Aug 29 23:41:32 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -555,6 +555,7 @@
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_EBTABLES is not set
# BR2_PACKAGE_ETHTOOL is not set
+# BR2_PACKAGE_FPING is not set
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IFTOP is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/package/Config.in 2012-08-30 04:47:10 UTC (rev 5652)
@@ -440,6 +440,7 @@
source "package/dropbear/Config.in"
source "package/ebtables/Config.in"
source "package/ethtool/Config.in"
+source "package/fping/Config.in"
source "package/hostapd/Config.in"
source "package/ifplugd/Config.in"
source "package/iftop/Config.in"
Added: branches/1.0/package/fping/Config.in
===================================================================
--- branches/1.0/package/fping/Config.in (rev 0)
+++ branches/1.0/package/fping/Config.in 2012-08-30 04:47:10 UTC (rev 5652)
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_FPING
+ bool "fping"
+ default n
+ help
+ fping is a program to send ICMP echo probes to network hosts, similar to ping,
+ but much better performing when pinging multiple hosts. fping has a very
+ long history: Roland Schemers did publish a first version of it in 1992 and it has
+ established itself since then as a standard tool for network diagnostics and statistics.
+
+ http://fping.org/
+
Added: branches/1.0/package/fping/fping.mk
===================================================================
--- branches/1.0/package/fping/fping.mk (rev 0)
+++ branches/1.0/package/fping/fping.mk 2012-08-30 04:47:10 UTC (rev 5652)
@@ -0,0 +1,24 @@
+#############################################################
+#
+# fping
+#
+#############################################################
+FPING_VERSION = 3.3
+FPING_SITE = http://fping.org/dist
+FPING_SOURCE = fping-$(FPING_VERSION).tar.gz
+
+FPING_CONF_OPT = \
+ --enable-ipv6
+
+define FPING_INSTALL_TARGET_CMDS
+ # Must set SUID for zabbix user
+ $(INSTALL) -D -m 4711 $(@D)/src/fping $(TARGET_DIR)/usr/sbin/
+ $(INSTALL) -D -m 4711 $(@D)/src/fping6 $(TARGET_DIR)/usr/sbin/
+endef
+
+define FPING_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/fping
+ rm -f $(TARGET_DIR)/usr/sbin/fping6
+endef
+
+$(eval $(call AUTOTARGETS,package,fping))
Modified: branches/1.0/package/zabbix/Config.in
===================================================================
--- branches/1.0/package/zabbix/Config.in 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/package/zabbix/Config.in 2012-08-30 04:47:10 UTC (rev 5652)
@@ -11,6 +11,7 @@
default n
depends on BR2_PACKAGE_ZABBIX
select BR2_PACKAGE_SQLITE
+ select BR2_PACKAGE_FPING
help
Zabbix proxy to be used with Zabbix Monitoring Solution
Modified: branches/1.0/package/zabbix/zabbix.mk
===================================================================
--- branches/1.0/package/zabbix/zabbix.mk 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/package/zabbix/zabbix.mk 2012-08-30 04:47:10 UTC (rev 5652)
@@ -14,7 +14,7 @@
--enable-ipv6
ifeq ($(strip $(BR2_PACKAGE_ZABBIX_PROXY)),y)
-ZABBIX_DEPENDENCIES += sqlite
+ZABBIX_DEPENDENCIES += sqlite fping
ZABBIX_CONF_OPT += \
--enable-proxy \
--with-sqlite3="$(STAGING_DIR)/usr"
Modified: branches/1.0/project/astlinux/target_skeleton/etc/protocols
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/protocols 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/project/astlinux/target_skeleton/etc/protocols 2012-08-30 04:47:10 UTC (rev 5652)
@@ -6,3 +6,4 @@
gre 47 GRE # Generic Routing Encapsulation
esp 50 ESP # Encap Security Payload
ah 51 AH # Authentication Header
+ipv6-icmp 58 IPv6-ICMP # ICMP for IPv6
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/runnix-uclibc.config 2012-08-30 04:47:10 UTC (rev 5652)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5615-dirty Configuration
-# Tue Jul 17 18:01:26 2012
+# Buildroot 2011.08-svn5651-dirty Configuration
+# Wed Aug 29 23:41:29 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -840,6 +840,7 @@
# ebtables requires a toolchain with IPv6 support
#
# BR2_PACKAGE_ETHTOOL is not set
+# BR2_PACKAGE_FPING is not set
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IFTOP is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2012-08-29 19:12:35 UTC (rev 5651)
+++ branches/1.0/runnix.config 2012-08-30 04:47:10 UTC (rev 5652)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5615-dirty Configuration
-# Tue Jul 17 18:01:24 2012
+# Buildroot 2011.08-svn5651-dirty Configuration
+# Wed Aug 29 23:41:28 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -585,6 +585,7 @@
BR2_PACKAGE_DROPBEAR_SMALL=y
# BR2_PACKAGE_EBTABLES is not set
# BR2_PACKAGE_ETHTOOL is not set
+# BR2_PACKAGE_FPING is not set
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IFTOP is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-01 14:35:42
|
Revision: 5654
http://astlinux.svn.sourceforge.net/astlinux/?rev=5654&view=rev
Author: abelbeck
Date: 2012-09-01 14:35:35 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
zabbix, add ServerActive support for zabbix_agentd
Modified Paths:
--------------
branches/1.0/package/zabbix/zabbix.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init 2012-08-30 17:57:16 UTC (rev 5653)
+++ branches/1.0/package/zabbix/zabbix.init 2012-09-01 14:35:35 UTC (rev 5654)
@@ -2,8 +2,21 @@
. /etc/rc.conf
+. /etc/init.d/functions
+
+agent_addr_port()
+{
+ local addr="$1" port="$2"
+
+ get_numeric_ip_version "$addr"
+ if [ $? -eq 6 ]; then
+ addr="[${addr}]"
+ fi
+ echo "${addr}:${port}"
+}
+
init () {
- local server="" IFS
+ local server="" serveractive="" IFS
if [ -z "$ZABBIX_SERVER" ] && [ ! -f /mnt/kd/zabbix_agentd.conf ]; then
if [ -f /tmp/etc/zabbix_agentd.conf ]; then
@@ -29,21 +42,23 @@
fi
fi
+ serverport="${ZABBIX_SERVER_PORT:-10051}"
# Allow space/comma in ZABBIX_SERVER, but zabbix requires comma's
IFS=' ,'
for i in $ZABBIX_SERVER; do
server="$server${server:+,}$i"
+ serveractive="$serveractive${serveractive:+,}$(agent_addr_port $i $serverport)"
done
unset IFS
- serverport="${ZABBIX_SERVER_PORT:-10051}"
hostname="${ZABBIX_HOSTNAME:-$HOSTNAME}"
listenport="${ZABBIX_LISTENPORT:-10050}"
startagents="${ZABBIX_STARTAGENTS:-3}"
debuglevel="${ZABBIX_DEBUGLEVEL:-3}"
timeout="${ZABBIX_TIMEOUT:-3}"
+ proxyserver="$(echo $server | cut -d',' -f1)" # Only use first server for proxy
proxyhostname="${ZABBIX_PROXY_HOSTNAME:-proxy-$HOSTNAME}"
- proxylistenport=$(($listenport + 1))
+ proxylistenport="$serverport"
if [ $proxy_enabled -eq 1 ]; then
@@ -55,7 +70,7 @@
else
echo "# Autogenerated. Do not edit.
# A manually generated zabbix_proxy config will use /mnt/kd/zabbix_proxy.conf if it exists.
-Server=$server
+Server=$proxyserver
ServerPort=$serverport
Hostname=$proxyhostname
ListenPort=$proxylistenport
@@ -79,6 +94,7 @@
# Set zabbix_agentd server to localhost unless ZABBIX_PROXY_AGENT="no"
if [ "$ZABBIX_PROXY_AGENT" != "no" ]; then
server="127.0.0.1"
+ serveractive="127.0.0.1:${proxylistenport}"
fi
else
if [ -f /tmp/etc/zabbix_proxy.conf ]; then
@@ -95,6 +111,7 @@
echo "# Autogenerated. Do not edit.
# A manually generated zabbix_agentd config will use /mnt/kd/zabbix_agentd.conf if it exists.
Server=$server
+ServerActive=$serveractive
Hostname=$hostname
ListenPort=$listenport
StartAgents=$startagents
@@ -166,7 +183,7 @@
restart)
stop
- sleep 2
+ sleep 4 # wait longer for things to settle
start
;;
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-08-30 17:57:16 UTC (rev 5653)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-09-01 14:35:35 UTC (rev 5654)
@@ -917,9 +917,9 @@
## Zabbix Agent Daemon
## Zabbix is enabled if ZABBIX_SERVER is defined.
#ZABBIX_SERVER="" # Comma/space separated list of IP addresses or hostnames for zabbix servers
-#ZABBIX_SERVER_PORT="10051" # TCP port used for retrieving/sending active check data (proxy-only)
+#ZABBIX_SERVER_PORT="10051" # TCP port used for retrieving/sending active check data
#ZABBIX_HOSTNAME="" # Unique, case sensitive hostname, required for active checks
-#ZABBIX_LISTENPORT="10050" # TCP port that zabbix_agentd listens on locally, proxy if enabled uses one port higher
+#ZABBIX_LISTENPORT="10050" # TCP port that zabbix_agentd listens on locally
#ZABBIX_STARTAGENTS="3" # Number of pre-forked instances of zabbix_agentd, must be between 1-16
#ZABBIX_DEBUGLEVEL="3" # "0" is no debug, "1" is critical, "2" is errors, "3" is warnings, "4" is full debugging
#ZABBIX_TIMEOUT="3" # Processing limit in seconds, must be between 1-30
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-03 02:50:34
|
Revision: 5657
http://astlinux.svn.sourceforge.net/astlinux/?rev=5657&view=rev
Author: abelbeck
Date: 2012-09-03 02:50:27 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
zabbix, add ZABBIX_PROXY_LISTENPORT variable to allow configuration with stunnel
Modified Paths:
--------------
branches/1.0/package/zabbix/zabbix.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init 2012-09-02 00:30:32 UTC (rev 5656)
+++ branches/1.0/package/zabbix/zabbix.init 2012-09-03 02:50:27 UTC (rev 5657)
@@ -58,7 +58,7 @@
timeout="${ZABBIX_TIMEOUT:-3}"
proxyserver="$(echo $server | cut -d',' -f1)" # Only use first server for proxy
proxyhostname="${ZABBIX_PROXY_HOSTNAME:-proxy-$HOSTNAME}"
- proxylistenport="$serverport"
+ proxylistenport="${ZABBIX_PROXY_LISTENPORT:-10051}"
if [ $proxy_enabled -eq 1 ]; then
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-09-02 00:30:32 UTC (rev 5656)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-09-03 02:50:27 UTC (rev 5657)
@@ -916,16 +916,17 @@
## Zabbix Agent Daemon
## Zabbix is enabled if ZABBIX_SERVER is defined.
-#ZABBIX_SERVER="" # Comma/space separated list of IP addresses or hostnames for zabbix servers
-#ZABBIX_SERVER_PORT="10051" # TCP port used for retrieving/sending active check data
-#ZABBIX_HOSTNAME="" # Unique, case sensitive hostname, required for active checks
-#ZABBIX_LISTENPORT="10050" # TCP port that zabbix_agentd listens on locally
-#ZABBIX_STARTAGENTS="3" # Number of pre-forked instances of zabbix_agentd, must be between 1-16
-#ZABBIX_DEBUGLEVEL="3" # "0" is no debug, "1" is critical, "2" is errors, "3" is warnings, "4" is full debugging
-#ZABBIX_TIMEOUT="3" # Processing limit in seconds, must be between 1-30
-#ZABBIX_PROXY="yes" # "yes" is to enable proxy, disabled by default
-#ZABBIX_PROXY_AGENT="no" # By default the zabbix_agentd is routed via the proxy if enabled, set to "no" to disable
-#ZABBIX_PROXY_HOSTNAME="" # Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server.
+#ZABBIX_SERVER="" # Comma/space separated list of IP addresses or hostnames for zabbix servers
+#ZABBIX_SERVER_PORT="10051" # TCP port used for retrieving/sending active check data
+#ZABBIX_HOSTNAME="" # Unique, case sensitive hostname, required for active checks
+#ZABBIX_LISTENPORT="10050" # TCP port that zabbix_agentd listens on locally
+#ZABBIX_STARTAGENTS="3" # Number of pre-forked instances of zabbix_agentd, must be between 1-16
+#ZABBIX_DEBUGLEVEL="3" # "0" is no debug, "1" is critical, "2" is errors, "3" is warnings, "4" is full debugging
+#ZABBIX_TIMEOUT="3" # Processing limit in seconds, must be between 1-30
+#ZABBIX_PROXY="yes" # "yes" is to enable proxy, disabled by default
+#ZABBIX_PROXY_AGENT="no" # By default the zabbix_agentd is routed via the proxy if enabled, set to "no" to disable
+#ZABBIX_PROXY_HOSTNAME="" # Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server.
+#ZABBIX_PROXY_LISTENPORT="10051" # TCP port that zabbix_proxy listens on locally
## NFS Server support (read only exports)
#NFS_EXPORTS_RO="/tftpboot"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-03 17:42:37
|
Revision: 5660
http://astlinux.svn.sourceforge.net/astlinux/?rev=5660&view=rev
Author: abelbeck
Date: 2012-09-03 17:42:30 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
stunnel, add STUNNEL_CLIENT and STUNNEL_DEBUGLEVEL variables, fix permissions issue so running as 'nobody' now always works
Modified Paths:
--------------
branches/1.0/package/stunnel/stunnel.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/stunnel/stunnel.init
===================================================================
--- branches/1.0/package/stunnel/stunnel.init 2012-09-03 13:55:30 UTC (rev 5659)
+++ branches/1.0/package/stunnel/stunnel.init 2012-09-03 17:42:30 UTC (rev 5660)
@@ -6,31 +6,37 @@
if [ -n "$STUNNELSERVS" ]; then
+ SUSER="${STUNNELUSER:-nobody}"
+ SDEBUG="${STUNNEL_DEBUGLEVEL:-5}"
+
mkdir -p /var/run/stunnel
+ chown ${SUSER}:${SUSER} /var/run/stunnel
- if [ -n "$STUNNELUSER" ]; then
- SUSER="$STUNNELUSER"
- else
- SUSER="nobody"
- fi
-
- if [ -n "$STUNNELCERT" ]; then
+ if [ "$STUNNEL_CLIENT" = "yes" ]; then
+ SCLIENT="yes"
SCERT="$STUNNELCERT"
- elif [ -n "$HTTPSCERT" ]; then
- SCERT="$HTTPSCERT"
- else
- SCERT="/etc/ssl/mini_httpd.pem"
+ else # Server mode
+ SCLIENT=""
+ if [ -n "$STUNNELCERT" ]; then
+ SCERT="$STUNNELCERT"
+ elif [ -n "$HTTPSCERT" ]; then
+ SCERT="$HTTPSCERT"
+ else
+ SCERT="/etc/ssl/mini_httpd.pem"
+ fi
fi
echo "; Autogenerated. Do not edit.
+${SCLIENT:+
+client = $SCLIENT}${SCERT:+
+cert = $SCERT}
-cert = $SCERT
-
socket = l:TCP_NODELAY=1
socket = r:TCP_NODELAY=1
setgid = $SUSER
setuid = $SUSER
+debug = $SDEBUG
" > /tmp/etc/stunnel.conf
for i in $STUNNELSERVS; do
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-09-03 13:55:30 UTC (rev 5659)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-09-03 17:42:30 UTC (rev 5660)
@@ -384,8 +384,8 @@
#SSHDROOT="yes"
## Stunnel support.
-## Listen on a TCP port using SSL, then relay that connection
-## to a non-SSL TCP service.
+## Listen on a TCP port using SSL, then relay that connection to a non-SSL TCP service. (STUNNEL_CLIENT="no")
+## Listen on a TCP port using non-SSL, then relay that connection to a SSL TCP service. (STUNNEL_CLIENT="yes")
## Define 3 ~ (tilde) separated arguments for each tunnel
## Arg1: Listen Port (or addr:port)
## Arg2: Connect to Host
@@ -393,14 +393,10 @@
## Separate multiple tunnel definitions with a space
#STUNNELSERVS="8443~192.168.111.11~80 993~mailserver~143"
##
-## Custom stunnel cert.
-## By default HTTPSCERT is used if defined, else /etc/ssl/mini_httpd.pem is used by default.
-#STUNNELCERT="/mnt/kd/ssl/stunnel.pem"
-##
-## Stunnel user/group id. By default stunnel is run as nobody
-## this is fine unless you need to run as some other user because
-## you need to bind to a port > 1023, etc. .
-#STUNNELUSER="root"
+#STUNNEL_CLIENT="yes" # "yes" is to enable 'client' mode (listen non-SSL), defaults to 'server' mode (listen SSL)
+#STUNNEL_DEBUGLEVEL="5" # "0" is no debug, "2" is critical, "3" is errors, "5" is notice, "7" is full debugging
+#STUNNELCERT="/mnt/kd/ssl/stunnel.pem" # defaults to HTTPSCERT if defined, optional when STUNNEL_CLIENT="yes"
+#STUNNELUSER="root" # defaults to "nobody", do not change unless binding fails
## Service Advertisement (mDNS)
## If you define ADNAME, I will advertise all of the available services on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-04 03:18:12
|
Revision: 5662
http://astlinux.svn.sourceforge.net/astlinux/?rev=5662&view=rev
Author: abelbeck
Date: 2012-09-04 03:18:06 +0000 (Tue, 04 Sep 2012)
Log Message:
-----------
stunnel, add simultaneous server and client support...
New variables: STUNNEL_SERVERS, STUNNEL_CLIENTS, STUNNEL_SERVER_CERT and STUNNEL_CLIENT_CERT
Deprecated (but still work) variables: STUNNELSERVS and STUNNELCERT
Removed variable: STUNNEL_CLIENT boolean recently added
Modified Paths:
--------------
branches/1.0/package/stunnel/stunnel.init
branches/1.0/package/stunnel/stunnel.mk
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/stunnel/stunnel.init
===================================================================
--- branches/1.0/package/stunnel/stunnel.init 2012-09-03 20:12:34 UTC (rev 5661)
+++ branches/1.0/package/stunnel/stunnel.init 2012-09-04 03:18:06 UTC (rev 5662)
@@ -2,78 +2,118 @@
. /etc/rc.conf
+gen_stunnel_config()
+{
+ local type="$1" stunnel="$2" client="" IFS
+
+ if [ "$type" = "client" ]; then
+ client="yes"
+ fi
+
+ echo "; Autogenerated. Do not edit.
+${client:+
+client = $client}${SCERT:+
+cert = $SCERT}
+
+socket = l:TCP_NODELAY=1
+socket = r:TCP_NODELAY=1
+
+setgid = $SUSER
+setuid = $SUSER
+debug = $SDEBUG
+pid = /var/run/stunnel/${type}.pid
+"
+
+ unset IFS
+ for i in $stunnel; do
+ LISTEN="$(echo $i | cut -d'~' -f1)"
+ HOST="$(echo $i | cut -d'~' -f2)"
+ SERVICE="$(echo $i | cut -d'~' -f3)"
+
+ if [ "$IPV6" = "yes" ]; then
+ # If LISTEN does not contain a ':' accept using IPv6/IPv4
+ case "$LISTEN" in
+ *:*) ;;
+ *) LISTEN=":::$LISTEN" ;;
+ esac
+ fi
+
+ echo "[$HOST-$SERVICE]
+accept = $LISTEN
+connect = $HOST:$SERVICE
+"
+ done
+}
+
init () {
- if [ -n "$STUNNELSERVS" ]; then
+ if [ -n "$STUNNELSERVS" -a -z "$STUNNEL_SERVERS" ]; then
+ STUNNEL_SERVERS="$STUNNELSERVS"
+ echo "stunnel: Config variable STUNNELSERVS is deprecated, use STUNNEL_SERVERS instead." >&2
+ fi
+ if [ -n "$STUNNEL_SERVERS" -o -n "$STUNNEL_CLIENTS" ]; then
+
SUSER="${STUNNELUSER:-nobody}"
SDEBUG="${STUNNEL_DEBUGLEVEL:-5}"
+ mkdir -p /tmp/etc/stunnel
mkdir -p /var/run/stunnel
chown ${SUSER}:${SUSER} /var/run/stunnel
- if [ "$STUNNEL_CLIENT" = "yes" ]; then
- SCLIENT="yes"
- SCERT="$STUNNELCERT"
- else # Server mode
- SCLIENT=""
- if [ -n "$STUNNELCERT" ]; then
- SCERT="$STUNNELCERT"
+ if [ -n "$STUNNEL_SERVERS" ]; then
+ if [ -n "$STUNNELCERT" -a -z "$STUNNEL_SERVER_CERT" ]; then
+ STUNNEL_SERVER_CERT="$STUNNELCERT"
+ echo "stunnel: Config variable STUNNELCERT is deprecated, use STUNNEL_SERVER_CERT instead." >&2
+ fi
+ if [ -n "$STUNNEL_SERVER_CERT" ]; then
+ SCERT="$STUNNEL_SERVER_CERT"
elif [ -n "$HTTPSCERT" ]; then
SCERT="$HTTPSCERT"
else
SCERT="/etc/ssl/mini_httpd.pem"
fi
+
+ gen_stunnel_config server "$STUNNEL_SERVERS" > /tmp/etc/stunnel/server.conf
fi
- echo "; Autogenerated. Do not edit.
-${SCLIENT:+
-client = $SCLIENT}${SCERT:+
-cert = $SCERT}
+ if [ -n "$STUNNEL_CLIENTS" ]; then
+ SCERT="$STUNNEL_CLIENT_CERT"
-socket = l:TCP_NODELAY=1
-socket = r:TCP_NODELAY=1
+ gen_stunnel_config client "$STUNNEL_CLIENTS" > /tmp/etc/stunnel/client.conf
+ fi
+ fi
-setgid = $SUSER
-setuid = $SUSER
-debug = $SDEBUG
-" > /tmp/etc/stunnel.conf
-
- for i in $STUNNELSERVS; do
- LISTEN="$(echo $i | cut -d'~' -f1)"
- HOST="$(echo $i | cut -d'~' -f2)"
- SERVICE="$(echo $i | cut -d'~' -f3)"
-
- if [ "$IPV6" = "yes" ]; then
- # If LISTEN does not contain a ':' accept using IPv6/IPv4
- case "$LISTEN" in
- *:*) ;;
- *) LISTEN=":::$LISTEN" ;;
- esac
- fi
-
- echo "[$HOST-$SERVICE]
-accept = $LISTEN
-connect = $HOST:$SERVICE
-" >> /tmp/etc/stunnel.conf
- done
+ if [ -z "$STUNNEL_SERVERS" -a -f /tmp/etc/stunnel/server.conf ]; then
+ rm /tmp/etc/stunnel/server.conf
fi
+ if [ -z "$STUNNEL_CLIENTS" -a -f /tmp/etc/stunnel/client.conf ]; then
+ rm /tmp/etc/stunnel/client.conf
+ fi
}
start () {
- if [ -f /etc/stunnel.conf ]; then
- echo "Starting stunnel..."
- stunnel /etc/stunnel.conf
+ if [ -f /etc/stunnel/server.conf ]; then
+ echo "Starting Stunnel Server Proxy..."
+ stunnel /etc/stunnel/server.conf
fi
+ if [ -f /etc/stunnel/client.conf ]; then
+ echo "Starting Stunnel Client Proxy..."
+ stunnel /etc/stunnel/client.conf
+ fi
}
stop () {
- if [ -f /var/run/stunnel/stunnel.pid ]; then
- echo "Stopping stunnel..."
- kill $(cat /var/run/stunnel/stunnel.pid) >/dev/null 2>&1
+ if [ -f /var/run/stunnel/server.pid ]; then
+ echo "Stopping Stunnel Server Proxy..."
+ kill $(cat /var/run/stunnel/server.pid) >/dev/null 2>&1
fi
+ if [ -f /var/run/stunnel/client.pid ]; then
+ echo "Stopping Stunnel Client Proxy..."
+ kill $(cat /var/run/stunnel/client.pid) >/dev/null 2>&1
+ fi
}
case $1 in
Modified: branches/1.0/package/stunnel/stunnel.mk
===================================================================
--- branches/1.0/package/stunnel/stunnel.mk 2012-09-03 20:12:34 UTC (rev 5661)
+++ branches/1.0/package/stunnel/stunnel.mk 2012-09-04 03:18:06 UTC (rev 5662)
@@ -15,7 +15,7 @@
--with-threads=fork
define STUNNEL_INSTALL_TARGET_CMDS
- ln -sf /tmp/etc/stunnel.conf $(TARGET_DIR)/etc/stunnel.conf
+ ln -snf /tmp/etc/stunnel $(TARGET_DIR)/etc/stunnel
$(INSTALL) -m 0755 -D package/stunnel/stunnel.init $(TARGET_DIR)/etc/init.d/stunnel
$(INSTALL) -m 0755 -D $(@D)/src/stunnel $(TARGET_DIR)/usr/sbin/stunnel
endef
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-09-03 20:12:34 UTC (rev 5661)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-09-04 03:18:06 UTC (rev 5662)
@@ -384,19 +384,20 @@
#SSHDROOT="yes"
## Stunnel support.
-## Listen on a TCP port using SSL, then relay that connection to a non-SSL TCP service. (STUNNEL_CLIENT="no")
-## Listen on a TCP port using non-SSL, then relay that connection to a SSL TCP service. (STUNNEL_CLIENT="yes")
-## Define 3 ~ (tilde) separated arguments for each tunnel
+## Listen on a TCP port using SSL, then relay that connection to a non-SSL TCP service. (STUNNEL_SERVERS)
+## Listen on a TCP port using non-SSL, then relay that connection to a SSL TCP service. (STUNNEL_CLIENTS)
+## Define 3 ~ (tilde) separated arguments for each tunnel, same format for server or client
## Arg1: Listen Port (or addr:port)
## Arg2: Connect to Host
## Arg3: Connect to Port
## Separate multiple tunnel definitions with a space
-#STUNNELSERVS="8443~192.168.111.11~80 993~mailserver~143"
+#STUNNEL_SERVERS="8443~192.168.111.11~80 993~mailserver~143"
+#STUNNEL_CLIENTS="127.0.0.1:10052~monitor.domain.com~10052"
##
-#STUNNEL_CLIENT="yes" # "yes" is to enable 'client' mode (listen non-SSL), defaults to 'server' mode (listen SSL)
-#STUNNEL_DEBUGLEVEL="5" # "0" is no debug, "2" is critical, "3" is errors, "5" is notice, "7" is full debugging
-#STUNNELCERT="/mnt/kd/ssl/stunnel.pem" # defaults to HTTPSCERT if defined, optional when STUNNEL_CLIENT="yes"
-#STUNNELUSER="root" # defaults to "nobody", do not change unless binding fails
+#STUNNEL_SERVER_CERT="/mnt/kd/ssl/stunnel.pem" # defaults to HTTPSCERT if STUNNEL_SERVER_CERT is not defined
+#STUNNEL_CLIENT_CERT="/mnt/kd/ssl/client.pem" # not required but eliminates man-in-the-middle attacks
+#STUNNEL_DEBUGLEVEL="5" # "0" is no debug, "2" is critical, "3" is errors, "5" is notice, "7" is full debugging
+#STUNNELUSER="root" # defaults to "nobody", do not change unless binding fails
## Service Advertisement (mDNS)
## If you define ADNAME, I will advertise all of the available services on
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-09 19:37:43
|
Revision: 5671
http://astlinux.svn.sourceforge.net/astlinux/?rev=5671&view=rev
Author: abelbeck
Date: 2012-09-09 19:37:37 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
Enable zabbix_proxy for 'standard' builds. Followup with a build engine option "Disable Zabbix and SNMP Monitoring" for custom builds
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-09-06 21:45:09 UTC (rev 5670)
+++ branches/1.0/astlinux.config 2012-09-09 19:37:37 UTC (rev 5671)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5651-dirty Configuration
-# Wed Aug 29 23:41:25 2012
+# Buildroot 2011.08-svn5670 Configuration
+# Sun Sep 9 14:18:47 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -421,7 +421,7 @@
# BR2_PACKAGE_WIPE is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_PACKAGE_ZABBIX=y
-# BR2_PACKAGE_ZABBIX_PROXY is not set
+BR2_PACKAGE_ZABBIX_PROXY=y
#
# Interpreter languages and scripting
@@ -512,7 +512,8 @@
#
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
-# BR2_PACKAGE_SQLITE is not set
+BR2_PACKAGE_SQLITE=y
+BR2_PACKAGE_SQLITE_READLINE=y
#
# Filesystem
@@ -658,7 +659,7 @@
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_EBTABLES is not set
BR2_PACKAGE_ETHTOOL=y
-# BR2_PACKAGE_FPING is not set
+BR2_PACKAGE_FPING=y
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-09-06 21:45:09 UTC (rev 5670)
+++ branches/1.0/astlinux18.config 2012-09-09 19:37:37 UTC (rev 5671)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5651-dirty Configuration
-# Wed Aug 29 23:41:26 2012
+# Buildroot 2011.08-svn5670-dirty Configuration
+# Sun Sep 9 14:20:39 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -415,7 +415,7 @@
# BR2_PACKAGE_WIPE is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_PACKAGE_ZABBIX=y
-# BR2_PACKAGE_ZABBIX_PROXY is not set
+BR2_PACKAGE_ZABBIX_PROXY=y
#
# Interpreter languages and scripting
@@ -652,7 +652,7 @@
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_EBTABLES is not set
BR2_PACKAGE_ETHTOOL=y
-# BR2_PACKAGE_FPING is not set
+BR2_PACKAGE_FPING=y
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
BR2_PACKAGE_IFTOP=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-09-09 21:23:14
|
Revision: 5672
http://astlinux.svn.sourceforge.net/astlinux/?rev=5672&view=rev
Author: abelbeck
Date: 2012-09-09 21:23:08 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
fping, version bump to 3.4
Revert '3.3: Output statistics to stdout instead of steer', because it breaks tools assuming the output goes to stderr
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/package/fping/fping.mk
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2012-09-09 19:37:37 UTC (rev 5671)
+++ branches/1.0/docs/ChangeLog.txt 2012-09-09 21:23:08 UTC (rev 5672)
@@ -16,15 +16,36 @@
-- bash, version bump to 4.1.11
+-- sqlite, version bump to 3.7.14
+
-- spandsp, version bump to 0.0.6pre21
+-- r8168 version bump to 8.032.00 RealTek PCI-Express Gigabit Ethernet Linux driver
+
+-- zabbix, version bump to 2.0.2, zabbix_proxy support added and IPv6 support enabled
+ New variables have been added to support zabbix_proxy, see /stat/etc/rc.conf for details.
+ Note: enabling zabbix_proxy requires a remote zabbix_server version 2.x
+
+-- The default limit of the /var tmpfs size is increased from 5 MB to 10 MB. /tmp remains at 10 MB.
+
** Networking
--- msmtp, version bump to 1.4.28, and add new variable SMTP_HOST_DOMAIN which when defined sets
+-- msmtp, version bump to 1.4.29, and add new variable SMTP_HOST_DOMAIN which when defined sets
the hostname used by the SMTP EHLO (or LMTP LHLO) command, the default is to use 'localhost'.
--- netsnmp, version bump to 5.7.1 (LTS) (security fix: CVE-2012-2141)
+-- netsnmp, version bump to 5.7.1 (LTS) (security fix: CVE-2012-2141) and IPv6 support enabled
+-- stunnel, version bump to 4.53, fixed crash on termination. Fixed permissions issue so
+ running as 'nobody' now always works.
+ Added new variables to support both inbound servers and now also outbound clients.
+ New variables: STUNNEL_SERVERS, STUNNEL_CLIENTS, STUNNEL_SERVER_CERT and STUNNEL_CLIENT_CERT
+ Deprecated (but still work) variables: STUNNELSERVS and STUNNELCERT
+
+-- fping, new ping-like command, fping and fping6 version 3.4. Required for proper zabbix_proxy support.
+ More info: http://fping.org/
+
+-- pppoe, version bump to 3.11
+
** Asterisk
-- Asterisk 1.4.44 and 1.8.15.0
@@ -35,9 +56,28 @@
** Web Interface
--- No changes
+-- Add support for Zabbix 2.0:
+ == Network tab -> Network Services: Zabbix Monitoring: { Configure Zabbix }
+ == Status tab -> Zabbix Monitoring Status - when Zabbix is enabled.
+ == Network, Edit and Zabbix tabs allow Zabbix to be Restarted.
+ == System tab -> View System Files: allows both Agent and Proxy log files to be viewed.
+ == Zabbix sub-tab allows Monitoring to be disabled without deleting the Server entry.
+ Note: For existing Zabbix configurations via user.conf, update by first clicking { Configure Zabbix }
+ from the Network tab, the existing Zabbix settings should be automatically imported. Then
+ click { Save Settings } in the Zabbix sub-tab to save them. Finally edit your user.conf file
+ via { Edit User Variables } from the Network tab and remove all Zabbix variable definitions, and
+ click { Save Changes } .
+-- Network and Edit tabs allow Stunnel Proxy to be Restarted.
+
+-- Users tab, honors a new Prefs tab -> "Users Tab Options":
+ ___ Remove User Voicemail Data when User is Deleted
+ When checked, the user's local file voicemail storage will be removed when a user is deleted.
+
+-- Voicemail tab, now automatically creates the "Old" voicemail folder if it doesn't exist.
+
+
Additions for AstLinux 1.0.4:
=============================
Modified: branches/1.0/package/fping/fping.mk
===================================================================
--- branches/1.0/package/fping/fping.mk 2012-09-09 19:37:37 UTC (rev 5671)
+++ branches/1.0/package/fping/fping.mk 2012-09-09 21:23:08 UTC (rev 5672)
@@ -3,7 +3,7 @@
# fping
#
#############################################################
-FPING_VERSION = 3.3
+FPING_VERSION = 3.4
FPING_SITE = http://fping.org/dist
FPING_SOURCE = fping-$(FPING_VERSION).tar.gz
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-11-01 03:26:09
|
Revision: 5728
http://astlinux.svn.sourceforge.net/astlinux/?rev=5728&view=rev
Author: abelbeck
Date: 2012-11-01 03:26:03 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
add the PCRE libs for lighttpd use in the default configs
Modified Paths:
--------------
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-11-01 00:34:01 UTC (rev 5727)
+++ branches/1.0/astlinux.config 2012-11-01 03:26:03 UTC (rev 5728)
@@ -609,7 +609,7 @@
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
BR2_PACKAGE_NEWT=y
-# BR2_PACKAGE_PCRE is not set
+BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
BR2_PACKAGE_READLINE=y
BR2_PACKAGE_SLANG=y
@@ -684,7 +684,7 @@
BR2_PACKAGE_LIGHTTPD_OPENSSL=y
# BR2_PACKAGE_LIGHTTPD_ZLIB is not set
# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
-# BR2_PACKAGE_LIGHTTPD_PCRE is not set
+BR2_PACKAGE_LIGHTTPD_PCRE=y
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
BR2_PACKAGE_LINKS=y
# BR2_PACKAGE_LINKS_GRAPHICS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-11-01 00:34:01 UTC (rev 5727)
+++ branches/1.0/astlinux18.config 2012-11-01 03:26:03 UTC (rev 5728)
@@ -602,7 +602,7 @@
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
BR2_PACKAGE_NEWT=y
-# BR2_PACKAGE_PCRE is not set
+BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
BR2_PACKAGE_READLINE=y
BR2_PACKAGE_SLANG=y
@@ -677,7 +677,7 @@
BR2_PACKAGE_LIGHTTPD_OPENSSL=y
# BR2_PACKAGE_LIGHTTPD_ZLIB is not set
# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
-# BR2_PACKAGE_LIGHTTPD_PCRE is not set
+BR2_PACKAGE_LIGHTTPD_PCRE=y
# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
BR2_PACKAGE_LINKS=y
# BR2_PACKAGE_LINKS_GRAPHICS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-11-01 06:16:39
|
Revision: 5729
http://astlinux.svn.sourceforge.net/astlinux/?rev=5729&view=rev
Author: abelbeck
Date: 2012-11-01 06:16:32 +0000 (Thu, 01 Nov 2012)
Log Message:
-----------
lighttpd, add new variable PHONEPROV_ALLOW to limit access to /phoneprov/ by IP address
Modified Paths:
--------------
branches/1.0/package/lighttpd/lighttpd.conf
branches/1.0/package/lighttpd/lighttpd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf 2012-11-01 03:26:03 UTC (rev 5728)
+++ branches/1.0/package/lighttpd/lighttpd.conf 2012-11-01 06:16:32 UTC (rev 5729)
@@ -141,4 +141,10 @@
@CLI_PROXY_SERVER@}
@PHO...@al... = ( "/phoneprov/" => "/mnt/kd/phoneprov/" )
+@PHONEPROV@
+@PHONEPROV@$HTTP["url"] =~ "^/phoneprov/" {
+@PHONEPROV@ $HTTP["remoteip"] !~ "^(@PHONEPROV_ALLOW@)$" {
+@PHONEPROV@ url.access-deny = ( "" )
+@PHONEPROV@ }
+@PHONEPROV@}
Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init 2012-11-01 03:26:03 UTC (rev 5728)
+++ branches/1.0/package/lighttpd/lighttpd.init 2012-11-01 06:16:32 UTC (rev 5729)
@@ -76,6 +76,20 @@
else
phoneprov="#"
fi
+ if [ -n "$PHONEPROV_ALLOW" ]; then
+ # Replace . with \. then replace * with .* for Regex match
+ # Match: "^($phoneprov_allow)$"
+ pp_allow="${PHONEPROV_ALLOW//./\.}"
+ pp_allow="${pp_allow//\*/.!}" # Use ! for now, replace to * shortly
+ phoneprov_allow=""
+ unset IFS
+ for i in $pp_allow; do
+ phoneprov_allow="$phoneprov_allow${phoneprov_allow:+|}$i"
+ done
+ phoneprov_allow="${phoneprov_allow//!/*}" # Replace ! with *
+ else
+ phoneprov_allow=".*"
+ fi
sed -i -e "s|@HOSTNAME@|${HOSTNAME}|g" \
-e "s|@HTTPDIR@|${httpdir}|g" \
@@ -89,6 +103,7 @@
-e "s|@IPV6@|${ipv6}|g" \
-e "s|@CLI_PROXY_SERVER@|${cli_proxy_server}|g" \
-e "s|@PHONEPROV@|${phoneprov}|g" \
+ -e "s!@PHONEPROV_ALLOW@!${phoneprov_allow}!g" \
/tmp/etc/lighttpd.conf
}
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-11-01 03:26:03 UTC (rev 5728)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-11-01 06:16:32 UTC (rev 5729)
@@ -304,6 +304,15 @@
HTTP_ACCESSLOG="no" # Enable access logging in /var/log/lighttpd/access.log
HTTPCGI="no"
+## HTTP and HTTPS /phoneprov/ directory server, useful for IP Phone provisioning
+## If the directory "/mnt/kd/phoneprov/" exists, this will be served as /phoneprov/
+## Limit access by IPv4 or IPv6 addresses using a space separated list of IP addresses.
+## Use the * character to match any number of any characters (expands to .* for regex match).
+## Note: Do not use CIDR notation, the IP is matched via a regular expression.
+## The default is to allow all IP's, PHONEPROV_ALLOW="*"
+## Example: PHONEPROV_ALLOW="10.10.10.* 2001:db8:1:* 192.168.101.20"
+#PHONEPROV_ALLOW="*"
+
## NTPd Server
## Note: also see NTPSERVS in the "General Configuration" section.
## Enable NTP broadcasts to local LAN(s). Use with something like
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-11-20 19:45:53
|
Revision: 5771
http://astlinux.svn.sourceforge.net/astlinux/?rev=5771&view=rev
Author: abelbeck
Date: 2012-11-20 19:45:46 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
cleanup remaining traces of 'nfsd', never supported in AstLinux 1.x
Modified Paths:
--------------
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/nfs-utils/old-nfsd.init
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/exports
branches/1.0/project/astlinux/target_skeleton/etc/init.d/nfsd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K28nfsd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S23nfsd
Copied: branches/1.0/package/nfs-utils/old-nfsd.init (from rev 5770, branches/1.0/project/astlinux/target_skeleton/etc/init.d/nfsd)
===================================================================
--- branches/1.0/package/nfs-utils/old-nfsd.init (rev 0)
+++ branches/1.0/package/nfs-utils/old-nfsd.init 2012-11-20 19:45:46 UTC (rev 5771)
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+ local NETWORK PREFIX
+
+ eval `ipcalc -n -p $INTIP $INTNM`
+
+ rm -f /tmp/etc/exports
+
+ for i in $NFS_EXPORTS_RO; do
+ echo "$i $NETWORK/$PREFIX(ro,no_root_squash,sync)" >> /tmp/etc/exports
+ done
+
+ for i in $NFS_EXPORTS_RW; do
+ echo "$i $NETWORK/$PREFIX(rw,no_root_squash,sync)" >> /tmp/etc/exports
+ done
+}
+
+start () {
+ if [ -f /etc/exports ]; then
+ portmap
+ if [ -n "$NFS_CLIENTS" ]; then
+ NFSD="$NFS_CLIENTS"
+ else
+ NFSD=4
+ fi
+ nfsd $NFSD
+ lockd
+ mountd
+ exportfs -a
+ fi
+}
+
+stop () {
+ if [ -f /etc/exports ]; then
+ killall mountd lockd nfsd portmap
+ rmmod mountd lockd nfsd sunrpc
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/exports
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/exports 2012-11-19 18:26:33 UTC (rev 5770)
+++ branches/1.0/project/astlinux/target_skeleton/etc/exports 2012-11-20 19:45:46 UTC (rev 5771)
@@ -1 +0,0 @@
-link /tmp/etc/exports
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/init.d/nfsd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/nfsd 2012-11-19 18:26:33 UTC (rev 5770)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/nfsd 2012-11-20 19:45:46 UTC (rev 5771)
@@ -1,68 +0,0 @@
-#!/bin/sh
-
-. /etc/rc.conf
-
-init () {
- local NETWORK PREFIX
-
- eval `ipcalc -n -p $INTIP $INTNM`
-
- rm -f /tmp/etc/exports
-
- for i in $NFS_EXPORTS_RO; do
- echo "$i $NETWORK/$PREFIX(ro,no_root_squash,sync)" >> /tmp/etc/exports
- done
-
- for i in $NFS_EXPORTS_RW; do
- echo "$i $NETWORK/$PREFIX(rw,no_root_squash,sync)" >> /tmp/etc/exports
- done
-}
-
-start () {
- if [ -f /etc/exports ]; then
- portmap
- if [ -n "$NFS_CLIENTS" ]; then
- NFSD="$NFS_CLIENTS"
- else
- NFSD=4
- fi
- nfsd $NFSD
- lockd
- mountd
- exportfs -a
- fi
-}
-
-stop () {
- if [ -f /etc/exports ]; then
- killall mountd lockd nfsd portmap
- rmmod mountd lockd nfsd sunrpc
- fi
-}
-
-case $1 in
-
-start)
- start
- ;;
-
-stop)
- stop
- ;;
-
-init)
- init
- start
- ;;
-
-restart)
- stop
- sleep 2
- start
- ;;
-
-*)
- echo "Usage: start|stop|restart"
- ;;
-
-esac
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K28nfsd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K28nfsd 2012-11-19 18:26:33 UTC (rev 5770)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K28nfsd 2012-11-20 19:45:46 UTC (rev 5771)
@@ -1 +0,0 @@
-link ../../init.d/nfsd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S23nfsd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S23nfsd 2012-11-19 18:26:33 UTC (rev 5770)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S23nfsd 2012-11-20 19:45:46 UTC (rev 5771)
@@ -1 +0,0 @@
-link ../../init.d/nfsd
\ No newline at end of file
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-11-19 18:26:33 UTC (rev 5770)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-11-20 19:45:46 UTC (rev 5771)
@@ -939,12 +939,6 @@
#ZABBIX_PROXY_HOSTNAME="" # Unique, case sensitive Proxy name. Make sure the Proxy name is known to the server.
#ZABBIX_PROXY_LISTENPORT="10051" # TCP port that zabbix_proxy listens on locally
-## NFS Server support (read only exports)
-#NFS_EXPORTS_RO="/tftpboot"
-
-## Read/write
-#NFS_EXPORTS_RW="/home"
-
## BOOTPFILE
## For diskless clients, the image to use for booting.
#BOOTPFILE="/pxelinux.0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-12-14 15:15:00
|
Revision: 5804
http://astlinux.svn.sourceforge.net/astlinux/?rev=5804&view=rev
Author: abelbeck
Date: 2012-12-14 15:14:53 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Linux Kernel, version bump from 2.6.35.13 to 2.6.35.14
Info: http://lwn.net/Articles/453757/
Note: While the crosstool toolchain config/info is updated, there is no reason to rebuild toolchains based on 2.6.35.13 headers
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/crosstool-ng-src/README
branches/1.0/crosstool-ng-src/ct-ng.config
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2012-12-13 02:46:38 UTC (rev 5803)
+++ branches/1.0/astlinux-ast11.config 2012-12-14 15:14:53 UTC (rev 5804)
@@ -856,7 +856,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-12-13 02:46:38 UTC (rev 5803)
+++ branches/1.0/astlinux.config 2012-12-14 15:14:53 UTC (rev 5804)
@@ -863,7 +863,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-12-13 02:46:38 UTC (rev 5803)
+++ branches/1.0/astlinux18.config 2012-12-14 15:14:53 UTC (rev 5804)
@@ -856,7 +856,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/crosstool-ng-src/README
===================================================================
--- branches/1.0/crosstool-ng-src/README 2012-12-13 02:46:38 UTC (rev 5803)
+++ branches/1.0/crosstool-ng-src/README 2012-12-14 15:14:53 UTC (rev 5804)
@@ -21,7 +21,7 @@
# leave as configured, just look, don't make any changes
ct-ng menuconfig
# then install linux kernel for the header includes
-wget http://files.astlinux.org/linux-2.6.35.13.tar.gz
+wget http://files.astlinux.org/linux-2.6.35.14.tar.gz
# finally, start the toolchain build process
ct-ng build
# takes 40-60 min.
Modified: branches/1.0/crosstool-ng-src/ct-ng.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng.config 2012-12-13 02:46:38 UTC (rev 5803)
+++ branches/1.0/crosstool-ng-src/ct-ng.config 2012-12-14 15:14:53 UTC (rev 5804)
@@ -194,7 +194,7 @@
# CT_KERNEL_V_2_6_31_14 is not set
# CT_KERNEL_V_2_6_27_59 is not set
CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_TARBALL="${CT_TOP_DIR}/linux-2.6.35.13.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_TARBALL="${CT_TOP_DIR}/linux-2.6.35.14.tar.gz"
CT_KERNEL_mingw32_AVAILABLE=y
#
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2012-12-13 02:46:38 UTC (rev 5803)
+++ branches/1.0/runnix-uclibc.config 2012-12-14 15:14:53 UTC (rev 5804)
@@ -1071,7 +1071,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2012-12-13 02:46:38 UTC (rev 5803)
+++ branches/1.0/runnix.config 2012-12-14 15:14:53 UTC (rev 5804)
@@ -774,7 +774,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://mirror.nexcess.net/kernel.org/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.13.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-12-24 21:08:46
|
Revision: 5834
http://astlinux.svn.sourceforge.net/astlinux/?rev=5834&view=rev
Author: abelbeck
Date: 2012-12-24 21:08:37 +0000 (Mon, 24 Dec 2012)
Log Message:
-----------
perl, new package, disabled by default for now.
This is 'real' perl but with a limited set of included modules because of our size limitations.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
branches/1.0/package/microperl/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/perl/
branches/1.0/package/perl/Config.in
branches/1.0/package/perl/perl-fix-Module-Build.patch
branches/1.0/package/perl/perl-ifprefixed.patch
branches/1.0/package/perl/perl.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2012-12-22 18:56:14 UTC (rev 5833)
+++ branches/1.0/astlinux-ast11.config 2012-12-24 21:08:37 UTC (rev 5834)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5762 Configuration
-# Thu Nov 8 16:10:10 2012
+# Buildroot 2011.08-svn5833-dirty Configuration
+# Mon Dec 24 14:51:51 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -423,6 +423,7 @@
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_PERL is not set
BR2_PACKAGE_MICROPERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-12-22 18:56:14 UTC (rev 5833)
+++ branches/1.0/astlinux.config 2012-12-24 21:08:37 UTC (rev 5834)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5670 Configuration
-# Sun Sep 9 14:18:47 2012
+# Buildroot 2011.08-svn5833-dirty Configuration
+# Mon Dec 24 14:51:44 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -429,6 +429,7 @@
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_PERL is not set
BR2_PACKAGE_MICROPERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-12-22 18:56:14 UTC (rev 5833)
+++ branches/1.0/astlinux18.config 2012-12-24 21:08:37 UTC (rev 5834)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5670-dirty Configuration
-# Sun Sep 9 14:20:39 2012
+# Buildroot 2011.08-svn5833-dirty Configuration
+# Mon Dec 24 14:51:47 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -423,6 +423,7 @@
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_PERL is not set
BR2_PACKAGE_MICROPERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2012-12-22 18:56:14 UTC (rev 5833)
+++ branches/1.0/package/Config.in 2012-12-24 21:08:37 UTC (rev 5834)
@@ -256,6 +256,7 @@
source "package/xavante/Config.in"
endmenu
endif
+source "package/perl/Config.in"
source "package/microperl/Config.in"
source "package/php/Config.in"
source "package/python/Config.in"
Modified: branches/1.0/package/microperl/Config.in
===================================================================
--- branches/1.0/package/microperl/Config.in 2012-12-22 18:56:14 UTC (rev 5833)
+++ branches/1.0/package/microperl/Config.in 2012-12-24 21:08:37 UTC (rev 5834)
@@ -1,4 +1,5 @@
config BR2_PACKAGE_MICROPERL
+ depends on !BR2_PACKAGE_PERL
bool "microperl"
help
Perl without operating-specific functions such as readdir.
Added: branches/1.0/package/perl/Config.in
===================================================================
--- branches/1.0/package/perl/Config.in (rev 0)
+++ branches/1.0/package/perl/Config.in 2012-12-24 21:08:37 UTC (rev 5834)
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_PERL
+ bool "perl"
+ depends on BR2_LINUX_KERNEL
+ default n
+ help
+ Larry Wall's Practical Extraction and Report Language
+ An interpreted scripting language, known among some as "Unix's Swiss
+ Army Chainsaw".
+
+ http://www.perl.org/
+
Added: branches/1.0/package/perl/perl-fix-Module-Build.patch
===================================================================
--- branches/1.0/package/perl/perl-fix-Module-Build.patch (rev 0)
+++ branches/1.0/package/perl/perl-fix-Module-Build.patch 2012-12-24 21:08:37 UTC (rev 5834)
@@ -0,0 +1,16 @@
+
+Signed-off-by: Francois Perrad <fra...@ga...>
+
+Index: b/cpan/Module-Build/lib/Module/Build/Base.pm
+===================================================================
+--- a/cpan/Module-Build/lib/Module/Build/Base.pm
++++ b/cpan/Module-Build/lib/Module/Build/Base.pm
+@@ -456,7 +456,7 @@
+ my $proto = shift;
+ my $c = ref($proto) ? $proto->{config} : 'Module::Build::Config';
+
+- my $perl = $^X;
++ my $perl = $ENV{RUN_PERL} || $^X;
+ my $perl_basename = File::Basename::basename($perl);
+
+ my @potential_perls;
Added: branches/1.0/package/perl/perl-ifprefixed.patch
===================================================================
--- branches/1.0/package/perl/perl-ifprefixed.patch (rev 0)
+++ branches/1.0/package/perl/perl-ifprefixed.patch 2012-12-24 21:08:37 UTC (rev 5834)
@@ -0,0 +1,11 @@
+--- perl-5.16.2/Makefile.config.SH.orig 2012-12-21 23:52:27.000000000 -0600
++++ perl-5.16.2/Makefile.config.SH 2012-12-21 23:53:11.000000000 -0600
+@@ -41,7 +41,7 @@
+ fi
+
+ function ifprefixed() {
+- val=`echo "$2" | sed -e "s/^$1//"`
++ val=`echo "$2" | sed -e "s|^$1||"`
+ if [ "$1$val" == "$2" ]; then
+ echo "\$(CROSS)$val"
+ else
Added: branches/1.0/package/perl/perl.mk
===================================================================
--- branches/1.0/package/perl/perl.mk (rev 0)
+++ branches/1.0/package/perl/perl.mk 2012-12-24 21:08:37 UTC (rev 5834)
@@ -0,0 +1,115 @@
+#############################################################
+#
+# perl
+#
+#############################################################
+
+PERL_VERSION_MAJOR = 16
+PERL_VERSION = 5.$(PERL_VERSION_MAJOR).2
+PERL_SITE = http://www.cpan.org/src/5.0
+PERL_SOURCE = perl-$(PERL_VERSION).tar.bz2
+PERL_INSTALL_STAGING = YES
+# Depend on linux to define LINUX_VERSION_PROBED
+PERL_DEPENDENCIES = linux
+
+PERL_MODULES = constant Carp Errno Fcntl POSIX Digest Socket IO XSLoader Digest/MD5 Digest/SHA Getopt/Std Time/Local File/Glob
+
+PERL_CROSS_VERSION = 0.7.1
+PERL_CROSS_BASE_VERSION = 5.$(PERL_VERSION_MAJOR).0
+PERL_CROSS_SITE = http://download.berlios.de/perlcross
+PERL_CROSS_SOURCE = perl-$(PERL_CROSS_BASE_VERSION)-cross-$(PERL_CROSS_VERSION).tar.gz
+PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
+PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod
+
+# We use the perlcross hack to cross-compile perl. It should
+# be extracted over the perl sources, so we don't define that
+# as a separate package. Instead, it is downloaded and extracted
+# together with perl
+
+define PERL_CROSS_DOWNLOAD
+ $(call DOWNLOAD,$(PERL_CROSS_SITE),$(PERL_CROSS_SOURCE))
+endef
+PERL_POST_DOWNLOAD_HOOKS += PERL_CROSS_DOWNLOAD
+
+define PERL_CROSS_EXTRACT
+ $(INFLATE$(suffix $(PERL_CROSS_SOURCE))) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \
+ $(TAR) $(TAR_STRIP_COMPONENTS)=1 -C $(@D) $(TAR_OPTIONS) -
+endef
+PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT
+
+define PERL_CROSS_SET_POD
+ $(SED) s/$(PERL_CROSS_OLD_POD)/$(PERL_CROSS_NEW_POD)/g $(@D)/Makefile
+endef
+PERL_POST_PATCH_HOOKS += PERL_CROSS_SET_POD
+
+ifeq ($(BR2_PACKAGE_BERKELEYDB),y)
+ PERL_DEPENDENCIES += berkeleydb
+endif
+
+# We have to override LD, because an external multilib toolchain ld is not
+# wrapped to provide the required sysroot options. We also can't use ccache
+# because the configure script doesn't support it.
+PERL_CONF_OPT = \
+ --target=$(GNU_TARGET_NAME) \
+ --target-tools-prefix=$(TARGET_CROSS) \
+ --prefix=/usr \
+ -Accflags='-DAPPLLIB_EXP=\"/mnt/kd/perl:/usr/local/share/perl\"' \
+ -Dsitelib=/mnt/kd/perl \
+ -Dld="$(TARGET_CC_NOCCACHE)" \
+ -Dccflags="$(TARGET_CFLAGS)" \
+ -Dldflags="$(TARGET_LDFLAGS) -lm" \
+ -Dmydomain="" \
+ -Dmyhostname="$(BR2_TARGET_GENERIC_HOSTNAME)" \
+ -Dmyuname="Buildroot $(BR2_VERSION_FULL)" \
+ -Dosname=linux \
+ -Dosvers=$(LINUX_VERSION_PROBED) \
+ -Dperladmin=root
+
+ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1)
+ PERL_CONF_OPT += -Dusedevel
+endif
+
+ifneq ($(BR2_LARGEFILE),y)
+ PERL_CONF_OPT += -Uuselargefiles
+endif
+
+ifneq ($(PERL_MODULES),)
+PERL_CONF_OPT += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES))
+endif
+
+define PERL_CONFIGURE_CMDS
+ (cd $(@D); HOSTCC='$(HOSTCC_NOCACHE)' ./configure $(PERL_CONF_OPT))
+ $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h
+endef
+
+# perlcross's miniperl_top forgets base, which is required by mktables.
+# Instead of patching, it's easier to just set PERL5LIB
+define PERL_BUILD_CMDS
+ PERL5LIB=$(@D)/dist/base/lib $(MAKE1) -C $(@D) perl modules
+endef
+
+define PERL_INSTALL_STAGING_CMDS
+ PERL5LIB=$(@D)/dist/base/lib $(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl
+endef
+
+PERL_INSTALL_TARGET_GOALS = install.perl
+ifeq ($(BR2_HAVE_DOCUMENTATION),y)
+PERL_INSTALL_TARGET_GOALS += install.man
+endif
+
+
+define PERL_INSTALL_TARGET_CMDS
+ PERL5LIB=$(@D)/dist/base/lib $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" $(PERL_INSTALL_TARGET_GOALS)
+ # Remove all .pod files
+ find $(TARGET_DIR)/usr/lib/perl/ -name "*.pod" | xargs rm -f
+ #
+ ln -sf perl$(PERL_VERSION) $(TARGET_DIR)/usr/bin/perl
+endef
+
+define PERL_CLEAN_CMDS
+ -$(MAKE1) -C $(@D) clean
+ rm -rf $(TARGET_DIR)/usr/lib/perl/
+ rm -f $(TARGET_DIR)/usr/bin/perl $(TARGET_DIR)/usr/bin/perl$(PERL_VERSION)
+endef
+
+$(eval $(call GENTARGETS,package,perl))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2012-12-22 18:56:14 UTC (rev 5833)
+++ branches/1.0/runnix-uclibc.config 2012-12-24 21:08:37 UTC (rev 5834)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5651-dirty Configuration
-# Wed Aug 29 23:41:29 2012
+# Buildroot 2011.08-svn5833-dirty Configuration
+# Mon Dec 24 14:52:04 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -584,6 +584,7 @@
# BR2_PACKAGE_BC is not set
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_PERL is not set
# BR2_PACKAGE_MICROPERL is not set
# BR2_PACKAGE_PHP is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2012-12-22 18:56:14 UTC (rev 5833)
+++ branches/1.0/runnix.config 2012-12-24 21:08:37 UTC (rev 5834)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5651-dirty Configuration
-# Wed Aug 29 23:41:28 2012
+# Buildroot 2011.08-svn5833-dirty Configuration
+# Mon Dec 24 14:51:56 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -408,6 +408,7 @@
# BR2_PACKAGE_BC is not set
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_PERL is not set
# BR2_PACKAGE_MICROPERL is not set
# BR2_PACKAGE_PHP is not set
# BR2_PACKAGE_PYTHON is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-12-26 21:33:59
|
Revision: 5838
http://astlinux.svn.sourceforge.net/astlinux/?rev=5838&view=rev
Author: abelbeck
Date: 2012-12-26 21:33:51 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
AIF traffic shaping, disable incoming shaping when 'Downlink Speed' (EXTDOWN) is set to 0
Modified Paths:
--------------
branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh
===================================================================
--- branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh 2012-12-26 17:38:44 UTC (rev 5837)
+++ branches/1.0/package/arnofw/traffic-shaper/60traffic-shaper.plugin.sh 2012-12-26 21:33:51 UTC (rev 5838)
@@ -187,6 +187,11 @@
incoming_traffic_limit()
{
+ # Skip if DOWNLINK is 0
+ if [ $DOWNLINK -eq 0 ]; then
+ return
+ fi
+
# Try to control the incoming traffic as well.
# Set up ingress qdisc
tc qdisc add dev $1 handle ffff: ingress
@@ -223,7 +228,7 @@
modprobe sch_hfsc
- printf "${INDENT}Shaping as %d/%d kb/s using '%s' for interface: %s\n" $DOWNLINK $UPLINK hfsc "$SHAPER_IF"
+ printf "${INDENT}Shaping as (Down/Up) %d/%d kb/s using '%s' for interface: %s\n" $DOWNLINK $UPLINK hfsc "$SHAPER_IF"
iptables -t mangle -N SHAPER_CHAIN
@@ -294,7 +299,7 @@
# Some required modules are already loaded by the main script:
modprobe ip_nat
- printf "${INDENT}Shaping as %d/%d kb/s using '%s' for interface: %s\n" $DOWNLINK $UPLINK htb "$SHAPER_IF"
+ printf "${INDENT}Shaping as (Down/Up) %d/%d kb/s using '%s' for interface: %s\n" $DOWNLINK $UPLINK htb "$SHAPER_IF"
iptables -t mangle -N SHAPER_CHAIN
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-12-26 17:38:44 UTC (rev 5837)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2012-12-26 21:33:51 UTC (rev 5838)
@@ -260,7 +260,9 @@
## Please change it after some testing, and make sure that it is %90 of your tested
## link speed. This prevents queing that destroys latency - very important for VOIP.
+## Disable incoming shaping by setting EXTDOWN=0, EXTUP must be greater than 0 if enabled.
## Disabled by default. Required if SHAPETYPE is set.
+## Units are in kbps
#EXTUP=300
#EXTDOWN=2000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2012-12-27 21:24:03
|
Revision: 5841
http://astlinux.svn.sourceforge.net/astlinux/?rev=5841&view=rev
Author: abelbeck
Date: 2012-12-27 21:23:56 +0000 (Thu, 27 Dec 2012)
Log Message:
-----------
perl, move from microperl to miniperl, a cross-compiled real perl with dynamic binaries
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2012-12-27 21:13:13 UTC (rev 5840)
+++ branches/1.0/astlinux-ast11.config 2012-12-27 21:23:56 UTC (rev 5841)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5833-dirty Configuration
-# Mon Dec 24 14:51:51 2012
+# Buildroot 2011.08-svn5840-dirty Configuration
+# Thu Dec 27 15:19:48 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -423,8 +423,7 @@
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
-# BR2_PACKAGE_PERL is not set
-BR2_PACKAGE_MICROPERL=y
+BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
# BR2_PACKAGE_PHP_SAPI_CLI is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2012-12-27 21:13:13 UTC (rev 5840)
+++ branches/1.0/astlinux.config 2012-12-27 21:23:56 UTC (rev 5841)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5833-dirty Configuration
-# Mon Dec 24 14:51:44 2012
+# Buildroot 2011.08-svn5840 Configuration
+# Thu Dec 27 15:16:12 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -429,8 +429,7 @@
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
-# BR2_PACKAGE_PERL is not set
-BR2_PACKAGE_MICROPERL=y
+BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
# BR2_PACKAGE_PHP_SAPI_CLI is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2012-12-27 21:13:13 UTC (rev 5840)
+++ branches/1.0/astlinux18.config 2012-12-27 21:23:56 UTC (rev 5841)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5833-dirty Configuration
-# Mon Dec 24 14:51:47 2012
+# Buildroot 2011.08-svn5840-dirty Configuration
+# Thu Dec 27 15:17:27 2012
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -423,8 +423,7 @@
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_LUA is not set
-# BR2_PACKAGE_PERL is not set
-BR2_PACKAGE_MICROPERL=y
+BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
# BR2_PACKAGE_PHP_SAPI_CLI is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-08 00:38:03
|
Revision: 5873
http://astlinux.svn.sourceforge.net/astlinux/?rev=5873&view=rev
Author: abelbeck
Date: 2013-01-08 00:37:56 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
prosody, prosody.init is completed along with documentation in /stat/etc/rc.conf
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-01-07 15:43:22 UTC (rev 5872)
+++ branches/1.0/package/prosody/prosody.init 2013-01-08 00:37:56 UTC (rev 5873)
@@ -2,9 +2,121 @@
. /etc/rc.conf
+DEFAULT_MODULES="roster saslauth tls dialback disco \
+private vcard \
+legacyauth version uptime time ping pep register adhoc \
+admin_adhoc"
+
+mod_in_list()
+{
+ local match="$1" list="$2" IFS
+
+ unset IFS
+ for i in $list; do
+ if [ "$match" = "$i" ]; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
+gen_xmpp_config()
+{
+ local m ADD_MODS="" modules="" admins="" hostname cert key log syslog error
+ local SSL_OK LOG_OK SYSLOG_OK ERROR_LOG IFS
+
+ unset IFS
+ for m in $XMPP_ENABLE_MODULES; do
+ if ! mod_in_list "$m" "$DEFAULT_MODULES"; then
+ ADD_MODS="$ADD_MODS${ADD_MODS:+ }$m"
+ fi
+ done
+ for m in $DEFAULT_MODULES $ADD_MODS; do
+ if ! mod_in_list "$m" "$XMPP_DISABLE_MODULES"; then
+ modules="$modules${modules:+, }\"$m\""
+ fi
+ done
+
+ SSL_OK="-- "
+ cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
+ key="${XMPP_KEY:-/etc/prosody/certs/server.key}"
+ if [ -f "$cert" -a -f "$key" ]; then
+ if [ "$(stat -c '%U:%G' "$cert")" = "prosody:prosody" -a "$(stat -c '%U:%G' "$key")" = "prosody:prosody" ]; then
+ SSL_OK=""
+ fi
+ fi
+
+ for m in $XMPP_ADMIN_USERS; do
+ admins="$admins${admins:+, }\"$m\""
+ done
+
+ hostname="${XMPP_HOSTNAME:-$HOSTNAME.$DOMAIN}"
+
+ log="${XMPP_LOG:-none}"
+ if [ "$log" = "warn" -o "$log" = "info" -o "$log" = "debug" ]; then
+ LOG_OK=""
+ else
+ LOG_OK="-- "
+ log="info"
+ fi
+
+ syslog="${XMPP_SYSLOG:-warn}"
+ if [ "$syslog" = "error" -o "$syslog" = "warn" -o "$syslog" = "info" ]; then
+ SYSLOG_OK=""
+ else
+ SYSLOG_OK="-- "
+ syslog="warn"
+ fi
+
+ error="${XMPP_ERROR_LOG:-no}"
+ if [ "$error" = "yes" -o "$error" = "error" ]; then
+ ERROR_LOG=""
+ else
+ ERROR_LOG="-- "
+ fi
+
+ echo "
+pidfile = \"/var/run/prosody/prosody.pid\"
+
+prosody_user = \"prosody\"
+prosody_group = \"prosody\"
+
+allow_registration = false
+
+authentication = \"internal_plain\"
+
+admins = { $admins }
+
+log = {
+${LOG_OK} $log = \"/var/log/prosody/prosody.log\",
+${SYSLOG_OK} $syslog = \"*syslog\",
+${ERROR_LOG} error = \"/var/log/prosody/prosody.err\",
+}
+
+${SSL_OK}ssl = {
+${SSL_OK} certificate = \"$cert\",
+${SSL_OK} key = \"$key\",
+${SSL_OK}}
+
+modules_enabled = { \"posix\", $modules }
+
+modules_disabled = { }
+
+VirtualHost \"$hostname\"
+"
+
+ if [ -n "$XMPP_CONFERENCE" ]; then
+ echo "Component \"$XMPP_CONFERENCE\" \"muc\""
+ fi
+}
+
init () {
if [ "$XMPP_ENABLE" != "yes" ]; then
+ if [ -f /mnt/kd/prosody/prosody.cfg.lua ]; then
+ rm /mnt/kd/prosody/prosody.cfg.lua
+ fi
exit
fi
@@ -17,19 +129,32 @@
mkdir /mnt/kd/prosody
mkdir /mnt/kd/prosody/data
mkdir /mnt/kd/prosody/certs
- cp /stat/etc/prosody/prosody.cfg.lua /mnt/kd/prosody/prosody.cfg.lua
find /mnt/kd/prosody -print0 | xargs -0 chown prosody:prosody
chmod 750 /mnt/kd/prosody/data
fi
ln -snf /mnt/kd/prosody /tmp/etc/prosody
chown prosody:prosody /tmp/etc/prosody
+ # Use SIP TLS certs if they exist and ours don't exist
+ if [ -f /mnt/kd/ssl/sip-tls/keys/server.crt ] && [ ! -f /mnt/kd/prosody/certs/server.crt ]; then
+ cp -a /mnt/kd/ssl/sip-tls/keys/server.crt /mnt/kd/prosody/certs/server.crt
+ chown prosody:prosody /mnt/kd/prosody/certs/server.crt
+ fi
+ if [ -f /mnt/kd/ssl/sip-tls/keys/server.key ] && [ ! -f /mnt/kd/prosody/certs/server.key ]; then
+ cp -a /mnt/kd/ssl/sip-tls/keys/server.key /mnt/kd/prosody/certs/server.key
+ chown prosody:prosody /mnt/kd/prosody/certs/server.key
+ fi
+
if [ -f /mnt/kd/prosody/prosody.conf ]; then
echo "-- Autogenerated. Edit /mnt/kd/prosody/prosody.conf file.
" >/mnt/kd/prosody/prosody.cfg.lua
cat /mnt/kd/prosody/prosody.conf >>/mnt/kd/prosody/prosody.cfg.lua
else
- : # Autogenerate /mnt/kd/prosody/prosody.cfg.lua
+ # Autogenerate /mnt/kd/prosody/prosody.cfg.lua
+ echo "-- Autogenerated. Do not edit.
+-- A manually generated prosody.cfg.lua config will use /mnt/kd/prosody/prosody.conf if it exists.
+" >/mnt/kd/prosody/prosody.cfg.lua
+ gen_xmpp_config >>/mnt/kd/prosody/prosody.cfg.lua
fi
chown prosody:prosody /mnt/kd/prosody/prosody.cfg.lua
@@ -42,7 +167,7 @@
start () {
- if [ "$XMPP_ENABLE" = "yes" ] && grep -q '^[^-]*"posix"' /etc/prosody/prosody.cfg.lua; then
+ if [ -f /etc/prosody/prosody.cfg.lua ] && grep -q '^[^-]*"posix"' /etc/prosody/prosody.cfg.lua; then
echo "Starting XMPP Server..."
su -p -c "/usr/bin/prosody" prosody 2>/dev/null
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-07 15:43:22 UTC (rev 5872)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-08 00:37:56 UTC (rev 5873)
@@ -437,6 +437,21 @@
#UPNP_BITRATE_DOWN=10000000
#UPNP_SECURE_MODE="no"
+## XMPP (Jabber) Server - Prosody
+## Data stored in /mnt/kd/prosody/ symlinked from /etc/prosody/
+## Enable XMPP server by setting XMPP_ENABLE="yes"
+#XMPP_ENABLE="yes"
+#XMPP_HOSTNAME="host.example.com" # Defaults to "$HOSTNAME.$DOMAIN"
+#XMPP_CERT="" # Defaults to "/etc/prosody/certs/server.crt"
+#XMPP_KEY="" # Defaults to "/etc/prosody/certs/server.key"
+#XMPP_ADMIN_USERS="" # Space separated list of accounts that are admins for the server.
+#XMPP_ENABLE_MODULES="" # Space separated list of modules to enable, not enabled by default.
+#XMPP_DISABLE_MODULES="" # Space separated list of default modules not to enable.
+#XMPP_CONFERENCE="" # Enable a multi-user chat room server, ie. conference.host.example.com
+#XMPP_LOG="none" # Enable /var/log/prosody/prosody.log: "none", "warn", "info", "debug"
+#XMPP_SYSLOG="warn" # Enable syslog logging: "none", "error", "warn", "info"
+#XMPP_ERROR_LOG="no" # Enable error logging /var/log/prosody/prosody.err: "no", "yes"
+
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
## The "user" and "pass" are optional
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-08 16:04:58
|
Revision: 5876
http://astlinux.svn.sourceforge.net/astlinux/?rev=5876&view=rev
Author: abelbeck
Date: 2013-01-08 16:04:52 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
prosody, fix syslog logging syntax, fail to start if no SSL cert - override with XMPP_REQUIRE_SSL=no
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-01-08 05:42:31 UTC (rev 5875)
+++ branches/1.0/package/prosody/prosody.init 2013-01-08 16:04:52 UTC (rev 5876)
@@ -89,14 +89,14 @@
admins = { $admins }
log = {
-${LOG_OK} $log = \"/var/log/prosody/prosody.log\",
-${SYSLOG_OK} $syslog = \"*syslog\",
-${ERROR_LOG} error = \"/var/log/prosody/prosody.err\",
+${LOG_OK} $log = \"/var/log/prosody/prosody.log\";
+${SYSLOG_OK} { levels = { min = \"$syslog\" }, to = \"syslog\" };
+${ERROR_LOG} error = \"/var/log/prosody/prosody.err\";
}
${SSL_OK}ssl = {
-${SSL_OK} certificate = \"$cert\",
-${SSL_OK} key = \"$key\",
+${SSL_OK} certificate = \"$cert\";
+${SSL_OK} key = \"$key\";
${SSL_OK}}
modules_enabled = { \"posix\", $modules }
@@ -109,6 +109,11 @@
if [ -n "$XMPP_CONFERENCE" ]; then
echo "Component \"$XMPP_CONFERENCE\" \"muc\""
fi
+
+ if [ -n "$SSL_OK" ]; then
+ return 1
+ fi
+ return 0
}
init () {
@@ -155,6 +160,12 @@
-- A manually generated prosody.cfg.lua config will use /mnt/kd/prosody/prosody.conf if it exists.
" >/mnt/kd/prosody/prosody.cfg.lua
gen_xmpp_config >>/mnt/kd/prosody/prosody.cfg.lua
+ if [ $? -ne 0 -a "$XMPP_REQUIRE_SSL" != "no" ]; then
+ logger -s -t prosody -p kern.info "XMPP SSL configuration error, failed to start."
+ logger -s -t prosody -p kern.info "Try generating an Asterisk SIP-TLS Server Certificate, which XMPP will use."
+ rm /mnt/kd/prosody/prosody.cfg.lua
+ return
+ fi
fi
chown prosody:prosody /mnt/kd/prosody/prosody.cfg.lua
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-08 05:42:31 UTC (rev 5875)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-08 16:04:52 UTC (rev 5876)
@@ -451,6 +451,7 @@
#XMPP_LOG="none" # Enable /var/log/prosody/prosody.log: "none", "warn", "info", "debug"
#XMPP_SYSLOG="warn" # Enable syslog logging: "none", "error", "warn", "info"
#XMPP_ERROR_LOG="no" # Enable error logging /var/log/prosody/prosody.err: "no", "yes"
+#XMPP_REQUIRE_SSL="yes" # Require SSL/TLS encryption, "no", "yes", defaults to "yes"
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-08 18:59:43
|
Revision: 5879
http://astlinux.svn.sourceforge.net/astlinux/?rev=5879&view=rev
Author: abelbeck
Date: 2013-01-08 18:59:36 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
update default configs
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-01-08 18:55:50 UTC (rev 5878)
+++ branches/1.0/astlinux-ast11.config 2013-01-08 18:59:36 UTC (rev 5879)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5840-dirty Configuration
-# Thu Dec 27 15:19:48 2012
+# Buildroot 2011.08-svn5878-dirty Configuration
+# Tue Jan 8 12:56:29 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -177,6 +177,7 @@
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_PROSODY is not set
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-01-08 18:55:50 UTC (rev 5878)
+++ branches/1.0/astlinux.config 2013-01-08 18:59:36 UTC (rev 5879)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5840 Configuration
-# Thu Dec 27 15:16:12 2012
+# Buildroot 2011.08-svn5878 Configuration
+# Tue Jan 8 12:56:24 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -183,6 +183,7 @@
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_PROSODY is not set
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-01-08 18:55:50 UTC (rev 5878)
+++ branches/1.0/astlinux18.config 2013-01-08 18:59:36 UTC (rev 5879)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5840-dirty Configuration
-# Thu Dec 27 15:17:27 2012
+# Buildroot 2011.08-svn5878-dirty Configuration
+# Tue Jan 8 12:56:27 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -177,6 +177,7 @@
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_PROSODY is not set
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-08 19:17:39
|
Revision: 5881
http://astlinux.svn.sourceforge.net/astlinux/?rev=5881&view=rev
Author: abelbeck
Date: 2013-01-08 19:17:33 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
update default configs
Modified Paths:
--------------
branches/1.0/initrd.config
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-01-08 19:15:00 UTC (rev 5880)
+++ branches/1.0/initrd.config 2013-01-08 19:17:33 UTC (rev 5881)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5651-dirty Configuration
-# Wed Aug 29 23:41:32 2012
+# Buildroot 2011.08-svn5880-dirty Configuration
+# Tue Jan 8 13:15:22 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -159,6 +159,7 @@
# BR2_PACKAGE_ASTERISK is not set
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_PROSODY is not set
#
# Audio and video libraries and applications
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-01-08 19:15:00 UTC (rev 5880)
+++ branches/1.0/runnix-uclibc.config 2013-01-08 19:17:33 UTC (rev 5881)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5833-dirty Configuration
-# Mon Dec 24 14:52:04 2012
+# Buildroot 2011.08-svn5880-dirty Configuration
+# Tue Jan 8 13:15:21 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -219,6 +219,7 @@
# BR2_PACKAGE_DAHDI_TOOLS is not set
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_PROSODY is not set
# BR2_PACKAGE_RHINO is not set
# BR2_PACKAGE_WANPIPE is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-01-08 19:15:00 UTC (rev 5880)
+++ branches/1.0/runnix.config 2013-01-08 19:17:33 UTC (rev 5881)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5833-dirty Configuration
-# Mon Dec 24 14:51:56 2012
+# Buildroot 2011.08-svn5880-dirty Configuration
+# Tue Jan 8 13:15:20 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -161,6 +161,7 @@
# BR2_PACKAGE_DAHDI_TOOLS is not set
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_PROSODY is not set
# BR2_PACKAGE_RHINO is not set
# BR2_PACKAGE_WANPIPE is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-09 19:47:10
|
Revision: 5883
http://astlinux.svn.sourceforge.net/astlinux/?rev=5883&view=rev
Author: abelbeck
Date: 2013-01-09 19:47:03 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
prosody, always require SSL/TLS and 'disallow_s2s'
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-01-08 23:03:47 UTC (rev 5882)
+++ branches/1.0/package/prosody/prosody.init 2013-01-09 19:47:03 UTC (rev 5883)
@@ -24,8 +24,17 @@
gen_xmpp_config()
{
local m ADD_MODS="" modules="" admins="" hostname cert key log syslog error
- local SSL_OK LOG_OK SYSLOG_OK ERROR_LOG IFS
+ local LOG_OK SYSLOG_OK ERROR_LOG IFS
+ cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
+ key="${XMPP_KEY:-/etc/prosody/certs/server.key}"
+ if [ ! -f "$cert" ] || [ ! -f "$key" ]; then
+ return 1
+ fi
+ if [ "$(stat -c '%U:%G' "$cert")" != "prosody:prosody" -o "$(stat -c '%U:%G' "$key")" != "prosody:prosody" ]; then
+ return 1
+ fi
+
unset IFS
for m in $XMPP_ENABLE_MODULES; do
if ! mod_in_list "$m" "$DEFAULT_MODULES"; then
@@ -38,15 +47,6 @@
fi
done
- SSL_OK="-- "
- cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
- key="${XMPP_KEY:-/etc/prosody/certs/server.key}"
- if [ -f "$cert" -a -f "$key" ]; then
- if [ "$(stat -c '%U:%G' "$cert")" = "prosody:prosody" -a "$(stat -c '%U:%G' "$key")" = "prosody:prosody" ]; then
- SSL_OK=""
- fi
- fi
-
for m in $XMPP_ADMIN_USERS; do
admins="$admins${admins:+, }\"$m\""
done
@@ -86,6 +86,10 @@
authentication = \"internal_plain\"
+disallow_s2s = true
+
+c2s_require_encryption = true
+
admins = { $admins }
log = {
@@ -94,10 +98,10 @@
${ERROR_LOG} error = \"/var/log/prosody/prosody.err\";
}
-${SSL_OK}ssl = {
-${SSL_OK} certificate = \"$cert\";
-${SSL_OK} key = \"$key\";
-${SSL_OK}}
+ssl = {
+ certificate = \"$cert\";
+ key = \"$key\";
+}
modules_enabled = { \"posix\", $modules }
@@ -110,9 +114,6 @@
echo "Component \"$XMPP_CONFERENCE\" \"muc\""
fi
- if [ -n "$SSL_OK" ]; then
- return 1
- fi
return 0
}
@@ -160,9 +161,9 @@
-- A manually generated prosody.cfg.lua config will use /mnt/kd/prosody/prosody.conf if it exists.
" >/mnt/kd/prosody/prosody.cfg.lua
gen_xmpp_config >>/mnt/kd/prosody/prosody.cfg.lua
- if [ $? -ne 0 -a "$XMPP_REQUIRE_SSL" != "no" ]; then
+ if [ $? -ne 0 ]; then
logger -s -t prosody -p kern.info "XMPP SSL configuration error, failed to start."
- logger -s -t prosody -p kern.info "Try generating an Asterisk SIP-TLS Server Certificate, which XMPP will use."
+ logger -s -t prosody -p kern.info "Try generating an Asterisk SIP-TLS Server Certificate, which XMPP will use by default."
rm /mnt/kd/prosody/prosody.cfg.lua
return
fi
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-08 23:03:47 UTC (rev 5882)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-09 19:47:03 UTC (rev 5883)
@@ -451,7 +451,6 @@
#XMPP_LOG="none" # Enable /var/log/prosody/prosody.log: "none", "warn", "info", "debug"
#XMPP_SYSLOG="warn" # Enable syslog logging: "none", "error", "warn", "info"
#XMPP_ERROR_LOG="no" # Enable error logging /var/log/prosody/prosody.err: "no", "yes"
-#XMPP_REQUIRE_SSL="yes" # Require SSL/TLS encryption, "no", "yes", defaults to "yes"
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-10 14:05:34
|
Revision: 5884
http://astlinux.svn.sourceforge.net/astlinux/?rev=5884&view=rev
Author: abelbeck
Date: 2013-01-10 14:05:27 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
prosody, add XMPP_ENABLE_S2S config variable
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-01-09 19:47:03 UTC (rev 5883)
+++ branches/1.0/package/prosody/prosody.init 2013-01-10 14:05:27 UTC (rev 5884)
@@ -2,11 +2,13 @@
. /etc/rc.conf
-DEFAULT_MODULES="roster saslauth tls dialback disco \
+DEFAULT_MODULES="roster saslauth tls disco \
private vcard \
legacyauth version uptime time ping pep register adhoc \
admin_adhoc"
+DEFAULT_MODULES_S2S="dialback"
+
mod_in_list()
{
local match="$1" list="$2" IFS
@@ -23,7 +25,7 @@
gen_xmpp_config()
{
- local m ADD_MODS="" modules="" admins="" hostname cert key log syslog error
+ local m MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error
local LOG_OK SYSLOG_OK ERROR_LOG IFS
cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
@@ -35,13 +37,21 @@
return 1
fi
+ if [ "$XMPP_ENABLE_S2S" = "yes" ]; then
+ MODS="$DEFAULT_MODULES $DEFAULT_MODULES_S2S"
+ no_s2s="false"
+ else
+ MODS="$DEFAULT_MODULES"
+ no_s2s="true"
+ fi
+
unset IFS
for m in $XMPP_ENABLE_MODULES; do
- if ! mod_in_list "$m" "$DEFAULT_MODULES"; then
+ if ! mod_in_list "$m" "$MODS"; then
ADD_MODS="$ADD_MODS${ADD_MODS:+ }$m"
fi
done
- for m in $DEFAULT_MODULES $ADD_MODS; do
+ for m in $MODS $ADD_MODS; do
if ! mod_in_list "$m" "$XMPP_DISABLE_MODULES"; then
modules="$modules${modules:+, }\"$m\""
fi
@@ -86,7 +96,7 @@
authentication = \"internal_plain\"
-disallow_s2s = true
+disallow_s2s = $no_s2s
c2s_require_encryption = true
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-09 19:47:03 UTC (rev 5883)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-10 14:05:27 UTC (rev 5884)
@@ -441,6 +441,7 @@
## Data stored in /mnt/kd/prosody/ symlinked from /etc/prosody/
## Enable XMPP server by setting XMPP_ENABLE="yes"
#XMPP_ENABLE="yes"
+#XMPP_ENABLE_S2S="no" # Enable server-to-server connections, "no", "yes", defaults to "no"
#XMPP_HOSTNAME="host.example.com" # Defaults to "$HOSTNAME.$DOMAIN"
#XMPP_CERT="" # Defaults to "/etc/prosody/certs/server.crt"
#XMPP_KEY="" # Defaults to "/etc/prosody/certs/server.key"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-10 23:18:31
|
Revision: 5885
http://astlinux.svn.sourceforge.net/astlinux/?rev=5885&view=rev
Author: abelbeck
Date: 2013-01-10 23:18:24 +0000 (Thu, 10 Jan 2013)
Log Message:
-----------
Add Prosody, an XMPP server, to the default configurations
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-01-10 14:05:27 UTC (rev 5884)
+++ branches/1.0/astlinux-ast11.config 2013-01-10 23:18:24 UTC (rev 5885)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5878-dirty Configuration
-# Tue Jan 8 12:56:29 2013
+# Buildroot 2011.08-svn5884-dirty Configuration
+# Thu Jan 10 17:13:09 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -177,7 +177,7 @@
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
-# BR2_PACKAGE_PROSODY is not set
+BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
@@ -423,7 +423,20 @@
#
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_LUA is not set
+BR2_PACKAGE_LUA=y
+
+#
+# LUA libraries/modules
+#
+# BR2_PACKAGE_CGILUA is not set
+# BR2_PACKAGE_COPAS is not set
+# BR2_PACKAGE_COXPCALL is not set
+BR2_PACKAGE_LUAEXPAT=y
+BR2_PACKAGE_LUAFILESYSTEM=y
+BR2_PACKAGE_LUASEC=y
+BR2_PACKAGE_LUASOCKET=y
+# BR2_PACKAGE_WSAPI is not set
+# BR2_PACKAGE_XAVANTE is not set
BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
@@ -562,7 +575,8 @@
BR2_PACKAGE_CURL=y
# BR2_PACKAGE_LIBDNET is not set
# BR2_PACKAGE_LIBEXOSIP2 is not set
-# BR2_PACKAGE_LIBIDN is not set
+BR2_PACKAGE_LIBIDN=y
+# BR2_PACKAGE_LIBIDN_BINARY is not set
# BR2_PACKAGE_LIBMICROHTTPD is not set
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBMNL is not set
@@ -611,7 +625,7 @@
#
# JSON/XML
#
-# BR2_PACKAGE_EXPAT is not set
+BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_EZXML is not set
BR2_PACKAGE_IKSEMEL=y
# BR2_PACKAGE_LIBROXML is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-01-10 14:05:27 UTC (rev 5884)
+++ branches/1.0/astlinux.config 2013-01-10 23:18:24 UTC (rev 5885)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5878 Configuration
-# Tue Jan 8 12:56:24 2013
+# Buildroot 2011.08-svn5884 Configuration
+# Thu Jan 10 17:11:26 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -183,7 +183,7 @@
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
-# BR2_PACKAGE_PROSODY is not set
+BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
@@ -429,7 +429,20 @@
#
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_LUA is not set
+BR2_PACKAGE_LUA=y
+
+#
+# LUA libraries/modules
+#
+# BR2_PACKAGE_CGILUA is not set
+# BR2_PACKAGE_COPAS is not set
+# BR2_PACKAGE_COXPCALL is not set
+BR2_PACKAGE_LUAEXPAT=y
+BR2_PACKAGE_LUAFILESYSTEM=y
+BR2_PACKAGE_LUASEC=y
+BR2_PACKAGE_LUASOCKET=y
+# BR2_PACKAGE_WSAPI is not set
+# BR2_PACKAGE_XAVANTE is not set
BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
@@ -569,7 +582,8 @@
BR2_PACKAGE_CURL=y
# BR2_PACKAGE_LIBDNET is not set
# BR2_PACKAGE_LIBEXOSIP2 is not set
-# BR2_PACKAGE_LIBIDN is not set
+BR2_PACKAGE_LIBIDN=y
+# BR2_PACKAGE_LIBIDN_BINARY is not set
# BR2_PACKAGE_LIBMICROHTTPD is not set
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBMNL is not set
@@ -618,7 +632,7 @@
#
# JSON/XML
#
-# BR2_PACKAGE_EXPAT is not set
+BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_EZXML is not set
BR2_PACKAGE_IKSEMEL=y
# BR2_PACKAGE_LIBROXML is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-01-10 14:05:27 UTC (rev 5884)
+++ branches/1.0/astlinux18.config 2013-01-10 23:18:24 UTC (rev 5885)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5878-dirty Configuration
-# Tue Jan 8 12:56:27 2013
+# Buildroot 2011.08-svn5884-dirty Configuration
+# Thu Jan 10 17:12:35 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -177,7 +177,7 @@
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
-# BR2_PACKAGE_PROSODY is not set
+BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
@@ -423,7 +423,20 @@
#
BR2_PACKAGE_BC=y
# BR2_PACKAGE_HASERL is not set
-# BR2_PACKAGE_LUA is not set
+BR2_PACKAGE_LUA=y
+
+#
+# LUA libraries/modules
+#
+# BR2_PACKAGE_CGILUA is not set
+# BR2_PACKAGE_COPAS is not set
+# BR2_PACKAGE_COXPCALL is not set
+BR2_PACKAGE_LUAEXPAT=y
+BR2_PACKAGE_LUAFILESYSTEM=y
+BR2_PACKAGE_LUASEC=y
+BR2_PACKAGE_LUASOCKET=y
+# BR2_PACKAGE_WSAPI is not set
+# BR2_PACKAGE_XAVANTE is not set
BR2_PACKAGE_PERL=y
BR2_PACKAGE_PHP=y
BR2_PACKAGE_PHP_CGI=y
@@ -562,7 +575,8 @@
BR2_PACKAGE_CURL=y
# BR2_PACKAGE_LIBDNET is not set
# BR2_PACKAGE_LIBEXOSIP2 is not set
-# BR2_PACKAGE_LIBIDN is not set
+BR2_PACKAGE_LIBIDN=y
+# BR2_PACKAGE_LIBIDN_BINARY is not set
# BR2_PACKAGE_LIBMICROHTTPD is not set
# BR2_PACKAGE_NEON is not set
# BR2_PACKAGE_LIBMNL is not set
@@ -611,7 +625,7 @@
#
# JSON/XML
#
-# BR2_PACKAGE_EXPAT is not set
+BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_EZXML is not set
BR2_PACKAGE_IKSEMEL=y
# BR2_PACKAGE_LIBROXML is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X