Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2013-01-11 00:18:41
|
Revision: 5886
http://astlinux.svn.sourceforge.net/astlinux/?rev=5886&view=rev
Author: abelbeck
Date: 2013-01-11 00:18:23 +0000 (Fri, 11 Jan 2013)
Log Message:
-----------
prosody, add rc.conf variables XMPP_C2S_PORT and XMPP_S2S_PORT to define TCP ports
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-10 23:18:24 UTC (rev 5885)
+++ branches/1.0/package/prosody/prosody.init 2013-01-11 00:18:23 UTC (rev 5886)
@@ -25,7 +25,7 @@
gen_xmpp_config()
{
- local m MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error
+ local m MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error c2s_port s2s_port
local LOG_OK SYSLOG_OK ERROR_LOG IFS
cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
@@ -63,6 +63,10 @@
hostname="${XMPP_HOSTNAME:-$HOSTNAME.$DOMAIN}"
+ c2s_port="${XMPP_C2S_PORT:-5222}"
+
+ s2s_port="${XMPP_S2S_PORT:-5269}"
+
log="${XMPP_LOG:-none}"
if [ "$log" = "warn" -o "$log" = "info" -o "$log" = "debug" ]; then
LOG_OK=""
@@ -100,6 +104,10 @@
c2s_require_encryption = true
+c2s_ports = { $c2s_port }
+
+s2s_ports = { $s2s_port }
+
admins = { $admins }
log = {
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-10 23:18:24 UTC (rev 5885)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-11 00:18:23 UTC (rev 5886)
@@ -449,6 +449,8 @@
#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_C2S_PORT="5222" # TCP Port for client-to-server connections, defaults to 5222
+#XMPP_S2S_PORT="5269" # TCP Port for server-to-server connections, defaults to 5269
#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"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-15 01:07:28
|
Revision: 5902
http://astlinux.svn.sourceforge.net/astlinux/?rev=5902&view=rev
Author: abelbeck
Date: 2013-01-15 01:07:21 +0000 (Tue, 15 Jan 2013)
Log Message:
-----------
update default configs with libical, disabled for now
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.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 2013-01-15 01:02:13 UTC (rev 5901)
+++ branches/1.0/astlinux-ast11.config 2013-01-15 01:07:21 UTC (rev 5902)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5884-dirty Configuration
-# Thu Jan 10 17:13:09 2013
+# Buildroot 2011.08-svn5901-dirty Configuration
+# Mon Jan 14 19:04:35 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -603,6 +603,7 @@
# BR2_PACKAGE_LIBFB is not set
# BR2_PACKAGE_LIBFFI is not set
# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBICAL is not set
# BR2_PACKAGE_LIBNSPR is not set
# BR2_PACKAGE_LIBSIGC is not set
# BR2_PACKAGE_ORC is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-01-15 01:02:13 UTC (rev 5901)
+++ branches/1.0/astlinux.config 2013-01-15 01:07:21 UTC (rev 5902)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5884 Configuration
-# Thu Jan 10 17:11:26 2013
+# Buildroot 2011.08-svn5901 Configuration
+# Mon Jan 14 19:04:31 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -610,6 +610,7 @@
# BR2_PACKAGE_LIBFB is not set
# BR2_PACKAGE_LIBFFI is not set
# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBICAL is not set
# BR2_PACKAGE_LIBNSPR is not set
# BR2_PACKAGE_LIBSIGC is not set
# BR2_PACKAGE_ORC is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-01-15 01:02:13 UTC (rev 5901)
+++ branches/1.0/astlinux18.config 2013-01-15 01:07:21 UTC (rev 5902)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5884-dirty Configuration
-# Thu Jan 10 17:12:35 2013
+# Buildroot 2011.08-svn5901-dirty Configuration
+# Mon Jan 14 19:04:33 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -603,6 +603,7 @@
# BR2_PACKAGE_LIBFB is not set
# BR2_PACKAGE_LIBFFI is not set
# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBICAL is not set
# BR2_PACKAGE_LIBNSPR is not set
# BR2_PACKAGE_LIBSIGC is not set
# BR2_PACKAGE_ORC is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-01-15 01:02:13 UTC (rev 5901)
+++ branches/1.0/initrd.config 2013-01-15 01:07:21 UTC (rev 5902)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5880-dirty Configuration
-# Tue Jan 8 13:15:22 2013
+# Buildroot 2011.08-svn5901-dirty Configuration
+# Mon Jan 14 19:04:50 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -499,6 +499,7 @@
# BR2_PACKAGE_LIBFB is not set
# BR2_PACKAGE_LIBFFI is not set
# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBICAL is not set
# BR2_PACKAGE_LIBNSPR is not set
# BR2_PACKAGE_LIBSIGC is not set
# BR2_PACKAGE_ORC is not set
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-01-15 01:02:13 UTC (rev 5901)
+++ branches/1.0/runnix-uclibc.config 2013-01-15 01:07:21 UTC (rev 5902)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5880-dirty Configuration
-# Tue Jan 8 13:15:21 2013
+# Buildroot 2011.08-svn5901-dirty Configuration
+# Mon Jan 14 19:04:37 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -749,6 +749,10 @@
#
#
+# libical requires a toolchain with WCHAR support
+#
+
+#
# libnspr requires a toolchain with LARGEFILE support
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-01-15 01:02:13 UTC (rev 5901)
+++ branches/1.0/runnix.config 2013-01-15 01:07:21 UTC (rev 5902)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5880-dirty Configuration
-# Tue Jan 8 13:15:20 2013
+# Buildroot 2011.08-svn5901-dirty Configuration
+# Mon Jan 14 19:04:36 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -523,6 +523,7 @@
# BR2_PACKAGE_LIBFB is not set
# BR2_PACKAGE_LIBFFI is not set
# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_LIBICAL is not set
# BR2_PACKAGE_LIBNSPR is not set
# BR2_PACKAGE_LIBSIGC is not set
# BR2_PACKAGE_ORC 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-16 18:15:58
|
Revision: 5906
http://astlinux.svn.sourceforge.net/astlinux/?rev=5906&view=rev
Author: abelbeck
Date: 2013-01-16 18:15:49 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
default configs, Asterisk 1.8 and 11, enable 'neon' (libneon) and 'libical' so Asterisk builds with calendar support
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-01-15 22:09:33 UTC (rev 5905)
+++ branches/1.0/astlinux-ast11.config 2013-01-16 18:15:49 UTC (rev 5906)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5901-dirty Configuration
-# Mon Jan 14 19:04:35 2013
+# Buildroot 2011.08-svn5905-dirty Configuration
+# Wed Jan 16 12:12:44 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -578,7 +578,12 @@
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_NEON=y
+BR2_PACKAGE_NEON_ZLIB=y
+BR2_PACKAGE_NEON_SSL=y
+# BR2_PACKAGE_NEON_NOXML is not set
+# BR2_PACKAGE_NEON_EXPAT is not set
+BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
@@ -603,7 +608,7 @@
# BR2_PACKAGE_LIBFB is not set
# BR2_PACKAGE_LIBFFI is not set
# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_LIBICAL is not set
+BR2_PACKAGE_LIBICAL=y
# BR2_PACKAGE_LIBNSPR is not set
# BR2_PACKAGE_LIBSIGC is not set
# BR2_PACKAGE_ORC is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-01-15 22:09:33 UTC (rev 5905)
+++ branches/1.0/astlinux18.config 2013-01-16 18:15:49 UTC (rev 5906)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5901-dirty Configuration
-# Mon Jan 14 19:04:33 2013
+# Buildroot 2011.08-svn5905 Configuration
+# Wed Jan 16 12:11:41 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -578,7 +578,12 @@
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_NEON=y
+BR2_PACKAGE_NEON_ZLIB=y
+BR2_PACKAGE_NEON_SSL=y
+# BR2_PACKAGE_NEON_NOXML is not set
+# BR2_PACKAGE_NEON_EXPAT is not set
+BR2_PACKAGE_NEON_LIBXML2=y
# BR2_PACKAGE_LIBMNL is not set
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNL is not set
@@ -603,7 +608,7 @@
# BR2_PACKAGE_LIBFB is not set
# BR2_PACKAGE_LIBFFI is not set
# BR2_PACKAGE_LIBGLIB2 is not set
-# BR2_PACKAGE_LIBICAL is not set
+BR2_PACKAGE_LIBICAL=y
# BR2_PACKAGE_LIBNSPR is not set
# BR2_PACKAGE_LIBSIGC is not set
# BR2_PACKAGE_ORC 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-19 19:09:39
|
Revision: 5911
http://astlinux.svn.sourceforge.net/astlinux/?rev=5911&view=rev
Author: abelbeck
Date: 2013-01-19 19:09:32 +0000 (Sat, 19 Jan 2013)
Log Message:
-----------
prosody, add XMPP_C2S_IDLE_TIMEOUT rc.conf variable
Modified Paths:
--------------
branches/1.0/package/prosody/prosody.init
branches/1.0/package/prosody/prosody.mk
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/prosody/modules/mod_pinger.lua
branches/1.0/package/prosody/util/
branches/1.0/package/prosody/util/watchdog.lua
Added: branches/1.0/package/prosody/modules/mod_pinger.lua
===================================================================
--- branches/1.0/package/prosody/modules/mod_pinger.lua (rev 0)
+++ branches/1.0/package/prosody/modules/mod_pinger.lua 2013-01-19 19:09:32 UTC (rev 5911)
@@ -0,0 +1,46 @@
+local new_watchdog = require "util.watchdog".new;
+local filters = require "util.filters";
+local st = require "util.stanza";
+
+local idle_timeout = module:get_option_number("c2s_idle_timeout", 300);
+local ping_timeout = module:get_option_number("c2s_ping_timeout", 30);
+
+function update_watchdog(data, session)
+ session.idle_watchdog:reset();
+ session.idle_pinged = nil;
+ return data;
+end
+
+function check_session(watchdog)
+ local session = watchdog.session;
+ if not session.idle_pinged then
+ session.idle_pinged = true;
+ session.send(st.iq({ type = "get", from = module.host, id = "idle-check" })
+ :tag("ping", { xmlns = "urn:xmpp:ping" }));
+ return ping_timeout; -- Call us again after ping_timeout
+ else
+ module:log("info", "Client %q silent for too long, closing...", session.full_jid);
+ session:close("connection-timeout");
+ end
+end
+
+
+function watch_session(session)
+ if not session.idle_watchdog
+ and not session.requests then -- Don't watch BOSH connections (BOSH already has timeouts)
+ session.idle_watchdog = new_watchdog(idle_timeout, check_session);
+ session.idle_watchdog.session = session;
+ filters.add_filter(session, "bytes/in", update_watchdog);
+ end
+end
+
+function unwatch_session(session)
+ if session.idle_watchdog then
+ session.idle_watchdog:cancel();
+ session.idle_watchdog = nil;
+ filters.remove_filter(session, "bytes/in", update_watchdog);
+ end
+end
+
+module:hook("resource-bind", function (event) watch_session(event.session); end);
+module:hook("resource-unbind", function (event) unwatch_session(event.session); end);
Modified: branches/1.0/package/prosody/prosody.init
===================================================================
--- branches/1.0/package/prosody/prosody.init 2013-01-18 15:37:38 UTC (rev 5910)
+++ branches/1.0/package/prosody/prosody.init 2013-01-19 19:09:32 UTC (rev 5911)
@@ -26,7 +26,7 @@
gen_xmpp_config()
{
local m MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error c2s_port s2s_port
- local LOG_OK SYSLOG_OK ERROR_LOG IFS
+ local LOG_OK SYSLOG_OK ERROR_LOG IFS c2s_idle_timeout
cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
key="${XMPP_KEY:-/etc/prosody/certs/server.key}"
@@ -45,6 +45,13 @@
no_s2s="true"
fi
+ if [ -n "$XMPP_C2S_IDLE_TIMEOUT" ]; then
+ MODS="$MODS pinger"
+ c2s_idle_timeout="$XMPP_C2S_IDLE_TIMEOUT"
+ else
+ c2s_idle_timeout=""
+ fi
+
unset IFS
for m in $XMPP_ENABLE_MODULES; do
if ! mod_in_list "$m" "$MODS"; then
@@ -102,8 +109,10 @@
disallow_s2s = $no_s2s
-c2s_require_encryption = true
+c2s_require_encryption = true${c2s_idle_timeout:+
+c2s_idle_timeout = $c2s_idle_timeout}
+
c2s_ports = { $c2s_port }
s2s_ports = { $s2s_port }
Modified: branches/1.0/package/prosody/prosody.mk
===================================================================
--- branches/1.0/package/prosody/prosody.mk 2013-01-18 15:37:38 UTC (rev 5910)
+++ branches/1.0/package/prosody/prosody.mk 2013-01-19 19:09:32 UTC (rev 5911)
@@ -30,6 +30,8 @@
cp $(TARGET_DIR)/etc/prosody/prosody.cfg.lua $(TARGET_DIR)/stat/etc/prosody/prosody.cfg.lua
rm -rf $(TARGET_DIR)/etc/prosody
$(INSTALL) -m 0644 -D package/prosody/modules/mod_listusers.lua $(TARGET_DIR)/usr/lib/prosody/modules/
+ $(INSTALL) -m 0644 -D package/prosody/modules/mod_pinger.lua $(TARGET_DIR)/usr/lib/prosody/modules/
+ $(INSTALL) -m 0644 -D package/prosody/util/watchdog.lua $(TARGET_DIR)/usr/lib/prosody/util/
$(INSTALL) -m 0755 -D package/prosody/prosody.init $(TARGET_DIR)/etc/init.d/prosody
ln -s /tmp/etc/prosody $(TARGET_DIR)/etc/prosody
ln -sf ../../init.d/prosody $(TARGET_DIR)/etc/runlevels/default/S58prosody
Added: branches/1.0/package/prosody/util/watchdog.lua
===================================================================
--- branches/1.0/package/prosody/util/watchdog.lua (rev 0)
+++ branches/1.0/package/prosody/util/watchdog.lua 2013-01-19 19:09:32 UTC (rev 5911)
@@ -0,0 +1,34 @@
+local timer = require "util.timer";
+local setmetatable = setmetatable;
+local os_time = os.time;
+
+module "watchdog"
+
+local watchdog_methods = {};
+local watchdog_mt = { __index = watchdog_methods };
+
+function new(timeout, callback)
+ local watchdog = setmetatable({ timeout = timeout, last_reset = os_time(), callback = callback }, watchdog_mt);
+ timer.add_task(timeout+1, function (current_time)
+ local last_reset = watchdog.last_reset;
+ if not last_reset then
+ return;
+ end
+ local time_left = (last_reset + timeout) - current_time;
+ if time_left < 0 then
+ return watchdog:callback();
+ end
+ return time_left + 1;
+ end);
+ return watchdog;
+end
+
+function watchdog_methods:reset()
+ self.last_reset = os_time();
+end
+
+function watchdog_methods:cancel()
+ self.last_reset = nil;
+end
+
+return _M;
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-18 15:37:38 UTC (rev 5910)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-19 19:09:32 UTC (rev 5911)
@@ -449,6 +449,7 @@
#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_C2S_IDLE_TIMEOUT="300" # Send server-to-client ping every "nnn" seconds and timeout if no reply, disabled if ""
#XMPP_C2S_PORT="5222" # TCP Port for client-to-server connections, defaults to 5222
#XMPP_S2S_PORT="5269" # TCP Port for server-to-server connections, defaults to 5269
#XMPP_LOG="none" # Enable /var/log/prosody/prosody.log: "none", "warn", "info", "debug"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-01-21 08:08:38
|
Revision: 5917
http://astlinux.svn.sourceforge.net/astlinux/?rev=5917&view=rev
Author: abelbeck
Date: 2013-01-21 08:08:32 +0000 (Mon, 21 Jan 2013)
Log Message:
-----------
prosody, add XMPP_GROUPS variable to enable 'mod_groups'
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-21 02:21:24 UTC (rev 5916)
+++ branches/1.0/package/prosody/prosody.init 2013-01-21 08:08:32 UTC (rev 5917)
@@ -26,7 +26,7 @@
gen_xmpp_config()
{
local m vh MODS ADD_MODS="" modules="" admins="" hostname cert key no_s2s log syslog error c2s_port s2s_port
- local LOG_OK SYSLOG_OK ERROR_LOG IFS c2s_idle_timeout
+ local LOG_OK SYSLOG_OK ERROR_LOG GROUPS_OK IFS c2s_idle_timeout
cert="${XMPP_CERT:-/etc/prosody/certs/server.crt}"
key="${XMPP_KEY:-/etc/prosody/certs/server.key}"
@@ -45,6 +45,15 @@
no_s2s="true"
fi
+ if [ "$XMPP_GROUPS" = "yes" ]; then
+ MODS="$MODS groups"
+ GROUPS_OK=""
+ touch /mnt/kd/prosody/sharedgroups.conf
+ chown prosody:prosody /mnt/kd/prosody/sharedgroups.conf
+ else
+ GROUPS_OK="-- "
+ fi
+
if [ -n "$XMPP_C2S_IDLE_TIMEOUT" ]; then
MODS="$MODS pinger"
c2s_idle_timeout="$XMPP_C2S_IDLE_TIMEOUT"
@@ -117,6 +126,8 @@
s2s_ports = { $s2s_port }
+${GROUPS_OK}groups_file = \"/mnt/kd/prosody/sharedgroups.conf\"
+
admins = { $admins }
log = {
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-21 02:21:24 UTC (rev 5916)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-01-21 08:08:32 UTC (rev 5917)
@@ -449,6 +449,7 @@
#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_GROUPS="no" # Enable shared groups, "no", "yes", defaults to "no"
#XMPP_C2S_IDLE_TIMEOUT="300" # Send server-to-client ping every "nnn" seconds and timeout if no reply, disabled if ""
#XMPP_C2S_PORT="5222" # TCP Port for client-to-server connections, defaults to 5222
#XMPP_S2S_PORT="5269" # TCP Port for server-to-server connections, defaults to 5269
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-11 18:57:56
|
Revision: 5950
http://astlinux.svn.sourceforge.net/astlinux/?rev=5950&view=rev
Author: abelbeck
Date: 2013-02-11 18:57:48 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
openvpn, add new optional variables OVPN_SERVERV6 and OVPN_TOPOLOGY for OpenVPN 2.3 IPv6 support
Modified Paths:
--------------
branches/1.0/package/openvpn/openvpn.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init 2013-02-11 15:28:45 UTC (rev 5949)
+++ branches/1.0/package/openvpn/openvpn.init 2013-02-11 18:57:48 UTC (rev 5950)
@@ -53,7 +53,8 @@
cert $OVPN_CERT
key $OVPN_KEY
dh $OVPN_DH
-server $OVPN_SERVER
+server $OVPN_SERVER${OVPN_SERVERV6:+
+server-ipv6 $OVPN_SERVERV6}
verb $OVPN_VERBOSITY" > /tmp/etc/openvpn.conf
# push settings from the server to the client
if [ -n "$OVPN_PUSH1" ]; then
@@ -95,6 +96,9 @@
if [ -n "$OVPN_CIPHER" ]; then
echo "cipher $OVPN_CIPHER" >> /tmp/etc/openvpn.conf
fi
+ if [ -n "$OVPN_TOPOLOGY" ]; then
+ echo "topology $OVPN_TOPOLOGY" >> /tmp/etc/openvpn.conf
+ fi
if [ -n "$OVPN_VALIDCLIENTS" ]; then
echo "tls-verify /usr/sbin/openvpn-tls-verify" >> /tmp/etc/openvpn.conf
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-02-11 15:28:45 UTC (rev 5949)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-11 18:57:48 UTC (rev 5950)
@@ -492,25 +492,18 @@
#OVPN_KEY="/etc/openvpn/easy-rsa/keys/server.key"
#OVPN_DH="/etc/openvpn/easy-rsa/keys/dh1024.pem"
#OVPN_SERVER="10.8.0.0 255.255.255.0"
+#OVPN_SERVERV6="2001:db8:108::1/64" # valid OVPN_SERVER also required if defined
+#OVPN_TOPOLOGY="subnet" # "net30", "p2p" or "subnet", defaults to OpenVPN default
#OVPN_VERBOSITY="1"
-#OVPN_CERT_KEYSIZE="1024" # "1024" or "2048", defaults to "1024"
+#OVPN_CERT_KEYSIZE="1024" # "1024" or "2048", defaults to "1024"
##
-#OVPN_PUSH1="route 192.168.0.0 255.255.255.0"
-#OVPN_PUSH2=""
-#OVPN_PUSH3=""
-#OVPN_PUSH4=""
-## Deprecate OVPN_PUSH1-4 in favor of OVPN_PUSH
#OVPN_PUSH="
#dhcp-option DOMAIN astlinux
#dhcp-option DNS 192.168.101.1
#route 192.168.101.0 255.255.255.0
#"
##
-#OVPN_OTHER1=""
-#OVPN_OTHER2=""
-## Deprecate OVPN_OTHER1-2 in favor of OVPN_OTHER
#OVPN_OTHER="
-#ifconfig-pool-linear
#client-to-client
#"
##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-12 20:16:59
|
Revision: 5952
http://astlinux.svn.sourceforge.net/astlinux/?rev=5952&view=rev
Author: abelbeck
Date: 2013-02-12 20:16:52 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
New system variable, EXTDHCP="no" by default, when "yes" the DHCP server will be enabled and allowed on a static IP external interface,
useful in very special situations, such as in a VM with a single interface.
Modified Paths:
--------------
branches/1.0/package/arnofw/arnofw.wrapper
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/arnofw/arnofw.wrapper
===================================================================
--- branches/1.0/package/arnofw/arnofw.wrapper 2013-02-12 01:51:21 UTC (rev 5951)
+++ branches/1.0/package/arnofw/arnofw.wrapper 2013-02-12 20:16:52 UTC (rev 5952)
@@ -207,6 +207,10 @@
EXT_IF_DHCP_IP=1
fi
+if [ "$EXTDHCP" = "yes" -a -n "$EXTIP" -a -z "$EXT2IF" -a -z "$PPPOEIF" ]; then
+ EXTERNAL_DHCP_SERVER=1
+fi
+
if isVPNtype racoon || isVPNtype ipsecmobile; then
RP_FILTER=0
fi
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2013-02-12 01:51:21 UTC (rev 5951)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2013-02-12 20:16:52 UTC (rev 5952)
@@ -172,6 +172,19 @@
fi
}
+is_EXTDHCP_active()
+{
+
+ # Applies to static EXTIP address, no EXT2IF and no PPPoE
+ if [ "$EXTDHCP" = "yes" -a -n "$EXTIP" -a -z "$EXT2IF" -a -z "$PPPOEIF" ]; then
+ if [ -n "$EXTIF" -a "$EXTIF" != "none" ] && isDHCPinterface $EXTIF; then
+ return 0
+ fi
+ fi
+
+ return 1
+}
+
is_DHCP_active()
{
@@ -243,7 +256,7 @@
return
fi
- if is_DHCP_active; then
+ if is_DHCP_active || is_EXTDHCP_active; then
createDNSMASQbasic dhcp >> /tmp/etc/dnsmasq.conf
addDNSMASQnet "$INTIF" "$INTIP" "$INTNM" lan >> /tmp/etc/dnsmasq.conf
@@ -254,6 +267,10 @@
addDNSMASQnet "$DMZIF" "$DMZIP" "$DMZNM" dmz >> /tmp/etc/dnsmasq.conf
+ if is_EXTDHCP_active; then
+ addDNSMASQnet "$EXTIF" "$EXTIP" "$EXTNM" ext >> /tmp/etc/dnsmasq.conf
+ fi
+
addDHCPhosts_options >> /tmp/etc/dnsmasq.conf
else
createDNSMASQbasic nodhcp >> /tmp/etc/dnsmasq.conf
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-12 01:51:21 UTC (rev 5951)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-12 20:16:52 UTC (rev 5952)
@@ -70,6 +70,10 @@
#EXTNM="255.255.255.0"
#EXTGW="192.168.25.1"
#DNS="192.168.1.1 192.168.1.2 192.168.1.3"
+## Enable DHCP Server on the external interface with a static IP address.
+## If the firewall is enabled, DHCP requests will be allowed automatically.
+## Note: Only use in very special situations.
+#EXTDHCP="no" # "no" or "yes", defaults to "no"
## Internal Interface
#INTIF=eth1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-15 18:40:42
|
Revision: 5956
http://astlinux.svn.sourceforge.net/astlinux/?rev=5956&view=rev
Author: abelbeck
Date: 2013-02-15 18:40:33 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
web interface, OpenVPN Server sub-tab, add 'client.ovpn' certificate profile file in zip download
Modified Paths:
--------------
branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
branches/1.0/package/webinterface/altweb/admin/openvpn.php
branches/1.0/package/webinterface/altweb/admin/siptlscert.php
branches/1.0/package/webinterface/altweb/common/openssl.php
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php 2013-02-14 21:33:03 UTC (rev 5955)
+++ branches/1.0/package/webinterface/altweb/admin/ipsecmobile.php 2013-02-15 18:40:33 UTC (rev 5956)
@@ -334,9 +334,9 @@
$p12pass = opensslRANDOMpass(12);
if (($p12 = opensslPKCS12str($openssl, $value, $p12pass)) !== '') {
$zip->addFromString($value.'/'.$value.'.p12', $p12);
- $zip->addFromString($value.'/README.txt', opensslREADMEstr(TRUE, $value, $p12pass));
+ $zip->addFromString($value.'/README.txt', opensslREADMEstr('p12', $value, $p12pass));
} else {
- $zip->addFromString($value.'/README.txt', opensslREADMEstr(FALSE, $value, $p12pass));
+ $zip->addFromString($value.'/README.txt', opensslREADMEstr('', $value, $p12pass));
}
$zip->close();
Modified: branches/1.0/package/webinterface/altweb/admin/openvpn.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/openvpn.php 2013-02-14 21:33:03 UTC (rev 5955)
+++ branches/1.0/package/webinterface/altweb/admin/openvpn.php 2013-02-15 18:40:33 UTC (rev 5956)
@@ -120,6 +120,25 @@
'subnet' => '[subnet] latest, requires OpenVPN 2.1+ clients'
);
+// Function: get_HOSTNAME_DOMAIN
+//
+function get_HOSTNAME_DOMAIN() {
+ $hostname_domain = '';
+
+ // System location of gui.network.conf file
+ $NETCONFFILE = '/mnt/kd/rc.conf.d/gui.network.conf';
+
+ if (is_file($NETCONFFILE)) {
+ $netvars = parseRCconf($NETCONFFILE);
+ if (($hostname = getVARdef($netvars, 'HOSTNAME')) !== '') {
+ if (($domain = getVARdef($netvars, 'DOMAIN')) !== '') {
+ $hostname_domain = $hostname.'.'.$domain;
+ }
+ }
+ }
+ return($hostname_domain);
+}
+
// Function: saveOVPNsettings
//
function saveOVPNsettings($conf_dir, $conf_file, $disabled = NULL) {
@@ -162,6 +181,9 @@
$value = 'OVPN_TUNNEL_HOSTS="'.trim($_POST['tunnel_external_hosts']).'"';
fwrite($fp, "### Allowed External Hosts\n".$value."\n");
+ $value = 'OVPN_HOSTNAME="'.trim($_POST['server_hostname']).'"';
+ fwrite($fp, "### Server Hostname\n".$value."\n");
+
$value = 'OVPN_SERVER="'.trim($_POST['server']).'"';
fwrite($fp, "### Server IPv4 Network\n".$value."\n");
@@ -261,6 +283,53 @@
return(TRUE);
}
+// Function: ovpnProfile
+//
+function ovpnProfile($db, $ca_file) {
+
+ $default = array (
+ 'client',
+ 'ns-cert-type server',
+ 'nobind',
+ 'persist-key',
+ 'persist-tun',
+ 'dev tun',
+ 'verb 3'
+ );
+
+ if (($server_hostname = getVARdef($db, 'OVPN_HOSTNAME')) === '') {
+ $server_hostname = get_HOSTNAME_DOMAIN();
+ }
+ if (($port = getVARdef($db, 'OVPN_PORT')) === '') {
+ return(FALSE);
+ }
+ if (($protocol = substr(getVARdef($db, 'OVPN_PROTOCOL'), 0 , 3)) === '') {
+ return(FALSE);
+ }
+
+ $str = "remote $server_hostname $port $protocol\n";
+
+ $str .= "comp-lzo ".getVARdef($db, 'OVPN_LZO')."\n";
+
+ if (getVARdef($db, 'OVPN_USER_PASS_VERIFY') === 'yes') {
+ $str .= "auth-user-pass\n";
+ $str .= "auth-retry interact\n";
+ $str .= "auth-nocache\n";
+ }
+ if (($cipher = getVARdef($db, 'OVPN_CIPHER')) !== '') {
+ $str .= "cipher $cipher\n";
+ }
+ foreach ($default as $value) {
+ $str .= "$value\n";
+ }
+ if (($caStr = @file_get_contents($ca_file)) !== FALSE) {
+ $str .= "<ca>\n";
+ $str .= $caStr;
+ $str .= "</ca>\n";
+ }
+ return($str);
+}
+
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$result = 1;
if (! $global_admin) {
@@ -356,9 +425,14 @@
$p12pass = opensslRANDOMpass(12);
if (($p12 = opensslPKCS12str($openssl, $value, $p12pass)) !== '') {
$zip->addFromString($value.'/'.$value.'.p12', $p12);
- $zip->addFromString($value.'/README.txt', opensslREADMEstr(TRUE, $value, $p12pass));
+ if (($ovpn = ovpnProfile($db, $openssl['key_dir'].'/ca.crt')) !== FALSE) {
+ $zip->addFromString($value.'/'.$value.'.ovpn', $ovpn);
+ $zip->addFromString($value.'/README.txt', opensslREADMEstr('ovpn', $value, $p12pass));
+ } else {
+ $zip->addFromString($value.'/README.txt', opensslREADMEstr('p12', $value, $p12pass));
+ }
} else {
- $zip->addFromString($value.'/README.txt', opensslREADMEstr(FALSE, $value, $p12pass));
+ $zip->addFromString($value.'/README.txt', opensslREADMEstr('', $value, $p12pass));
}
$zip->close();
@@ -570,6 +644,15 @@
putHtml('</td></tr>');
putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
+ putHtml('Server Hostname:');
+ putHtml('</td><td style="text-align: left;" colspan="4">');
+ if (($server_hostname = getVARdef($db, 'OVPN_HOSTNAME')) === '') {
+ $server_hostname = get_HOSTNAME_DOMAIN();
+ }
+ putHtml('<input type="text" size="48" maxlength="128" value="'.$server_hostname.'" name="server_hostname" />');
+ putHtml('</td></tr>');
+
+ putHtml('<tr class="dtrow1"><td style="text-align: right;" colspan="2">');
putHtml('Network IPv4 NM:');
putHtml('</td><td style="text-align: left;" colspan="4">');
if (($value = getVARdef($db, 'OVPN_SERVER')) === '') {
Modified: branches/1.0/package/webinterface/altweb/admin/siptlscert.php
===================================================================
--- branches/1.0/package/webinterface/altweb/admin/siptlscert.php 2013-02-14 21:33:03 UTC (rev 5955)
+++ branches/1.0/package/webinterface/altweb/admin/siptlscert.php 2013-02-15 18:40:33 UTC (rev 5956)
@@ -193,9 +193,9 @@
// $p12pass = opensslRANDOMpass(12);
// if (($p12 = opensslPKCS12str($openssl, $value, $p12pass)) !== '') {
// $zip->addFromString($value.'/'.$value.'.p12', $p12);
-// $zip->addFromString($value.'/README.txt', opensslREADMEstr(TRUE, $value, $p12pass));
+// $zip->addFromString($value.'/README.txt', opensslREADMEstr('p12', $value, $p12pass));
// } else {
-// $zip->addFromString($value.'/README.txt', opensslREADMEstr(FALSE, $value, $p12pass));
+// $zip->addFromString($value.'/README.txt', opensslREADMEstr('', $value, $p12pass));
// }
$readme = "Asterisk SIP-TLS Server \"".$openssl['dn']['commonName']."\" Credentials.\n\n";
$readme .= "ca.crt - A self-signed Certificate Authority (CA).\n\n";
Modified: branches/1.0/package/webinterface/altweb/common/openssl.php
===================================================================
--- branches/1.0/package/webinterface/altweb/common/openssl.php 2013-02-14 21:33:03 UTC (rev 5955)
+++ branches/1.0/package/webinterface/altweb/common/openssl.php 2013-02-15 18:40:33 UTC (rev 5956)
@@ -244,17 +244,20 @@
// Function: opensslREADMEstr()
//
-function opensslREADMEstr($pkcs12, $commonName, $pass) {
+function opensslREADMEstr($type, $commonName, $pass) {
- $readme = 'Client "'.$commonName.'" Credentials'."\n\n";
+ $readme = "Client \"$commonName\" Credentials\n\n";
$readme .= "ca.crt - A self-signed Certificate Authority (CA).\n\n";
- $readme .= $commonName.".crt - This client's public key certificate, signed by ca.crt.\n\n";
- $readme .= $commonName.".key - This client's private key.\n";
- $readme .= "Note: File ".$commonName.".key is not encrypted and must be kept secure.\n\n";
- if ($pkcs12) {
- $readme .= $commonName.".p12 - A password protected PKCS#12 container combining the credentials from the above three files.\n\n";
- $readme .= "PKCS#12 Container Password: ".$pass."\n";
+ $readme .= "$commonName.crt - This client's public key certificate, signed by ca.crt.\n\n";
+ $readme .= "$commonName.key - This client's private key.\n";
+ $readme .= "Note: File '$commonName.key' is not encrypted and must be kept secure.\n\n";
+ if ($type === 'p12' || $type === 'ovpn') {
+ $readme .= "$commonName.p12 - A password protected PKCS#12 container combining the credentials from the above three files.\n\n";
+ $readme .= "PKCS#12 Container Password: $pass\n";
$readme .= "Keep it secure.\n\n";
+ if ($type === 'ovpn') {
+ $readme .= "$commonName.ovpn - OpenVPN certificate profile, use with file '$commonName.p12' for client devices.\n\n";
+ }
}
return($readme);
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-14 21:33:03 UTC (rev 5955)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-15 18:40:33 UTC (rev 5956)
@@ -495,6 +495,7 @@
#OVPN_CERT="/etc/openvpn/easy-rsa/keys/server.crt"
#OVPN_KEY="/etc/openvpn/easy-rsa/keys/server.key"
#OVPN_DH="/etc/openvpn/easy-rsa/keys/dh1024.pem"
+#OVPN_HOSTNAME="vpn.example.com" # DNS name, IPv4 or IPv6 address of OpenVPN Server - Only used by the web interface.
#OVPN_SERVER="10.8.0.0 255.255.255.0"
#OVPN_SERVERV6="2001:db8:108::1/64" # valid OVPN_SERVER also required if defined
#OVPN_TOPOLOGY="subnet" # "net30", "p2p" or "subnet", defaults to OpenVPN default
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-16 20:53:32
|
Revision: 5957
http://astlinux.svn.sourceforge.net/astlinux/?rev=5957&view=rev
Author: abelbeck
Date: 2013-02-16 20:53:24 +0000 (Sat, 16 Feb 2013)
Log Message:
-----------
openvpn, add optional tls-auth support for both server and client, OVPN_TA and OVPNC_TA variables
Modified Paths:
--------------
branches/1.0/package/openvpn/openvpn.init
branches/1.0/package/openvpn/openvpnclient.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init 2013-02-15 18:40:33 UTC (rev 5956)
+++ branches/1.0/package/openvpn/openvpn.init 2013-02-16 20:53:24 UTC (rev 5957)
@@ -55,7 +55,8 @@
ca $OVPN_CA
cert $OVPN_CERT
key $OVPN_KEY
-dh $OVPN_DH
+dh $OVPN_DH${OVPN_TA:+
+tls-auth $OVPN_TA 0}
server $OVPN_SERVER${OVPN_SERVERV6:+
server-ipv6 $OVPN_SERVERV6}
verb $OVPN_VERBOSITY" > /tmp/etc/openvpn.conf
@@ -128,9 +129,8 @@
start () {
if [ -f $lock ]; then
# we were not shut down correctly
- kill `cat $pid` >/dev/null 2>&1
- rm -f $pid
- rm -f $lock
+ kill $(cat $pid) >/dev/null 2>&1
+ rm -f $pid $lock
sleep 2
fi
@@ -146,9 +146,8 @@
stop () {
if [ -f $pid ]; then
echo "Stopping OpenVPN Server..."
- kill `cat $pid` >/dev/null 2>&1
- rm -f $pid
- rm -f $lock
+ kill $(cat $pid) >/dev/null 2>&1
+ rm -f $pid $lock
fi
}
Modified: branches/1.0/package/openvpn/openvpnclient.init
===================================================================
--- branches/1.0/package/openvpn/openvpnclient.init 2013-02-15 18:40:33 UTC (rev 5956)
+++ branches/1.0/package/openvpn/openvpnclient.init 2013-02-16 20:53:24 UTC (rev 5957)
@@ -54,7 +54,8 @@
proto $OVPNC_PROTOCOL
ca $OVPNC_CA
cert $OVPNC_CERT
-key $OVPNC_KEY
+key $OVPNC_KEY${OVPNC_TA:+
+tls-auth $OVPNC_TA 1}
verb $OVPNC_VERBOSITY" > /tmp/etc/openvpnclient.conf
IFS=$'\n'
@@ -94,9 +95,8 @@
start () {
if [ -f $lock ]; then
# we were not shut down correctly
- kill `cat $pid` >/dev/null 2>&1
- rm -f $pid
- rm -f $lock
+ kill $(cat $pid) >/dev/null 2>&1
+ rm -f $pid $lock
sleep 2
fi
@@ -112,9 +112,8 @@
stop () {
if [ -f $pid ]; then
echo "Stopping OpenVPN Client..."
- kill `cat $pid` >/dev/null 2>&1
- rm -f $pid
- rm -f $lock
+ kill $(cat $pid) >/dev/null 2>&1
+ rm -f $pid $lock
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-02-15 18:40:33 UTC (rev 5956)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-16 20:53:24 UTC (rev 5957)
@@ -495,6 +495,7 @@
#OVPN_CERT="/etc/openvpn/easy-rsa/keys/server.crt"
#OVPN_KEY="/etc/openvpn/easy-rsa/keys/server.key"
#OVPN_DH="/etc/openvpn/easy-rsa/keys/dh1024.pem"
+#OVPN_TA="/etc/openvpn/ta.key" # optional tls-auth shared key
#OVPN_HOSTNAME="vpn.example.com" # DNS name, IPv4 or IPv6 address of OpenVPN Server - Only used by the web interface.
#OVPN_SERVER="10.8.0.0 255.255.255.0"
#OVPN_SERVERV6="2001:db8:108::1/64" # valid OVPN_SERVER also required if defined
@@ -552,6 +553,7 @@
#OVPNC_CA="/etc/openvpn/client/ca.crt"
#OVPNC_CERT="/etc/openvpn/client/client.crt"
#OVPNC_KEY="/etc/openvpn/client/client.key"
+#OVPNC_TA="/etc/openvpn/client/ta.key" # optional tls-auth shared key
#OVPNC_SERVER="10.8.0.0 255.255.255.0"
#OVPNC_VERBOSITY="1"
##
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-18 19:57:45
|
Revision: 5960
http://astlinux.svn.sourceforge.net/astlinux/?rev=5960&view=rev
Author: abelbeck
Date: 2013-02-18 19:57:20 +0000 (Mon, 18 Feb 2013)
Log Message:
-----------
openvpn, server and client, add optional Auth HMAC variables, OVPN_AUTH and OVPNC_AUTH
Modified Paths:
--------------
branches/1.0/package/openvpn/openvpn.init
branches/1.0/package/openvpn/openvpnclient.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init 2013-02-18 18:06:49 UTC (rev 5959)
+++ branches/1.0/package/openvpn/openvpn.init 2013-02-18 19:57:20 UTC (rev 5960)
@@ -103,6 +103,9 @@
if [ -n "$OVPN_CIPHER" ]; then
echo "cipher $OVPN_CIPHER" >> /tmp/etc/openvpn.conf
fi
+ if [ -n "$OVPN_AUTH" ]; then
+ echo "auth $OVPN_AUTH" >> /tmp/etc/openvpn.conf
+ fi
if [ -n "$OVPN_TOPOLOGY" ]; then
echo "topology $OVPN_TOPOLOGY" >> /tmp/etc/openvpn.conf
fi
Modified: branches/1.0/package/openvpn/openvpnclient.init
===================================================================
--- branches/1.0/package/openvpn/openvpnclient.init 2013-02-18 18:06:49 UTC (rev 5959)
+++ branches/1.0/package/openvpn/openvpnclient.init 2013-02-18 19:57:20 UTC (rev 5960)
@@ -70,6 +70,9 @@
if [ -n "$OVPNC_CIPHER" ]; then
echo "cipher $OVPNC_CIPHER" >> /tmp/etc/openvpnclient.conf
fi
+ if [ -n "$OVPNC_AUTH" ]; then
+ echo "auth $OVPNC_AUTH" >> /tmp/etc/openvpnclient.conf
+ fi
if [ -n "$OVPNC_NSCERTTYPE" ]; then
echo "ns-cert-type $OVPNC_NSCERTTYPE" >> /tmp/etc/openvpnclient.conf
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-02-18 18:06:49 UTC (rev 5959)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-18 19:57:20 UTC (rev 5960)
@@ -519,9 +519,10 @@
## Enable QoS for the tunnel packet. yes|no
## Set the TOS field of the tunnel packet to what the payload's TOS is.
#OVPN_QOS="yes"
-## Define the Cipher, defaults to BF-CBC if not defined
-## Change to match any hardware crypto acceleration, the client's setting must match
+## Define the Cipher, defaults to BF-CBC if not defined, the client's setting must match
#OVPN_CIPHER="AES-128-CBC"
+## Define the Auth HMAC, defaults to SHA1 if not defined, the client's setting must match
+#OVPN_AUTH="SHA256"
## Restrict OpenVPN clients allowed to connect, by CommonName.
## Client CommonName list lines are newline terminated.
## If not defined, the default, any client with a valid cert/key is allowed to connect.
@@ -567,9 +568,10 @@
## Enable QoS for the tunnel packet. yes|no
## Set the TOS field of the tunnel packet to what the payload's TOS is.
#OVPNC_QOS="yes"
-## Define the Cipher, defaults to BF-CBC if not defined
-## Change to match any hardware crypto acceleration, the client's setting must match
+## Define the Cipher, defaults to BF-CBC if not defined, the server's setting must match
#OVPNC_CIPHER="AES-128-CBC"
+## Define the Auth HMAC, defaults to SHA1 if not defined, the server's setting must match
+#OVPNC_AUTH="SHA256"
## Define ns-cert-type if set
#OVPNC_NSCERTTYPE="server"
## Allow OpenVPN Client tunnel to one LAN Interface, defaults to disallow
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-02-23 21:26:40
|
Revision: 5965
http://astlinux.svn.sourceforge.net/astlinux/?rev=5965&view=rev
Author: abelbeck
Date: 2013-02-23 21:26:30 +0000 (Sat, 23 Feb 2013)
Log Message:
-----------
openvpn, for client add user/pass authentication via new OVPNC_USER_PASS variable
Modified Paths:
--------------
branches/1.0/package/openvpn/openvpnclient.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/openvpn/openvpnclient.init
===================================================================
--- branches/1.0/package/openvpn/openvpnclient.init 2013-02-23 15:43:26 UTC (rev 5964)
+++ branches/1.0/package/openvpn/openvpnclient.init 2013-02-23 21:26:30 UTC (rev 5965)
@@ -8,6 +8,8 @@
lock="/var/lock/openvpnclient.lock"
# PID
pid="/var/run/openvpnclient.pid"
+# PSK file for optional OVPNC_USER_PASS
+psk="/tmp/etc/openvpnclient-psk.txt"
init () {
local IFS
@@ -73,6 +75,12 @@
if [ -n "$OVPNC_AUTH" ]; then
echo "auth $OVPNC_AUTH" >> /tmp/etc/openvpnclient.conf
fi
+ if [ -n "$OVPNC_USER_PASS" ]; then
+ echo "$OVPNC_USER_PASS" | awk -F' ' '{ print $1; }' > $psk
+ echo "$OVPNC_USER_PASS" | awk -F' ' '{ print $2; }' >> $psk
+ chmod 600 $psk
+ echo "auth-user-pass $psk" >> /tmp/etc/openvpnclient.conf
+ fi
if [ -n "$OVPNC_NSCERTTYPE" ]; then
echo "ns-cert-type $OVPNC_NSCERTTYPE" >> /tmp/etc/openvpnclient.conf
fi
@@ -97,7 +105,7 @@
if [ -f $lock ]; then
# we were not shut down correctly
kill $(cat $pid) >/dev/null 2>&1
- rm -f $pid $lock
+ rm -f $pid $lock $psk
sleep 2
fi
@@ -117,7 +125,7 @@
if [ -f $pid ]; then
echo "Stopping OpenVPN Client..."
kill $(cat $pid) >/dev/null 2>&1
- rm -f $pid $lock
+ rm -f $pid $lock $psk
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-02-23 15:43:26 UTC (rev 5964)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2013-02-23 21:26:30 UTC (rev 5965)
@@ -572,6 +572,8 @@
#OVPNC_CIPHER="AES-128-CBC"
## Define the Auth HMAC, defaults to SHA1 if not defined, the server's setting must match
#OVPNC_AUTH="SHA256"
+## Enable User/Pass authentication using space separated user & pass"
+#OVPNC_USER_PASS="user pass"
## Define ns-cert-type if set
#OVPNC_NSCERTTYPE="server"
## Allow OpenVPN Client tunnel to one LAN Interface, defaults to disallow
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-03-05 00:48:59
|
Revision: 5976
http://astlinux.svn.sourceforge.net/astlinux/?rev=5976&view=rev
Author: abelbeck
Date: 2013-03-05 00:48:52 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
unixodbc, new package - disabled by default, for now.
When selected, asterisk now builds all related 'odbc' modules
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/unixodbc/
branches/1.0/package/unixodbc/Config.in
branches/1.0/package/unixodbc/unixodbc.init
branches/1.0/package/unixodbc/unixodbc.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-03-04 20:17:21 UTC (rev 5975)
+++ branches/1.0/astlinux-ast11.config 2013-03-05 00:48:52 UTC (rev 5976)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5905-dirty Configuration
-# Wed Jan 16 12:12:44 2013
+# Buildroot 2011.08-svn5975-dirty Configuration
+# Mon Mar 4 18:43:01 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -521,6 +521,7 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
+# BR2_PACKAGE_UNIXODBC is not set
#
# Filesystem
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-03-04 20:17:21 UTC (rev 5975)
+++ branches/1.0/astlinux.config 2013-03-05 00:48:52 UTC (rev 5976)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5901 Configuration
-# Mon Jan 14 19:04:31 2013
+# Buildroot 2011.08-svn5975-dirty Configuration
+# Mon Mar 4 18:42:49 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -528,6 +528,7 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
+# BR2_PACKAGE_UNIXODBC is not set
#
# Filesystem
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-03-04 20:17:21 UTC (rev 5975)
+++ branches/1.0/astlinux18.config 2013-03-05 00:48:52 UTC (rev 5976)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5905 Configuration
-# Wed Jan 16 12:11:41 2013
+# Buildroot 2011.08-svn5975-dirty Configuration
+# Mon Mar 4 18:42:52 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -521,6 +521,7 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
+# BR2_PACKAGE_UNIXODBC is not set
#
# Filesystem
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-03-04 20:17:21 UTC (rev 5975)
+++ branches/1.0/initrd.config 2013-03-05 00:48:52 UTC (rev 5976)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5901-dirty Configuration
-# Mon Jan 14 19:04:50 2013
+# Buildroot 2011.08-svn5975-dirty Configuration
+# Mon Mar 4 18:43:18 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -421,6 +421,7 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
# BR2_PACKAGE_SQLITE is not set
+# BR2_PACKAGE_UNIXODBC is not set
#
# Filesystem
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-03-04 20:17:21 UTC (rev 5975)
+++ branches/1.0/package/Config.in 2013-03-05 00:48:52 UTC (rev 5976)
@@ -291,6 +291,7 @@
source "package/berkeleydb/Config.in"
source "package/mysql_client/Config.in"
source "package/sqlite/Config.in"
+source "package/unixodbc/Config.in"
endmenu
menu "Filesystem"
Added: branches/1.0/package/unixodbc/Config.in
===================================================================
--- branches/1.0/package/unixodbc/Config.in (rev 0)
+++ branches/1.0/package/unixodbc/Config.in 2013-03-05 00:48:52 UTC (rev 5976)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_UNIXODBC
+ bool "unixodbc"
+ default n
+ select BR2_PACKAGE_LIBTOOL
+ help
+
+ Connect to ODBC resources from Linux systems
+
+ http://www.unixodbc.org
+
Added: branches/1.0/package/unixodbc/unixodbc.init
===================================================================
--- branches/1.0/package/unixodbc/unixodbc.init (rev 0)
+++ branches/1.0/package/unixodbc/unixodbc.init 2013-03-05 00:48:52 UTC (rev 5976)
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+# No variables required
+#. /etc/rc.conf
+
+init () {
+
+ # Automatically create "/mnt/kd/odbc" directory if it doesn't exist
+ if [ ! -d /mnt/kd/odbc ]; then
+ mkdir /mnt/kd/odbc 2>/dev/null # will fail on virgin RO filesystem, ignore stderr
+ fi
+
+ if [ -d /mnt/kd/odbc ]; then
+ ln -sf /mnt/kd/odbc/odbc.ini /tmp/etc/odbc.ini
+ ln -sf /mnt/kd/odbc/odbcinst.ini /tmp/etc/odbcinst.ini
+ fi
+ if [ ! -d /tmp/etc/ODBCDataSources ]; then
+ mkdir /tmp/etc/ODBCDataSources
+ fi
+
+ if [ ! -f /etc/odbc.ini ]; then
+ touch /etc/odbc.ini
+ fi
+ if [ ! -f /etc/odbcinst.ini ]; then
+ touch /etc/odbcinst.ini
+ fi
+
+ if [ ! -f /root/.odbc.ini ]; then
+ ln -sf /etc/odbc.ini /root/.odbc.ini
+ fi
+ if [ ! -f /root/.odbcinst.ini ]; then
+ ln -sf /etc/odbcinst.ini /root/.odbcinst.ini
+ fi
+}
+
+start () {
+ :
+}
+
+stop () {
+ :
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Property changes on: branches/1.0/package/unixodbc/unixodbc.init
___________________________________________________________________
Added: svn:executable
+ *
Added: branches/1.0/package/unixodbc/unixodbc.mk
===================================================================
--- branches/1.0/package/unixodbc/unixodbc.mk (rev 0)
+++ branches/1.0/package/unixodbc/unixodbc.mk 2013-03-05 00:48:52 UTC (rev 5976)
@@ -0,0 +1,42 @@
+#############################################################
+#
+# unixodbc
+#
+#############################################################
+UNIXODBC_VERSION = 2.3.1
+UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
+UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC
+UNIXODBC_DEPENDENCIES = libtool
+
+UNIXODBC_INSTALL_STAGING = YES
+
+UNIXODBC_CONF_OPT = \
+ --disable-gui \
+ --with-pic \
+ --enable-drivers
+
+define UNIXODBC_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/libodbc[.ci]*so* $(TARGET_DIR)/usr/lib/
+ cp -a $(STAGING_DIR)/usr/lib/libnn.*so* $(TARGET_DIR)/usr/lib/
+ $(INSTALL) -m 0755 -D package/unixodbc/unixodbc.init $(TARGET_DIR)/etc/init.d/unixodbc
+ $(INSTALL) -m 0755 -D $(STAGING_DIR)/usr/bin/isql $(TARGET_DIR)/usr/bin/isql
+ $(INSTALL) -m 0755 -D $(STAGING_DIR)/usr/bin/odbcinst $(TARGET_DIR)/usr/bin/odbcinst
+ ln -sf /tmp/etc/odbc.ini $(TARGET_DIR)/etc/odbc.ini
+ ln -sf /tmp/etc/odbcinst.ini $(TARGET_DIR)/etc/odbcinst.ini
+ ln -sf /tmp/etc/ODBCDataSources $(TARGET_DIR)/etc/ODBCDataSources
+ ln -sf ../../init.d/unixodbc $(TARGET_DIR)/etc/runlevels/default/S00unixodbc
+endef
+
+define UNIXODBC_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libodbc[.ci]*so*
+ rm -f $(TARGET_DIR)/usr/lib/libnn.*so*
+ rm -f $(TARGET_DIR)/etc/init.d/unixodbc
+ rm -f $(TARGET_DIR)/usr/bin/isql
+ rm -f $(TARGET_DIR)/usr/bin/odbcinst
+ rm -f $(TARGET_DIR)/etc/odbc.ini
+ rm -f $(TARGET_DIR)/etc/odbcinst.ini
+ rm -f $(TARGET_DIR)/etc/ODBCDataSources
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S00unixodbc
+endef
+
+$(eval $(call AUTOTARGETS,package,unixodbc))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-03-04 20:17:21 UTC (rev 5975)
+++ branches/1.0/runnix-uclibc.config 2013-03-05 00:48:52 UTC (rev 5976)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5901-dirty Configuration
-# Mon Jan 14 19:04:37 2013
+# Buildroot 2011.08-svn5975-dirty Configuration
+# Mon Mar 4 18:43:13 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -636,6 +636,7 @@
# Mysql client requires a toolchain with C++ support enabled
#
# BR2_PACKAGE_SQLITE is not set
+# BR2_PACKAGE_UNIXODBC is not set
#
# Filesystem
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-03-04 20:17:21 UTC (rev 5975)
+++ branches/1.0/runnix.config 2013-03-05 00:48:52 UTC (rev 5976)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5901-dirty Configuration
-# Mon Jan 14 19:04:36 2013
+# Buildroot 2011.08-svn5975-dirty Configuration
+# Mon Mar 4 18:43:03 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -445,6 +445,7 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
# BR2_PACKAGE_SQLITE is not set
+# BR2_PACKAGE_UNIXODBC is not set
#
# Filesystem
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-03-05 18:28:39
|
Revision: 5979
http://astlinux.svn.sourceforge.net/astlinux/?rev=5979&view=rev
Author: abelbeck
Date: 2013-03-05 18:28:32 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
sqliteodbc, new package, disabled by default, for now.
This lib allows a sqlite3 database to be used by asterisk, eg. ODBC dialplan functions can be created to read/write to a sqlite3 database
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
Added Paths:
-----------
branches/1.0/package/sqliteodbc/
branches/1.0/package/sqliteodbc/Config.in
branches/1.0/package/sqliteodbc/sqliteodbc.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-03-05 14:37:17 UTC (rev 5978)
+++ branches/1.0/astlinux-ast11.config 2013-03-05 18:28:32 UTC (rev 5979)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5975-dirty Configuration
-# Mon Mar 4 18:43:01 2013
+# Buildroot 2011.08-svn5978-dirty Configuration
+# Tue Mar 5 11:47:47 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -521,6 +521,7 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
+# BR2_PACKAGE_SQLITEODBC is not set
# BR2_PACKAGE_UNIXODBC is not set
#
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-03-05 14:37:17 UTC (rev 5978)
+++ branches/1.0/astlinux.config 2013-03-05 18:28:32 UTC (rev 5979)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5975-dirty Configuration
-# Mon Mar 4 18:42:49 2013
+# Buildroot 2011.08-svn5978-dirty Configuration
+# Tue Mar 5 11:47:40 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -528,6 +528,7 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
+# BR2_PACKAGE_SQLITEODBC is not set
# BR2_PACKAGE_UNIXODBC is not set
#
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-03-05 14:37:17 UTC (rev 5978)
+++ branches/1.0/astlinux18.config 2013-03-05 18:28:32 UTC (rev 5979)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5975-dirty Configuration
-# Mon Mar 4 18:42:52 2013
+# Buildroot 2011.08-svn5978-dirty Configuration
+# Tue Mar 5 11:47:45 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -521,6 +521,7 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
+# BR2_PACKAGE_SQLITEODBC is not set
# BR2_PACKAGE_UNIXODBC is not set
#
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-03-05 14:37:17 UTC (rev 5978)
+++ branches/1.0/package/Config.in 2013-03-05 18:28:32 UTC (rev 5979)
@@ -291,6 +291,7 @@
source "package/berkeleydb/Config.in"
source "package/mysql_client/Config.in"
source "package/sqlite/Config.in"
+source "package/sqliteodbc/Config.in"
source "package/unixodbc/Config.in"
endmenu
Added: branches/1.0/package/sqliteodbc/Config.in
===================================================================
--- branches/1.0/package/sqliteodbc/Config.in (rev 0)
+++ branches/1.0/package/sqliteodbc/Config.in 2013-03-05 18:28:32 UTC (rev 5979)
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_SQLITEODBC
+ bool "sqliteodbc"
+ default n
+ depends on BR2_PACKAGE_SQLITE
+ select BR2_PACKAGE_UNIXODBC
+ help
+
+ SQLite library wrapped into an ODBC driver.
+
+ http://www.ch-werner.de/sqliteodbc/
+
Added: branches/1.0/package/sqliteodbc/sqliteodbc.mk
===================================================================
--- branches/1.0/package/sqliteodbc/sqliteodbc.mk (rev 0)
+++ branches/1.0/package/sqliteodbc/sqliteodbc.mk 2013-03-05 18:28:32 UTC (rev 5979)
@@ -0,0 +1,31 @@
+#############################################################
+#
+# sqliteodbc
+#
+#############################################################
+SQLITEODBC_VERSION = 0.99
+SQLITEODBC_SOURCE = sqliteodbc-$(SQLITEODBC_VERSION).tar.gz
+SQLITEODBC_SITE = http://www.ch-werner.de/sqliteodbc
+SQLITEODBC_SUBDIR = sqliteodbc-$(SQLITEODBC_VERSION)
+SQLITEODBC_DEPENDENCIES = sqlite unixodbc
+
+SQLITEODBC_INSTALL_STAGING = YES
+
+SQLITEODBC_CONF_OPT = \
+ --disable-static \
+ --with-pic \
+ --with-sqlite="$(STAGING_DIR)/usr" \
+ --with-sqlite3="$(STAGING_DIR)/usr" \
+ --with-odbc="$(STAGING_DIR)/usr"
+
+define SQLITEODBC_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/libsqlite3odbc*.so $(TARGET_DIR)/usr/lib/
+ #cp -a $(STAGING_DIR)/usr/lib/libsqlite3_mod_*.so $(TARGET_DIR)/usr/lib/
+endef
+
+define SQLITEODBC_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libsqlite3odbc*.so
+ #rm -f $(TARGET_DIR)/usr/lib/libsqlite3_mod_*.so
+endef
+
+$(eval $(call AUTOTARGETS,package,sqliteodbc))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-03-06 20:27:03
|
Revision: 5982
http://astlinux.svn.sourceforge.net/astlinux/?rev=5982&view=rev
Author: abelbeck
Date: 2013-03-06 20:26:55 +0000 (Wed, 06 Mar 2013)
Log Message:
-----------
default configs, enable php's PDO Sqlite in all the 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-03-06 00:05:35 UTC (rev 5981)
+++ branches/1.0/astlinux-ast11.config 2013-03-06 20:26:55 UTC (rev 5982)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5978-dirty Configuration
-# Tue Mar 5 11:47:47 2013
+# Buildroot 2011.08-svn5981-dirty Configuration
+# Wed Mar 6 14:22:03 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -479,7 +479,8 @@
#
# BR2_PACKAGE_PHP_EXT_SQLITE is not set
BR2_PACKAGE_PHP_EXT_PDO=y
-# BR2_PACKAGE_PHP_EXT_PDO_SQLITE is not set
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
# BR2_PACKAGE_PYTHON is not set
# BR2_PACKAGE_RUBY is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-03-06 00:05:35 UTC (rev 5981)
+++ branches/1.0/astlinux.config 2013-03-06 20:26:55 UTC (rev 5982)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5978-dirty Configuration
-# Tue Mar 5 11:47:40 2013
+# Buildroot 2011.08-svn5981 Configuration
+# Wed Mar 6 14:20:34 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -485,7 +485,8 @@
#
# BR2_PACKAGE_PHP_EXT_SQLITE is not set
BR2_PACKAGE_PHP_EXT_PDO=y
-# BR2_PACKAGE_PHP_EXT_PDO_SQLITE is not set
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
# BR2_PACKAGE_PYTHON is not set
# BR2_PACKAGE_RUBY is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-03-06 00:05:35 UTC (rev 5981)
+++ branches/1.0/astlinux18.config 2013-03-06 20:26:55 UTC (rev 5982)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5978-dirty Configuration
-# Tue Mar 5 11:47:45 2013
+# Buildroot 2011.08-svn5981-dirty Configuration
+# Wed Mar 6 14:21:21 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -479,7 +479,8 @@
#
# BR2_PACKAGE_PHP_EXT_SQLITE is not set
BR2_PACKAGE_PHP_EXT_PDO=y
-# BR2_PACKAGE_PHP_EXT_PDO_SQLITE is not set
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
+BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL=y
# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
# BR2_PACKAGE_PYTHON is not set
# BR2_PACKAGE_RUBY 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-03-07 23:50:42
|
Revision: 5983
http://astlinux.svn.sourceforge.net/astlinux/?rev=5983&view=rev
Author: abelbeck
Date: 2013-03-07 23:50:35 +0000 (Thu, 07 Mar 2013)
Log Message:
-----------
enable 'unixodbc' and 'sqliteodbc' packages for Asterisk 1.8 and 11 default builds
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-03-06 20:26:55 UTC (rev 5982)
+++ branches/1.0/astlinux-ast11.config 2013-03-07 23:50:35 UTC (rev 5983)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5981-dirty Configuration
-# Wed Mar 6 14:22:03 2013
+# Buildroot 2011.08-svn5982-dirty Configuration
+# Thu Mar 7 17:47:13 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -522,8 +522,8 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
-# BR2_PACKAGE_SQLITEODBC is not set
-# BR2_PACKAGE_UNIXODBC is not set
+BR2_PACKAGE_SQLITEODBC=y
+BR2_PACKAGE_UNIXODBC=y
#
# Filesystem
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-03-06 20:26:55 UTC (rev 5982)
+++ branches/1.0/astlinux18.config 2013-03-07 23:50:35 UTC (rev 5983)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5981-dirty Configuration
-# Wed Mar 6 14:21:21 2013
+# Buildroot 2011.08-svn5982 Configuration
+# Thu Mar 7 17:45:58 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -522,8 +522,8 @@
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
BR2_PACKAGE_SQLITE_READLINE=y
-# BR2_PACKAGE_SQLITEODBC is not set
-# BR2_PACKAGE_UNIXODBC is not set
+BR2_PACKAGE_SQLITEODBC=y
+BR2_PACKAGE_UNIXODBC=y
#
# Filesystem
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-03-24 23:26:12
|
Revision: 6011
http://astlinux.svn.sourceforge.net/astlinux/?rev=6011&view=rev
Author: abelbeck
Date: 2013-03-24 23:26:05 +0000 (Sun, 24 Mar 2013)
Log Message:
-----------
clix, new package, command line tool to send Jabber/XMPP messages, enabled by default
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/clix/
branches/1.0/package/clix/Config.in
branches/1.0/package/clix/clix.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-03-21 04:12:48 UTC (rev 6010)
+++ branches/1.0/astlinux-ast11.config 2013-03-24 23:26:05 UTC (rev 6011)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5982-dirty Configuration
-# Thu Mar 7 17:47:13 2013
+# Buildroot 2011.08-svn6010-dirty Configuration
+# Sun Mar 24 18:00:14 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -153,7 +153,7 @@
# BR2_PACKAGE_CUSTOMIZE is not set
#
-# Asterisk, FreeSWITCH and telephony applications
+# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
# BR2_PACKAGE_ASTERISK_v1_4 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_CLIX=y
BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-03-21 04:12:48 UTC (rev 6010)
+++ branches/1.0/astlinux.config 2013-03-24 23:26:05 UTC (rev 6011)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5981 Configuration
-# Wed Mar 6 14:20:34 2013
+# Buildroot 2011.08-svn6010-dirty Configuration
+# Sun Mar 24 17:59:56 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -153,7 +153,7 @@
# BR2_PACKAGE_CUSTOMIZE is not set
#
-# Asterisk, FreeSWITCH and telephony applications
+# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
BR2_PACKAGE_ASTERISK_v1_4=y
@@ -183,6 +183,7 @@
BR2_PACKAGE_DAHDI_TOOLS=y
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+BR2_PACKAGE_CLIX=y
BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-03-21 04:12:48 UTC (rev 6010)
+++ branches/1.0/astlinux18.config 2013-03-24 23:26:05 UTC (rev 6011)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5982 Configuration
-# Thu Mar 7 17:45:58 2013
+# Buildroot 2011.08-svn6010-dirty Configuration
+# Sun Mar 24 18:00:11 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -153,7 +153,7 @@
# BR2_PACKAGE_CUSTOMIZE is not set
#
-# Asterisk, FreeSWITCH and telephony applications
+# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
# BR2_PACKAGE_ASTERISK_v1_4 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_CLIX=y
BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-03-21 04:12:48 UTC (rev 6010)
+++ branches/1.0/initrd.config 2013-03-24 23:26:05 UTC (rev 6011)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5975-dirty Configuration
-# Mon Mar 4 18:43:18 2013
+# Buildroot 2011.08-svn6010-dirty Configuration
+# Sun Mar 24 18:00:19 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -154,11 +154,12 @@
# BR2_PACKAGE_CUSTOMIZE is not set
#
-# Asterisk, FreeSWITCH and telephony applications
+# Asterisk, XMPP and telephony applications
#
# BR2_PACKAGE_ASTERISK is not set
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_CLIX is not set
# BR2_PACKAGE_PROSODY is not set
#
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-03-21 04:12:48 UTC (rev 6010)
+++ branches/1.0/package/Config.in 2013-03-24 23:26:05 UTC (rev 6011)
@@ -3,7 +3,7 @@
source "package/busybox/Config.in"
source "package/customize/Config.in"
-menu "Asterisk, FreeSWITCH and telephony applications"
+menu "Asterisk, XMPP and telephony applications"
source "package/asterisk/Config.in"
source "package/asterisk-agi-audiotx/Config.in"
source "package/asterisk-app_notify/Config.in"
@@ -18,6 +18,7 @@
source "package/fonulator/Config.in"
source "package/fbflash/Config.in"
source "package/freeswitch/Config.in"
+source "package/clix/Config.in"
source "package/prosody/Config.in"
source "package/rhino/Config.in"
source "package/wanpipe/Config.in"
Added: branches/1.0/package/clix/Config.in
===================================================================
--- branches/1.0/package/clix/Config.in (rev 0)
+++ branches/1.0/package/clix/Config.in 2013-03-24 23:26:05 UTC (rev 6011)
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_CLIX
+ bool "clix"
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_LIBIDN
+ select BR2_PACKAGE_LUA
+ select BR2_PACKAGE_LUAFILESYSTEM
+ select BR2_PACKAGE_LUASOCKET
+ select BR2_PACKAGE_LUASEC
+ select BR2_PACKAGE_LUAEXPAT
+ default n
+ help
+ clix is a command line client for Jabber/XMPP written in Lua
+
+ hg clone http://code.matthewwild.co.uk/verse
+ hg clone http://code.matthewwild.co.uk/clix
+ hg clone http://code.matthewwild.co.uk/squish
+
+ Manually created into package download.
+
Added: branches/1.0/package/clix/clix.mk
===================================================================
--- branches/1.0/package/clix/clix.mk (rev 0)
+++ branches/1.0/package/clix/clix.mk 2013-03-24 23:26:05 UTC (rev 6011)
@@ -0,0 +1,18 @@
+#############################################################
+#
+# clix
+#
+#############################################################
+CLIX_VERSION = 2013-03-24
+CLIX_SOURCE = clix-$(CLIX_VERSION).tar.gz
+CLIX_SITE = http://files.astlinux.org
+
+define CLIX_INSTALL_TARGET_CMDS
+ install -D -m 755 $(@D)/clix.bin $(TARGET_DIR)/usr/bin/clix
+endef
+
+define CLIX_UNINSTALL_TARGET_CMDS
+ rm -rf $(TARGET_DIR)/usr/bin/clix
+endef
+
+$(eval $(call GENTARGETS,package,clix))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-03-21 04:12:48 UTC (rev 6010)
+++ branches/1.0/runnix-uclibc.config 2013-03-24 23:26:05 UTC (rev 6011)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5975-dirty Configuration
-# Mon Mar 4 18:43:13 2013
+# Buildroot 2011.08-svn6010-dirty Configuration
+# Sun Mar 24 18:00:17 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -212,13 +212,14 @@
# BR2_PACKAGE_CUSTOMIZE is not set
#
-# Asterisk, FreeSWITCH and telephony applications
+# Asterisk, XMPP and telephony applications
#
# BR2_PACKAGE_ASTERISK is not set
# BR2_PACKAGE_DAHDI_LINUX is not set
# BR2_PACKAGE_DAHDI_TOOLS is not set
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_CLIX 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-03-21 04:12:48 UTC (rev 6010)
+++ branches/1.0/runnix.config 2013-03-24 23:26:05 UTC (rev 6011)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn5975-dirty Configuration
-# Mon Mar 4 18:43:03 2013
+# Buildroot 2011.08-svn6010-dirty Configuration
+# Sun Mar 24 18:00:16 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -154,13 +154,14 @@
# BR2_PACKAGE_CUSTOMIZE is not set
#
-# Asterisk, FreeSWITCH and telephony applications
+# Asterisk, XMPP and telephony applications
#
# BR2_PACKAGE_ASTERISK is not set
# BR2_PACKAGE_DAHDI_LINUX is not set
# BR2_PACKAGE_DAHDI_TOOLS is not set
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
+# BR2_PACKAGE_CLIX 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-04-16 07:06:45
|
Revision: 6045
http://sourceforge.net/p/astlinux/code/6045
Author: abelbeck
Date: 2013-04-16 07:06:40 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
util-linux, version bump to 2.22.2
e2fsprogs, version bump to 1.42.7 - also disable e2fsprogs-findfs and do uuid related stuff in util-linux
Note: BR2_PACKAGE_UTIL_LINUX_LIBMOUNT=y will add 'findmnt' and 'lsblk' if needed
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/e2fsprogs/Config.in
branches/1.0/package/e2fsprogs/e2fsprogs.mk
branches/1.0/package/util-linux/util-linux.mk
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/e2fsprogs/e2fsprogs-sem-init-libs.patch
Removed Paths:
-------------
branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch
branches/1.0/package/util-linux/util-linux-uclibc-build-fix.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/astlinux-ast11.config 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6010-dirty Configuration
-# Sun Mar 24 18:00:14 2013
+# Buildroot 2011.08-svn6044-dirty Configuration
+# Tue Apr 16 01:56:34 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -347,7 +347,7 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FINDFS=y
+# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
@@ -355,8 +355,6 @@
BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
-BR2_PACKAGE_E2FSPROGS_UUIDD=y
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/astlinux.config 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6010-dirty Configuration
-# Sun Mar 24 17:59:56 2013
+# Buildroot 2011.08-svn6044-dirty Configuration
+# Tue Apr 16 01:56:33 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -353,7 +353,7 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FINDFS=y
+# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
@@ -361,8 +361,6 @@
BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
-BR2_PACKAGE_E2FSPROGS_UUIDD=y
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/astlinux18.config 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6010-dirty Configuration
-# Sun Mar 24 18:00:11 2013
+# Buildroot 2011.08-svn6044-dirty Configuration
+# Tue Apr 16 01:56:33 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -347,7 +347,7 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FINDFS=y
+# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
@@ -355,8 +355,6 @@
BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
-BR2_PACKAGE_E2FSPROGS_UUIDD=y
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/initrd.config 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6010-dirty Configuration
-# Sun Mar 24 18:00:19 2013
+# Buildroot 2011.08-svn6044-dirty Configuration
+# Tue Apr 16 01:56:35 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -329,8 +329,6 @@
# BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND is not set
# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
# BR2_PACKAGE_E2FSPROGS_TUNE2FS is not set
-# BR2_PACKAGE_E2FSPROGS_UUIDGEN is not set
-# BR2_PACKAGE_E2FSPROGS_UUIDD is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
Modified: branches/1.0/package/e2fsprogs/Config.in
===================================================================
--- branches/1.0/package/e2fsprogs/Config.in 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/package/e2fsprogs/Config.in 2013-04-16 07:06:40 UTC (rev 6045)
@@ -85,16 +85,6 @@
default y
select BR2_PACKAGE_E2FSPROGS_E2LABEL
-config BR2_PACKAGE_E2FSPROGS_UUIDGEN
- bool "uuidgen"
- default y
-
-config BR2_PACKAGE_E2FSPROGS_UUIDD
- bool "uuidd"
- default y
- help
- The uuidd daemon from the e2fsprogs suite
-
endif
comment "e2fsprogs requires a toolchain with LARGEFILE + WCHAR support"
Deleted: branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-add-missing-dep-of-tst_uuid-o.patch 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,18 +0,0 @@
-Add missing dependency of tst_uuid.o on uuid.h
-
-The missing dependency used to break parallel builds.
-
-Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <ar...@mi...>
----
-diff -Nrup e2fsprogs.orig//lib/uuid/Makefile.in e2fsprogs-1.41.14//lib/uuid/Makefile.in
---- e2fsprogs.orig//lib/uuid/Makefile.in 2010-06-14 05:07:36.000000000 +0200
-+++ e2fsprogs-1.41.14//lib/uuid/Makefile.in 2011-07-18 13:44:58.000000000 +0200
-@@ -76,7 +76,7 @@ uuid.h: $(srcdir)/uuid.h.in
- $(top_builddir)/lib/uuid/uuid_types.h: $(srcdir)/uuid_types.h.in $(top_builddir)/config.status
- cd $(top_builddir); CONFIG_FILES=$(my_dir)/uuid_types.h ./config.status
-
--tst_uuid.o: $(srcdir)/tst_uuid.c
-+tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
- $(E) " CC $@"
- $(Q) $(CC) $(ALL_CFLAGS) -c $(srcdir)/tst_uuid.c -o tst_uuid.o
-
Deleted: branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,11 +0,0 @@
---- e2fsprogs-1.41.9/MCONFIG.in.orig 2009-10-07 20:25:07.000000000 +0800
-+++ e2fsprogs-1.41.9/MCONFIG.in 2009-10-07 20:21:41.000000000 +0800
-@@ -85,7 +85,7 @@
- #
- LIB = $(top_builddir)/lib
- LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
--LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
-+LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @SEM_INIT_LIB@
- LIBE2P = $(LIB)/libe2p@LIB_EXT@
- LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
- LIBUUID = @LIBUUID@ @SOCKET_LIB@
Copied: branches/1.0/package/e2fsprogs/e2fsprogs-sem-init-libs.patch (from rev 6044, branches/1.0/package/e2fsprogs/e2fsprogs-1.41.9-sem-init-libs.patch)
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs-sem-init-libs.patch (rev 0)
+++ branches/1.0/package/e2fsprogs/e2fsprogs-sem-init-libs.patch 2013-04-16 07:06:40 UTC (rev 6045)
@@ -0,0 +1,11 @@
+--- e2fsprogs-1.41.9/MCONFIG.in.orig 2009-10-07 20:25:07.000000000 +0800
++++ e2fsprogs-1.41.9/MCONFIG.in 2009-10-07 20:21:41.000000000 +0800
+@@ -85,7 +85,7 @@
+ #
+ LIB = $(top_builddir)/lib
+ LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@
+-LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@
++LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @SEM_INIT_LIB@
+ LIBE2P = $(LIB)/libe2p@LIB_EXT@
+ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
+ LIBUUID = @LIBUUID@ @SOCKET_LIB@
Modified: branches/1.0/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs.mk 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/package/e2fsprogs/e2fsprogs.mk 2013-04-16 07:06:40 UTC (rev 6045)
@@ -4,17 +4,18 @@
#
#############################################################
-E2FSPROGS_VERSION = 1.41.14
-E2FSPROGS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/e2fsprogs
+E2FSPROGS_VERSION = 1.42.7
+E2FSPROGS_SITE = http://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v$(E2FSPROGS_VERSION)
E2FSPROGS_CONF_OPT = \
--disable-tls \
--enable-elf-shlibs \
$(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \
$(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \
+ --disable-defrag \
$(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \
- $(if $(BR2_PACKAGE_E2FSPROGS_UUIDD),,--disable-uuidd) \
- --disable-blkid \
+ --disable-uuidd \
+ --disable-libblkid \
--disable-libuuid \
--enable-fsck \
--disable-e2initrd-helper \
@@ -43,7 +44,6 @@
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LSATTR) += usr/bin/lsattr
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs
E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += usr/sbin/mklost+found
-E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen
# files to remove
E2FSPROGS_TXTTARGETS_ = \
Deleted: branches/1.0/package/util-linux/util-linux-uclibc-build-fix.patch
===================================================================
--- branches/1.0/package/util-linux/util-linux-uclibc-build-fix.patch 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/package/util-linux/util-linux-uclibc-build-fix.patch 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,16 +0,0 @@
-Signed-off-by: Khem Raj <raj...@gm...>
-
-Index: util-linux-2.19.1/configure.ac
-===================================================================
---- util-linux-2.19.1.orig/configure.ac
-+++ util-linux-2.19.1/configure.ac
-@@ -250,7 +250,7 @@ esac
-
-
- AC_MSG_CHECKING(whether program_invocation_short_name is defined)
--AC_TRY_COMPILE([#include <argp.h>],
-+AC_TRY_COMPILE([#include <errno.h>],
- [program_invocation_short_name = "test";],
- AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME, 1,
- [Define if program_invocation_short_name is defined])
-
Modified: branches/1.0/package/util-linux/util-linux.mk
===================================================================
--- branches/1.0/package/util-linux/util-linux.mk 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/package/util-linux/util-linux.mk 2013-04-16 07:06:40 UTC (rev 6045)
@@ -3,13 +3,14 @@
# util-linux
#
#############################################################
-UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).1
-UTIL_LINUX_VERSION_MAJOR = 2.19
+UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2
+UTIL_LINUX_VERSION_MAJOR = 2.22
UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.bz2
-UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
+UTIL_LINUX_SITE = http://www.kernel.org/pub/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR)
UTIL_LINUX_AUTORECONF = YES
UTIL_LINUX_INSTALL_STAGING = YES
UTIL_LINUX_DEPENDENCIES = host-pkg-config
+UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no
UTIL_LINUX_CONF_OPT += --disable-rpath --disable-makeinstall-chown
@@ -30,53 +31,35 @@
UTIL_LINUX_MAKE_OPT += LIBS=-lintl
endif
-#############################################
-#
-# disable default utilities
-#
+# Disable/Enable utilities
UTIL_LINUX_CONF_OPT += \
- $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),,--disable-mount) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),,--disable-fsck) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),,--disable-libmount) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),,--disable-libuuid) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),,--disable-uuidd) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),,--disable-libblkid) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),,--disable-agetty) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),,--disable-cramfs) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),,--disable-switch_root) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),,--disable-pivot_root) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),,--disable-fallocate) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),,--disable-unshare) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),,--disable-rename) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),,--disable-schedutils) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),,--disable-wall)
+ $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch,--disable-arch) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \
+ --disable-ddate \
+ --disable-eject \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-su --enable-sulogin,--disable-last --disable-login --disable-su --disable-sulogin) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),,--disable-partx) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \
+ --disable-utmpdump \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \
+ $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write)
-#############################################
-#
-# enable extra utilities
-#
-UTIL_LINUX_CONF_OPT += \
- $(if $(BR2_PACKAGE_UTIL_LINUX_ARCH),--enable-arch) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_INIT),--enable-init) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-login-utils) \
- $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write)
-
-define UTIL_LINUX_REMOVE_PARTX_FILES
- rm -f $(TARGET_DIR)/usr/sbin/addpart
- rm -f $(TARGET_DIR)/usr/sbin/delpart
- rm -f $(TARGET_DIR)/usr/sbin/partx
-endef
-
-ifneq ($(BR2_PACKAGE_UTIL_LINUX_PARTX),y)
-UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_REMOVE_PARTX_FILES
-endif
-
$(eval $(call AUTOTARGETS,package,util-linux))
# MKINSTALLDIRS comes from tweaked m4/nls.m4, but autoreconf uses staging
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-04-15 19:10:05 UTC (rev 6044)
+++ branches/1.0/runnix.config 2013-04-16 07:06:40 UTC (rev 6045)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6010-dirty Configuration
-# Sun Mar 24 18:00:16 2013
+# Buildroot 2011.08-svn6044-dirty Configuration
+# Tue Apr 16 01:56:34 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -342,7 +342,7 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FINDFS=y
+# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
@@ -350,8 +350,6 @@
BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-BR2_PACKAGE_E2FSPROGS_UUIDGEN=y
-BR2_PACKAGE_E2FSPROGS_UUIDD=y
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS 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-04-16 15:46:05
|
Revision: 6046
http://sourceforge.net/p/astlinux/code/6046
Author: abelbeck
Date: 2013-04-16 15:46:02 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
e2fsprogs, remove FINDFS option, build findfs with util-linux, and now with --disable-libblkid findfs is not built in e2fsprogs
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/e2fsprogs/Config.in
branches/1.0/package/e2fsprogs/e2fsprogs.mk
branches/1.0/runnix.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/astlinux-ast11.config 2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:34 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:53 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -347,7 +347,6 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/astlinux.config 2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:33 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:52 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -353,7 +353,6 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/astlinux18.config 2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:33 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:52 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -347,7 +347,6 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/initrd.config 2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:35 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:54 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -321,7 +321,6 @@
# BR2_PACKAGE_E2FSPROGS_E2LABEL is not set
# BR2_PACKAGE_E2FSPROGS_E2UNDO is not set
# BR2_PACKAGE_E2FSPROGS_FILEFRAG is not set
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
# BR2_PACKAGE_E2FSPROGS_FSCK is not set
# BR2_PACKAGE_E2FSPROGS_LOGSAVE is not set
# BR2_PACKAGE_E2FSPROGS_LSATTR is not set
Modified: branches/1.0/package/e2fsprogs/Config.in
===================================================================
--- branches/1.0/package/e2fsprogs/Config.in 2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/package/e2fsprogs/Config.in 2013-04-16 15:46:02 UTC (rev 6046)
@@ -51,11 +51,6 @@
bool "filefrag"
default y
-config BR2_PACKAGE_E2FSPROGS_FINDFS
- bool "findfs"
- default y
- select BR2_PACKAGE_E2FSPROGS_E2LABEL
-
config BR2_PACKAGE_E2FSPROGS_FSCK
bool "fsck"
default y
Modified: branches/1.0/package/e2fsprogs/e2fsprogs.mk
===================================================================
--- branches/1.0/package/e2fsprogs/e2fsprogs.mk 2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/package/e2fsprogs/e2fsprogs.mk 2013-04-16 15:46:02 UTC (rev 6046)
@@ -51,7 +51,6 @@
usr/sbin/mkfs.ext4dev \
usr/sbin/fsck.ext[234] \
usr/sbin/fsck.ext4dev \
- usr/sbin/findfs \
usr/sbin/tune2fs
define E2FSPROGS_TARGET_REMOVE_UNNEEDED
@@ -91,13 +90,5 @@
E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK
endif
-define E2FSPROGS_TARGET_FINDFS_SYMLINK
- ln -sf e2label $(TARGET_DIR)/usr/sbin/findfs
-endef
-
-ifeq ($(BR2_PACKAGE_E2FSPROGS_FINDFS),y)
-E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_FINDFS_SYMLINK
-endif
-
$(eval $(call AUTOTARGETS,package,e2fsprogs))
$(eval $(call AUTOTARGETS,package,e2fsprogs,host))
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-04-16 07:06:40 UTC (rev 6045)
+++ branches/1.0/runnix.config 2013-04-16 15:46:02 UTC (rev 6046)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6044-dirty Configuration
-# Tue Apr 16 01:56:34 2013
+# Buildroot 2011.08-svn6045-dirty Configuration
+# Tue Apr 16 10:39:53 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -342,7 +342,6 @@
BR2_PACKAGE_E2FSPROGS_E2LABEL=y
BR2_PACKAGE_E2FSPROGS_E2UNDO=y
BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-# BR2_PACKAGE_E2FSPROGS_FINDFS is not set
BR2_PACKAGE_E2FSPROGS_FSCK=y
BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
BR2_PACKAGE_E2FSPROGS_LSATTR=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-04-27 18:20:10
|
Revision: 6057
http://sourceforge.net/p/astlinux/code/6057
Author: abelbeck
Date: 2013-04-27 18:20:07 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
network, unify network configuration to use ip (iproute2)
Modified Paths:
--------------
branches/1.0/package/dahdi-tools/dahdi.init
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
branches/1.0/project/astlinux/target_skeleton/etc/udhcpc.script
Modified: branches/1.0/package/dahdi-tools/dahdi.init
===================================================================
--- branches/1.0/package/dahdi-tools/dahdi.init 2013-04-25 21:31:59 UTC (rev 6056)
+++ branches/1.0/package/dahdi-tools/dahdi.init 2013-04-27 18:20:07 UTC (rev 6057)
@@ -39,7 +39,7 @@
if [ "$HDLCLMI" -a "$HDLCDLCI" ]; then
sethdlc hdlc0 fr lmi "$HDLCLMI"
sethdlc hdlc0 create "$HDLCDLCI"
- ifconfig hdlc0 up
+ ip link set dev hdlc0 up
fi
fi
fi
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2013-04-25 21:31:59 UTC (rev 6056)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2013-04-27 18:20:07 UTC (rev 6057)
@@ -20,9 +20,9 @@
# initialize any values
IFS=$'\n'
for list in $ATM_PARAMS; do
- type="`nthfield list ~ 1`"
- tag="`nthfield list ~ 2`"
- value="`nthfield list ~ 3`"
+ type="$(nthfield list ~ 1)"
+ tag="$(nthfield list ~ 2)"
+ value="$(nthfield list ~ 3)"
case $type in
solos)
soloscli -s $CARD "$tag" "$value"
@@ -43,7 +43,7 @@
br2684ctl -b -c "$CARD" -e 0 -p 1 -s 2040 -a "$CARD.$VPI.$VCI"
- ifconfig "$IF" up
+ ip link set dev "$IF" up
return 0
}
@@ -70,13 +70,13 @@
case $type in
6in4-static)
ip tunnel add ip6tun mode sit remote $remote_addr local $local_addr ttl 255
- ip link set ip6tun up
+ ip link set dev ip6tun up
ip -6 addr add $endpoint_addr dev ip6tun
ip -6 route add ::/0 dev ip6tun metric 1
;;
6to4-relay)
ip tunnel add ip6tun mode sit remote any local $local_addr ttl 255
- ip link set ip6tun up
+ ip link set dev ip6tun up
ip -6 addr add $endpoint_addr dev ip6tun
ip -6 route add ::/0 via ::192.88.99.1 dev ip6tun metric 1
;;
@@ -90,7 +90,7 @@
case $type in
6in4-static|6to4-relay)
ip -6 route flush dev ip6tun
- ip link set ip6tun down
+ ip link set dev ip6tun down
ip tunnel del ip6tun
;;
*)
@@ -139,14 +139,14 @@
COUNT=10
for i in $IFRENAME; do
- IF=`echo $i | cut -d: -f1`
- DRIVER=`echo $i | cut -d: -f2`
- ID=`echo $i | cut -d: -f3`
+ IF="$(echo $i | cut -d: -f1)"
+ DRIVER="$(echo $i | cut -d: -f2)"
+ ID="$(echo $i | cut -d: -f3)"
- COUNT=`expr $COUNT - 1`
+ COUNT=$((COUNT-1))
if echo $ID | grep -q i; then
- RID=`echo $ID | tr -d i`
+ RID="$(echo $ID | tr -d i)"
echo "eth$COUNT driver $DRIVER interrupt $RID" >> /tmp/etc/iftab.init
echo "$IF driver $DRIVER interrupt $RID" >> /tmp/etc/iftab
fi
@@ -154,21 +154,21 @@
done
fi
- if [ -r /etc/iftab.init ]; then
+ if [ -f /etc/iftab.init ]; then
echo "Remapping interfaces (init)..."
ifrename -c /etc/iftab.init
fi
- if [ -r /etc/iftab ]; then
+ if [ -f /etc/iftab ]; then
echo "Remapping interfaces..."
ifrename -c /etc/iftab
fi
if [ -n "$PHYETH" ]; then
for i in $PHYETH; do
- INT=`echo $i | cut -d: -f1`
- SPEED=`echo $i | cut -d: -f2`
- DUP=`echo $i | cut -d: -f3`
+ INT="$(echo $i | cut -d: -f1)"
+ SPEED="$(echo $i | cut -d: -f2)"
+ DUP="$(echo $i | cut -d: -f3)"
echo "Setting ethernet parameters for $INT..."
ethtool -s "$INT" speed "$SPEED" duplex "$DUP" autoneg off
@@ -200,15 +200,16 @@
echo -n "" > /tmp/etc/ethers
- if [ -r /stat/etc/ethers ]; then
+ if [ -f /stat/etc/ethers ]; then
cat /stat/etc/ethers >> /tmp/etc/ethers
fi
- if [ -r /mnt/kd/ethers ]; then
+ if [ -f /mnt/kd/ethers ]; then
cat /mnt/kd/ethers >> /tmp/etc/ethers
fi
- ifconfig lo up 127.0.0.1
+ ip addr add 127.0.0.1/8 dev lo scope host
+ ip link set dev lo up
# look for nas[0123] being any one of our interfaces, and create it
for IF in $PPPOEIF $BRIDGE0 $BRIDGE1 $BRIDGE2 $INTIF $INT2IF $INT3IF; do
@@ -225,7 +226,7 @@
br[0-2])
;;
*)
- ifconfig "$EXTIF" down hw ether $EXTIFMAC up
+ ip link set dev "$EXTIF" address $EXTIFMAC
;;
esac
fi
@@ -235,7 +236,7 @@
br[0-2])
;;
*)
- ifconfig "$EXT2IF" down hw ether $EXT2IFMAC up
+ ip link set dev "$EXT2IF" address $EXT2IFMAC
;;
esac
fi
@@ -243,11 +244,11 @@
#VLANS
if [ -n "$VLANS" ]; then
for i in $VLANS; do
- IF=`echo $i | cut -d. -f1`
- VID=`echo $i | cut -d. -f2`
+ IF="$(echo $i | cut -d. -f1)"
+ VID="$(echo $i | cut -d. -f2)"
modprobe 8021q
- ifconfig $IF up
- vconfig add $IF $VID > /dev/null
+ ip link add link $IF name $IF.$VID type vlan id $VID
+ ip link set dev $IF up
if [ "$VLANCOS" = "yes" ]; then
vconfig set_egress_map "$IF.$VID" 0 3 > /dev/null
vconfig set_egress_map "$IF.$VID" 1 3 > /dev/null
@@ -267,7 +268,7 @@
brctl addbr br0
brctl setfd br0 0
for i in $BRIDGE0; do
- ifconfig $i up
+ ip link set dev $i up
brctl addif br0 $i
done
fi
@@ -277,7 +278,7 @@
brctl addbr br1
brctl setfd br1 0
for i in $BRIDGE1; do
- ifconfig $i up
+ ip link set dev $i up
brctl addif br1 $i
done
fi
@@ -287,7 +288,7 @@
brctl addbr br2
brctl setfd br2 0
for i in $BRIDGE2; do
- ifconfig $i up
+ ip link set dev $i up
brctl addif br2 $i
done
fi
@@ -296,7 +297,8 @@
if [ -n "$EXTIF" -a -n "$EXTIFMAC" -a "$EXTIF" != "none" ]; then
case "$EXTIF" in
br[0-2])
- ifconfig "$EXTIF" down hw ether $EXTIFMAC up
+ ip link set dev "$EXTIF" down
+ ip link set dev "$EXTIF" address $EXTIFMAC
;;
esac
fi
@@ -304,41 +306,46 @@
if [ -n "$EXT2IF" -a -n "$EXT2IFMAC" -a "$EXT2IF" != "none" ]; then
case "$EXT2IF" in
br[0-2])
- ifconfig "$EXT2IF" down hw ether $EXT2IFMAC up
+ ip link set dev "$EXT2IF" down
+ ip link set dev "$EXT2IF" address $EXT2IFMAC
;;
esac
fi
if [ -n "$IFMTU" ]; then
for i in $IFMTU; do
- IF=`echo $i | cut -d: -f1`
- MTU=`echo $i | cut -d: -f2`
- ifconfig $IF mtu $MTU
+ IF="$(echo $i | cut -d: -f1)"
+ MTU="$(echo $i | cut -d: -f2)"
+ ip link set dev $IF mtu $MTU
done
fi
if [ -n "$INTIF" -a -n "$INTIP" -a -n "$INTNM" -a "$INTIF" != "none" ]; then
- ifconfig $INTIF $INTIP netmask $INTNM
- route add -net 224.0.0.0 netmask 240.0.0.0 $INTIF
+ ip addr add $INTIP/$INTNM brd + dev $INTIF
if [ "$IPV6" = "yes" -a -n "$INTIPV6" ]; then
ip -6 addr add $INTIPV6 dev $INTIF
fi
+ ip link set dev $INTIF up
+
+ if [ "$NTPBROADCAST" = "yes" ]; then
+ ip route add 224.0.0.0/4 dev $INTIF
+ fi
fi
if [ -n "$INT2IF" -a -n "$INT2IP" -a -n "$INT2NM" -a "$INT2IF" != "none" ]; then
- ifconfig $INT2IF $INT2IP netmask $INT2NM
- route add -net 224.0.0.0 netmask 240.0.0.0 $INT2IF
+ ip addr add $INT2IP/$INT2NM brd + dev $INT2IF
if [ "$IPV6" = "yes" -a -n "$INT2IPV6" ]; then
ip -6 addr add $INT2IPV6 dev $INT2IF
fi
+ ip link set dev $INT2IF up
fi
if [ -n "$INT3IF" -a -n "$INT3IP" -a -n "$INT3NM" -a "$INT3IF" != "none" ]; then
- ifconfig $INT3IF $INT3IP netmask $INT3NM
- route add -net 224.0.0.0 netmask 240.0.0.0 $INT3IF
+ ip addr add $INT3IP/$INT3NM brd + dev $INT3IF
if [ "$IPV6" = "yes" -a -n "$INT3IPV6" ]; then
ip -6 addr add $INT3IPV6 dev $INT3IF
fi
+ ip link set dev $INT3IF up
fi
if [ -n "$WANDELAY" ]; then
@@ -350,9 +357,9 @@
if isextppp; then
case $PPPOEIF in
eth*|nas[0123])
- ifconfig $PPPOEIF up ;;
+ ip link set dev $PPPOEIF up ;;
br[012])
- ifconfig $PPPOEIF up
+ ip link set dev $PPPOEIF up
# because bridging does weird and unpleasant things to PPPoE packets
echo "0" > /proc/sys/net/bridge/bridge-nf-call-iptables
echo "0" > /proc/sys/net/bridge/bridge-nf-filter-pppoe-tagged
@@ -382,7 +389,7 @@
FIREWALL=NONE
PPPOE_EXTRA=\"\"" > /tmp/etc/ppp/pppoe.conf
- PPPVER=`(pppd --version 2>&1 >/dev/null ) | awk '/^pppd version/ { print $3; }'`
+ PPPVER="$( (pppd --version 2>&1 >/dev/null ) | awk '/^pppd version/ { print $3; }')"
if [ -n "$PPPOEKERNEL" ]; then
echo "LINUX_PLUGIN=\"/usr/lib/pppd/$PPPVER/rp-pppoe.so\"" >> /tmp/etc/ppp/pppoe.conf
@@ -426,24 +433,26 @@
wp)
;;
hdlc0|pvc0)
- ifconfig $EXTIF $EXTIP pointopoint $EXTGW
+ ip tunnel add $EXTIF mode ipip remote $EXTGW local $EXTIP
+ ip link set dev $EXTIF up
;;
*)
- ifconfig $EXTIF $EXTIP netmask $EXTNM
+ ip addr add $EXTIP/$EXTNM brd + dev $EXTIF
if [ -n "$EXTIP_ALIAS" ]; then
alias_interface add $EXTIF "$EXTIP_ALIAS"
fi
if [ "$IPV6" = "yes" -a -n "$EXTIPV6" ]; then
ip -6 addr add $EXTIPV6 dev $EXTIF
fi
+ ip link set dev $EXTIF up
;;
esac
if [ -n "$EXTGW" ]; then
- route add -net default gw $EXTGW dev $EXTIF
+ ip route add default via $EXTGW dev $EXTIF
fi
if [ "$IPV6" = "yes" -a -n "$EXTGWIPV6" ]; then
- ip -6 route add ::/0 via $EXTGWIPV6 dev $EXTIF metric 1
+ ip -6 route add default via $EXTGWIPV6 dev $EXTIF metric 1
fi
#end static IP
fi
@@ -455,24 +464,26 @@
wp)
;;
hdlc0|pvc0)
- ifconfig $EXT2IF $EXT2IP pointopoint $EXT2GW
+ ip tunnel add $EXT2IF mode ipip remote $EXT2GW local $EXT2IP
+ ip link set dev $EXT2IF up
;;
*)
- ifconfig $EXT2IF $EXT2IP netmask $EXT2NM
+ ip addr add $EXT2IP/$EXT2NM brd + dev $EXT2IF
if [ -n "$EXT2IP_ALIAS" ]; then
alias_interface add $EXT2IF "$EXT2IP_ALIAS"
fi
if [ "$IPV6" = "yes" -a -n "$EXT2IPV6" ]; then
ip -6 addr add $EXT2IPV6 dev $EXT2IF
fi
+ ip link set dev $EXT2IF up
;;
esac
if [ -n "$EXT2GW" ]; then
- route add -net default gw $EXT2GW dev $EXT2IF
+ ip route add default via $EXT2GW dev $EXT2IF
fi
if [ "$IPV6" = "yes" -a -n "$EXT2GWIPV6" ]; then
- ip -6 route add ::/0 via $EXT2GWIPV6 dev $EXT2IF metric 1
+ ip -6 route add default via $EXT2GWIPV6 dev $EXT2IF metric 1
fi
#end static ip on 2nd if
fi
@@ -498,16 +509,20 @@
##DMZ Network
if [ -n "$DMZIF" -a -n "$DMZIP" -a -n "$DMZNM" -a "$DMZIF" != "none" ]; then
- ifconfig $DMZIF $DMZIP netmask $DMZNM
+ ip addr add $DMZIP/$DMZNM brd + dev $DMZIF
if [ "$IPV6" = "yes" -a -n "$DMZIPV6" ]; then
ip -6 addr add $DMZIPV6 dev $DMZIF
fi
+ ip link set dev $DMZIF up
fi
##IPv6 Tunnel
if [ "$IPV6" = "yes" -a -n "$IPV6_TUNNEL" ]; then
ipv6_tunnel start
fi
+
+ echo "Network UP"
+ sleep 1
}
stop () {
@@ -519,11 +534,11 @@
fi
if [ -z "$EXTIP" ]; then
- kill `cat /var/run/udhcpc-$EXTIF.pid` 2>/dev/null
+ kill $(cat /var/run/udhcpc-$EXTIF.pid) 2>/dev/null
fi
- if [ -r /var/run/ppp0.pid ]; then
- kill `cat /var/run/ppp0.pid`
+ if [ -f /var/run/ppp0.pid ]; then
+ kill $(cat /var/run/ppp0.pid)
fi
if [ -n "$EXTIF" -a "$EXTIF" != "none" ]; then
@@ -531,7 +546,7 @@
if [ -n "$EXTIP_ALIAS" ]; then
alias_interface delete $EXTIF "$EXTIP_ALIAS"
fi
- ifconfig $EXTIF down
+ ip link set dev $EXTIF down
fi
if [ -n "$EXT2IF" -a "$EXT2IF" != "none" ]; then
@@ -539,49 +554,50 @@
if [ -n "$EXT2IP_ALIAS" ]; then
alias_interface delete $EXT2IF "$EXT2IP_ALIAS"
fi
- ifconfig $EXT2IF down
+ ip link set dev $EXT2IF down
fi
if [ -n "$INTIF" -a "$INTIF" != "none" ]; then
echo "Bringing down $INTIF..."
- ifconfig $INTIF down
+ ip link set dev $INTIF down
fi
if [ -n "$INT2IF" -a "$INT2IF" != "none" ]; then
echo "Bringing down $INT2IF ..."
- ifconfig $INT2IF down
+ ip link set dev $INT2IF down
fi
if [ -n "$INT3IF" -a "$INT3IF" != "none" ]; then
echo "Bringing down $INT3IF..."
- ifconfig $INT3IF down
+ ip link set dev $INT3IF down
fi
if [ -n "$DMZIF" -a "$DMZIF" != "none" ]; then
echo "Bringing down $DMZIF ..."
- ifconfig $DMZIF down
+ ip link set dev $DMZIF down
fi
#BRIDGES
if [ -n "$BRIDGE0" ]; then
- ifconfig br0 down
+ ip link set dev br0 down
brctl delbr br0
fi
if [ -n "$BRIDGE1" ]; then
- ifconfig br1 down
+ ip link set dev br1 down
brctl delbr br1
fi
if [ -n "$BRIDGE2" ]; then
- ifconfig br2 down
+ ip link set dev br2 down
brctl delbr br2
fi
#VLANS
if [ -n "$VLANS" ]; then
for i in $VLANS; do
- vconfig rem $i
+ ip link set dev $i down
+ ip link delete $i
done
fi
@@ -589,7 +605,7 @@
for IF in $PPPOEIF $BRIDGE0 $BRIDGE1 $BRIDGE2 $INTIF $INT2IF $INT3IF; do
case $IF in
nas[0123])
- ifconfig "$IF" down
+ ip link set dev "$IF" down
killall br2684ctl
if [ -n "$ATM_MODULE" ]; then
modprobe -r $ATM_MODULE
@@ -598,6 +614,8 @@
;;
esac
done
+
+ echo "Network DOWN"
}
case $1 in
Modified: branches/1.0/project/astlinux/target_skeleton/etc/udhcpc.script
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/udhcpc.script 2013-04-25 21:31:59 UTC (rev 6056)
+++ branches/1.0/project/astlinux/target_skeleton/etc/udhcpc.script 2013-04-27 18:20:07 UTC (rev 6057)
@@ -5,41 +5,49 @@
[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1
-. /etc/rc.conf
+resolv_conf="/tmp/etc/resolv-up.conf"
-[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast"
-[ -n "$subnet" ] && NETMASK="netmask $subnet"
+udhcpc_conf="/tmp/udhcpc-${interface}.conf"
case "$1" in
- deconfig)
- /sbin/ifconfig $interface 0.0.0.0
- rm -f /tmp/mydhcpip /tmp/udhcpc-$interface.conf
- ;;
+ deconfig)
+ /sbin/ip link set dev ${interface} up
+ /sbin/ip -4 addr flush dev ${interface} scope global
+ rm -f /tmp/mydhcpip "$udhcpc_conf"
+ ;;
- renew|bound)
- /sbin/ifconfig $interface $ip $BROADCAST $NETMASK
- echo $ip > /tmp/mydhcpip
- echo -e "IP=$ip\nBCAST=$broadcast\nNETMASK=$subnet" > /tmp/udhcpc-$interface.conf
- if [ -n "$router" ] ; then
- echo "deleting routers"
- while route del default gw 0.0.0.0 dev $interface 2> /dev/null > /dev/null; do
- :
- done
+ renew|bound)
+ /sbin/ip link set dev ${interface} up
+ /sbin/ip -4 addr flush dev ${interface} scope global
+ /sbin/ip -4 addr add ${ip}/${subnet} brd ${broadcast:-+} dev ${interface}
+ echo "${ip}" > /tmp/mydhcpip
+ echo "IP=${ip}
+BCAST=${broadcast}
+NETMASK=${subnet}" > "$udhcpc_conf"
+ if [ -n "${router}" ]; then
+ # Delete existing default route(s)
+ while /sbin/ip route del default dev ${interface} >/dev/null 2>&1; do
+ :
+ done
- for i in $router ; do
- route add default gw $i dev $interface
- echo "GW=$i" >> /tmp/udhcpc-$interface.conf
- done
- fi
+ metric=0
+ for i in ${router}; do
+ echo "udhcpc: adding route via ${i}"
+ /sbin/ip route add default via ${i} dev ${interface} metric $((metric++))
+ echo "GW=${i}" >> "$udhcpc_conf"
+ done
+ fi
- echo -n > /tmp/etc/resolv-up.conf
- [ -n "$domain" ] && echo search $domain >> /tmp/etc/resolv-up.conf
- for i in $dns ; do
- echo adding dns $i
- echo nameserver $i >> /tmp/etc/resolv-up.conf
- echo "DNS=$i" >> /tmp/udhcpc-$interface.conf
- done
- ;;
+ echo -n "" > "$resolv_conf"
+ if [ -n "${domain}" ]; then
+ echo "search ${domain}" >> "$resolv_conf"
+ fi
+ for i in ${dns}; do
+ echo "udhcpc: adding resolver ${i}"
+ echo "nameserver ${i}" >> "$resolv_conf"
+ echo "DNS=${i}" >> "$udhcpc_conf"
+ done
+ ;;
esac
exit 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-05-02 00:13:46
|
Revision: 6071
http://sourceforge.net/p/astlinux/code/6071
Author: abelbeck
Date: 2013-05-02 00:13:42 +0000 (Thu, 02 May 2013)
Log Message:
-----------
bluez_utils, add package from upstream Buildroot, also tweak dbus and libglib2
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
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/dbus/Config.in
branches/1.0/package/dbus/dbus.mk
branches/1.0/package/libglib2/libglib2.mk
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/bluez_utils/
branches/1.0/package/bluez_utils/Config.in
branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
branches/1.0/package/bluez_utils/bluez_utils.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/astlinux-ast11.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:53 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:21 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -659,6 +659,7 @@
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
BR2_PACKAGE_BRIDGE=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/astlinux.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:52 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:17 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -661,6 +661,7 @@
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
BR2_PACKAGE_BRIDGE=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/astlinux18.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:52 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:19 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -659,6 +659,7 @@
BR2_PACKAGE_ARNOFW=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
BR2_PACKAGE_BRIDGE=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/initrd.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:54 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:47 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -304,10 +304,7 @@
# BR2_PACKAGE_BFDETECT is not set
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
+# BR2_PACKAGE_DBUS is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
BR2_PACKAGE_E2FSPROGS=y
@@ -544,6 +541,7 @@
# BR2_PACKAGE_ARNOFW is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/Config.in 2013-05-02 00:13:42 UTC (rev 6071)
@@ -431,6 +431,7 @@
source "package/arnofw/Config.in"
source "package/avahi/Config.in"
source "package/axel/Config.in"
+source "package/bluez_utils/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/boa/Config.in"
endif
Added: branches/1.0/package/bluez_utils/Config.in
===================================================================
--- branches/1.0/package/bluez_utils/Config.in (rev 0)
+++ branches/1.0/package/bluez_utils/Config.in 2013-05-02 00:13:42 UTC (rev 6071)
@@ -0,0 +1,34 @@
+config BR2_PACKAGE_BLUEZ_UTILS
+ bool "bluez-utils"
+ depends on BR2_USE_WCHAR # libglib2
+ select BR2_PACKAGE_DBUS
+ select BR2_PACKAGE_LIBGLIB2
+ help
+ bluez utils
+
+ http://www.kernel.org/pub/linux/bluetooth
+
+if BR2_PACKAGE_BLUEZ_UTILS
+
+config BR2_PACKAGE_BLUEZ_UTILS_COMPAT
+ bool "BlueZ 3.x compatibility binaries"
+ help
+ BlueZ 3.x compatibility binaries like pand, hidd, sdp
+
+config BR2_PACKAGE_BLUEZ_UTILS_AUDIO
+ bool "audio support"
+ select BR2_PACKAGE_ALSA_LIB
+ select BR2_PACKAGE_LIBSNDFILE
+ help
+ Audio support
+
+config BR2_PACKAGE_BLUEZ_UTILS_USB
+ bool "USB support"
+ select BR2_PACKAGE_LIBUSB
+ help
+ USB support
+
+endif
+
+comment "bluez-utils require a toolchain with WCHAR support"
+ depends on !(BR2_USE_WCHAR)
Added: branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch
===================================================================
--- branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch (rev 0)
+++ branches/1.0/package/bluez_utils/bluez_utils-4.101-enable_cg2900_on_upstream_4.91.patch 2013-05-02 00:13:42 UTC (rev 6071)
@@ -0,0 +1,105 @@
+From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001
+From: Gregory Hermant <gre...@ca...>
+Date: Wed, 14 Nov 2012 14:27:02 +0100
+Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth
+ combo controller
+
+
+Signed-off-by: Gregory Hermant <gre...@ca...>
+---
+ tools/hciattach.c | 22 +++++++++++++++-------
+ tools/hciattach.h | 1 +
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/tools/hciattach.c b/tools/hciattach.c
+index e4d5aa1..7f08243 100644
+--- a/tools/hciattach.c
++++ b/tools/hciattach.c
+@@ -1066,6 +1066,11 @@ struct uart_t uart[] = {
+ { "texasalt", 0x0000, 0x0000, HCI_UART_LL, 115200, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL },
+
++ /* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */
++ { "cg2900", 0x0000, 0x0000, HCI_UART_STE, 115200, 115200,
++ FLOW_CTL, DISABLE_PM, NULL, NULL },
++
++
+ /* ST Microelectronics minikits based on STLC2410/STLC2415 */
+ { "st", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200,
+ FLOW_CTL, DISABLE_PM, NULL, st },
+@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type)
+ }
+
+ /* Initialize UART driver */
+-static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
++static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc)
+ {
+ struct termios ti;
+- int fd, i;
++ int fd;
+ unsigned long flags = 0;
+
+ if (raw)
+@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw)
+ }
+
+ /* Set TTY to N_HCI line discipline */
+- i = N_HCI;
+- if (ioctl(fd, TIOCSETD, &i) < 0) {
++ if (ioctl(fd, TIOCSETD, &line_disc) < 0) {
+ perror("Can't set line discipline");
+ return -1;
+ }
+@@ -1243,7 +1247,7 @@ static void usage(void)
+ {
+ printf("hciattach - HCI UART driver initialization utility\n");
+ printf("Usage:\n");
+- printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
++ printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] <tty> <type | id> [speed] [flow|noflow] [bdaddr]\n");
+ printf("\thciattach -l\n");
+ }
+
+@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[])
+ struct uart_t *u = NULL;
+ int detach, printpid, raw, opt, i, n, ld, err;
+ int to = 10;
++ int line_disc = N_HCI;
+ int init_speed = 0;
+ int send_break = 0;
+ pid_t pid;
+@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[])
+ printpid = 0;
+ raw = 0;
+
+- while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) {
++ while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) {
+ switch(opt) {
++ case 'a':
++ line_disc = atoi(optarg);
++ break;
+ case 'b':
+ send_break = 1;
+ break;
+@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[])
+ alarm(to);
+ bcsp_max_retries = to;
+
+- n = init_uart(dev, u, send_break, raw);
++ n = init_uart(dev, u, send_break, raw, line_disc);
+ if (n < 0) {
+ perror("Can't initialize device");
+ exit(1);
+diff --git a/tools/hciattach.h b/tools/hciattach.h
+index fed0d11..09b534d 100644
+--- a/tools/hciattach.h
++++ b/tools/hciattach.h
+@@ -39,6 +39,7 @@
+ #define HCI_UART_H4DS 3
+ #define HCI_UART_LL 4
+ #define HCI_UART_ATH3K 5
++#define HCI_UART_STE 6
+
+ #define HCI_UART_RAW_DEVICE 0
+
+--
+1.7.9.5
Added: branches/1.0/package/bluez_utils/bluez_utils.mk
===================================================================
--- branches/1.0/package/bluez_utils/bluez_utils.mk (rev 0)
+++ branches/1.0/package/bluez_utils/bluez_utils.mk 2013-05-02 00:13:42 UTC (rev 6071)
@@ -0,0 +1,47 @@
+#############################################################
+#
+# bluez_utils
+#
+#############################################################
+BLUEZ_UTILS_VERSION = 4.101
+BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.gz
+BLUEZ_UTILS_SITE = http://www.kernel.org/pub/linux/bluetooth
+BLUEZ_UTILS_INSTALL_STAGING = YES
+BLUEZ_UTILS_DEPENDENCIES = dbus libglib2
+BLUEZ_UTILS_CONF_OPT = --enable-test --enable-tools
+BLUEZ_UTILS_AUTORECONF = YES
+
+# BlueZ 3.x compatibility
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y)
+BLUEZ_UTILS_CONF_OPT += \
+ --enable-hidd \
+ --enable-pand \
+ --enable-sdp \
+ --enable-dund
+endif
+
+# audio support
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y)
+BLUEZ_UTILS_DEPENDENCIES += \
+ alsa-lib \
+ libsndfile
+BLUEZ_UTILS_CONF_OPT += \
+ --enable-alsa \
+ --enable-audio
+else
+BLUEZ_UTILS_CONF_OPT += \
+ --disable-alsa \
+ --disable-audio
+endif
+
+# USB support
+ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y)
+BLUEZ_UTILS_DEPENDENCIES += libusb
+BLUEZ_UTILS_CONF_OPT += \
+ --enable-usb
+else
+BLUEZ_UTILS_CONF_OPT += \
+ --disable-usb
+endif
+
+$(eval $(call AUTOTARGETS,package,bluez_utils))
Modified: branches/1.0/package/dbus/Config.in
===================================================================
--- branches/1.0/package/dbus/Config.in 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/dbus/Config.in 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,18 +1,13 @@
config BR2_PACKAGE_DBUS
bool "dbus"
- depends on BR2_PACKAGE_EXPAT || BR2_PACKAGE_LIBXML2
help
The D-Bus message bus system.
http://www.freedesktop.org/wiki/Software/dbus
-comment "dbus not available (need expat or libxml2)"
- depends on !BR2_PACKAGE_EXPAT && !BR2_PACKAGE_LIBXML2
-
choice
prompt "XML library to use"
depends on BR2_PACKAGE_DBUS
- default BR2_DBUS_LIBXML2 if (BR2_PACKAGE_LIBXML2 && !BR2_PACKAGE_EXPAT)
default BR2_DBUS_EXPAT
help
Select the XML library to use with D-Bus. Select Expat
@@ -21,10 +16,10 @@
config BR2_DBUS_EXPAT
bool "Expat"
- depends on BR2_PACKAGE_EXPAT
+ select BR2_PACKAGE_EXPAT
config BR2_DBUS_LIBXML2
bool "libxml2"
- depends on BR2_PACKAGE_LIBXML2
+ select BR2_PACKAGE_LIBXML2
endchoice
Modified: branches/1.0/package/dbus/dbus.mk
===================================================================
--- branches/1.0/package/dbus/dbus.mk 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/dbus/dbus.mk 2013-05-02 00:13:42 UTC (rev 6071)
@@ -3,11 +3,10 @@
# dbus
#
#############################################################
-DBUS_VERSION = 1.4.10
+DBUS_VERSION = 1.4.24
DBUS_SOURCE = dbus-$(DBUS_VERSION).tar.gz
-DBUS_SITE = http://dbus.freedesktop.org/releases/dbus/
+DBUS_SITE = http://dbus.freedesktop.org/releases/dbus
DBUS_INSTALL_STAGING = YES
-DBUS_INSTALL_TARGET = YES
DBUS_DEPENDENCIES = host-pkg-config
@@ -58,7 +57,7 @@
define DBUS_INSTALL_TARGET_FIXUP
rm -rf $(TARGET_DIR)/var/lib/dbus
ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus
- $(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus
+ #$(INSTALL) -m 0755 -D package/dbus/S30dbus $(TARGET_DIR)/etc/init.d/S30dbus
endef
DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_INSTALL_TARGET_FIXUP
Modified: branches/1.0/package/libglib2/libglib2.mk
===================================================================
--- branches/1.0/package/libglib2/libglib2.mk 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/package/libglib2/libglib2.mk 2013-05-02 00:13:42 UTC (rev 6071)
@@ -4,7 +4,7 @@
#
#############################################################
LIBGLIB2_VERSION_MAJOR = 2.28
-LIBGLIB2_VERSION_MINOR = 6
+LIBGLIB2_VERSION_MINOR = 8
LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).$(LIBGLIB2_VERSION_MINOR)
LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.bz2
LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR)
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/runnix-uclibc.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6010-dirty Configuration
-# Sun Mar 24 18:00:17 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:37 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -474,17 +474,14 @@
# cdrkit requires a toolchain with LARGEFILE support
#
# BR2_PACKAGE_CRAMFS is not set
+# BR2_PACKAGE_DBUS is not set
#
-# dbus not available (need expat or libxml2)
-#
-
-#
# dmraid requires a toolchain with LARGEFILE support
#
#
-# dosfstools requires a toolchain with LARGEFILE support
+# dosfstools requires a toolchain with LARGEFILE and WCHAR support
#
# BR2_PACKAGE_E1000 is not set
# BR2_PACKAGE_E1000E is not set
@@ -820,6 +817,10 @@
# BR2_PACKAGE_ARNOFW is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+
+#
+# bluez-utils require a toolchain with WCHAR support
+#
# BR2_PACKAGE_BOA is not set
#
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-05-01 18:57:50 UTC (rev 6070)
+++ branches/1.0/runnix.config 2013-05-02 00:13:42 UTC (rev 6071)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6045-dirty Configuration
-# Tue Apr 16 10:39:53 2013
+# Buildroot 2011.08-svn6070-dirty Configuration
+# Wed May 1 18:58:33 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -320,10 +320,7 @@
# BR2_PACKAGE_BFDETECT is not set
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
-
-#
-# dbus not available (need expat or libxml2)
-#
+# BR2_PACKAGE_DBUS is not set
# BR2_PACKAGE_DMRAID is not set
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
@@ -571,6 +568,7 @@
# BR2_PACKAGE_ARNOFW is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
+# BR2_PACKAGE_BLUEZ_UTILS is not set
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BMON 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-05-07 17:32:29
|
Revision: 6075
http://sourceforge.net/p/astlinux/code/6075
Author: abelbeck
Date: 2013-05-07 17:32:25 +0000 (Tue, 07 May 2013)
Log Message:
-----------
arnofw, add new time-schedule-host-block plugin. Additionally upgrade-arno-firewall now supports both single and multi line variables when merging previous variables to updated configurations
Modified Paths:
--------------
branches/1.0/package/arnofw/arnofw.mk
branches/1.0/package/arnofw/arnofw.serial
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-arno-firewall
Added Paths:
-----------
branches/1.0/package/arnofw/time-schedule-host-block/
branches/1.0/package/arnofw/time-schedule-host-block/30time-schedule-host-block.plugin.sh
branches/1.0/package/arnofw/time-schedule-host-block/time-schedule-host-block.conf
Modified: branches/1.0/package/arnofw/arnofw.mk
===================================================================
--- branches/1.0/package/arnofw/arnofw.mk 2013-05-05 21:17:46 UTC (rev 6074)
+++ branches/1.0/package/arnofw/arnofw.mk 2013-05-07 17:32:25 UTC (rev 6075)
@@ -119,6 +119,13 @@
$(INSTALL) -m 0644 package/arnofw/openvpn-server/openvpn-server-astlinux.conf \
$(TARGET_DIR)/stat$(ARNOFW_PLUGIN_CONFIG_DIR)/openvpn-server.conf
@echo
+ @echo "Install local version of Time Schedule Host Block plugin."
+ @echo
+ $(INSTALL) -m 0644 package/arnofw/time-schedule-host-block/30time-schedule-host-block.plugin.sh \
+ $(TARGET_DIR)$(ARNOFW_PLUGIN_SCRIPT_DIR)/30time-schedule-host-block.plugin
+ $(INSTALL) -m 0644 package/arnofw/time-schedule-host-block/time-schedule-host-block.conf \
+ $(TARGET_DIR)/stat$(ARNOFW_PLUGIN_CONFIG_DIR)/time-schedule-host-block.conf
+ @echo
@echo "Install local version of PPTP VPN plugin."
@echo
$(INSTALL) -m 0644 package/arnofw/pptp-vpn/50pptp-vpn.plugin.sh \
Modified: branches/1.0/package/arnofw/arnofw.serial
===================================================================
--- branches/1.0/package/arnofw/arnofw.serial 2013-05-05 21:17:46 UTC (rev 6074)
+++ branches/1.0/package/arnofw/arnofw.serial 2013-05-07 17:32:25 UTC (rev 6075)
@@ -1 +1 @@
-0002~0018~0000~0000~0000~
+0002~0019~0000~0000~0000~
Added: branches/1.0/package/arnofw/time-schedule-host-block/30time-schedule-host-block.plugin.sh
===================================================================
--- branches/1.0/package/arnofw/time-schedule-host-block/30time-schedule-host-block.plugin.sh (rev 0)
+++ branches/1.0/package/arnofw/time-schedule-host-block/30time-schedule-host-block.plugin.sh 2013-05-07 17:32:25 UTC (rev 6075)
@@ -0,0 +1,235 @@
+# ------------------------------------------------------------------------------
+# -= Arno's iptables firewall - Time Schedule Host Block plugin =-
+#
+PLUGIN_NAME="Time Schedule Host Block plugin"
+PLUGIN_VERSION="1.00"
+PLUGIN_CONF_FILE="time-schedule-host-block.conf"
+#
+# Last changed : May 06, 2013
+# Requirements : AIF 2.0.0+
+# Comments : This plugin blocks forwarded packets based on time and day-of-week.
+#
+# Author : (C) Copyright 2012-2013 by Lonnie Abelbeck & Arno van Amersfoort
+# Homepage : http://rocky.eld.leidenuniv.nl/
+# Email : a r n o v a AT r o c k y DOT e l d DOT l e i d e n u n i v DOT n l
+# (note: you must remove all spaces and substitute the @ and the .
+# at the proper locations!)
+# ------------------------------------------------------------------------------
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# ------------------------------------------------------------------------------
+
+# Plugin start function
+plugin_start()
+{
+ local rule type data addr timestart timestop weekdays i DAYS SHOWRULE IFS
+
+ IFS=$EOL
+ for rule in $TIME_SCHEDULE_HOST_BLOCK_MAC; do
+ unset IFS
+ type="$(echo "$rule" | cut -s -d'|' -f1)"
+ data="$(echo "$rule" | cut -s -d'|' -f2)"
+ addr="$(echo "$data" | cut -s -d'~' -f1)"
+ timestart="$(echo "$data" | cut -s -d'~' -f2)"
+ timestop="$(echo "$data" | cut -s -d'~' -f3)"
+ weekdays="$(echo "$data" | cut -s -d'~' -f4)"
+ if [ -z "$addr" -o -z "$timestart" -o -z "$timestop" ]; then
+ type=""
+ else
+ # Check for MAC address, if not, try from STATICHOSTS
+ case "$addr" in
+ *:*)
+ ;;
+ *)
+ if [ -n "$STATICHOSTS" ]; then
+ IFS=$EOL
+ for i in $STATICHOSTS; do
+ if [ "$(echo "$i" | cut -s -d'~' -f1)" = "$addr" ]; then
+ addr="$(echo "$i" | cut -s -d'~' -f3)"
+ break
+ fi
+ done
+ unset IFS
+ fi
+ # Still not MAC address, ignore rule
+ case "$addr" in
+ *:*) ;;
+ *) type="" ;;
+ esac
+ ;;
+ esac
+ SHOWRULE="${INDENT}Blocking $type Source MAC Addr: $addr using Schedule: $timestart to $timestop on Days:"
+ if [ -n "$weekdays" ]; then
+ DAYS="--weekdays $weekdays"
+ SHOWRULE="$SHOWRULE $weekdays"
+ else
+ DAYS=""
+ SHOWRULE="$SHOWRULE All"
+ fi
+ # Adjust time to UTC for iptables
+ timestart="$(date -u -d "@$(date -d $timestart '+%s')" '+%H:%M:%S')"
+ timestop="$(date -u -d "@$(date -d $timestop '+%s')" '+%H:%M:%S')"
+ fi
+ case $type in
+ LAN-EXT|lan-ext)
+ echo "$SHOWRULE"
+ iptables -A LAN_INET_FORWARD_CHAIN -m mac --mac-source $addr \
+ -m time --timestart $timestart --timestop $timestop $DAYS -j REJECT
+ ;;
+ DMZ-EXT|dmz-ext)
+ echo "$SHOWRULE"
+ iptables -A DMZ_INET_FORWARD_CHAIN -m mac --mac-source $addr \
+ -m time --timestart $timestart --timestop $timestop $DAYS -j REJECT
+ ;;
+ ANY|any)
+ echo "$SHOWRULE"
+ iptables -A FORWARD_CHAIN -m mac --mac-source $addr \
+ -m time --timestart $timestart --timestop $timestop $DAYS -j REJECT
+ ;;
+ '#'*) # Disable rule
+ ;;
+ *)
+ echo "** WARNING: In Variable TIME_SCHEDULE_HOST_BLOCK_MAC, Rule: \"$rule\" is ignored." >&2
+ ;;
+ esac
+ done
+
+ IFS=$EOL
+ for rule in $TIME_SCHEDULE_HOST_BLOCK; do
+ unset IFS
+ type="$(echo "$rule" | cut -s -d'|' -f1)"
+ data="$(echo "$rule" | cut -s -d'|' -f2)"
+ addr="$(echo "$data" | cut -s -d'~' -f1)"
+ timestart="$(echo "$data" | cut -s -d'~' -f2)"
+ timestop="$(echo "$data" | cut -s -d'~' -f3)"
+ weekdays="$(echo "$data" | cut -s -d'~' -f4)"
+ if [ -z "$addr" -o -z "$timestart" -o -z "$timestop" ]; then
+ type=""
+ else
+ SHOWRULE="${INDENT}Blocking $type Source IP Addr: $addr using Schedule: $timestart to $timestop on Days:"
+ if [ -n "$weekdays" ]; then
+ DAYS="--weekdays $weekdays"
+ SHOWRULE="$SHOWRULE $weekdays"
+ else
+ DAYS=""
+ SHOWRULE="$SHOWRULE All"
+ fi
+ # Adjust time to UTC for iptables
+ timestart="$(date -u -d "@$(date -d $timestart '+%s')" '+%H:%M:%S')"
+ timestop="$(date -u -d "@$(date -d $timestop '+%s')" '+%H:%M:%S')"
+ fi
+ case $type in
+ LAN-EXT|lan-ext)
+ echo "$SHOWRULE"
+ iptables -A LAN_INET_FORWARD_CHAIN -s $addr \
+ -m time --timestart $timestart --timestop $timestop $DAYS -j REJECT
+ ;;
+ DMZ-EXT|dmz-ext)
+ echo "$SHOWRULE"
+ iptables -A DMZ_INET_FORWARD_CHAIN -s $addr \
+ -m time --timestart $timestart --timestop $timestop $DAYS -j REJECT
+ ;;
+ ANY|any)
+ echo "$SHOWRULE"
+ iptables -A FORWARD_CHAIN -s $addr \
+ -m time --timestart $timestart --timestop $timestop $DAYS -j REJECT
+ ;;
+ '#'*) # Disable rule
+ ;;
+ *)
+ echo "** WARNING: In Variable TIME_SCHEDULE_HOST_BLOCK, Rule: \"$rule\" is ignored." >&2
+ ;;
+ esac
+ done
+
+ return 0
+}
+
+
+# Plugin restart function
+plugin_restart()
+{
+
+ # Skip plugin_stop on a restart
+ plugin_start
+
+ return 0
+}
+
+
+# Plugin stop function
+plugin_stop()
+{
+
+ return 0
+}
+
+
+# Plugin status function
+plugin_status()
+{
+ return 0
+}
+
+
+# Check sanity of eg. environment
+plugin_sanity_check()
+{
+ # Sanity check
+
+ return 0
+}
+
+
+############
+# Mainline #
+############
+
+# Check where to find the config file
+CONF_FILE=""
+if [ -n "$PLUGIN_CONF_PATH" ]; then
+ CONF_FILE="$PLUGIN_CONF_PATH/$PLUGIN_CONF_FILE"
+fi
+
+# Check if the config file exists
+if [ ! -e "$CONF_FILE" ]; then
+ printf "NOTE: Config file \"$CONF_FILE\" not found!\n Plugin \"$PLUGIN_NAME v$PLUGIN_VERSION\" ignored!\n" >&2
+ PLUGIN_RET_VAL=0
+else
+ # Source the plugin config file
+ . "$CONF_FILE"
+
+ if [ "$ENABLED" = "1" -a "$PLUGIN_CMD" != "stop-restart" ] ||
+ [ "$ENABLED" = "0" -a "$PLUGIN_CMD" = "stop-restart" ] ||
+ [ -n "$PLUGIN_LOAD_FILE" -a "$PLUGIN_CMD" = "stop" ] ||
+ [ -n "$PLUGIN_LOAD_FILE" -a "$PLUGIN_CMD" = "status" ]; then
+ # Show who we are:
+ echo "${INDENT}$PLUGIN_NAME v$PLUGIN_VERSION"
+
+ # Increment indention
+ INDENT="$INDENT "
+
+ # Only proceed if environment ok
+ if plugin_sanity_check; then
+ case $PLUGIN_CMD in
+ start|'') plugin_start; PLUGIN_RET_VAL=$?;;
+ restart ) plugin_restart; PLUGIN_RET_VAL=$?;;
+ stop|stop-restart) plugin_stop; PLUGIN_RET_VAL=$?;;
+ status ) plugin_status; PLUGIN_RET_VAL=$?;;
+ * ) PLUGIN_RET_VAL=1; printf "\033[40m\033[1;31m ERROR: Invalid plugin option \"$PLUGIN_CMD\"!\033[0m\n" >&2;;
+ esac
+ fi
+ else
+ PLUGIN_RET_VAL=0
+ fi
+fi
Added: branches/1.0/package/arnofw/time-schedule-host-block/time-schedule-host-block.conf
===================================================================
--- branches/1.0/package/arnofw/time-schedule-host-block/time-schedule-host-block.conf (rev 0)
+++ branches/1.0/package/arnofw/time-schedule-host-block/time-schedule-host-block.conf 2013-05-07 17:32:25 UTC (rev 6075)
@@ -0,0 +1,49 @@
+# ------------------------------------------------------------------------------
+# -= Arno's iptables firewall - Time Schedule Host Block plugin =-
+# ------------------------------------------------------------------------------
+
+# To actually enable this plugin make ENABLED=1:
+# ------------------------------------------------------------------------------
+ENABLED=0
+
+# TIME_SCHEDULE_HOST_BLOCK_MAC
+# type|mac_addr~timestart~timestop~weekdays
+#
+# TIME_SCHEDULE_HOST_BLOCK
+# type|ip_addr~timestart~timestop~weekdays
+#
+# "type" must be one of:
+# LAN-EXT: Block in LAN->EXT Forward Chain
+# DMZ-EXT: Block in DMZ->EXT Forward Chain
+# ANY: Block in any Forward Chain
+# #<type>: Leading '#' disables that line's rule without deleting it
+#
+# "mac_addr" must be of the form 00:11:22:33:44:55
+# "ip_addr" may be any IPv4, IPv6 address or CIDR
+# "timestart" and "timestop" Local times of the form HH:MM:SS (:SS optional)
+# "weekdays" (optional), a comma separated list including any of: Mon,Tue,Wed,Thu,Fri,Sat,Sun
+#
+# Note: Multi-line variables, each line is an entry.
+# Do not remove the variables' closing double-quote (") character.
+#
+
+# Block by MAC Address Source
+# Examples:
+# LAN-EXT|00:11:22:33:44:55~21:00~6:00~Mon,Tue,Wed,Thu,Fri
+# DMZ-EXT|00:11:22:33:44:aa~15:45~9:00
+# ------------------------------------------------------------------------------
+TIME_SCHEDULE_HOST_BLOCK_MAC="
+#LAN-EXT|00:11:22:33:44:55~21:00~6:00~Mon,Tue,Wed,Thu,Fri
+"
+
+# Block by IPv4 or IPv6 Address Source
+# Examples:
+# LAN-EXT|192.168.101.13~21:00~6:00~Sat,Sun
+# DMZ-EXT|192.168.1.1/24~21:00~7:00
+# DMZ-EXT|2001:db8:200::5294~15:45~22:00~Mon,Tue,Wed,Thu,Fri
+# ANY|192.168.101.23~15:45~22:00
+# ------------------------------------------------------------------------------
+TIME_SCHEDULE_HOST_BLOCK="
+#DMZ-EXT|192.168.1.1/24~21:00~7:00
+"
+
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-arno-firewall
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-arno-firewall 2013-05-05 21:17:46 UTC (rev 6074)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-arno-firewall 2013-05-07 17:32:25 UTC (rev 6075)
@@ -36,7 +36,7 @@
merge_old_plugin_configs()
{
- local plugin plugins editname var search replace IFS
+ local plugin plugins editname var search IFS
plugins="$(grep -m1 '^ENABLED=1' /mnt/kd/arno-iptables-OLD/plugins/*.conf | sed 's/:ENABLED.*//')"
@@ -44,11 +44,38 @@
for plugin in $plugins; do
editname="$(echo $plugin | sed 's/arno-iptables-OLD/arno-iptables-firewall/')"
if [ -f "$editname" ]; then
+ IFS=$'\n'
for var in $(grep '^[A-Z][A-Z0-9_-]*[=][^$\`]*$' $plugin); do
+ unset IFS
search="$(echo $var | cut -d= -f1)"
if [ -n "$search" -a "$search" != "IFS" ]; then
- replace="$(echo $var | sed 's:/:\\/:g')"
- sed -i "/^${search}=/ s/^.*$/${replace}/" "$editname"
+ if echo $var | grep -q "^${search}=\"[^\"]*$"; then # Single double-quote (")
+ # Multi-line OLD variable
+ if grep -q "^${search}=\"[^\"]*$" "$editname"; then # Multi-Line NEW variable
+ sed -n "/^${search}=\"/,/^.*\"/ p" "$plugin" | sed -i "/^${search}=\"/,/^.*\"/ {
+r /dev/stdin
+d
+}" "$editname"
+ else
+ sed -n "/^${search}=\"/,/^.*\"/ p" "$plugin" | sed -i "/^${search}=/ {
+r /dev/stdin
+d
+}" "$editname"
+ fi
+ else
+ # Single-line OLD variable
+ if grep -q "^${search}=\"[^\"]*$" "$editname"; then # Multi-Line NEW variable
+ echo $var | sed -i "/^${search}=\"/,/^.*\"/ {
+r /dev/stdin
+d
+}" "$editname"
+ else
+ echo $var | sed -i "/^${search}=/ {
+r /dev/stdin
+d
+}" "$editname"
+ fi
+ fi
echo "Merged variable \"${search}\" in plugin: $editname" 1>&2
fi
done
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-05-17 23:01:52
|
Revision: 6089
http://sourceforge.net/p/astlinux/code/6089
Author: abelbeck
Date: 2013-05-17 23:01:48 +0000 (Fri, 17 May 2013)
Log Message:
-----------
tg3, new package, build NIC kernel driver from source, version 3.124c
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/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/tg3/
branches/1.0/package/tg3/Config.in
branches/1.0/package/tg3/tg3.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-05-16 21:55:35 UTC (rev 6088)
+++ branches/1.0/astlinux-ast11.config 2013-05-17 23:01:48 UTC (rev 6089)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6070-dirty Configuration
-# Wed May 1 18:58:21 2013
+# Buildroot 2011.08-svn6088-dirty Configuration
+# Fri May 17 17:48:59 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -403,6 +403,7 @@
# BR2_PACKAGE_SSHFS is not set
BR2_PACKAGE_STATSERIAL=y
# BR2_PACKAGE_SYSSTAT is not set
+BR2_PACKAGE_TG3=y
# BR2_PACKAGE_TI_UTILS is not set
# BR2_PACKAGE_UBOOT_TOOLS is not set
BR2_PACKAGE_UDEV=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-05-16 21:55:35 UTC (rev 6088)
+++ branches/1.0/astlinux.config 2013-05-17 23:01:48 UTC (rev 6089)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6070-dirty Configuration
-# Wed May 1 18:58:17 2013
+# Buildroot 2011.08-svn6088-dirty Configuration
+# Fri May 17 17:48:58 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -409,6 +409,7 @@
# BR2_PACKAGE_SSHFS is not set
BR2_PACKAGE_STATSERIAL=y
# BR2_PACKAGE_SYSSTAT is not set
+BR2_PACKAGE_TG3=y
# BR2_PACKAGE_TI_UTILS is not set
# BR2_PACKAGE_UBOOT_TOOLS is not set
BR2_PACKAGE_UDEV=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-05-16 21:55:35 UTC (rev 6088)
+++ branches/1.0/astlinux18.config 2013-05-17 23:01:48 UTC (rev 6089)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6070-dirty Configuration
-# Wed May 1 18:58:19 2013
+# Buildroot 2011.08-svn6088-dirty Configuration
+# Fri May 17 17:48:58 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -403,6 +403,7 @@
# BR2_PACKAGE_SSHFS is not set
BR2_PACKAGE_STATSERIAL=y
# BR2_PACKAGE_SYSSTAT is not set
+BR2_PACKAGE_TG3=y
# BR2_PACKAGE_TI_UTILS is not set
# BR2_PACKAGE_UBOOT_TOOLS is not set
BR2_PACKAGE_UDEV=y
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-05-16 21:55:35 UTC (rev 6088)
+++ branches/1.0/package/Config.in 2013-05-17 23:01:48 UTC (rev 6089)
@@ -230,6 +230,7 @@
source "package/sshfs/Config.in"
source "package/statserial/Config.in"
source "package/sysstat/Config.in"
+source "package/tg3/Config.in"
source "package/ti-utils/Config.in"
source "package/uboot-tools/Config.in"
source "package/udev/Config.in"
Added: branches/1.0/package/tg3/Config.in
===================================================================
--- branches/1.0/package/tg3/Config.in (rev 0)
+++ branches/1.0/package/tg3/Config.in 2013-05-17 23:01:48 UTC (rev 6089)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_TG3
+ bool "tg3"
+ depends on BR2_LINUX_KERNEL
+ default n
+ help
+ Linux NIC device driver tg3 released for Broadcom's NetLink Ethernet
+ controllers: 5784, 5785, 57780, 57781, 57785, 57790, 57795
+
+ 10/100/1000 Mbps PCI/PCI-X/PCI Express Ethernet Network Controllers
+
+ http://www.broadcom.com/support/ethernet_nic/netlink_k57.php
+
Added: branches/1.0/package/tg3/tg3.mk
===================================================================
--- branches/1.0/package/tg3/tg3.mk (rev 0)
+++ branches/1.0/package/tg3/tg3.mk 2013-05-17 23:01:48 UTC (rev 6089)
@@ -0,0 +1,38 @@
+#############################################################
+#
+# tg3
+#
+#############################################################
+
+TG3_VERSION = 3.124c
+TG3_SOURCE:=tg3-$(TG3_VERSION).tar.gz
+TG3_SITE = http://files.astlinux.org
+TG3_DEPENDENCIES = linux
+
+TG3_UNINSTALL_STAGING_OPT = --version
+
+TG3_MAKE_OPT += \
+ CC=$(TARGET_CC) \
+ LD=$(TARGET_LD) \
+ KVER=$(LINUX_VERSION_PROBED) \
+ BCMPROC=$(KERNEL_ARCH) \
+ BCMCFGDIR=$(LINUX_DIR) \
+ BCMMODDIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net \
+ BCMSRCDIR=$(LINUX_DIR) \
+ ARCH=$(KERNEL_ARCH)
+
+define TG3_CONFIGURE_CMDS
+ @echo "No configure"
+endef
+
+define TG3_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 644 -D $(@D)/tg3.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/tg3.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+define TG3_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/tg3.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+$(eval $(call AUTOTARGETS,package,tg3))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-05-16 21:55:35 UTC (rev 6088)
+++ branches/1.0/runnix-uclibc.config 2013-05-17 23:01:48 UTC (rev 6089)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6070-dirty Configuration
-# Wed May 1 18:58:37 2013
+# Buildroot 2011.08-svn6088-dirty Configuration
+# Fri May 17 17:49:00 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -562,6 +562,7 @@
#
# BR2_PACKAGE_STATSERIAL is not set
# BR2_PACKAGE_SYSSTAT is not set
+# BR2_PACKAGE_TG3 is not set
# BR2_PACKAGE_TI_UTILS is not set
# BR2_PACKAGE_UBOOT_TOOLS is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-05-16 21:55:35 UTC (rev 6088)
+++ branches/1.0/runnix.config 2013-05-17 23:01:48 UTC (rev 6089)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6070-dirty Configuration
-# Wed May 1 18:58:33 2013
+# Buildroot 2011.08-svn6088-dirty Configuration
+# Fri May 17 17:48:59 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -386,6 +386,7 @@
# BR2_PACKAGE_SSHFS is not set
# BR2_PACKAGE_STATSERIAL is not set
# BR2_PACKAGE_SYSSTAT is not set
+# BR2_PACKAGE_TG3 is not set
# BR2_PACKAGE_TI_UTILS is not set
# BR2_PACKAGE_UBOOT_TOOLS 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-05-18 19:56:10
|
Revision: 6092
http://sourceforge.net/p/astlinux/code/6092
Author: abelbeck
Date: 2013-05-18 19:56:07 +0000 (Sat, 18 May 2013)
Log Message:
-----------
openldap, add new package, disabled by default, currently installs LDAP libraries and ldapsearch app without cyrus-sasl auth enabled
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/openldap/
branches/1.0/package/openldap/Config.in
branches/1.0/package/openldap/openldap.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-05-18 16:16:12 UTC (rev 6091)
+++ branches/1.0/astlinux-ast11.config 2013-05-18 19:56:07 UTC (rev 6092)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6088-dirty Configuration
-# Fri May 17 17:48:59 2013
+# Buildroot 2011.08-svn6091-dirty Configuration
+# Sat May 18 14:47:39 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -734,6 +734,7 @@
# BR2_PACKAGE_NTP_TICKADJ is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENLDAP is not set
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-05-18 16:16:12 UTC (rev 6091)
+++ branches/1.0/astlinux.config 2013-05-18 19:56:07 UTC (rev 6092)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6088-dirty Configuration
-# Fri May 17 17:48:58 2013
+# Buildroot 2011.08-svn6091-dirty Configuration
+# Sat May 18 14:47:37 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -736,6 +736,7 @@
# BR2_PACKAGE_NTP_TICKADJ is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENLDAP is not set
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-05-18 16:16:12 UTC (rev 6091)
+++ branches/1.0/astlinux18.config 2013-05-18 19:56:07 UTC (rev 6092)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6088-dirty Configuration
-# Fri May 17 17:48:58 2013
+# Buildroot 2011.08-svn6091-dirty Configuration
+# Sat May 18 14:47:38 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -734,6 +734,7 @@
# BR2_PACKAGE_NTP_TICKADJ is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENLDAP is not set
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2013-05-18 16:16:12 UTC (rev 6091)
+++ branches/1.0/initrd.config 2013-05-18 19:56:07 UTC (rev 6092)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6070-dirty Configuration
-# Wed May 1 18:58:47 2013
+# Buildroot 2011.08-svn6091-dirty Configuration
+# Sat May 18 14:47:43 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -588,6 +588,7 @@
# BR2_PACKAGE_NTP is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENLDAP is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENVPN is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2013-05-18 16:16:12 UTC (rev 6091)
+++ branches/1.0/package/Config.in 2013-05-18 19:56:07 UTC (rev 6092)
@@ -491,6 +491,7 @@
source "package/ntp/Config.in"
source "package/nuttcp/Config.in"
source "package/olsr/Config.in"
+source "package/openldap/Config.in"
source "package/openntpd/Config.in"
source "package/openssh/Config.in"
source "package/openvpn/Config.in"
Added: branches/1.0/package/openldap/Config.in
===================================================================
--- branches/1.0/package/openldap/Config.in (rev 0)
+++ branches/1.0/package/openldap/Config.in 2013-05-18 19:56:07 UTC (rev 6092)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_OPENLDAP
+ bool "openldap"
+ select BR2_PACKAGE_OPENSSL
+ help
+ OpenLDAP Software is an open source implementation of the
+ Lightweight Directory Access Protocol.
+
+ The suite includes:
+ - slapd: stand-alone LDAP daemon (server) DISABLED
+ - libraries: implementing the LDAP protocol
+ - utilities, tools, and sample clients (ex. ldapsearch)
+
+ http://www.openldap.org/
Added: branches/1.0/package/openldap/openldap.mk
===================================================================
--- branches/1.0/package/openldap/openldap.mk (rev 0)
+++ branches/1.0/package/openldap/openldap.mk 2013-05-18 19:56:07 UTC (rev 6092)
@@ -0,0 +1,44 @@
+#############################################################
+#
+# openldap
+#
+#############################################################
+
+OPENLDAP_VERSION = 2.4.35
+OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz
+OPENLDAP_SITE = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release
+OPENLDAP_INSTALL_STAGING = YES
+OPENLDAP_DEPENDENCIES += openssl
+
+OPENLDAP_UNINSTALL_STAGING_OPT = --version
+
+OPENLDAP_CONF_OPT = \
+ --enable-shared \
+ --disable-static \
+ --disable-debug \
+ --enable-syslog \
+ --enable-ipv6 \
+ --with-tls \
+ --with-yielding_select="yes" \
+ --without-fetch \
+ --without-cyrus-sasl \
+ --disable-slapd \
+ --disable-local \
+ --disable-bdb \
+ --disable-hdb \
+ --disable-monitor \
+ --disable-relay
+
+define OPENLDAP_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/libldap*.so* $(TARGET_DIR)/usr/lib/
+ cp -a $(STAGING_DIR)/usr/lib/liblber*.so* $(TARGET_DIR)/usr/lib/
+ $(INSTALL) -D -m 0755 $(STAGING_DIR)/usr/bin/ldapsearch $(TARGET_DIR)/usr/bin/ldapsearch
+endef
+
+define OPENLDAP_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libldap*
+ rm -f $(TARGET_DIR)/usr/lib/liblber*
+ rm -f $(TARGET_DIR)/usr/bin/ldapsearch
+endef
+
+$(eval $(call AUTOTARGETS,package,openldap))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2013-05-18 16:16:12 UTC (rev 6091)
+++ branches/1.0/runnix-uclibc.config 2013-05-18 19:56:07 UTC (rev 6092)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6088-dirty Configuration
-# Fri May 17 17:49:00 2013
+# Buildroot 2011.08-svn6091-dirty Configuration
+# Sat May 18 14:47:41 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -917,6 +917,7 @@
#
# olsr requires a toolchain with IPv6 support
#
+# BR2_PACKAGE_OPENLDAP is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENVPN is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2013-05-18 16:16:12 UTC (rev 6091)
+++ branches/1.0/runnix.config 2013-05-18 19:56:07 UTC (rev 6092)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6088-dirty Configuration
-# Fri May 17 17:48:59 2013
+# Buildroot 2011.08-svn6091-dirty Configuration
+# Sat May 18 14:47:40 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -623,6 +623,7 @@
# BR2_PACKAGE_NTP is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
+# BR2_PACKAGE_OPENLDAP is not set
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENSSH is not set
# BR2_PACKAGE_OPENVPN 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-05-26 21:36:00
|
Revision: 6104
http://sourceforge.net/p/astlinux/code/6104
Author: abelbeck
Date: 2013-05-26 21:35:58 +0000 (Sun, 26 May 2013)
Log Message:
-----------
php, enable basic XML support using libxml2, needed for utf8_encode() and utf8_decode() functions, adds very little to the size of PHP since it is an external library. Enable in standard configs.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux.config
branches/1.0/astlinux18.config
branches/1.0/package/php/Config.ext
branches/1.0/package/php/php.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2013-05-24 19:05:36 UTC (rev 6103)
+++ branches/1.0/astlinux-ast11.config 2013-05-26 21:35:58 UTC (rev 6104)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6091-dirty Configuration
-# Sat May 18 14:47:39 2013
+# Buildroot 2011.08-svn6103-dirty Configuration
+# Sun May 26 15:57:43 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -454,7 +454,8 @@
BR2_PACKAGE_PHP_EXT_SESSION=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
# BR2_PACKAGE_PHP_EXT_CURL is not set
-# BR2_PACKAGE_PHP_EXT_LIBXML2 is not set
+BR2_PACKAGE_PHP_EXT_LIBXML2=y
+BR2_PACKAGE_PHP_EXT_XMLPARSER=y
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
# BR2_PACKAGE_PHP_EXT_ZLIB is not set
# BR2_PACKAGE_PHP_EXT_EXIF is not set
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-05-24 19:05:36 UTC (rev 6103)
+++ branches/1.0/astlinux.config 2013-05-26 21:35:58 UTC (rev 6104)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6091-dirty Configuration
-# Sat May 18 14:47:37 2013
+# Buildroot 2011.08-svn6103-dirty Configuration
+# Sun May 26 15:57:35 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -460,7 +460,8 @@
BR2_PACKAGE_PHP_EXT_SESSION=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
# BR2_PACKAGE_PHP_EXT_CURL is not set
-# BR2_PACKAGE_PHP_EXT_LIBXML2 is not set
+BR2_PACKAGE_PHP_EXT_LIBXML2=y
+BR2_PACKAGE_PHP_EXT_XMLPARSER=y
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
# BR2_PACKAGE_PHP_EXT_ZLIB is not set
# BR2_PACKAGE_PHP_EXT_EXIF is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-05-24 19:05:36 UTC (rev 6103)
+++ branches/1.0/astlinux18.config 2013-05-26 21:35:58 UTC (rev 6104)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6091-dirty Configuration
-# Sat May 18 14:47:38 2013
+# Buildroot 2011.08-svn6103-dirty Configuration
+# Sun May 26 15:57:40 2013
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -454,7 +454,8 @@
BR2_PACKAGE_PHP_EXT_SESSION=y
BR2_PACKAGE_PHP_EXT_OPENSSL=y
# BR2_PACKAGE_PHP_EXT_CURL is not set
-# BR2_PACKAGE_PHP_EXT_LIBXML2 is not set
+BR2_PACKAGE_PHP_EXT_LIBXML2=y
+BR2_PACKAGE_PHP_EXT_XMLPARSER=y
# BR2_PACKAGE_PHP_EXT_SIMPLEXML is not set
# BR2_PACKAGE_PHP_EXT_ZLIB is not set
# BR2_PACKAGE_PHP_EXT_EXIF is not set
Modified: branches/1.0/package/php/Config.ext
===================================================================
--- branches/1.0/package/php/Config.ext 2013-05-24 19:05:36 UTC (rev 6103)
+++ branches/1.0/package/php/Config.ext 2013-05-26 21:35:58 UTC (rev 6104)
@@ -48,6 +48,13 @@
help
libxml2 support
+config BR2_PACKAGE_PHP_EXT_XMLPARSER
+ bool "xmlparser"
+ select BR2_PACKAGE_PHP_EXT_LIBXML2
+ help
+ XML Parser support
+ Also adds utf8_encode()/utf8_decode() from/to ISO-8859-1 functions
+
config BR2_PACKAGE_PHP_EXT_SIMPLEXML
bool "simplexml"
select BR2_PACKAGE_PHP_EXT_LIBXML2
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2013-05-24 19:05:36 UTC (rev 6103)
+++ branches/1.0/package/php/php.mk 2013-05-26 21:35:58 UTC (rev 6104)
@@ -70,6 +70,10 @@
PHP_DEPENDENCIES += libxml2
endif
+ifeq ($(BR2_PACKAGE_PHP_EXT_XMLPARSER),y)
+ PHP_CONF_OPT += --enable-xml
+endif
+
ifeq ($(BR2_PACKAGE_PHP_EXT_SIMPLEXML),y)
PHP_CONF_OPT += --enable-simplexml
endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2013-05-26 21:51:08
|
Revision: 6105
http://sourceforge.net/p/astlinux/code/6105
Author: abelbeck
Date: 2013-05-26 21:51:05 +0000 (Sun, 26 May 2013)
Log Message:
-----------
openldap, LDAP Client - enable in standard configs, potentially too useful not to be standard equipment
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-05-26 21:35:58 UTC (rev 6104)
+++ branches/1.0/astlinux-ast11.config 2013-05-26 21:51:05 UTC (rev 6105)
@@ -735,7 +735,7 @@
# BR2_PACKAGE_NTP_TICKADJ is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
-# BR2_PACKAGE_OPENLDAP is not set
+BR2_PACKAGE_OPENLDAP=y
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux.config
===================================================================
--- branches/1.0/astlinux.config 2013-05-26 21:35:58 UTC (rev 6104)
+++ branches/1.0/astlinux.config 2013-05-26 21:51:05 UTC (rev 6105)
@@ -737,7 +737,7 @@
# BR2_PACKAGE_NTP_TICKADJ is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
-# BR2_PACKAGE_OPENLDAP is not set
+BR2_PACKAGE_OPENLDAP=y
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2013-05-26 21:35:58 UTC (rev 6104)
+++ branches/1.0/astlinux18.config 2013-05-26 21:51:05 UTC (rev 6105)
@@ -735,7 +735,7 @@
# BR2_PACKAGE_NTP_TICKADJ is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
-# BR2_PACKAGE_OPENLDAP is not set
+BR2_PACKAGE_OPENLDAP=y
# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
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