Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2014-01-24 05:04:23
|
Revision: 6375
http://sourceforge.net/p/astlinux/code/6375
Author: abelbeck
Date: 2014-01-24 05:04:19 +0000 (Fri, 24 Jan 2014)
Log Message:
-----------
runnix, update busybox.config for 1.19.4 and minor tweaks
Modified Paths:
--------------
branches/1.0/package/memtest/memtest.mk
branches/1.0/project/runnix/busybox.config
branches/1.0/project/runnix/files/rootfs_vfat/boot.msg
Modified: branches/1.0/package/memtest/memtest.mk
===================================================================
--- branches/1.0/package/memtest/memtest.mk 2014-01-23 01:17:12 UTC (rev 6374)
+++ branches/1.0/package/memtest/memtest.mk 2014-01-24 05:04:19 UTC (rev 6375)
@@ -23,7 +23,7 @@
touch $@
$(MEMTEST_DIR)/$(MEMTEST_BIN): $(MEMTEST_DIR)/.configured
- $(MAKE1) -C $(MEMTEST_DIR) CC=$(TARGET_CC)
+ $(MAKE1) -C $(MEMTEST_DIR) CC=$(TARGET_CC) memtest.bin
memtest: $(MEMTEST_DIR)/$(MEMTEST_BIN)
Modified: branches/1.0/project/runnix/busybox.config
===================================================================
--- branches/1.0/project/runnix/busybox.config 2014-01-23 01:17:12 UTC (rev 6374)
+++ branches/1.0/project/runnix/busybox.config 2014-01-24 05:04:19 UTC (rev 6375)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.18.3
-# Wed May 4 12:07:48 2011
+# Busybox version: 1.19.4
+# Thu Jan 23 16:45:14 2014
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -39,8 +39,8 @@
CONFIG_LONG_OPTS=y
# CONFIG_FEATURE_DEVPTS is not set
# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_UTMP=y
CONFIG_FEATURE_WTMP=y
-CONFIG_FEATURE_UTMP=y
# CONFIG_FEATURE_PIDFILE is not set
CONFIG_FEATURE_SUID=y
# CONFIG_FEATURE_SUID_CONFIG is not set
@@ -89,6 +89,8 @@
#
# Busybox Library Tuning
#
+# CONFIG_FEATURE_SYSTEMD is not set
+# CONFIG_FEATURE_RTMINMAX is not set
CONFIG_PASSWORD_MINLEN=6
CONFIG_MD5_SIZE_VS_SPEED=2
CONFIG_FEATURE_FAST_TOP=y
@@ -99,6 +101,7 @@
# CONFIG_FEATURE_EDITING_VI is not set
CONFIG_FEATURE_EDITING_HISTORY=255
CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_REVERSE_SEARCH=y
CONFIG_FEATURE_TAB_COMPLETION=y
CONFIG_FEATURE_USERNAME_COMPLETION=y
CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
@@ -106,6 +109,7 @@
# CONFIG_FEATURE_NON_POSIX_CP is not set
# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set
CONFIG_FEATURE_COPYBUF_KB=4
+# CONFIG_FEATURE_SKIP_ROOTFS is not set
# CONFIG_MONOTONIC_SYSCALL is not set
# CONFIG_IOCTL_HEX2STR_ERROR is not set
# CONFIG_FEATURE_HWIB is not set
@@ -169,12 +173,17 @@
CONFIG_FEATURE_DATE_ISOFMT=y
# CONFIG_FEATURE_DATE_NANO is not set
CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_ID=y
+# CONFIG_GROUPS is not set
CONFIG_TEST=y
CONFIG_FEATURE_TEST_64=y
+CONFIG_TOUCH=y
CONFIG_TR=y
# CONFIG_FEATURE_TR_CLASSES is not set
# CONFIG_FEATURE_TR_EQUIV is not set
# CONFIG_BASE64 is not set
+# CONFIG_WHO is not set
+# CONFIG_USERS is not set
# CONFIG_CAL is not set
# CONFIG_CATV is not set
CONFIG_CHGRP=y
@@ -212,10 +221,8 @@
CONFIG_HEAD=y
# CONFIG_FEATURE_FANCY_HEAD is not set
CONFIG_HOSTID=y
-CONFIG_ID=y
# CONFIG_INSTALL is not set
# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
CONFIG_LN=y
CONFIG_LOGNAME=y
CONFIG_LS=y
@@ -267,7 +274,6 @@
CONFIG_FEATURE_FANCY_TAIL=y
CONFIG_TEE=y
CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
-CONFIG_TOUCH=y
CONFIG_TRUE=y
CONFIG_TTY=y
CONFIG_UNAME=y
@@ -279,7 +285,6 @@
# CONFIG_UUENCODE is not set
CONFIG_WC=y
# CONFIG_FEATURE_WC_LARGE is not set
-# CONFIG_WHO is not set
# CONFIG_WHOAMI is not set
CONFIG_YES=y
@@ -346,20 +351,13 @@
# Editors
#
# CONFIG_PATCH is not set
-CONFIG_AWK=y
-# CONFIG_FEATURE_AWK_LIBM is not set
-CONFIG_CMP=y
-# CONFIG_DIFF is not set
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-# CONFIG_FEATURE_DIFF_DIR is not set
-# CONFIG_ED is not set
-CONFIG_SED=y
CONFIG_VI=y
CONFIG_FEATURE_VI_MAX_LEN=4096
# CONFIG_FEATURE_VI_8BIT is not set
CONFIG_FEATURE_VI_COLON=y
CONFIG_FEATURE_VI_YANKMARK=y
CONFIG_FEATURE_VI_SEARCH=y
+# CONFIG_FEATURE_VI_REGEX_SEARCH is not set
CONFIG_FEATURE_VI_USE_SIGNALS=y
CONFIG_FEATURE_VI_DOT_CMD=y
CONFIG_FEATURE_VI_READONLY=y
@@ -368,6 +366,14 @@
CONFIG_FEATURE_VI_WIN_RESIZE=y
# CONFIG_FEATURE_VI_ASK_TERMINAL is not set
CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_AWK=y
+# CONFIG_FEATURE_AWK_LIBM is not set
+CONFIG_CMP=y
+# CONFIG_DIFF is not set
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+# CONFIG_FEATURE_DIFF_DIR is not set
+# CONFIG_ED is not set
+CONFIG_SED=y
# CONFIG_FEATURE_ALLOW_EXEC is not set
#
@@ -426,6 +432,7 @@
CONFIG_FEATURE_INITRD=y
CONFIG_INIT_TERMINAL_TYPE="linux"
# CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
#
# Login/Password Management Utilities
@@ -511,6 +518,7 @@
# CONFIG_ACPID is not set
# CONFIG_FEATURE_ACPID_COMPAT is not set
# CONFIG_BLKID is not set
+# CONFIG_FEATURE_BLKID_TYPE is not set
CONFIG_DMESG=y
# CONFIG_FEATURE_DMESG_PRETTY is not set
# CONFIG_FBSET is not set
@@ -519,7 +527,7 @@
# CONFIG_FDFLUSH is not set
# CONFIG_FDFORMAT is not set
CONFIG_FDISK=y
-CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
+# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set
CONFIG_FEATURE_FDISK_WRITABLE=y
# CONFIG_FEATURE_AIX_LABEL is not set
# CONFIG_FEATURE_SGI_LABEL is not set
@@ -610,10 +618,25 @@
# Miscellaneous Utilities
#
# CONFIG_CONSPY is not set
+CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
+CONFIG_FEATURE_LESS_BRACKETS=y
+CONFIG_FEATURE_LESS_FLAGS=y
+# CONFIG_FEATURE_LESS_MARKS is not set
+# CONFIG_FEATURE_LESS_REGEXP is not set
+# CONFIG_FEATURE_LESS_WINCH is not set
+# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
+CONFIG_FEATURE_LESS_DASHCMD=y
+# CONFIG_FEATURE_LESS_LINENUMS is not set
# CONFIG_NANDWRITE is not set
# CONFIG_NANDDUMP is not set
+# CONFIG_SETSERIAL is not set
# CONFIG_UBIATTACH is not set
# CONFIG_UBIDETACH is not set
+# CONFIG_UBIMKVOL is not set
+# CONFIG_UBIRMVOL is not set
+# CONFIG_UBIRSVOL is not set
+# CONFIG_UBIUPDATEVOL is not set
# CONFIG_ADJTIMEX is not set
# CONFIG_BBCONFIG is not set
# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
@@ -654,15 +677,6 @@
CONFIG_LAST=y
CONFIG_FEATURE_LAST_SMALL=y
# CONFIG_FEATURE_LAST_FANCY is not set
-CONFIG_LESS=y
-CONFIG_FEATURE_LESS_MAXLINES=9999999
-CONFIG_FEATURE_LESS_BRACKETS=y
-CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
-# CONFIG_FEATURE_LESS_WINCH is not set
-CONFIG_FEATURE_LESS_DASHCMD=y
-# CONFIG_FEATURE_LESS_LINENUMS is not set
CONFIG_HDPARM=y
CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y
@@ -696,12 +710,18 @@
#
# Networking Utilities
#
+# CONFIG_NAMEIF is not set
+# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
# CONFIG_NBDCLIENT is not set
CONFIG_NC=y
# CONFIG_NC_SERVER is not set
# CONFIG_NC_EXTRA is not set
# CONFIG_NC_110_COMPAT is not set
-# CONFIG_FEATURE_IPV6 is not set
+CONFIG_PING=y
+# CONFIG_PING6 is not set
+CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_WHOIS is not set
+CONFIG_FEATURE_IPV6=y
# CONFIG_FEATURE_UNIX_LOCAL is not set
# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
@@ -747,7 +767,7 @@
# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
# CONFIG_INETD is not set
@@ -773,17 +793,12 @@
# CONFIG_IPCALC is not set
# CONFIG_FEATURE_IPCALC_FANCY is not set
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
-# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
CONFIG_NETSTAT=y
CONFIG_FEATURE_NETSTAT_WIDE=y
# CONFIG_FEATURE_NETSTAT_PRG is not set
CONFIG_NSLOOKUP=y
# CONFIG_NTPD is not set
# CONFIG_FEATURE_NTPD_SERVER is not set
-CONFIG_PING=y
-# CONFIG_PING6 is not set
-CONFIG_FEATURE_FANCY_PING=y
# CONFIG_PSCAN is not set
CONFIG_ROUTE=y
# CONFIG_SLATTACH is not set
@@ -816,12 +831,14 @@
# CONFIG_DHCPRELAY is not set
# CONFIG_DUMPLEASES is not set
# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
CONFIG_DHCPD_LEASES_FILE=""
CONFIG_UDHCPC=y
CONFIG_FEATURE_UDHCPC_ARPING=y
CONFIG_FEATURE_UDHCP_PORT=y
CONFIG_UDHCP_DEBUG=9
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
+# CONFIG_FEATURE_UDHCP_8021Q is not set
CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
@@ -857,15 +874,19 @@
#
# CONFIG_IOSTAT is not set
# CONFIG_MPSTAT is not set
+# CONFIG_NMETER is not set
# CONFIG_PMAP is not set
# CONFIG_POWERTOP is not set
+# CONFIG_PSTREE is not set
+# CONFIG_PWDX is not set
# CONFIG_SMEMCAP is not set
+CONFIG_UPTIME=y
+# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
CONFIG_FREE=y
CONFIG_FUSER=y
CONFIG_KILL=y
CONFIG_KILLALL=y
# CONFIG_KILLALL5 is not set
-# CONFIG_NMETER is not set
# CONFIG_PGREP is not set
CONFIG_PIDOF=y
# CONFIG_FEATURE_PIDOF_SINGLE is not set
@@ -886,7 +907,6 @@
# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
# CONFIG_FEATURE_TOPMEM is not set
# CONFIG_FEATURE_SHOW_THREADS is not set
-CONFIG_UPTIME=y
CONFIG_WATCH=y
#
@@ -924,6 +944,7 @@
#
CONFIG_ASH=y
# CONFIG_ASH_BASH_COMPAT is not set
+# CONFIG_ASH_IDLE_TIMEOUT is not set
CONFIG_ASH_JOB_CONTROL=y
CONFIG_ASH_ALIAS=y
# CONFIG_ASH_GETOPTS is not set
@@ -964,6 +985,7 @@
CONFIG_FEATURE_SH_EXTRA_QUIET=y
# CONFIG_FEATURE_SH_STANDALONE is not set
# CONFIG_FEATURE_SH_NOFORK is not set
+CONFIG_FEATURE_SH_HISTFILESIZE=y
#
# System Logging Utilities
@@ -972,6 +994,7 @@
# CONFIG_FEATURE_ROTATE_LOGFILE is not set
# CONFIG_FEATURE_REMOTE_LOG is not set
# CONFIG_FEATURE_SYSLOGD_DUP is not set
+# CONFIG_FEATURE_SYSLOGD_CFG is not set
CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0
# CONFIG_FEATURE_IPC_SYSLOG is not set
CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
Modified: branches/1.0/project/runnix/files/rootfs_vfat/boot.msg
===================================================================
--- branches/1.0/project/runnix/files/rootfs_vfat/boot.msg 2014-01-23 01:17:12 UTC (rev 6374)
+++ branches/1.0/project/runnix/files/rootfs_vfat/boot.msg 2014-01-24 05:04:19 UTC (rev 6375)
@@ -11,6 +11,6 @@
xrunnix) Use previous RUNNIX image (if any)
-memtest) Run Memtest86+ v4.20
+memtest) Run Memtest86+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-02-03 22:12:44
|
Revision: 6399
http://sourceforge.net/p/astlinux/code/6399
Author: abelbeck
Date: 2014-02-03 22:12:38 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
joe, add new package, NOT enabled, JOE is an easy-to-use, full featured terminal-based screen editor.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.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/joe/
branches/1.0/package/joe/Config.in
branches/1.0/package/joe/joe.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-02-03 15:45:59 UTC (rev 6398)
+++ branches/1.0/astlinux-ast11.config 2014-02-03 22:12:38 UTC (rev 6399)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6372-dirty Configuration
-# Wed Jan 22 18:33:28 2014
+# Buildroot 2011.08-svn6398-dirty Configuration
+# Mon Feb 3 16:09:22 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -839,6 +839,7 @@
#
# BR2_PACKAGE_ED is not set
BR2_PACKAGE_EX_VI=y
+# BR2_PACKAGE_JOE is not set
BR2_PACKAGE_NANO=y
# BR2_PACKAGE_UEMACS is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-02-03 15:45:59 UTC (rev 6398)
+++ branches/1.0/astlinux18.config 2014-02-03 22:12:38 UTC (rev 6399)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6372-dirty Configuration
-# Wed Jan 22 18:33:27 2014
+# Buildroot 2011.08-svn6398-dirty Configuration
+# Mon Feb 3 16:09:18 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -839,6 +839,7 @@
#
# BR2_PACKAGE_ED is not set
BR2_PACKAGE_EX_VI=y
+# BR2_PACKAGE_JOE is not set
BR2_PACKAGE_NANO=y
# BR2_PACKAGE_UEMACS is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-02-03 15:45:59 UTC (rev 6398)
+++ branches/1.0/initrd.config 2014-02-03 22:12:38 UTC (rev 6399)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6371-dirty Configuration
-# Mon Jan 20 14:49:55 2014
+# Buildroot 2011.08-svn6398-dirty Configuration
+# Mon Feb 3 16:09:36 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -682,6 +682,7 @@
#
# BR2_PACKAGE_ED is not set
# BR2_PACKAGE_EX_VI is not set
+# BR2_PACKAGE_JOE is not set
# BR2_PACKAGE_NANO is not set
# BR2_PACKAGE_UEMACS is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-02-03 15:45:59 UTC (rev 6398)
+++ branches/1.0/package/Config.in 2014-02-03 22:12:38 UTC (rev 6399)
@@ -581,6 +581,7 @@
menu "Text editors and viewers"
source "package/ed/Config.in"
source "package/ex-vi/Config.in"
+source "package/joe/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/less/Config.in"
endif
Added: branches/1.0/package/joe/Config.in
===================================================================
--- branches/1.0/package/joe/Config.in (rev 0)
+++ branches/1.0/package/joe/Config.in 2014-02-03 22:12:38 UTC (rev 6399)
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_JOE
+ bool "joe"
+ help
+ Joe's Own Editor
+
+ JOE is an easy-to-use, full featured terminal-based screen editor.
+ Its behavior is a blending of WordStar and GNU-EMACS (but it does
+ not use code from either program). It is a great editor for new
+ users or as an alternative to vi.
+
+ http://joe-editor.sf.net
+
+config BR2_PACKAGE_JOE_FULL
+ bool "full install of rc and syntax highlighting files"
+ depends on BR2_PACKAGE_JOE
+ default n
+ help
+ Install all rc and syntax highlighting files. Without this option
+ only the joe binary is installed, which contains a default
+ configuration.
+
Added: branches/1.0/package/joe/joe.mk
===================================================================
--- branches/1.0/package/joe/joe.mk (rev 0)
+++ branches/1.0/package/joe/joe.mk 2014-02-03 22:12:38 UTC (rev 6399)
@@ -0,0 +1,28 @@
+################################################################################
+#
+# joe
+#
+################################################################################
+
+JOE_VERSION = 3.7
+JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION)
+JOE_SOURCE = joe-$(JOE_VERSION).tar.gz
+
+ifeq ($(BR2_PACKAGE_NCURSES),y)
+JOE_DEPENDENCIES += ncurses
+JOE_CONF_OPT += --enable-curses
+else
+JOE_CONF_OPT += --disable-curses
+endif
+
+ifneq ($(BR2_PACKAGE_JOE_FULL),y)
+define JOE_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/joe $(TARGET_DIR)/usr/bin/joe
+endef
+
+define JOE_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/joe
+endef
+endif
+
+$(eval $(call AUTOTARGETS,package,joe))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-02-03 15:45:59 UTC (rev 6398)
+++ branches/1.0/runnix-uclibc.config 2014-02-03 22:12:38 UTC (rev 6399)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6371-dirty Configuration
-# Mon Jan 20 14:49:43 2014
+# Buildroot 2011.08-svn6398-dirty Configuration
+# Mon Feb 3 16:09:32 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -1038,6 +1038,7 @@
#
# BR2_PACKAGE_ED is not set
# BR2_PACKAGE_EX_VI is not set
+# BR2_PACKAGE_JOE is not set
# BR2_PACKAGE_LESS is not set
# BR2_PACKAGE_NANO is not set
# BR2_PACKAGE_UEMACS is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-02-03 15:45:59 UTC (rev 6398)
+++ branches/1.0/runnix.config 2014-02-03 22:12:38 UTC (rev 6399)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6371-dirty Configuration
-# Mon Jan 20 14:49:39 2014
+# Buildroot 2011.08-svn6398-dirty Configuration
+# Mon Feb 3 16:09:30 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -733,6 +733,7 @@
#
# BR2_PACKAGE_ED is not set
# BR2_PACKAGE_EX_VI is not set
+# BR2_PACKAGE_JOE is not set
# BR2_PACKAGE_LESS is not set
# BR2_PACKAGE_NANO is not set
# BR2_PACKAGE_UEMACS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-02-04 04:31:55
|
Revision: 6401
http://sourceforge.net/p/astlinux/code/6401
Author: abelbeck
Date: 2014-02-04 04:31:52 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
update the default sourceforge mirror to 'colocrossing'. Note 'downloads.sourceforge.net' is the new method that automatically chooses the mirror and we are slowly switching to that site definition.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.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 2014-02-04 01:28:14 UTC (rev 6400)
+++ branches/1.0/astlinux-ast11.config 2014-02-04 04:31:52 UTC (rev 6401)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="voxel"
+BR2_SOURCEFORGE_MIRROR="colocrossing"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-02-04 01:28:14 UTC (rev 6400)
+++ branches/1.0/astlinux18.config 2014-02-04 04:31:52 UTC (rev 6401)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="voxel"
+BR2_SOURCEFORGE_MIRROR="colocrossing"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-02-04 01:28:14 UTC (rev 6400)
+++ branches/1.0/initrd.config 2014-02-04 04:31:52 UTC (rev 6401)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="voxel"
+BR2_SOURCEFORGE_MIRROR="colocrossing"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-02-04 01:28:14 UTC (rev 6400)
+++ branches/1.0/runnix-uclibc.config 2014-02-04 04:31:52 UTC (rev 6401)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="voxel"
+BR2_SOURCEFORGE_MIRROR="colocrossing"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-02-04 01:28:14 UTC (rev 6400)
+++ branches/1.0/runnix.config 2014-02-04 04:31:52 UTC (rev 6401)
@@ -70,7 +70,7 @@
#
BR2_PRIMARY_SITE=""
BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="voxel"
+BR2_SOURCEFORGE_MIRROR="colocrossing"
BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
BR2_DEBIAN_MIRROR="http://ftp.debian.org"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-02-07 21:54:49
|
Revision: 6406
http://sourceforge.net/p/astlinux/code/6406
Author: abelbeck
Date: 2014-02-07 21:54:46 +0000 (Fri, 07 Feb 2014)
Log Message:
-----------
New packages: libsodium and dnscrypt-proxy, both disabled by default. Hooks added to dnsmasq to make it work
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/dnscrypt-proxy/
branches/1.0/package/dnscrypt-proxy/Config.in
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk
branches/1.0/package/libsodium/
branches/1.0/package/libsodium/Config.in
branches/1.0/package/libsodium/libsodium.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-02-04 19:42:00 UTC (rev 6405)
+++ branches/1.0/astlinux-ast11.config 2014-02-07 21:54:46 UTC (rev 6406)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6398-dirty Configuration
-# Mon Feb 3 16:09:22 2014
+# Buildroot 2011.08-svn6405-dirty Configuration
+# Fri Feb 7 15:08:32 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -514,6 +514,7 @@
BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_OPENSSL_ENGINES=y
# BR2_PACKAGE_OPENSSL_OCF is not set
+# BR2_PACKAGE_LIBSODIUM is not set
BR2_PACKAGE_LIBSRTP=y
#
@@ -672,6 +673,7 @@
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DNSCRYPT_PROXY is not set
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
BR2_PACKAGE_DNSMASQ_DHCP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-02-04 19:42:00 UTC (rev 6405)
+++ branches/1.0/astlinux18.config 2014-02-07 21:54:46 UTC (rev 6406)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6398-dirty Configuration
-# Mon Feb 3 16:09:18 2014
+# Buildroot 2011.08-svn6405-dirty Configuration
+# Fri Feb 7 15:08:28 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -514,6 +514,7 @@
BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_OPENSSL_ENGINES=y
# BR2_PACKAGE_OPENSSL_OCF is not set
+# BR2_PACKAGE_LIBSODIUM is not set
BR2_PACKAGE_LIBSRTP=y
#
@@ -672,6 +673,7 @@
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
+# BR2_PACKAGE_DNSCRYPT_PROXY is not set
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
BR2_PACKAGE_DNSMASQ_DHCP=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-02-04 19:42:00 UTC (rev 6405)
+++ branches/1.0/initrd.config 2014-02-07 21:54:46 UTC (rev 6406)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6398-dirty Configuration
-# Mon Feb 3 16:09:36 2014
+# Buildroot 2011.08-svn6405-dirty Configuration
+# Fri Feb 7 15:08:43 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -408,6 +408,7 @@
# BR2_PACKAGE_LIBGPG_ERROR is not set
# BR2_PACKAGE_LIBNSS is not set
# BR2_PACKAGE_OPENSSL is not set
+# BR2_PACKAGE_LIBSODIUM is not set
# BR2_PACKAGE_LIBSRTP is not set
#
@@ -551,6 +552,7 @@
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
# BR2_PACKAGE_EBTABLES is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-02-04 19:42:00 UTC (rev 6405)
+++ branches/1.0/package/Config.in 2014-02-07 21:54:46 UTC (rev 6406)
@@ -282,6 +282,7 @@
source "package/libgpg-error/Config.in"
source "package/libnss/Config.in"
source "package/openssl/Config.in"
+source "package/libsodium/Config.in"
source "package/libsrtp/Config.in"
endmenu
@@ -444,6 +445,7 @@
source "package/dhcp/Config.in"
endif
source "package/dhcpdump/Config.in"
+source "package/dnscrypt-proxy/Config.in"
source "package/dnsmasq/Config.in"
source "package/dropbear/Config.in"
source "package/ebtables/Config.in"
Added: branches/1.0/package/dnscrypt-proxy/Config.in
===================================================================
--- branches/1.0/package/dnscrypt-proxy/Config.in (rev 0)
+++ branches/1.0/package/dnscrypt-proxy/Config.in 2014-02-07 21:54:46 UTC (rev 6406)
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_DNSCRYPT_PROXY
+ bool "dnscrypt-proxy"
+ select BR2_PACKAGE_LIBSODIUM
+ default n
+ help
+ dnscrypt-proxy is a slight variation on DNSCurve.
+ DNSCurve improves the confidentiality and integrity of DNS requests using
+ high-speed high-security elliptic-curve cryptography. Best of all, DNSCurve
+ has very low overhead and adds virtually no latency to queries.
+
+ http://dnscrypt.org/
Added: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init (rev 0)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.init 2014-02-07 21:54:46 UTC (rev 6406)
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+PIDFILE="/var/run/dnscrypt-proxy.pid"
+
+init () {
+ :
+}
+
+start () {
+
+ if [ "$DNSCRYPT_PROXY" = "yes" ]; then
+ echo "Starting dnscrypt..."
+
+ dnscrypt-proxy -d --local-address 127.0.0.1:2053 -n 128 -p $PIDFILE \
+ ${DNSCRYPT_SERVER_ADDRESS:+--resolver-address "$DNSCRYPT_SERVER_ADDRESS"} \
+ ${DNSCRYPT_PROVIDER_KEY:+--provider-key "$DNSCRYPT_PROVIDER_KEY"} \
+ ${DNSCRYPT_PROVIDER_NAME:+--provider-name "$DNSCRYPT_PROVIDER_NAME"}
+ fi
+}
+
+stop () {
+
+ if [ -f $PIDFILE ]; then
+ echo "Stopping dnscrypt..."
+
+ kill $(cat $PIDFILE) >/dev/null 2>&1
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Added: branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk
===================================================================
--- branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk (rev 0)
+++ branches/1.0/package/dnscrypt-proxy/dnscrypt-proxy.mk 2014-02-07 21:54:46 UTC (rev 6406)
@@ -0,0 +1,26 @@
+#############################################################
+#
+# dnscrypt-proxy
+#
+#############################################################
+DNSCRYPT_PROXY_VERSION = 1.3.3
+DNSCRYPT_PROXY_SOURCE = dnscrypt-proxy-$(DNSCRYPT_PROXY_VERSION).tar.gz
+DNSCRYPT_PROXY_SITE = http://download.dnscrypt.org/dnscrypt-proxy
+
+DNSCRYPT_PROXY_DEPENDENCIES += libsodium
+
+define DNSCRYPT_PROXY_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 $(@D)/src/proxy/dnscrypt-proxy $(TARGET_DIR)/usr/sbin/
+ $(INSTALL) -D -m 0755 package/dnscrypt-proxy/dnscrypt-proxy.init $(TARGET_DIR)/etc/init.d/dnscrypt
+ ln -sf ../../init.d/dnscrypt $(TARGET_DIR)/etc/runlevels/default/S18dnscrypt
+ ln -sf ../../init.d/dnscrypt $(TARGET_DIR)/etc/runlevels/default/K15dnscrypt
+endef
+
+define DNSCRYPT_PROXY_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/dnscrypt-proxy
+ rm -f $(TARGET_DIR)/etc/init.d/dnscrypt
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S18dnscrypt
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K15dnscrypt
+endef
+
+$(eval $(call AUTOTARGETS,package,dnscrypt-proxy))
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2014-02-04 19:42:00 UTC (rev 6405)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2014-02-07 21:54:46 UTC (rev 6406)
@@ -4,6 +4,17 @@
. /etc/init.d/functions
+dnscrypt_proxy_check()
+{
+ if [ -f /etc/init.d/dnscrypt ]; then
+ if [ "$DNSCRYPT_PROXY" = "yes" ]; then
+ return 0
+ fi
+ fi
+
+ return 1
+}
+
tftpd_check()
{
if [ -f /etc/init.d/tftpd ]; then
@@ -123,9 +134,15 @@
${local_domain}local=/$DOMAIN/
expand-hosts
domain=$DOMAIN
-resolv-file=/etc/resolv-extern.conf
cache-size=2048"
+ if dnscrypt_proxy_check; then
+ echo "no-resolv
+server=127.0.0.1#2053"
+ else
+ echo "resolv-file=/etc/resolv-extern.conf"
+ fi
+
# TFTP options
if tftpd_check; then
echo "enable-tftp
Added: branches/1.0/package/libsodium/Config.in
===================================================================
--- branches/1.0/package/libsodium/Config.in (rev 0)
+++ branches/1.0/package/libsodium/Config.in 2014-02-07 21:54:46 UTC (rev 6406)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_LIBSODIUM
+ bool "libsodium"
+ default n
+ help
+ Sodium is a portable, cross-compilable, installable, packageable
+ fork of the NaCl Cryptograpy & Networking library, with a compatible API.
+
+ http://github.com/jedisct1/libsodium
Added: branches/1.0/package/libsodium/libsodium.mk
===================================================================
--- branches/1.0/package/libsodium/libsodium.mk (rev 0)
+++ branches/1.0/package/libsodium/libsodium.mk 2014-02-07 21:54:46 UTC (rev 6406)
@@ -0,0 +1,20 @@
+#############################################################
+#
+# libsodium
+#
+#############################################################
+LIBSODIUM_VERSION = 0.4.5
+LIBSODIUM_SOURCE = libsodium-$(LIBSODIUM_VERSION).tar.gz
+LIBSODIUM_SITE = http://github.com/jedisct1/libsodium/releases/download/$(LIBSODIUM_VERSION)
+
+LIBSODIUM_INSTALL_STAGING = YES
+
+define LIBSODIUM_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/libsodium.so* $(TARGET_DIR)/usr/lib/
+endef
+
+define LIBSODIUM_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libsodium.so*
+endef
+
+$(eval $(call AUTOTARGETS,package,libsodium))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-02-04 19:42:00 UTC (rev 6405)
+++ branches/1.0/runnix-uclibc.config 2014-02-07 21:54:46 UTC (rev 6406)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6398-dirty Configuration
-# Mon Feb 3 16:09:32 2014
+# Buildroot 2011.08-svn6405-dirty Configuration
+# Fri Feb 7 15:08:40 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -625,6 +625,7 @@
# libnss requires a toolchain with LARGEFILE support
#
# BR2_PACKAGE_OPENSSL is not set
+# BR2_PACKAGE_LIBSODIUM is not set
# BR2_PACKAGE_LIBSRTP is not set
#
@@ -843,6 +844,7 @@
# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-02-04 19:42:00 UTC (rev 6405)
+++ branches/1.0/runnix.config 2014-02-07 21:54:46 UTC (rev 6406)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6398-dirty Configuration
-# Mon Feb 3 16:09:30 2014
+# Buildroot 2011.08-svn6405-dirty Configuration
+# Fri Feb 7 15:08:37 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -434,6 +434,7 @@
# BR2_PACKAGE_LIBGPG_ERROR is not set
# BR2_PACKAGE_LIBNSS is not set
# BR2_PACKAGE_OPENSSL is not set
+# BR2_PACKAGE_LIBSODIUM is not set
# BR2_PACKAGE_LIBSRTP is not set
#
@@ -582,6 +583,7 @@
# BR2_PACKAGE_DARKSTAT is not set
# BR2_PACKAGE_DHCP is not set
# BR2_PACKAGE_DHCPDUMP is not set
+# BR2_PACKAGE_DNSCRYPT_PROXY is not set
# BR2_PACKAGE_DNSMASQ is not set
BR2_PACKAGE_DROPBEAR=y
# BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-02-09 15:55:17
|
Revision: 6410
http://sourceforge.net/p/astlinux/code/6410
Author: abelbeck
Date: 2014-02-09 15:55:13 +0000 (Sun, 09 Feb 2014)
Log Message:
-----------
enable dnscrypt-proxy in 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 2014-02-09 15:50:25 UTC (rev 6409)
+++ branches/1.0/astlinux-ast11.config 2014-02-09 15:55:13 UTC (rev 6410)
@@ -514,7 +514,7 @@
BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_OPENSSL_ENGINES=y
# BR2_PACKAGE_OPENSSL_OCF is not set
-# BR2_PACKAGE_LIBSODIUM is not set
+BR2_PACKAGE_LIBSODIUM=y
BR2_PACKAGE_LIBSRTP=y
#
@@ -673,7 +673,7 @@
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
-# BR2_PACKAGE_DNSCRYPT_PROXY is not set
+BR2_PACKAGE_DNSCRYPT_PROXY=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
BR2_PACKAGE_DNSMASQ_DHCP=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-02-09 15:50:25 UTC (rev 6409)
+++ branches/1.0/astlinux18.config 2014-02-09 15:55:13 UTC (rev 6410)
@@ -514,7 +514,7 @@
BR2_PACKAGE_OPENSSL_BIN=y
BR2_PACKAGE_OPENSSL_ENGINES=y
# BR2_PACKAGE_OPENSSL_OCF is not set
-# BR2_PACKAGE_LIBSODIUM is not set
+BR2_PACKAGE_LIBSODIUM=y
BR2_PACKAGE_LIBSRTP=y
#
@@ -673,7 +673,7 @@
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
BR2_PACKAGE_DHCPDUMP=y
-# BR2_PACKAGE_DNSCRYPT_PROXY is not set
+BR2_PACKAGE_DNSCRYPT_PROXY=y
BR2_PACKAGE_DNSMASQ=y
BR2_PACKAGE_DNSMASQ_TFTP=y
BR2_PACKAGE_DNSMASQ_DHCP=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-03-05 21:36:18
|
Revision: 6434
http://sourceforge.net/p/astlinux/code/6434
Author: abelbeck
Date: 2014-03-05 21:36:15 +0000 (Wed, 05 Mar 2014)
Log Message:
-----------
add new package, 'phoneprov-tools' using only local files. A set of scripts and configuration templates designed to generate IP Phone provisioning files as well as Asterisk sip.conf and extensions.conf includes files. Special thanks to Michael Keuter.
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/package/Config.in
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Added Paths:
-----------
branches/1.0/package/phoneprov-tools/
branches/1.0/package/phoneprov-tools/Config.in
branches/1.0/package/phoneprov-tools/massdeployment.conf
branches/1.0/package/phoneprov-tools/phoneprov-build
branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
branches/1.0/package/phoneprov-tools/phoneprov-tools.mk
branches/1.0/package/phoneprov-tools/templates/
branches/1.0/package/phoneprov-tools/templates/snom320.conf
branches/1.0/package/phoneprov-tools/templates/spa942.conf
branches/1.0/package/phoneprov-tools/templates/yealink.conf
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-02-27 14:10:19 UTC (rev 6433)
+++ branches/1.0/astlinux-ast11.config 2014-03-05 21:36:15 UTC (rev 6434)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6405-dirty Configuration
-# Fri Feb 7 15:08:32 2014
+# Buildroot 2011.08-svn6433-dirty Configuration
+# Wed Mar 5 15:25:32 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -171,6 +171,7 @@
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
BR2_PACKAGE_ASTERISK_GUI=y
+BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
BR2_PACKAGE_DAHDI_HFCS=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-02-27 14:10:19 UTC (rev 6433)
+++ branches/1.0/astlinux18.config 2014-03-05 21:36:15 UTC (rev 6434)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6405-dirty Configuration
-# Fri Feb 7 15:08:28 2014
+# Buildroot 2011.08-svn6433-dirty Configuration
+# Wed Mar 5 15:25:25 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -171,6 +171,7 @@
BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
BR2_PACKAGE_ASTERISK_FOP2=y
BR2_PACKAGE_ASTERISK_GUI=y
+BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
BR2_PACKAGE_DAHDI_HFCS=y
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-02-27 14:10:19 UTC (rev 6433)
+++ branches/1.0/package/Config.in 2014-03-05 21:36:15 UTC (rev 6434)
@@ -9,6 +9,7 @@
source "package/asterisk-codec-silk/Config.in"
source "package/asterisk-fop2/Config.in"
source "package/asterisk-gui/Config.in"
+source "package/phoneprov-tools/Config.in"
source "package/dahdi-linux/Config.in"
source "package/dahdi-tools/Config.in"
source "package/fonulator/Config.in"
Added: branches/1.0/package/phoneprov-tools/Config.in
===================================================================
--- branches/1.0/package/phoneprov-tools/Config.in (rev 0)
+++ branches/1.0/package/phoneprov-tools/Config.in 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_PHONEPROV_TOOLS
+ bool "phoneprov-tools"
+ depends on BR2_PACKAGE_ASTERISK
+ default n
+ help
+ A set of scripts and configuration templates designed to
+ generate IP Phone provisioning files as well as Asterisk
+ sip.conf and extensions.conf includes files.
+
+ Lonnie Abelbeck and Michael Keuter
+ http://www.astlinux.org/
+
Added: branches/1.0/package/phoneprov-tools/massdeployment.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/massdeployment.conf (rev 0)
+++ branches/1.0/package/phoneprov-tools/massdeployment.conf 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,8 @@
+##
+## Mass Deployment Data for IP Phones
+##
+## phone_model | mac_addr | extension[/CID_Name] | username | password
+##
+## Example:
+## yealink 00:15:65:22:44:12 301/Front_Desk yealink_4412_301 supersecret
+##
Added: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build (rev 0)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,277 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+usage()
+{
+ echo '
+Usage: phoneprov-build [options...] phone_model mac_addr extension[/CID_Name] username password
+
+Options:
+ -f, --force-overwrite Overwrite existing files
+ -h, --help Show this help text
+ -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, defaults to INTIF
+'
+ exit 1
+}
+
+find_ipv4_from_if()
+{
+ ip -o addr show dev "$1" \
+ | awk '$3 == "inet" { split($4, field, "/"); print field[1]; nextfile; }'
+}
+
+is_context() {
+ local context="$1" file="$2"
+
+ grep -q "^\[${context}\]" "$file"
+}
+
+extract_context() {
+ local context="$1" file="$2" match_ext
+
+ # Properly match if '*' exists in the extension
+ match_ext="$(echo "$ext" | sed 's/*/\\*/g')"
+
+ sed -n "/^\[${context}\]/,/^\[/ p" "$file" | sed -e 's/^\[.*//' -e "s/^#<${match_ext}>//" -e 's/^#.*//' -e '/^$/ d'
+}
+
+extract_var() {
+ local var="$1"
+
+ echo "$OPTIONS" | sed -n -r -e "s/^${var} *= *([^ ]*).*$/\1/p"
+}
+
+exit_no_overwrite() {
+ local file="$1"
+
+ if [ $force_overwrite -eq 0 -a -f "$file" ]; then
+ echo "phoneprov-build: File \"$file\" exists." >&2
+ exit 2
+ fi
+}
+
+merge_variables()
+{
+ sed -e 's/^\\#/#/' \
+ -e 's/^\\\[/\[/' \
+ -e "s|@MODEL@|${model}|g" \
+ -e "s|@VENDOR@|${vendor}|g" \
+ -e "s|@MAC_ADDR@|${mac_addr}|g" \
+ -e "s|@MAC@|${mac}|g" \
+ -e "s|@EXT@|${ext}|g" \
+ -e "s|@CID_NAME@|${cid_name}|g" \
+ -e "s|@USERNAME@|${username}|g" \
+ -e "s|@PASSWORD@|${password}|g" \
+ -e "s|@SIP_SERVER_IPV4@|${sip_server_ipv4}|g"
+}
+
+ARGS="$(getopt --name phoneprov-build \
+ --long force-overwrite,help,if-name: \
+ --options fhi: \
+ -- "$@")"
+if [ $? -ne 0 ]; then
+ usage
+fi
+eval set -- $ARGS
+
+force_overwrite=0
+if_name="INTIF"
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -f|--force-overwrite) force_overwrite=1 ;;
+ -h|--help) usage ;;
+ -i|--if-name) if_name="$2"; shift ;;
+ --) shift; break ;;
+ esac
+ shift
+done
+
+model="$1"
+mac_addr="$2"
+ext="$(echo "$3" | cut -d'/' -f1)"
+cid_name="$(echo "$3" | cut -s -d'/' -f2- | tr '_' ' ')"
+username="$4"
+password="$5"
+
+PHONEPROV_DIR="${PHONEPROV_BASE_DIR:-/mnt/kd/phoneprov}"
+TEMPLATE_DIR="$PHONEPROV_DIR/templates"
+
+DIALPLAN_DIR="/mnt/kd/asterisk/includes"
+SIP_DIR="/mnt/kd/asterisk/includes"
+
+case $if_name in
+ INTIF)
+ sip_server_if="$INTIF"
+ sip_server_ipv4="$INTIP"
+ ;;
+ INT2IF)
+ sip_server_if="$INT2IF"
+ sip_server_ipv4="$INT2IP"
+ ;;
+ INT3IF)
+ sip_server_if="$INT3IF"
+ sip_server_ipv4="$INT3IP"
+ ;;
+ EXTIF)
+ sip_server_if="$EXTIF"
+ sip_server_ipv4="$(find_ipv4_from_if $EXTIF)"
+ ;;
+ *)
+ usage
+ ;;
+esac
+
+if [ -z "$mac_addr" -o -z "$ext" ]; then
+ usage
+fi
+
+if [ -z "$cid_name" ]; then
+ cid_name="$ext"
+fi
+
+case $mac_addr in
+ ??:??:??:??:??:??)
+ ;;
+ *)
+ echo "phoneprov-build: Invalid MAC address: $mac_addr" >&2
+ exit 1
+ ;;
+esac
+mac="$(echo "$mac_addr" | tr -d ':')"
+
+if [ ! -f "$TEMPLATE_DIR/$model.conf" ]; then
+ echo "phoneprov-build: Template file \"$TEMPLATE_DIR/$model.conf\" not found." >&2
+ exit 1
+fi
+
+if ! is_context "general" "$TEMPLATE_DIR/$model.conf"; then
+ echo "phoneprov-build: No [general] context defined, invalid template file." >&2
+ exit 1
+fi
+
+# Extract General Definitions
+OPTIONS="$(extract_context "general" "$TEMPLATE_DIR/$model.conf")"
+
+macaddress_case="$(extract_var macaddress_case)"
+case $macaddress_case in
+ upper) mac="$(echo "$mac" | tr '[:lower:]' '[:upper:]')"
+ ;;
+ lower) mac="$(echo "$mac" | tr '[:upper:]' '[:lower:]')"
+ ;;
+esac
+OPTIONS="$(echo "$OPTIONS" | merge_variables)"
+
+vendor="$(extract_var vendor)"
+if [ -z "$vendor" ]; then
+ vendor="$model"
+fi
+prov_path="$(extract_var prov_path)"
+if [ -z "$prov_path" ]; then
+ prov_path="$PHONEPROV_DIR/$vendor"
+fi
+prov_file="$(extract_var prov_file)"
+if [ -z "$prov_file" ]; then
+ prov_file="$mac.cfg"
+fi
+dialplan_path="$(extract_var dialplan_path)"
+if [ -z "$dialplan_path" ]; then
+ dialplan_path="$DIALPLAN_DIR"
+fi
+dialplan_file="$(extract_var dialplan_file)"
+if [ -z "$dialplan_file" ]; then
+ dialplan_file="astlinux-phoneprov-exten.conf"
+fi
+dialplan_context="$(extract_var dialplan_context)"
+sip_path="$(extract_var sip_path)"
+if [ -z "$sip_path" ]; then
+ sip_path="$SIP_DIR"
+fi
+sip_file="$(extract_var sip_file)"
+if [ -z "$sip_file" ]; then
+ sip_file="astlinux-phoneprov-sip.conf"
+fi
+
+# Special case to initialize dialplan and sip output files
+if [ "$ext" = "init" -o "$ext" = "init-dialplan" -o "$ext" = "init-sip" ]; then
+ if [ "$ext" = "init" -o "$ext" = "init-dialplan" ]; then
+ if is_context "dialplan" "$TEMPLATE_DIR/$model.conf"; then
+ exit_no_overwrite "$dialplan_path/$dialplan_file"
+ echo ";
+; ####################################################
+; ### AstLinux auto-provisioned IP-Phone dialplan ####
+; ####################################################
+;
+; Include in your extensions.conf file by using:
+; #include $dialplan_path/$dialplan_file
+${dialplan_context:+
+[$dialplan_context]}
+" > "$dialplan_path/$dialplan_file"
+ fi
+ fi
+ if [ "$ext" = "init" -o "$ext" = "init-sip" ]; then
+ if is_context "sip" "$TEMPLATE_DIR/$model.conf"; then
+ exit_no_overwrite "$sip_path/$sip_file"
+ echo ";
+; ##############################################################
+; ### AstLinux auto-provisioned IP-Phone SIP configurations ####
+; ##############################################################
+;
+; Include in your sip.conf file by using:
+; #include $sip_path/$sip_file
+
+" > "$sip_path/$sip_file"
+ fi
+ fi
+ exit 0
+fi
+
+if [ -z "$username" ]; then
+ echo "phoneprov-build: no username defined." >&2
+ exit 3
+fi
+if [ -z "$password" ]; then
+ echo "phoneprov-build: no password defined." >&2
+ exit 3
+fi
+
+is_context_dialplan=0
+if is_context "dialplan" "$TEMPLATE_DIR/$model.conf"; then
+ is_context_dialplan=1
+fi
+is_context_sip=0
+if is_context "sip" "$TEMPLATE_DIR/$model.conf"; then
+ is_context_sip=1
+fi
+is_context_phoneprov=0
+if is_context "phoneprov" "$TEMPLATE_DIR/$model.conf"; then
+ exit_no_overwrite "$prov_path/$prov_file"
+ is_context_phoneprov=1
+fi
+
+if [ $is_context_dialplan -eq 1 ]; then
+ if [ ! -d "$dialplan_path" ]; then
+ mkdir -p "$dialplan_path"
+ fi
+ extract_context "dialplan" "$TEMPLATE_DIR/$model.conf" | \
+ merge_variables >> "$dialplan_path/$dialplan_file"
+fi
+
+if [ $is_context_sip -eq 1 ]; then
+ if [ ! -d "$sip_path" ]; then
+ mkdir -p "$sip_path"
+ fi
+ extract_context "sip" "$TEMPLATE_DIR/$model.conf" | \
+ merge_variables >> "$sip_path/$sip_file"
+ # Add an empty line
+ echo "" >> "$sip_path/$sip_file"
+fi
+
+if [ $is_context_phoneprov -eq 1 ]; then
+ if [ ! -d "$prov_path" ]; then
+ mkdir -p "$prov_path"
+ fi
+ extract_context "phoneprov" "$TEMPLATE_DIR/$model.conf" | \
+ merge_variables > "$prov_path/$prov_file"
+fi
+
Property changes on: branches/1.0/package/phoneprov-tools/phoneprov-build
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment (rev 0)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,180 @@
+#!/bin/sh
+##
+## Mass Deployment of IP Phones
+##
+
+usage()
+{
+ echo '
+Usage: phoneprov-massdeployment [options...] in_file
+
+Options:
+ -a, --auto-user-pass Automatically generate missing username/password(s)
+ -A, --only-user-pass Same as "-a, --auto-user-pass" without further processing
+ -f, --force-overwrite Overwrite existing files
+ -h, --help Show this help text
+ -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, defaults to INTIF
+ -p, --partial Partial input, append "dialplan" and "sip" entries to existing
+'
+ exit 1
+}
+
+error_info() {
+ local result="$1"
+
+ if [ $result -eq 2 ]; then
+ echo "phoneprov-massdeployment: Use -f or --force-overwrite option to overwrite."
+ echo "Files left unchanged."
+ elif [ $result -eq 3 ]; then
+ echo "phoneprov-massdeployment: Use -a or --auto-user-pass option to automatically"
+ echo " generate any missing username/password(s)."
+ fi
+}
+
+extract_file() {
+ local file="$1"
+
+ cat "$file" | sed -e 's/[#;].*//' -e 's/ *$//' -e '/^$/d'
+}
+
+init_args() {
+ local args="$1" model
+
+ model="$(echo "$args" | awk -F' ' '{ print $1; }')"
+
+ echo "$model 00:00:00:00:00:00 init"
+}
+
+gen_user_pass() {
+ local data="$1" model mac_addr ext_cid ext user pass
+
+ model="$(echo "$data" | awk -F' ' '{ print $1; }')"
+ mac_addr="$(echo "$data" | awk -F' ' '{ print $2; }')"
+ ext_cid="$(echo "$data" | awk -F' ' '{ print $3; }')"
+ user="$(echo "$data" | awk -F' ' '{ print $4; }')"
+ pass="$(echo "$data" | awk -F' ' '{ print $5; }')"
+
+ ext="$(echo "$ext_cid" | cut -d'/' -f1)"
+
+ if [ -n "$model" -a -n "$mac_addr" -a -n "$ext" ]; then
+ if [ -z "$user" -o -z "$pass" ]; then
+ if [ -z "$user" ]; then
+ user="${model}_$(echo "$mac_addr" | cut -d':' -f5)$(echo "$mac_addr" | cut -d':' -f6)_${ext}"
+ fi
+ if [ -z "$pass" ]; then
+ pass="$(openssl rand -base64 12)"
+ fi
+ # Properly match if '*' exists in the extension/cid
+ ext_cid="$(echo "$ext_cid" | sed 's/*/\\*/g')"
+
+ sed -i -e "s|^${model} *${mac_addr} *${ext_cid}.*$|${model} ${mac_addr} ${ext_cid} ${user} ${pass}|" "$in_file"
+ fi
+ fi
+}
+
+ARGS="$(getopt --name phoneprov-massdeployment \
+ --long auto-user-pass,only-user-pass,force-overwrite,help,if-name:,partial \
+ --options aAfhi:p \
+ -- "$@")"
+if [ $? -ne 0 ]; then
+ usage
+fi
+eval set -- $ARGS
+
+auto_user_pass=0
+only_user_pass=0
+force_overwrite=0
+partial=0
+if_name="INTIF"
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -a|--auto-user-pass) auto_user_pass=1 ;;
+ -A|--only-user-pass) auto_user_pass=1 ; only_user_pass=1 ;;
+ -f|--force-overwrite) force_overwrite=1 ;;
+ -h|--help) usage ;;
+ -i|--if-name) if_name="$2"; shift ;;
+ -p|--partial) partial=1 ;;
+ --) shift; break ;;
+ esac
+ shift
+done
+in_file="$1"
+
+if [ -z "$in_file" -o "$in_file" = "--" ]; then
+ usage
+fi
+if [ ! -f "$in_file" ]; then
+ echo "phoneprov-massdeployment: file not found: $in_file" >&2
+ exit 1
+fi
+
+if [ $auto_user_pass -eq 1 ]; then
+ echo "Auto-generating username/password(s):"
+
+ temp_file="$(mktemp "${in_file}.XXXXXX")"
+ cp "$in_file" "$temp_file"
+
+ IFS=$'\n'
+ extract_file "$temp_file" | while read data; do
+ unset IFS
+ gen_user_pass "$data"
+ done
+ unset IFS
+
+ if cmp -s "$temp_file" "$in_file"; then
+ echo "No missing username/password(s), input file left unchanged."
+ else
+ echo "Missing username/password(s) were added to input file."
+ fi
+ rm "$temp_file"
+
+ if [ $only_user_pass -eq 1 ]; then
+ exit 0
+ fi
+fi
+
+options=""
+if [ $force_overwrite -eq 1 ]; then
+ options="$options${options:+ }-f"
+fi
+if [ -n "$if_name" ]; then
+ options="$options${options:+ }-i $if_name"
+fi
+
+echo "Generating Phone Provisioning files:"
+
+if [ $partial -eq 1 ]; then
+ first=0
+else
+ first=1
+fi
+IFS=$'\n'
+extract_file "$in_file" | while read data; do
+ unset IFS
+ if [ $first -eq 1 ]; then
+ phoneprov-build $options $(init_args $data)
+ result=$?
+ if [ $result -ne 0 ]; then
+ error_info $result
+ exit $result
+ fi
+ first=0
+ fi
+ phoneprov-build $options $data
+ result=$?
+ if [ $result -ne 0 ]; then
+ error_info $result
+ exit $result
+ fi
+ printf "."
+done
+result=$?
+unset IFS
+
+if [ $result -ne 0 ]; then
+ exit $result
+fi
+
+echo "Done"
+exit 0
+
Property changes on: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/phoneprov-tools/phoneprov-tools.mk
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-tools.mk (rev 0)
+++ branches/1.0/package/phoneprov-tools/phoneprov-tools.mk 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,27 @@
+#############################################################
+#
+# phoneprov-tools
+#
+#############################################################
+
+# source included in package
+PHONEPROV_TOOLS_SOURCE =
+
+define PHONEPROV_TOOLS_BUILD_CMDS
+ # No build needed
+endef
+
+define PHONEPROV_TOOLS_INSTALL_TARGET_CMDS
+ install -D -m 755 package/phoneprov-tools/phoneprov-build $(TARGET_DIR)/usr/sbin/
+ install -D -m 755 package/phoneprov-tools/phoneprov-massdeployment $(TARGET_DIR)/usr/sbin/
+ install -D -m 644 package/phoneprov-tools/massdeployment.conf $(TARGET_DIR)/stat/etc/phoneprov/massdeployment.conf
+ rsync -a --exclude=".svn" package/phoneprov-tools/templates/ $(TARGET_DIR)/stat/etc/phoneprov/templates/
+endef
+
+define PHONEPROV_TOOLS_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/phoneprov-build
+ rm -f $(TARGET_DIR)/usr/sbin/phoneprov-massdeployment
+ rm -rf $(TARGET_DIR)/stat/etc/phoneprov
+endef
+
+$(eval $(call GENTARGETS,package,phoneprov-tools))
Added: branches/1.0/package/phoneprov-tools/templates/snom320.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/snom320.conf (rev 0)
+++ branches/1.0/package/phoneprov-tools/templates/snom320.conf 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,56 @@
+# AstLinux provisioning template
+# for snom 320
+menu_name=snom 320
+
+# General Definitions
+[general]
+vendor=snom
+#prov_path=/mnt/kd/phoneprov/snom
+prov_file=@MODEL@-@MAC@.htm
+macaddress_case=upper
+
+#dialplan_path=/mnt/kd/asterisk/includes
+dialplan_file=astlinux-phoneprov-exten.conf
+#dialplan_context=provisioned-phones
+
+#sip_path=/mnt/kd/asterisk/includes
+sip_file=astlinux-phoneprov-sip.conf
+
+# Dialplan File entries
+[dialplan]
+exten => @EXT@,1,Dial(SIP/@USERNAME@)
+
+# SIP File entries
+[sip]
+; @EXT@ / @MAC_ADDR@ / @MODEL@
+\[@USERNAME@]
+type=friend
+host=dynamic
+context=internal-phones
+secret=@PASSWORD@
+defaultuser=@USERNAME@
+callerid="@CID_NAME@" <@EXT@>
+mailbox=@EXT@@default
+qualify=no
+directmedia=no
+dtmfmode=rfc2833
+disallow=all
+allow=ulaw
+;allow=g722
+
+# Provision File entries
+[phoneprov]
+<?xml version="1.0" encoding="utf-8"?>
+<settings>
+<phone-settings>
+<user_realname idx="1" perm="">@EXT@</user_realname>
+<user_name idx="1" perm="">@USERNAME@</user_name>
+<user_pname idx="1" perm="">@USERNAME@</user_pname>
+<user_pass idx="1" perm="">@PASSWORD@</user_pass>
+<user_host idx="1" perm="">@SIP_SERVER_IPV4@</user_host>
+<user_outbound idx="1" perm="">@SIP_SERVER_IPV4@</user_outbound>
+<user_server_type idx="1" perm="">asterisk</user_server_type>
+<phone_name perm="">@VENDOR@-@EXT@</phone_name>
+</phone-settings>
+</settings>
+
Added: branches/1.0/package/phoneprov-tools/templates/spa942.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/spa942.conf (rev 0)
+++ branches/1.0/package/phoneprov-tools/templates/spa942.conf 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,197 @@
+# AstLinux provisioning template
+# for Cisco/Linksys SPA942
+menu_name=Cisco/Linksys SPA942
+
+# General Definitions
+[general]
+vendor=linksys
+prov_path=/mnt/kd/tftpboot/linksys
+prov_file=@EXT@.xml
+macaddress_case=lower
+
+#dialplan_path=/mnt/kd/asterisk/includes
+dialplan_file=astlinux-phoneprov-exten.conf
+#dialplan_context=provisioned-phones
+
+#sip_path=/mnt/kd/asterisk/includes
+sip_file=astlinux-phoneprov-sip.conf
+
+# Dialplan File entries
+[dialplan]
+exten => @EXT@,1,Dial(SIP/@USERNAME@)
+
+# SIP File entries
+[sip]
+; @EXT@ / @MAC_ADDR@ / @MODEL@
+\[@USERNAME@]
+type=friend
+#host=dynamic
+#<1010>host=10.10.20.20
+#<1011>host=10.10.20.21
+#<1012>host=10.10.20.22
+#<1013>host=10.10.20.23
+#<1014>host=10.10.20.24
+#<1015>host=10.10.20.25
+#<1016>host=10.10.20.26
+#<1017>host=10.10.20.27
+#<1018>host=10.10.20.28
+#<1019>host=10.10.20.29
+context=internal-phones
+secret=@PASSWORD@
+defaultuser=@USERNAME@
+callerid="@CID_NAME@" <@EXT@>
+mailbox=@EXT@@default
+qualify=0
+directmedia=no
+dtmfmode=info
+disallow=all
+allow=ulaw
+
+# Phone Provision File entries
+[phoneprov]
+<flat-profile>
+ <Provision_Enable ua="na"> No
+ </Provision_Enable>
+
+ <Primary_NTP_Server ua="na"> @SIP_SERVER_IPV4@
+ </Primary_NTP_Server>
+ <Time_Zone ua="na"> GMT-06:00
+ </Time_Zone>
+ <Daylight_Saving_Time_Rule ua="na"> start=3/8/7/2:0:0;end=11/1/7/2:0:0;save=1
+ </Daylight_Saving_Time_Rule>
+
+ <Enable_CDP ua="na"> No
+ </Enable_CDP>
+
+ <RTP_Packet_Size ua="na"> 0.020
+ </RTP_Packet_Size>
+
+ <Symmetric_RTP ua="na"> No
+ </Symmetric_RTP>
+
+ <Reorder_Delay ua="na"> 255
+ </Reorder_Delay>
+
+ <Handset_Input_Gain ua="na"> 0
+ </Handset_Input_Gain>
+ <Headset_Input_Gain ua="na"> 0
+ </Headset_Input_Gain>
+
+ <Default_Ring__1__ ua="na"> 10
+ </Default_Ring__1__>
+ <Default_Ring__2__ ua="na"> 10
+ </Default_Ring__2__>
+ <Default_Ring__3__ ua="na"> 10
+ </Default_Ring__3__>
+ <Default_Ring__4__ ua="na"> 10
+ </Default_Ring__4__>
+
+ <Line_Enable_1_ ua="na"> Yes
+ </Line_Enable_1_>
+ <SIP_Port_1_ ua="na"> 5060
+ </SIP_Port_1_>
+ <Proxy_1_ ua="na"> @SIP_SERVER_IPV4@
+ </Proxy_1_>
+ <Register_1_ ua="na"> No
+ </Register_1_>
+ <Make_Call_Without_Reg_1_ ua="na"> Yes
+ </Make_Call_Without_Reg_1_>
+ <Ans_Call_Without_Reg_1_ ua="na"> Yes
+ </Ans_Call_Without_Reg_1_>
+ <Preferred_Codec_1_ ua="na"> G711u
+ </Preferred_Codec_1_>
+ <Use_Pref_Codec_Only_1_ ua="na"> Yes
+ </Use_Pref_Codec_Only_1_>
+ <DTMF_Process_AVT_1_ ua="na"> No
+ </DTMF_Process_AVT_1_>
+ <Silence_Supp_Enable_1_ ua="na"> No
+ </Silence_Supp_Enable_1_>
+ <DTMF_Tx_Method_1_ ua="na"> INFO
+ </DTMF_Tx_Method_1_>
+ <Dial_Plan_1_ ua="na"> (00,xx.|911S0|[3-6]11S0|1[01]xxS0|[2-9]xxxxxxxxxS0|1[2-9]xxxxxxxxxS0|0[12][2-9]xxxxxxxxxS0)
+ </Dial_Plan_1_>
+ <Enable_IP_Dialing_1_ ua="na"> No
+ </Enable_IP_Dialing_1_>
+
+ <Line_Enable_2_ ua="na"> No
+ </Line_Enable_2_>
+ <SIP_Port_2_ ua="na"> 5061
+ </SIP_Port_2_>
+ <Proxy_2_ ua="na"> @SIP_SERVER_IPV4@
+ </Proxy_2_>
+ <Register_2_ ua="na"> No
+ </Register_2_>
+ <Make_Call_Without_Reg_2_ ua="na"> Yes
+ </Make_Call_Without_Reg_2_>
+ <Ans_Call_Without_Reg_2_ ua="na"> Yes
+ </Ans_Call_Without_Reg_2_>
+ <Preferred_Codec_2_ ua="na"> G711u
+ </Preferred_Codec_2_>
+ <Use_Pref_Codec_Only_2_ ua="na"> Yes
+ </Use_Pref_Codec_Only_2_>
+ <DTMF_Process_AVT_2_ ua="na"> No
+ </DTMF_Process_AVT_2_>
+ <Silence_Supp_Enable_2_ ua="na"> No
+ </Silence_Supp_Enable_2_>
+ <DTMF_Tx_Method_2_ ua="na"> INFO
+ </DTMF_Tx_Method_2_>
+ <Dial_Plan_2_ ua="na"> (00,xx.|911S0|[3-6]11S0|1[01]xxS0|[2-9]xxxxxxxxxS0|1[2-9]xxxxxxxxxS0|0[12][2-9]xxxxxxxxxS0)
+ </Dial_Plan_2_>
+ <Enable_IP_Dialing_2_ ua="na"> No
+ </Enable_IP_Dialing_2_>
+
+ <Line_Enable_3_ ua="na"> No
+ </Line_Enable_3_>
+ <SIP_Port_3_ ua="na"> 5062
+ </SIP_Port_3_>
+ <Proxy_3_ ua="na"> @SIP_SERVER_IPV4@
+ </Proxy_3_>
+ <Register_3_ ua="na"> No
+ </Register_3_>
+
+ <Line_Enable_4_ ua="na"> No
+ </Line_Enable_4_>
+ <SIP_Port_4_ ua="na"> 5063
+ </SIP_Port_4_>
+ <Proxy_4_ ua="na"> @SIP_SERVER_IPV4@
+ </Proxy_4_>
+ <Register_4_ ua="na"> No
+ </Register_4_>
+
+ <Speaker_Volume ua="na"> 10
+ </Speaker_Volume>
+
+ <Handset_Volume ua="na"> 10
+ </Handset_Volume>
+
+ <Headset_Volume ua="na"> 10
+ </Headset_Volume>
+
+ <Station_Name ua="na"> @CID_NAME@
+ </Station_Name>
+ <Voice_Mail_Number ua="na"> @EXT@
+ </Voice_Mail_Number>
+ <Text_Logo ua="na">
+ </Text_Logo>
+
+ <Display_Name_1_ ua="na"> @CID_NAME@
+ </Display_Name_1_>
+ <User_ID_1_ ua="na"> @EXT@
+ </User_ID_1_>
+ <Password_1_ ua="na"> @PASSWORD@
+ </Password_1_>
+
+ <Speakerphone_Input_Gain ua="na"> -6
+ </Speakerphone_Input_Gain>
+
+ <Ringer_Volume ua="na"> 6
+ </Ringer_Volume>
+
+ <Back_Light_Timer ua="na"> 30 s
+ </Back_Light_Timer>
+ <LCD_Contrast ua="na"> 4
+ </LCD_Contrast>
+
+ <Miss_Call_Shortcut ua="na"> Yes
+ </Miss_Call_Shortcut>
+</flat-profile>
Added: branches/1.0/package/phoneprov-tools/templates/yealink.conf
===================================================================
--- branches/1.0/package/phoneprov-tools/templates/yealink.conf (rev 0)
+++ branches/1.0/package/phoneprov-tools/templates/yealink.conf 2014-03-05 21:36:15 UTC (rev 6434)
@@ -0,0 +1,55 @@
+# AstLinux provisioning template
+# for Yealink T2x, T3x models (with firmware 70)
+menu_name=Yealink T2x, T3x (FW 70)
+
+# General Definitions
+[general]
+vendor=yealink
+#prov_path=/mnt/kd/phoneprov/yealink
+prov_file=@MAC@.cfg
+macaddress_case=lower
+
+#dialplan_path=/mnt/kd/asterisk/includes
+dialplan_file=astlinux-phoneprov-exten.conf
+#dialplan_context=provisioned-phones
+
+#sip_path=/mnt/kd/asterisk/includes
+sip_file=astlinux-phoneprov-sip.conf
+
+# Dialplan File entries
+[dialplan]
+exten => @EXT@,1,Dial(SIP/@USERNAME@)
+
+# SIP File entries
+[sip]
+; @EXT@ / @MAC_ADDR@ / @MODEL@
+\[@USERNAME@]
+type=friend
+host=dynamic
+context=internal-phones
+secret=@PASSWORD@
+defaultuser=@USERNAME@
+callerid="@CID_NAME@" <@EXT@>
+mailbox=@EXT@@default
+qualify=0
+directmedia=no
+dtmfmode=rfc2833
+disallow=all
+allow=ulaw
+;allow=g722
+
+# Phone Provision File entries
+[phoneprov]
+\#!version:1.0.0.1
+
+account.1.enable=1
+account.1.label=@EXT@
+account.1.auth_name=@USERNAME@
+account.1.user_name=@USERNAME@
+account.1.password=@PASSWORD@
+account.1.sip_server.1.address=@SIP_SERVER_IPV4@
+account.1.sip_server1.port=5060
+
+security.trust_certificates=0
+network.dhcp_host_name=@VENDOR@-@EXT@
+
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-02-27 14:10:19 UTC (rev 6433)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-03-05 21:36:15 UTC (rev 6434)
@@ -337,6 +337,9 @@
## The default is to allow all IP's, PHONEPROV_ALLOW="*"
## Example: PHONEPROV_ALLOW="10.10.10.* 2001:db8:1:* 192.168.101.20"
#PHONEPROV_ALLOW="*"
+##
+## Default base directory for phoneprov-tools scripts, default is "/mnt/kd/phoneprov"
+#PHONEPROV_BASE_DIR="/mnt/kd/phoneprov"
## NTPd Server
## Note: also see NTPSERVS in the "General Configuration" section.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-03-12 00:29:53
|
Revision: 6454
http://sourceforge.net/p/astlinux/code/6454
Author: abelbeck
Date: 2014-03-12 00:29:48 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
phoneprov-tools, add PHONEPROV_GW_IF rc.conf variable and auto-reload Asterisk option
Modified Paths:
--------------
branches/1.0/package/phoneprov-tools/phoneprov-build
branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/phoneprov-tools/phoneprov-build
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-build 2014-03-11 17:27:16 UTC (rev 6453)
+++ branches/1.0/package/phoneprov-tools/phoneprov-build 2014-03-12 00:29:48 UTC (rev 6454)
@@ -10,7 +10,8 @@
Options:
-f, --force-overwrite Overwrite existing files
-h, --help Show this help text
- -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN, defaults to INTIF
+ -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN
+ Defaults to config variable PHONEPROV_GW_IF
'
exit 1
}
@@ -146,7 +147,7 @@
eval set -- $ARGS
force_overwrite=0
-if_name="INTIF"
+if_name="${PHONEPROV_GW_IF:-INTIF}"
while [ $# -gt 0 ]; do
case "$1" in
-f|--force-overwrite) force_overwrite=1 ;;
Modified: branches/1.0/package/phoneprov-tools/phoneprov-massdeployment
===================================================================
--- branches/1.0/package/phoneprov-tools/phoneprov-massdeployment 2014-03-11 17:27:16 UTC (rev 6453)
+++ branches/1.0/package/phoneprov-tools/phoneprov-massdeployment 2014-03-12 00:29:48 UTC (rev 6454)
@@ -13,12 +13,23 @@
-A, --only-pass Same as "-a, --auto-pass" without further processing
-f, --force-overwrite Overwrite existing files
-h, --help Show this help text
- -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN, defaults to INTIF
+ -i, --if-name Interface Name: INTIF, INT2IF, INT3IF, EXTIF, ethN, brN
+ Defaults to config variable PHONEPROV_GW_IF
-p, --partial Partial input, append "dialplan" and "sip" entries to existing
+ -r, --auto-reload Automatically reload Asterisk "dialplan" and "sip" on success
+ -R, --only-reload Same as "-r, --auto-reload" without further processing
'
exit 1
}
+reload_asterisk()
+{
+ echo "Auto-reloading Asterisk 'dialplan' and 'sip'."
+
+ asterisk -rx "dialplan reload" >/dev/null
+ asterisk -rx "sip reload" >/dev/null
+}
+
error_info() {
local result="$1"
@@ -70,8 +81,8 @@
}
ARGS="$(getopt --name phoneprov-massdeployment \
- --long auto-pass,only-pass,force-overwrite,help,if-name:,partial \
- --options aAfhi:p \
+ --long auto-pass,only-pass,force-overwrite,help,if-name:,partial,auto-reload,only-reload \
+ --options aAfhi:prR \
-- "$@")"
if [ $? -ne 0 ]; then
usage
@@ -82,21 +93,30 @@
only_pass=0
force_overwrite=0
partial=0
-if_name="INTIF"
+auto_reload=0
+only_reload=0
+if_name=""
while [ $# -gt 0 ]; do
case "$1" in
- -a|--auto-pass) auto_pass=1 ;;
- -A|--only-pass) auto_pass=1 ; only_pass=1 ;;
+ -a|--auto-pass) auto_pass=1 ;;
+ -A|--only-pass) auto_pass=1 ; only_pass=1 ;;
-f|--force-overwrite) force_overwrite=1 ;;
-h|--help) usage ;;
-i|--if-name) if_name="$2"; shift ;;
-p|--partial) partial=1 ;;
+ -r|--auto-reload) auto_reload=1 ;;
+ -R|--only-reload) auto_reload=1 ; only_reload=1 ;;
--) shift; break ;;
esac
shift
done
in_file="$1"
+if [ $auto_reload -eq 1 -a $only_reload -eq 1 ]; then
+ reload_asterisk
+ exit 0
+fi
+
if [ -z "$in_file" -o "$in_file" = "--" ]; then
usage
fi
@@ -173,5 +193,10 @@
fi
echo "Done"
+
+if [ $auto_reload -eq 1 ]; then
+ reload_asterisk
+fi
+
exit 0
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-03-11 17:27:16 UTC (rev 6453)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-03-12 00:29:48 UTC (rev 6454)
@@ -340,6 +340,9 @@
##
## Default base directory for phoneprov-tools scripts, default is "/mnt/kd/phoneprov"
#PHONEPROV_BASE_DIR="/mnt/kd/phoneprov"
+## Default gateway interface for phoneprov-tools scripts.
+## Interface Name: "INTIF", "INT2IF", "INT3IF", "EXTIF", ethN, brN, defaults to "INTIF"
+#PHONEPROV_GW_IF="INTIF"
## NTPd Server
## Note: also see NTPSERVS in the "General Configuration" section.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-05-02 00:07:15
|
Revision: 6513
http://sourceforge.net/p/astlinux/code/6513
Author: abelbeck
Date: 2014-05-02 00:07:10 +0000 (Fri, 02 May 2014)
Log Message:
-----------
initrd, increase the tmpfs asturo limit from 128 MB to 192 MB. Additionally resize the asturo mount to match the 'used' space so no free space remains.
Modified Paths:
--------------
branches/1.0/project/initrd/busybox.config
branches/1.0/project/initrd/target_skeleton/linuxrc
branches/1.0/scripts/build
Modified: branches/1.0/project/initrd/busybox.config
===================================================================
--- branches/1.0/project/initrd/busybox.config 2014-04-30 14:58:31 UTC (rev 6512)
+++ branches/1.0/project/initrd/busybox.config 2014-05-02 00:07:10 UTC (rev 6513)
@@ -200,7 +200,7 @@
# CONFIG_FEATURE_DD_SIGNAL_HANDLING is not set
# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
# CONFIG_FEATURE_DD_IBS_OBS is not set
-# CONFIG_DF is not set
+CONFIG_DF=y
# CONFIG_FEATURE_DF_FANCY is not set
# CONFIG_DIRNAME is not set
# CONFIG_DOS2UNIX is not set
Modified: branches/1.0/project/initrd/target_skeleton/linuxrc
===================================================================
--- branches/1.0/project/initrd/target_skeleton/linuxrc 2014-04-30 14:58:31 UTC (rev 6512)
+++ branches/1.0/project/initrd/target_skeleton/linuxrc 2014-05-02 00:07:10 UTC (rev 6513)
@@ -5,10 +5,28 @@
# when reverted to an older version that still uses IDE
DRIVES="hda hdb hdc hdd sda sdb sdc sdd sde sdf sdg sdh"
-# Max image size in megabytes
-IMAGEFS_SIZE=128
+# Max image size in 1024 (k) bytes
+MAX_IMAGEFS_SIZE=196608 # 192m
#functions
+
+image_to_tmpfs() {
+ local mp="$1" used
+
+ mount -t tmpfs -o size=${MAX_IMAGEFS_SIZE}k none $mp
+
+ echo "Copying AstLinux files to RAM..."
+ cp -a /image/. $mp/
+
+ mount -o ro,remount $mp
+
+ # Reduce total size to 'used'
+ used="$(df -k -P $mp | awk '/^none/ { print $3; }')"
+ if [ -n "$used" ] && [ $used -lt $MAX_IMAGEFS_SIZE ]; then
+ mount -o remount,size=${used}k $mp
+ fi
+}
+
geninstall () {
echo "
@@ -138,17 +156,8 @@
mount -t ext2 -o noatime $ASTURW /mnt/asturw
- # no longer needed with new version of unionfs
- # rm -rf /mnt/asturw/lib/modules
+ image_to_tmpfs /mnt/asturo
- mount -t tmpfs -o size=${IMAGEFS_SIZE}m none /mnt/asturo
-
- echo "Copying AstLinux files to RAM..."
-
- cp -a /image/. /mnt/asturo/
-
- mount -o ro,remount /mnt/asturo
-
mount -t unionfs -o dirs=/mnt/asturw=rw:/mnt/asturo=ro none /new
cd /
@@ -170,22 +179,14 @@
mount -t ext2 -o noatime $ASTURW /mnt/asturw
- # no longer needed since new unionfs version
- # rm -rf /mnt/asturw/lib/modules
-
mount -t unionfs -o dirs=/mnt/asturw=rw:/image=ro none /new
fi
else
# non unionfs stuff
if [ "$RAMFS" = "yes" ]; then
- mount -t tmpfs -o size=${IMAGEFS_SIZE}m none /new
+ image_to_tmpfs /new
- echo "Copying AstLinux files to RAM..."
-
- cp -a /image/. /new/
- mount -o ro,remount /new
-
# unmount the loop device
cd /
umount /dev/loop0
Modified: branches/1.0/scripts/build
===================================================================
--- branches/1.0/scripts/build 2014-04-30 14:58:31 UTC (rev 6512)
+++ branches/1.0/scripts/build 2014-05-02 00:07:10 UTC (rev 6513)
@@ -3,7 +3,8 @@
# build [ board ]
#
-IMAGEFS_SIZE=128
+# Max image size in 1024 (k) bytes
+MAX_IMAGEFS_SIZE=196608 # 192m
REQUIRED_CMDS="which zcat bzcat make gcc bison flex msgfmt makeinfo autoconf nasm wget rsync sed"
@@ -48,9 +49,9 @@
)
touch ${ASTVER}/astflag
sed -e "s/ASTVER/${ASTVER}/g" project/astlinux/board/${board}/runnix.conf > ${ASTVER}/${ASTVER}.run.conf
- image_size=$(du -s -m "${ROOTFS_EXT2}" | awk '{ print $1 }')
- if [ "$image_size" -gt ${IMAGEFS_SIZE} ]; then
- echo "build: WARNING -- Image Size is larger then ${IMAGEFS_SIZE}MB, 'noram' is set"
+ image_size=$(du -s -k "${ROOTFS_EXT2}" | awk '{ print $1 }')
+ if [ $image_size -gt $MAX_IMAGEFS_SIZE ]; then
+ echo "build: WARNING -- Image Size is larger then ${MAX_IMAGEFS_SIZE}KB, 'noram' is set"
sed -i 's/ astlive / astlive noram /' ${ASTVER}/${ASTVER}.run.conf
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-05-11 21:30:52
|
Revision: 6522
http://sourceforge.net/p/astlinux/code/6522
Author: abelbeck
Date: 2014-05-11 21:30:48 +0000 (Sun, 11 May 2014)
Log Message:
-----------
dynamicdns, allow DDCLIENT=none to provide a simple method to disable Dynamic DNS without deleteing a working configuration
Modified Paths:
--------------
branches/1.0/package/inadyn/dynamicdns.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/inadyn/dynamicdns.init
===================================================================
--- branches/1.0/package/inadyn/dynamicdns.init 2014-05-10 17:46:43 UTC (rev 6521)
+++ branches/1.0/package/inadyn/dynamicdns.init 2014-05-11 21:30:48 UTC (rev 6522)
@@ -135,7 +135,7 @@
if [ "$DDCLIENT" = "ddclient" ]; then
gen_ddclient_conf
- else
+ elif [ "$DDCLIENT" = "inadyn" -o -z "$DDCLIENT" ]; then # unset default for backward compatibility
gen_inadyn_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 2014-05-10 17:46:43 UTC (rev 6521)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-05-11 21:30:48 UTC (rev 6522)
@@ -184,7 +184,7 @@
## Dynamic DNS Support
## Both "inadyn" and "ddclient" clients are supported.
## For a list of valid DDSERVICE names, see the ouput of "inadyn".
-#DDCLIENT="ddclient" # "inadyn" or "ddclient", defaults to "inadyn"
+#DDCLIENT="ddclient" # "none", "inadyn" or "ddclient", unset defaults to "inadyn" for backward compatibility
#DDSERVICE=
#DDUSER=
#DDPASS=
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-06-08 20:05:34
|
Revision: 6540
http://sourceforge.net/p/astlinux/code/6540
Author: abelbeck
Date: 2014-06-08 20:05:31 +0000 (Sun, 08 Jun 2014)
Log Message:
-----------
arnofw, add support for multiple 'Allow OpenVPN' LAN interfaces using OVPN_ALLOWLAN and OVPNC_ALLOWLAN
Modified Paths:
--------------
branches/1.0/package/arnofw/arnofw.wrapper
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 2014-06-05 17:04:44 UTC (rev 6539)
+++ branches/1.0/package/arnofw/arnofw.wrapper 2014-06-08 20:05:31 UTC (rev 6540)
@@ -1,27 +1,12 @@
#
# In this shim, we're invoked after /etc/arno-iptables-firewall/firewall.conf
# has been read. We then read /etc/rc.conf, and paste in variables from
-# the latter file that should override whatever values were configured in
-# firewall.conf. Reason being that it should be easy to swap between
-# arno-iptables-firewall and astfw (and back again) with fewer values to
-# reconfigure.
+# the latter file that will override whatever values were configured in
+# firewall.conf.
#
-# You could argue that this will be confusing, and I wouldn't disagree.
-#
-# Ideally, we should have the values in /etc/rc.conf and firewall.conf
-# converge... and possibly finalize on a single firewall project for
-# AstLinux.
-#
. /etc/rc.conf
-#
-# the attrocious logic below is to make sure that if INTIF='' and INT2IF=''
-# and INT3IF='', then INT_IF='' as well (and not a string of spaces).
-#
-# this is so that tests for [ -n "$INT_IF" ] do exactly what they should.
-#
-
isVPNtype()
{
# args: vpn_type
@@ -229,13 +214,18 @@
ovpnIF="$OVPN_DEV"
fi
addINTERNALnet "$ovpnIF" "$ovpnIP" "$ovpnNM"
- allowif="$(getLANinterface "$OVPN_ALLOWLAN")"
- if [ $? -eq 0 ]; then
- IFS=' ,'
- for intf in $INT_IF; do
- if [ "$intf" = "$allowif" ]; then
- IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
- break;
+ if [ -n "$OVPN_ALLOWLAN" ]; then
+ unset IFS
+ for lan in $OVPN_ALLOWLAN; do
+ allowif="$(getLANinterface "$lan")"
+ if [ $? -eq 0 ]; then
+ IFS=' ,'
+ for intf in $INT_IF; do
+ if [ "$intf" = "$allowif" ]; then
+ IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
+ break;
+ fi
+ done
fi
done
fi
@@ -256,13 +246,18 @@
ovpnIF="$OVPNC_DEV"
fi
addNOnatINTERNALnet "$ovpnIF" "$ovpnIP" "$ovpnNM"
- allowif="$(getLANinterface "$OVPNC_ALLOWLAN")"
- if [ $? -eq 0 ]; then
- IFS=' ,'
- for intf in $INT_IF; do
- if [ "$intf" = "$allowif" ]; then
- IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
- break;
+ if [ -n "$OVPNC_ALLOWLAN" ]; then
+ unset IFS
+ for lan in $OVPNC_ALLOWLAN; do
+ allowif="$(getLANinterface "$lan")"
+ if [ $? -eq 0 ]; then
+ IFS=' ,'
+ for intf in $INT_IF; do
+ if [ "$intf" = "$allowif" ]; then
+ IF_TRUSTS="$IF_TRUSTS${IF_TRUSTS:+|}$allowif $ovpnIF"
+ break;
+ fi
+ done
fi
done
fi
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-06-05 17:04:44 UTC (rev 6539)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-06-08 20:05:31 UTC (rev 6540)
@@ -596,8 +596,8 @@
#username1 password1
#username2 password2
#"
-## Allow OpenVPN Server tunnel to one LAN Interface, defaults to disallow
-## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface
+## Allow OpenVPN Server tunnel to LAN Interface(s), defaults to disallow
+## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
#OVPN_ALLOWLAN="INTIF"
##
## Firewall Options, automatically supported via AIF openvpn-server plugin.
@@ -635,8 +635,8 @@
#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
-## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface
+## Allow OpenVPN Client tunnel to LAN Interface(s), defaults to disallow
+## Use "INTIF" for 1st, "INT2IF" for 2nd, or "INT3IF" for 3rd Internal Interface, space separated for multiple
#OVPNC_ALLOWLAN="INTIF"
## Racoon support - VPN above must include "racoon"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-07-16 23:45:02
|
Revision: 6596
http://sourceforge.net/p/astlinux/code/6596
Author: abelbeck
Date: 2014-07-16 23:44:56 +0000 (Wed, 16 Jul 2014)
Log Message:
-----------
igb, new package, Intel Gigabit Ethernet Network Driver, including Intel i210 and i354 support
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules
branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules
branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules
branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/igb/
branches/1.0/package/igb/Config.in
branches/1.0/package/igb/igb.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/astlinux-ast11.config 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6433-dirty Configuration
-# Wed Mar 5 15:25:32 2014
+# Buildroot 2011.08-svn6595-dirty Configuration
+# Wed Jul 16 18:10:41 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -326,6 +326,19 @@
#
# Hardware handling
#
+
+#
+# Network Interface Kernel Drivers
+#
+BR2_PACKAGE_E1000=y
+BR2_PACKAGE_E1000E=y
+BR2_PACKAGE_IGB=y
+BR2_PACKAGE_R8168=y
+BR2_PACKAGE_TG3=y
+
+#
+# Other Hardware
+#
BR2_PACKAGE_ACPID=y
BR2_PACKAGE_BFDETECT=y
# BR2_PACKAGE_CDRKIT is not set
@@ -336,8 +349,6 @@
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-BR2_PACKAGE_E1000=y
-BR2_PACKAGE_E1000E=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
BR2_PACKAGE_E2FSPROGS_CHATTR=y
@@ -395,7 +406,6 @@
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
BR2_PACKAGE_PCIUTILS=y
-BR2_PACKAGE_R8168=y
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
@@ -405,7 +415,6 @@
# 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 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/astlinux18.config 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6433-dirty Configuration
-# Wed Mar 5 15:25:25 2014
+# Buildroot 2011.08-svn6595-dirty Configuration
+# Wed Jul 16 18:10:35 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -326,6 +326,19 @@
#
# Hardware handling
#
+
+#
+# Network Interface Kernel Drivers
+#
+BR2_PACKAGE_E1000=y
+BR2_PACKAGE_E1000E=y
+BR2_PACKAGE_IGB=y
+BR2_PACKAGE_R8168=y
+BR2_PACKAGE_TG3=y
+
+#
+# Other Hardware
+#
BR2_PACKAGE_ACPID=y
BR2_PACKAGE_BFDETECT=y
# BR2_PACKAGE_CDRKIT is not set
@@ -336,8 +349,6 @@
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-BR2_PACKAGE_E1000=y
-BR2_PACKAGE_E1000E=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
BR2_PACKAGE_E2FSPROGS_CHATTR=y
@@ -395,7 +406,6 @@
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
BR2_PACKAGE_PCIUTILS=y
-BR2_PACKAGE_R8168=y
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
@@ -405,7 +415,6 @@
# 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/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/initrd.config 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6405-dirty Configuration
-# Fri Feb 7 15:08:43 2014
+# Buildroot 2011.08-svn6595-dirty Configuration
+# Wed Jul 16 18:11:11 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -301,6 +301,14 @@
#
# Hardware handling
#
+
+#
+# Network Interface Kernel Drivers
+#
+
+#
+# Other Hardware
+#
# BR2_PACKAGE_ACPID is not set
# BR2_PACKAGE_BFDETECT is not set
# BR2_PACKAGE_CDRKIT is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/package/Config.in 2014-07-16 23:44:56 UTC (rev 6596)
@@ -165,6 +165,15 @@
endmenu
menu "Hardware handling"
+
+comment "Network Interface Kernel Drivers"
+source "package/e1000/Config.in"
+source "package/e1000e/Config.in"
+source "package/igb/Config.in"
+source "package/r8168/Config.in"
+source "package/tg3/Config.in"
+
+comment "Other Hardware"
source "package/acpid/Config.in"
source "package/bfdetect/Config.in"
source "package/cdrkit/Config.in"
@@ -177,8 +186,6 @@
endif
source "package/dmraid/Config.in"
source "package/dosfstools/Config.in"
-source "package/e1000/Config.in"
-source "package/e1000e/Config.in"
source "package/e2fsprogs/Config.in"
source "package/eeprog/Config.in"
source "package/fconfig/Config.in"
@@ -212,7 +219,6 @@
source "package/ntfs-3g/Config.in"
source "package/ntfsprogs/Config.in"
source "package/pciutils/Config.in"
-source "package/r8168/Config.in"
source "package/rng-tools/Config.in"
source "package/sdparm/Config.in"
source "package/setserial/Config.in"
@@ -227,7 +233,6 @@
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/igb/Config.in
===================================================================
--- branches/1.0/package/igb/Config.in (rev 0)
+++ branches/1.0/package/igb/Config.in 2014-07-16 23:44:56 UTC (rev 6596)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_IGB
+ bool "igb"
+ depends on BR2_LINUX_KERNEL
+ default n
+ help
+ Newer stable igb Intel Gigabit Ethernet Network Driver
+
+ http://sourceforge.net/projects/e1000/
+
Added: branches/1.0/package/igb/igb.mk
===================================================================
--- branches/1.0/package/igb/igb.mk (rev 0)
+++ branches/1.0/package/igb/igb.mk 2014-07-16 23:44:56 UTC (rev 6596)
@@ -0,0 +1,39 @@
+#############################################################
+#
+# igb
+#
+#############################################################
+
+IGB_VERSION = 5.2.5
+IGB_SOURCE:=igb-$(IGB_VERSION).tar.gz
+IGB_SITE = http://downloads.sourceforge.net/project/e1000/igb%20stable/$(IGB_VERSION)
+IGB_DEPENDENCIES = linux
+IGB_SUBDIR = src
+
+IGB_UNINSTALL_STAGING_OPT = --version
+
+IGB_MAKE_OPT += \
+ CC=$(TARGET_CC) \
+ LD=$(TARGET_LD) \
+ BUILD_KERNEL=$(LINUX_VERSION_PROBED) \
+ KSRC=$(LINUX_DIR) \
+ RHEL_CODE=0 \
+ VERSION_FILE=$(LINUX_DIR)/include/generated/utsrelease.h \
+ CONFIG_FILE=$(LINUX_DIR)/include/generated/autoconf.h \
+ ARCH=$(KERNEL_ARCH)
+
+define IGB_CONFIGURE_CMDS
+ @echo "No configure"
+endef
+
+define IGB_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 644 -D $(@D)/src/igb.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/igb/igb.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+define IGB_UNINSTALL_TARGET_CMDS
+ rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/igb/igb.ko
+ $(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
+endef
+
+$(eval $(call AUTOTARGETS,package,igb))
Modified: branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/project/astlinux/board/alix/target_skeleton/etc/rc.modules 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,9 +1,9 @@
-# These modules get modprobe'd when the system starts up.
+## These modules get modprobe'd when the system starts up.
rtc
-#Comment out the modules you don't need, and change the order to
-#move eth0 to eth1, etc.
-#Ethernet support
-#10/100 first, then Gigabit
+## Uncomment any additional modules you need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
#3c59x
#typhoon
#tulip
Modified: branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/project/astlinux/board/geni586/target_skeleton/etc/rc.modules 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,9 +1,9 @@
-# These modules get modprobe'd when the system starts up.
+## These modules get modprobe'd when the system starts up.
rtc
-#Comment out the modules you don't need, and change the order to
-#move eth0 to eth1, etc.
-#Ethernet support
-#10/100 first, then Gigabit
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
3c59x
typhoon
tulip
@@ -18,6 +18,7 @@
acenic
e1000
e1000e
+igb
ns83820
r8168
r8169
Modified: branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/project/astlinux/board/geni586-serial/target_skeleton/etc/rc.modules 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,9 +1,9 @@
-# These modules get modprobe'd when the system starts up.
+## These modules get modprobe'd when the system starts up.
rtc
-#Comment out the modules you don't need, and change the order to
-#move eth0 to eth1, etc.
-#Ethernet support
-#10/100 first, then Gigabit
+## Comment out any modules you don't need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
3c59x
typhoon
tulip
@@ -18,6 +18,7 @@
acenic
e1000
e1000e
+igb
ns83820
r8168
r8169
Modified: branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules
===================================================================
--- branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/project/astlinux/board/net5501/target_skeleton/etc/rc.modules 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,9 +1,9 @@
-# These modules get modprobe'd when the system starts up.
+## These modules get modprobe'd when the system starts up.
rtc
-#Comment out the modules you don't need, and change the order to
-#move eth0 to eth1, etc.
-#Ethernet support
-#10/100 first, then Gigabit
+## Uncomment any additional modules you need.
+##
+## Ethernet support
+## 10/100 first, then Gigabit
#3c59x
#typhoon
#tulip
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/runnix-uclibc.config 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6405-dirty Configuration
-# Fri Feb 7 15:08:40 2014
+# Buildroot 2011.08-svn6595-dirty Configuration
+# Wed Jul 16 18:11:10 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -468,6 +468,19 @@
#
# Hardware handling
#
+
+#
+# Network Interface Kernel Drivers
+#
+# BR2_PACKAGE_E1000 is not set
+# BR2_PACKAGE_E1000E is not set
+# BR2_PACKAGE_IGB is not set
+# BR2_PACKAGE_R8168 is not set
+# BR2_PACKAGE_TG3 is not set
+
+#
+# Other Hardware
+#
# BR2_PACKAGE_ACPID is not set
# BR2_PACKAGE_BFDETECT is not set
@@ -484,8 +497,6 @@
#
# dosfstools requires a toolchain with LARGEFILE and WCHAR support
#
-# BR2_PACKAGE_E1000 is not set
-# BR2_PACKAGE_E1000E is not set
#
# e2fsprogs requires a toolchain with LARGEFILE + WCHAR support
@@ -544,7 +555,6 @@
# ntfsprogs requires a toolchain with WCHAR and LARGEFILE support
#
# BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_R8168 is not set
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
@@ -563,7 +573,6 @@
#
# 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 2014-07-16 14:35:25 UTC (rev 6595)
+++ branches/1.0/runnix.config 2014-07-16 23:44:56 UTC (rev 6596)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6405-dirty Configuration
-# Fri Feb 7 15:08:37 2014
+# Buildroot 2011.08-svn6595-dirty Configuration
+# Wed Jul 16 18:10:50 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -317,6 +317,19 @@
#
# Hardware handling
#
+
+#
+# Network Interface Kernel Drivers
+#
+# BR2_PACKAGE_E1000 is not set
+# BR2_PACKAGE_E1000E is not set
+# BR2_PACKAGE_IGB is not set
+# BR2_PACKAGE_R8168 is not set
+# BR2_PACKAGE_TG3 is not set
+
+#
+# Other Hardware
+#
# BR2_PACKAGE_ACPID is not set
# BR2_PACKAGE_BFDETECT is not set
# BR2_PACKAGE_CDRKIT is not set
@@ -327,8 +340,6 @@
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-# BR2_PACKAGE_E1000 is not set
-# BR2_PACKAGE_E1000E is not set
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
BR2_PACKAGE_E2FSPROGS_CHATTR=y
@@ -377,7 +388,6 @@
# BR2_PACKAGE_NTFS_3G is not set
# BR2_PACKAGE_NTFSPROGS is not set
# BR2_PACKAGE_PCIUTILS is not set
-# BR2_PACKAGE_R8168 is not set
# BR2_PACKAGE_RNG_TOOLS is not set
# BR2_PACKAGE_SDPARM is not set
# BR2_PACKAGE_SETSERIAL is not set
@@ -387,7 +397,6 @@
# 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...> - 2014-07-28 16:59:48
|
Revision: 6601
http://sourceforge.net/p/astlinux/code/6601
Author: abelbeck
Date: 2014-07-28 16:59:39 +0000 (Mon, 28 Jul 2014)
Log Message:
-----------
radvd, version bump to 2.1 plus upstream fixes
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/package/radvd/Config.in
branches/1.0/package/radvd/radvd.init
branches/1.0/package/radvd/radvd.mk
Added Paths:
-----------
branches/1.0/package/radvd/radvd-drop-check.patch
branches/1.0/package/radvd/radvd-netlink-ready.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-07-21 15:58:02 UTC (rev 6600)
+++ branches/1.0/astlinux-ast11.config 2014-07-28 16:59:39 UTC (rev 6601)
@@ -617,7 +617,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-BR2_PACKAGE_LIBDAEMON=y
+# BR2_PACKAGE_LIBDAEMON is not set
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-07-21 15:58:02 UTC (rev 6600)
+++ branches/1.0/astlinux18.config 2014-07-28 16:59:39 UTC (rev 6601)
@@ -617,7 +617,7 @@
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
# BR2_PACKAGE_LIBCAP is not set
-BR2_PACKAGE_LIBDAEMON=y
+# BR2_PACKAGE_LIBDAEMON is not set
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
# BR2_PACKAGE_LIBFB is not set
Modified: branches/1.0/package/radvd/Config.in
===================================================================
--- branches/1.0/package/radvd/Config.in 2014-07-21 15:58:02 UTC (rev 6600)
+++ branches/1.0/package/radvd/Config.in 2014-07-28 16:59:39 UTC (rev 6601)
@@ -2,7 +2,6 @@
bool "radvd"
select BR2_PACKAGE_FLEX
select BR2_PACKAGE_FLEX_LIBFL
- select BR2_PACKAGE_LIBDAEMON
depends on BR2_INET_IPV6
help
IPv6 Router Advertisement Daemon.
Added: branches/1.0/package/radvd/radvd-drop-check.patch
===================================================================
--- branches/1.0/package/radvd/radvd-drop-check.patch (rev 0)
+++ branches/1.0/package/radvd/radvd-drop-check.patch 2014-07-28 16:59:39 UTC (rev 6601)
@@ -0,0 +1,15 @@
+Drop check requirement, we don't do unit tests.
+
+Signed-off-by: Gustavo Zacarias <gu...@za...>
+
+diff -Nura radvd-2.1.orig/configure.ac radvd-2.1/configure.ac
+--- radvd-2.1.orig/configure.ac 2014-07-22 08:23:12.642260069 -0300
++++ radvd-2.1/configure.ac 2014-07-22 08:23:21.270552628 -0300
+@@ -49,7 +49,6 @@
+ dnl Determine CC and preset CFLAGS
+ AC_PROG_CC_C99
+ AC_PROG_RANLIB
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
+
+ dnl Determine of netlink is available
+ AC_MSG_CHECKING(netlink)
Added: branches/1.0/package/radvd/radvd-netlink-ready.patch
===================================================================
--- branches/1.0/package/radvd/radvd-netlink-ready.patch (rev 0)
+++ branches/1.0/package/radvd/radvd-netlink-ready.patch 2014-07-28 16:59:39 UTC (rev 6601)
@@ -0,0 +1,425 @@
+From a79451fa20e5aa6f9f224b137328ed2213762117 Mon Sep 17 00:00:00 2001
+From: Reuben Hawkins <reu...@gm...>
+Date: Sun, 27 Jul 2014 18:17:47 -0700
+Subject: [PATCH] ensure if_index gets set and setup_iface is called
+
+If radvd 2.1 is started with a configured interface not connected (link down), using...
+
+IgnoreIfMissing on;
+
+when the link goes up, that interface does not work until radvd is restarted.
+
+The primary change is in radvd.c, function setup_iface() swap the occurrence of calling
+check_device() and update_device_index(), calling update_device_index() first always
+creates a 'slot' that can be indexed later when the link goes up.
+
+There's also a change in send.c which will ensure setup_iface is allways called on an
+interface that is not ready.
+
+This commit also moves setup_iface to interface.c from radvd.c.
+---
+ interface.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
+ netlink.c | 2 ++
+ radvd.c | 47 -----------------------------------------------
+ radvd.h | 2 +-
+ send.c | 17 ++++++++---------
+ 5 files changed, 59 insertions(+), 57 deletions(-)
+
+diff --git a/interface.c b/interface.c
+index d874232..5baf919 100644
+--- a/interface.c
++++ b/interface.c
+@@ -48,6 +48,54 @@ void iface_init_defaults(struct Interface *iface)
+
+ }
+
++int setup_iface(int sock, struct Interface *iface)
++{
++ iface->state_info.ready = 0;
++
++ /* The device index must be setup first so we can search it later */
++ if (update_device_index(iface) < 0) {
++ return -1;
++ }
++
++ /* Check IFF_UP, IFF_RUNNING and IFF_MULTICAST */
++ if (check_device(sock, iface) < 0) {
++ return -1;
++ }
++
++ /* Set iface->if_index, iface->max_mtu and iface hardware address */
++ if (update_device_info(sock, iface) < 0) {
++ return -1;
++ }
++
++ /* Make sure the settings in the config file for this interface are ok (this depends
++ * on iface->max_mtu already being set). */
++ if (check_iface(iface) < 0) {
++ return -1;
++ }
++
++ /* Make sure this is diabled. We don't want this interface to autoconfig using its
++ * own advert messages. */
++ if (disable_ipv6_autoconfig(iface->props.name)) {
++ return -1;
++ }
++
++ /* Save the first link local address seen on the specified interface to iface->if_addr */
++ if (setup_linklocal_addr(iface) < 0) {
++ return -1;
++ }
++
++ /* join the allrouters multicast group so we get the solicitations */
++ if (setup_allrouters_membership(sock, iface) < 0) {
++ return -1;
++ }
++
++ iface->state_info.ready = 1;
++
++ dlog(LOG_DEBUG, 4, "interface definition for %s is ok", iface->props.name);
++
++ return 0;
++}
++
+ void prefix_init_defaults(struct AdvPrefix *prefix)
+ {
+ memset(prefix, 0, sizeof(struct AdvPrefix));
+diff --git a/netlink.c b/netlink.c
+index dfdbf3c..474e867 100644
+--- a/netlink.c
++++ b/netlink.c
+@@ -79,6 +79,7 @@ void process_netlink_msg(int sock, struct Interface * ifaces)
+ /* Reinit the interfaces which needs it. */
+ struct Interface *iface = find_iface_by_index(ifaces, ifinfo->ifi_index);
+ if (iface) {
++ iface->state_info.ready = 0;
+ iface->state_info.racount = 0;
+ reschedule_iface(iface, 0);
+ }
+@@ -106,6 +107,7 @@ void process_netlink_msg(int sock, struct Interface * ifaces)
+
+ struct Interface *iface = find_iface_by_index(ifaces, ifaddr->ifa_index);
+ if (iface) {
++ iface->state_info.ready = 0;
+ iface->state_info.racount = 0;
+ reschedule_iface(iface, 0);
+ }
+diff --git a/radvd.c b/radvd.c
+index 69f97c4..b4f1ca5 100644
+--- a/radvd.c
++++ b/radvd.c
+@@ -549,53 +549,6 @@ static void stop_adverts(int sock, struct Interface *ifaces)
+ for_each_iface(ifaces, stop_advert_foo, &sock);
+ }
+
+-int setup_iface(int sock, struct Interface *iface)
+-{
+- iface->state_info.ready = 0;
+-
+- /* Check IFF_UP, IFF_RUNNING and IFF_MULTICAST */
+- if (check_device(sock, iface) < 0) {
+- return -1;
+- }
+-
+- if (update_device_index(iface) < 0) {
+- return -1;
+- }
+-
+- /* Set iface->if_index, iface->max_mtu and iface hardware address */
+- if (update_device_info(sock, iface) < 0) {
+- return -1;
+- }
+-
+- /* Make sure the settings in the config file for this interface are ok (this depends
+- * on iface->max_mtu already being set). */
+- if (check_iface(iface) < 0) {
+- return -1;
+- }
+-
+- /* Make sure this is diabled. We don't want this interface to autoconfig using its
+- * own advert messages. */
+- if (disable_ipv6_autoconfig(iface->props.name)) {
+- return -1;
+- }
+-
+- /* Save the first link local address seen on the specified interface to iface->if_addr */
+- if (setup_linklocal_addr(iface) < 0) {
+- return -1;
+- }
+-
+- /* join the allrouters multicast group so we get the solicitations */
+- if (setup_allrouters_membership(sock, iface) < 0) {
+- return -1;
+- }
+-
+- iface->state_info.ready = 1;
+-
+- dlog(LOG_DEBUG, 4, "interface definition for %s is ok", iface->props.name);
+-
+- return 0;
+-}
+-
+ static void setup_iface_foo(struct Interface *iface, void *data)
+ {
+ int sock = *(int *)data;
+diff --git a/radvd.h b/radvd.h
+index 15e25c0..2840d9e 100644
+--- a/radvd.h
++++ b/radvd.h
+@@ -254,7 +254,6 @@ struct Interface *readin_config(char const *fname);
+
+ /* radvd.c */
+ int disable_ipv6_autoconfig(char const *iface);
+-int setup_iface(int sock, struct Interface *iface);
+
+ /* timer.c */
+ struct timespec next_timespec(double next);
+@@ -283,6 +282,7 @@ void route_init_defaults(struct AdvRoute *, struct Interface *);
+ void rdnss_init_defaults(struct AdvRDNSS *, struct Interface *);
+ void dnssl_init_defaults(struct AdvDNSSL *, struct Interface *);
+ int check_iface(struct Interface *);
++int setup_iface(int sock, struct Interface *iface);
+ void free_ifaces(struct Interface *ifaces);
+ struct Interface *find_iface_by_index(struct Interface *iface, int index);
+ struct Interface *find_iface_by_time(struct Interface *iface_list);
+diff --git a/send.c b/send.c
+index c05d6aa..df9aa94 100644
+--- a/send.c
++++ b/send.c
+@@ -53,6 +53,12 @@ static void add_abro(struct safe_buffer * sb, struct AdvAbro const *abroo);
+ */
+ int send_ra_forall(int sock, struct Interface *iface, struct in6_addr *dest)
+ {
++ /* when netlink is not available (disabled or BSD), ensure_iface_setup is necessary. */
++ if (ensure_iface_setup(sock, iface) < 0) {
++ dlog(LOG_DEBUG, 3, "Not sending RA for %s, interface is not ready", iface->props.name);
++ return 0;
++ }
++
+ if (iface->state_info.racount < MAX_INITIAL_RTR_ADVERTISEMENTS)
+ iface->state_info.racount++;
+
+@@ -100,9 +106,8 @@ int send_ra_forall(int sock, struct Interface *iface, struct in6_addr *dest)
+
+ static int ensure_iface_setup(int sock, struct Interface *iface)
+ {
+-#ifndef HAVE_NETLINK
+- setup_iface(sock, iface);
+-#endif
++ if (!iface->state_info.ready)
++ setup_iface(sock, iface);
+
+ return (iface->state_info.ready ? 0 : -1);
+ }
+@@ -615,12 +620,6 @@ static int send_ra(int sock, struct Interface *iface, struct in6_addr const *des
+ return 0;
+ }
+
+- /* when netlink is not available (disabled or BSD), ensure_iface_setup is necessary. */
+- if (ensure_iface_setup(sock, iface) < 0) {
+- dlog(LOG_DEBUG, 3, "Not sending RA for %s, interface is not ready", iface->props.name);
+- return 0;
+- }
+-
+ if (dest == NULL) {
+ static uint8_t const all_hosts_addr[] = { 0xff, 0x02, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+ dest = (struct in6_addr const *)all_hosts_addr;
+--
+1.9.3
+
+From b7e670959c4e889f055a93e3926b4387358537c1 Mon Sep 17 00:00:00 2001
+From: Reuben Hawkins <reu...@gm...>
+Date: Mon, 28 Jul 2014 07:40:31 -0700
+Subject: [PATCH] fix logging flood created by setup_iface
+
+The fix to setup iface causes a bit of a flood to the logging. This
+change uses dlog rather than flog to log output from setup_iface and
+the loglevels have been changed from 3 to 4.
+---
+ device-common.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/device-common.c b/device-common.c
+index 209cf17..5312ef0 100644
+--- a/device-common.c
++++ b/device-common.c
+@@ -32,24 +32,24 @@ int check_device(int sock, struct Interface *iface)
+ }
+
+ if (!(ifr.ifr_flags & IFF_UP)) {
+- flog(LOG_ERR, "interface %s is not up", iface->props.name);
++ dlog(LOG_ERR, 4, "interface %s is not up", iface->props.name);
+ return -1;
+ } else {
+- dlog(LOG_ERR, 3, "interface %s is up", iface->props.name);
++ dlog(LOG_ERR, 4, "interface %s is up", iface->props.name);
+ }
+
+ if (!(ifr.ifr_flags & IFF_RUNNING)) {
+- flog(LOG_ERR, "interface %s is not running", iface->props.name);
++ dlog(LOG_ERR, 4, "interface %s is not running", iface->props.name);
+ return -1;
+ } else {
+- dlog(LOG_ERR, 3, "interface %s is running", iface->props.name);
++ dlog(LOG_ERR, 4, "interface %s is running", iface->props.name);
+ }
+
+ if (!iface->UnicastOnly && !(ifr.ifr_flags & IFF_MULTICAST)) {
+ flog(LOG_INFO, "interface %s does not support multicast, forcing UnicastOnly", iface->props.name);
+ iface->UnicastOnly = 1;
+ } else {
+- dlog(LOG_ERR, 3, "interface %s supports multicast", iface->props.name);
++ dlog(LOG_ERR, 4, "interface %s supports multicast", iface->props.name);
+ }
+
+ return 0;
+--
+2.0.3
+
+From 99e8d1f1b49f1dc29a6239200f55740fc43e789f Mon Sep 17 00:00:00 2001
+From: Reuben Hawkins <reu...@gm...>
+Date: Mon, 28 Jul 2014 07:58:37 -0700
+Subject: [PATCH] process.c: use dlog for RS on unknown interface
+
+It's not unexpected for an unknown interface to get an RA. This can
+happen if the WAN gets RA's from the ISP.
+---
+ process.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/process.c b/process.c
+index 759fd4b..82d810e 100644
+--- a/process.c
++++ b/process.c
+@@ -88,7 +88,7 @@ void process(int sock, struct Interface *interfaces, unsigned char *msg, int len
+ struct Interface *iface = find_iface_by_index(interfaces, pkt_info->ipi6_ifindex);
+
+ if (iface == NULL) {
+- flog(LOG_WARNING, "received icmpv6 RS/RA packet on an unknown interface with index %d",
++ dlog(LOG_WARNING, 4, "received icmpv6 RS/RA packet on an unknown interface with index %d",
+ pkt_info->ipi6_ifindex);
+ return;
+ }
+--
+2.0.3
+
+From 07e3f9361ecba310ca1a5bf78c8734c94c8e6fda Mon Sep 17 00:00:00 2001
+From: Reuben Hawkins <reu...@gm...>
+Date: Mon, 28 Jul 2014 08:00:49 -0700
+Subject: [PATCH] add state_info.changed to avoid calling setup_iface too much
+
+setup_iface will not be called over and over for interfaces that are not
+ready with this change. If an interface is marked as changes in netlink
+or in set_interface_defaults, setup_iface will be called.
+---
+ interface.c | 13 +++++++++++--
+ netlink.c | 8 ++------
+ radvd.h | 4 +++-
+ send.c | 6 +++++-
+ 4 files changed, 21 insertions(+), 10 deletions(-)
+
+diff --git a/interface.c b/interface.c
+index 9bbcc6d..4fc3687 100644
+--- a/interface.c
++++ b/interface.c
+@@ -21,9 +21,8 @@ void iface_init_defaults(struct Interface *iface)
+ {
+ memset(iface, 0, sizeof(struct Interface));
+
+- iface->state_info.cease_adv = 0;
++ iface->state_info.changed = 1;
+
+- iface->state_info.ready = 0;
+ iface->IgnoreIfMissing = DFLT_IgnoreIfMissing;
+ iface->AdvSendAdvert = DFLT_AdvSendAdv;
+ iface->MaxRtrAdvInterval = DFLT_MaxRtrAdvInterval;
+@@ -48,8 +47,18 @@ void iface_init_defaults(struct Interface *iface)
+
+ }
+
++
++void touch_iface(struct Interface * iface)
++{
++ iface->state_info.changed = 1;
++ iface->state_info.ready = 0;
++ iface->state_info.racount = 0;
++ reschedule_iface(iface, 0);
++}
++
+ int setup_iface(int sock, struct Interface *iface)
+ {
++ iface->state_info.changed = 0;
+ iface->state_info.ready = 0;
+
+ /* The device index must be setup first so we can search it later */
+diff --git a/netlink.c b/netlink.c
+index 474e867..7685f86 100644
+--- a/netlink.c
++++ b/netlink.c
+@@ -79,9 +79,7 @@ void process_netlink_msg(int sock, struct Interface * ifaces)
+ /* Reinit the interfaces which needs it. */
+ struct Interface *iface = find_iface_by_index(ifaces, ifinfo->ifi_index);
+ if (iface) {
+- iface->state_info.ready = 0;
+- iface->state_info.racount = 0;
+- reschedule_iface(iface, 0);
++ touch_iface(iface);
+ }
+
+ } else if (nh->nlmsg_type == RTM_NEWADDR || nh->nlmsg_type == RTM_DELADDR) {
+@@ -107,9 +105,7 @@ void process_netlink_msg(int sock, struct Interface * ifaces)
+
+ struct Interface *iface = find_iface_by_index(ifaces, ifaddr->ifa_index);
+ if (iface) {
+- iface->state_info.ready = 0;
+- iface->state_info.racount = 0;
+- reschedule_iface(iface, 0);
++ touch_iface(iface);
+ }
+ }
+ }
+diff --git a/radvd.h b/radvd.h
+index 2840d9e..1cebdc4 100644
+--- a/radvd.h
++++ b/radvd.h
+@@ -57,9 +57,10 @@ struct Interface {
+ struct Clients *ClientList;
+
+ struct state_info {
+- uint32_t racount;
+ int ready; /* Info whether this interface has been initialized successfully */
++ int changed; /* Info whether this interface's settings have changed */
+ int cease_adv;
++ uint32_t racount;
+ } state_info;
+
+ struct properties {
+@@ -282,6 +283,7 @@ void route_init_defaults(struct AdvRoute *, struct Interface *);
+ void rdnss_init_defaults(struct AdvRDNSS *, struct Interface *);
+ void dnssl_init_defaults(struct AdvDNSSL *, struct Interface *);
+ int check_iface(struct Interface *);
++void touch_iface(struct Interface * iface);
+ int setup_iface(int sock, struct Interface *iface);
+ void free_ifaces(struct Interface *ifaces);
+ struct Interface *find_iface_by_index(struct Interface *iface, int index);
+diff --git a/send.c b/send.c
+index df9aa94..ec6b93b 100644
+--- a/send.c
++++ b/send.c
+@@ -106,8 +106,12 @@ int send_ra_forall(int sock, struct Interface *iface, struct in6_addr *dest)
+
+ static int ensure_iface_setup(int sock, struct Interface *iface)
+ {
+- if (!iface->state_info.ready)
++#ifdef HAVE_NETLINK
++ if (iface->state_info.changed)
+ setup_iface(sock, iface);
++#else
++ setup_iface(sock, iface);
++#endif
+
+ return (iface->state_info.ready ? 0 : -1);
+ }
+--
+2.0.3
+
Modified: branches/1.0/package/radvd/radvd.init
===================================================================
--- branches/1.0/package/radvd/radvd.init 2014-07-21 15:58:02 UTC (rev 6600)
+++ branches/1.0/package/radvd/radvd.init 2014-07-28 16:59:39 UTC (rev 6601)
@@ -149,7 +149,7 @@
start () {
if [ -f "$config_file" ]; then
echo "Starting radvd..."
- radvd
+ radvd --logmethod syslog
fi
}
Modified: branches/1.0/package/radvd/radvd.mk
===================================================================
--- branches/1.0/package/radvd/radvd.mk 2014-07-21 15:58:02 UTC (rev 6600)
+++ branches/1.0/package/radvd/radvd.mk 2014-07-28 16:59:39 UTC (rev 6601)
@@ -3,10 +3,12 @@
# radvd
#
#############################################################
-RADVD_VERSION = 1.9.9
+RADVD_VERSION = 2.1
RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.gz
RADVD_SITE = http://www.litech.org/radvd/dist/
-RADVD_DEPENDENCIES:=flex libdaemon host-flex host-pkg-config
+RADVD_DEPENDENCIES:=flex host-flex host-pkg-config
+# For radvd-drop-check.patch
+RADVD_AUTORECONF = YES
define RADVD_INSTALL_INITSCRIPT
$(INSTALL) -D -m 0755 package/radvd/radvd.init $(TARGET_DIR)/etc/init.d/radvd
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-08-16 02:54:26
|
Revision: 6628
http://sourceforge.net/p/astlinux/code/6628
Author: abelbeck
Date: 2014-08-16 02:54:20 +0000 (Sat, 16 Aug 2014)
Log Message:
-----------
linux, bump kernel to 3.2.62
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/crosstool-ng-src/README
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/e1000e/e1000e.mk
branches/1.0/package/igb/igb.mk
branches/1.0/package/iproute2/iproute2.mk
branches/1.0/package/r8168/r8168.mk
branches/1.0/package/tg3/tg3.mk
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/geni586/linux.config
branches/1.0/project/astlinux/target_skeleton/etc/rc
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
branches/1.0/scripts/master-tag
branches/1.0/toolchain/kernel-headers/kernel-headers.mk
Added Paths:
-----------
branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config
branches/1.0/package/wanpipe/wanpipe-linux3.2-sk_for_each.patch
branches/1.0/project/astlinux/kernel-patches/linux-100-unionfs-2.5.13_for_3.2.55.patch
branches/1.0/project/astlinux/kernel-patches/linux-410-ledtrig-netdev.patch
Removed Paths:
-------------
branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config
branches/1.0/package/e1000/
branches/1.0/package/iproute2/iproute2-get_dont_filter_cached.patch
branches/1.0/package/iproute2/iproute2-xt-v6.patch
branches/1.0/project/astlinux/kernel-patches/linux-100-unionfs-2.5.11_for_2.6.35.14.patch
branches/1.0/project/astlinux/kernel-patches/linux-110-n_tty-CVE-2014-0196.patch
branches/1.0/project/astlinux/kernel-patches/linux-400-ledtrig-netdev.patch
branches/1.0/project/astlinux/kernel-patches/linux-500-hwmon-f71882fg.patch
branches/1.0/project/astlinux/kernel-patches/linux-510-hwmon-k10temp.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/astlinux-ast11.config 2014-08-16 02:54:20 UTC (rev 6628)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6595-dirty Configuration
-# Wed Jul 16 18:10:41 2014
+# Buildroot 2011.08-svn6627-dirty Configuration
+# Fri Aug 15 06:27:55 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
@@ -330,7 +330,6 @@
#
# Network Interface Kernel Drivers
#
-BR2_PACKAGE_E1000=y
BR2_PACKAGE_E1000E=y
BR2_PACKAGE_IGB=y
BR2_PACKAGE_R8168=y
@@ -900,7 +899,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.62.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/astlinux18.config 2014-08-16 02:54:20 UTC (rev 6628)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6595-dirty Configuration
-# Wed Jul 16 18:10:35 2014
+# Buildroot 2011.08-svn6627-dirty Configuration
+# Fri Aug 15 06:27:54 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
@@ -330,7 +330,6 @@
#
# Network Interface Kernel Drivers
#
-BR2_PACKAGE_E1000=y
BR2_PACKAGE_E1000E=y
BR2_PACKAGE_IGB=y
BR2_PACKAGE_R8168=y
@@ -900,7 +899,7 @@
# BR2_LINUX_KERNEL_CUSTOM_VERSION is not set
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
# BR2_LINUX_KERNEL_CUSTOM_GIT is not set
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="http://ftp.kernel.org/pub/linux/kernel/v2.6/longterm/v2.6.35/linux-2.6.35.14.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.62.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/crosstool-ng-src/README
===================================================================
--- branches/1.0/crosstool-ng-src/README 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/crosstool-ng-src/README 2014-08-16 02:54:20 UTC (rev 6628)
@@ -6,6 +6,9 @@
## The resulting toolchain is output to $HOME/astlinux/x-tools-1.19.0
## Make sure you have a $HOME/astlinux/ directory.
##
+## Note: If "crosstool-ng-1.19.0" is already installed, jump to "## Build toolchain ##"
+##
+## Install crosstool-ng ##
# mkdir ~/source-control # used as example folder for these configs
cd ~/source-control
wget -O - http://crosstool-ng.org/download/crosstool-ng/crosstool-ng-1.19.0.tar.bz2 | tar xj
@@ -14,15 +17,17 @@
# Note: the 'gperf' package may need to be added to your system.
make
sudo make install
+##
+## Build toolchain ##
cd ~/source-control
-mkdir ctng-1.19.0
-cd ctng-1.19.0
-# then copy the "crosstool-ng-src/ct-ng-1.19.0.config" file from the SVN to ".config" here
-cp ~/astlinux/1.0/crosstool-ng-src/ct-ng-1.19.0.config .config
+mkdir ctng-1.19.0-3.2
+cd ctng-1.19.0-3.2
+# then copy the "crosstool-ng-src/ct-ng-1.19.0-3.2.config" file from the SVN to ".config" here
+cp ~/astlinux/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config .config
# leave as configured, just look, don't make any changes
ct-ng menuconfig
# then install linux kernel for the header includes
-wget http://files.astlinux.org/linux-2.6.35.14.tar.gz
+wget http://files.astlinux.org/linux-3.2.62.tar.gz
# finally, start the toolchain build process
ct-ng build
# takes 50-70 min.
Copied: branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config (from rev 6627, branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config)
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config (rev 0)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.19.0-3.2.config 2014-08-16 02:54:20 UTC (rev 6628)
@@ -0,0 +1,475 @@
+#
+# Automatically generated make config: don't edit
+# crosstool-NG 1.19.0 Configuration
+# Wed Jan 22 05:59:57 2014
+#
+CT_CONFIGURE_has_xz=y
+CT_CONFIGURE_has_cvs=y
+CT_CONFIGURE_has_svn=y
+CT_MODULES=y
+
+#
+# Paths and misc options
+#
+
+#
+# crosstool-NG behavior
+#
+# CT_OBSOLETE is not set
+# CT_EXPERIMENTAL is not set
+# CT_DEBUG_CT is not set
+
+#
+# Paths
+#
+CT_LOCAL_TARBALLS_DIR=""
+CT_WORK_DIR="${CT_TOP_DIR}/.build"
+CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.19.0-3.2/${CT_TARGET}"
+CT_INSTALL_DIR="${CT_PREFIX_DIR}"
+CT_RM_RF_PREFIX_DIR=y
+CT_REMOVE_DOCS=y
+CT_INSTALL_DIR_RO=y
+CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES=y
+
+#
+# Downloading
+#
+# CT_FORBID_DOWNLOAD is not set
+# CT_FORCE_DOWNLOAD is not set
+CT_CONNECT_TIMEOUT=10
+# CT_ONLY_DOWNLOAD is not set
+# CT_USE_MIRROR is not set
+
+#
+# Extracting
+#
+# CT_FORCE_EXTRACT is not set
+CT_OVERIDE_CONFIG_GUESS_SUB=y
+# CT_ONLY_EXTRACT is not set
+CT_PATCH_BUNDLED=y
+# CT_PATCH_LOCAL is not set
+# CT_PATCH_BUNDLED_LOCAL is not set
+# CT_PATCH_LOCAL_BUNDLED is not set
+# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
+# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
+# CT_PATCH_NONE is not set
+CT_PATCH_ORDER="bundled"
+
+#
+# Build behavior
+#
+CT_PARALLEL_JOBS=1
+CT_LOAD=""
+CT_USE_PIPES=y
+CT_EXTRA_CFLAGS_FOR_BUILD=""
+CT_EXTRA_LDFLAGS_FOR_BUILD=""
+CT_EXTRA_CFLAGS_FOR_HOST=""
+CT_EXTRA_LDFLAGS_FOR_HOST=""
+# CT_CONFIG_SHELL_SH is not set
+# CT_CONFIG_SHELL_ASH is not set
+CT_CONFIG_SHELL_BASH=y
+# CT_CONFIG_SHELL_CUSTOM is not set
+CT_CONFIG_SHELL="${bash}"
+
+#
+# Logging
+#
+# CT_LOG_ERROR is not set
+# CT_LOG_WARN is not set
+CT_LOG_INFO=y
+# CT_LOG_EXTRA is not set
+# CT_LOG_ALL is not set
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="INFO"
+# CT_LOG_SEE_TOOLS_WARN is not set
+CT_LOG_PROGRESS_BAR=y
+CT_LOG_TO_FILE=y
+CT_LOG_FILE_COMPRESS=y
+
+#
+# Target options
+#
+CT_ARCH="x86"
+CT_ARCH_SUPPORTS_32=y
+CT_ARCH_SUPPORTS_64=y
+CT_ARCH_SUPPORTS_WITH_ARCH=y
+CT_ARCH_SUPPORTS_WITH_CPU=y
+CT_ARCH_SUPPORTS_WITH_TUNE=y
+CT_ARCH_DEFAULT_32=y
+CT_ARCH_ARCH="i586"
+CT_ARCH_CPU=""
+CT_ARCH_TUNE=""
+CT_ARCH_32=y
+# CT_ARCH_64 is not set
+CT_ARCH_BITNESS=32
+CT_TARGET_CFLAGS=""
+CT_TARGET_LDFLAGS=""
+# CT_ARCH_alpha is not set
+# CT_ARCH_arm is not set
+# CT_ARCH_avr32 is not set
+# CT_ARCH_blackfin is not set
+# CT_ARCH_m68k is not set
+# CT_ARCH_mips is not set
+# CT_ARCH_powerpc is not set
+# CT_ARCH_s390 is not set
+# CT_ARCH_sh is not set
+# CT_ARCH_sparc is not set
+CT_ARCH_x86=y
+CT_ARCH_alpha_AVAILABLE=y
+CT_ARCH_arm_AVAILABLE=y
+CT_ARCH_avr32_AVAILABLE=y
+CT_ARCH_blackfin_AVAILABLE=y
+CT_ARCH_m68k_AVAILABLE=y
+CT_ARCH_microblaze_AVAILABLE=y
+CT_ARCH_mips_AVAILABLE=y
+CT_ARCH_powerpc_AVAILABLE=y
+CT_ARCH_s390_AVAILABLE=y
+CT_ARCH_sh_AVAILABLE=y
+CT_ARCH_sparc_AVAILABLE=y
+CT_ARCH_x86_AVAILABLE=y
+CT_ARCH_SUFFIX=""
+
+#
+# Generic target options
+#
+# CT_MULTILIB is not set
+CT_ARCH_USE_MMU=y
+
+#
+# Target optimisations
+#
+CT_ARCH_FLOAT=""
+
+#
+# Toolchain options
+#
+
+#
+# General toolchain options
+#
+CT_FORCE_SYSROOT=y
+CT_USE_SYSROOT=y
+CT_SYSROOT_NAME="sysroot"
+CT_SYSROOT_DIR_PREFIX=""
+CT_WANTS_STATIC_LINK=y
+# CT_STATIC_TOOLCHAIN is not set
+CT_TOOLCHAIN_PKGVERSION=""
+CT_TOOLCHAIN_BUGURL=""
+
+#
+# Tuple completion and aliasing
+#
+CT_TARGET_VENDOR="unknown"
+CT_TARGET_ALIAS_SED_EXPR=""
+CT_TARGET_ALIAS=""
+
+#
+# Toolchain type
+#
+CT_CROSS=y
+# CT_CANADIAN is not set
+CT_TOOLCHAIN_TYPE="cross"
+
+#
+# Build system
+#
+CT_BUILD=""
+CT_BUILD_PREFIX=""
+CT_BUILD_SUFFIX=""
+
+#
+# Misc options
+#
+# CT_TOOLCHAIN_ENABLE_NLS is not set
+
+#
+# Operating System
+#
+CT_KERNEL_SUPPORTS_SHARED_LIBS=y
+CT_KERNEL="linux"
+CT_KERNEL_VERSION="custom"
+# CT_KERNEL_bare_metal is not set
+CT_KERNEL_linux=y
+# CT_KERNEL_windows is not set
+CT_KERNEL_bare_metal_AVAILABLE=y
+CT_KERNEL_linux_AVAILABLE=y
+# CT_KERNEL_V_3_10 is not set
+# CT_KERNEL_V_3_9 is not set
+# CT_KERNEL_V_3_8 is not set
+# CT_KERNEL_V_3_7 is not set
+# CT_KERNEL_V_3_6 is not set
+# CT_KERNEL_V_3_5 is not set
+# CT_KERNEL_V_3_4 is not set
+# CT_KERNEL_V_3_3 is not set
+# CT_KERNEL_V_3_2 is not set
+# CT_KERNEL_V_3_1 is not set
+# CT_KERNEL_V_3_0 is not set
+# CT_KERNEL_V_2_6_39 is not set
+# CT_KERNEL_V_2_6_38 is not set
+# CT_KERNEL_V_2_6_37 is not set
+# CT_KERNEL_V_2_6_36 is not set
+# CT_KERNEL_V_2_6_33 is not set
+# CT_KERNEL_V_2_6_32 is not set
+# CT_KERNEL_V_2_6_31 is not set
+# CT_KERNEL_V_2_6_27 is not set
+CT_KERNEL_LINUX_CUSTOM=y
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.62.tar.gz"
+CT_KERNEL_windows_AVAILABLE=y
+
+#
+# Common kernel options
+#
+CT_SHARED_LIBS=y
+
+#
+# linux other options
+#
+CT_KERNEL_LINUX_VERBOSITY_0=y
+# CT_KERNEL_LINUX_VERBOSITY_1 is not set
+# CT_KERNEL_LINUX_VERBOSITY_2 is not set
+CT_KERNEL_LINUX_VERBOSE_LEVEL=0
+CT_KERNEL_LINUX_INSTALL_CHECK=y
+
+#
+# Binary utilities
+#
+CT_ARCH_BINFMT_ELF=y
+CT_BINUTILS="binutils"
+CT_BINUTILS_binutils=y
+
+#
+# GNU binutils
+#
+# CT_BINUTILS_V_2_22 is not set
+# CT_BINUTILS_V_2_21_53 is not set
+# CT_BINUTILS_V_2_21_1a is not set
+CT_BINUTILS_V_2_20_1a=y
+# CT_BINUTILS_V_2_19_1a is not set
+# CT_BINUTILS_V_2_18a is not set
+CT_BINUTILS_VERSION="2.20.1a"
+CT_BINUTILS_2_20_or_later=y
+CT_BINUTILS_2_19_or_later=y
+CT_BINUTILS_2_18_or_later=y
+CT_BINUTILS_HAS_HASH_STYLE=y
+CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
+CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
+CT_BINUTILS_FORCE_LD_BFD=y
+CT_BINUTILS_LINKER_LD=y
+CT_BINUTILS_LINKERS_LIST="ld"
+CT_BINUTILS_LINKER_DEFAULT="bfd"
+CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
+# CT_BINUTILS_FOR_TARGET is not set
+
+#
+# binutils other options
+#
+
+#
+# C compiler
+#
+CT_CC="gcc"
+CT_CC_VERSION="4.4.7"
+CT_CC_CORE_PASSES_NEEDED=y
+CT_CC_gcc=y
+# CT_CC_GCC_SHOW_LINARO is not set
+# CT_CC_V_4_8_1 is not set
+# CT_CC_V_4_8_0 is not set
+# CT_CC_V_4_7_3 is not set
+# CT_CC_V_4_7_2 is not set
+# CT_CC_V_4_7_1 is not set
+# CT_CC_V_4_7_0 is not set
+# CT_CC_V_4_6_4 is not set
+# CT_CC_V_4_6_3 is not set
+# CT_CC_V_4_6_2 is not set
+# CT_CC_V_4_6_1 is not set
+# CT_CC_V_4_6_0 is not set
+# CT_CC_V_4_5_3 is not set
+# CT_CC_V_4_5_2 is not set
+# CT_CC_V_4_5_1 is not set
+# CT_CC_V_4_5_0 is not set
+CT_CC_V_4_4_7=y
+# CT_CC_V_4_4_6 is not set
+# CT_CC_V_4_4_5 is not set
+# CT_CC_V_4_4_4 is not set
+# CT_CC_V_4_4_3 is not set
+# CT_CC_V_4_4_2 is not set
+# CT_CC_V_4_4_1 is not set
+# CT_CC_V_4_4_0 is not set
+# CT_CC_V_4_3_6 is not set
+# CT_CC_V_4_3_5 is not set
+# CT_CC_V_4_3_4 is not set
+# CT_CC_V_4_3_3 is not set
+# CT_CC_V_4_3_2 is not set
+# CT_CC_V_4_3_1 is not set
+# CT_CC_V_4_2_4 is not set
+# CT_CC_V_4_2_2 is not set
+CT_CC_GCC_4_2_or_later=y
+CT_CC_GCC_4_3_or_later=y
+CT_CC_GCC_4_4=y
+CT_CC_GCC_4_4_or_later=y
+CT_CC_GCC_HAS_GRAPHITE=y
+CT_CC_GCC_USE_GRAPHITE=y
+# CT_CC_GCC_USE_LTO is not set
+CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
+CT_CC_GCC_USE_GMP_MPFR=y
+# CT_CC_LANG_FORTRAN is not set
+CT_CC_SUPPORT_CXX=y
+CT_CC_SUPPORT_FORTRAN=y
+CT_CC_SUPPORT_JAVA=y
+CT_CC_SUPPORT_ADA=y
+CT_CC_SUPPORT_OBJC=y
+CT_CC_SUPPORT_OBJCXX=y
+
+#
+# Additional supported languages:
+#
+CT_CC_LANG_CXX=y
+# CT_CC_LANG_JAVA is not set
+
+#
+# gcc other options
+#
+CT_CC_ENABLE_CXX_FLAGS=""
+CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_EXTRA_CONFIG_ARRAY=""
+CT_CC_STATIC_LIBSTDCXX=y
+# CT_CC_GCC_SYSTEM_ZLIB is not set
+
+#
+# Optimisation features
+#
+
+#
+# Settings for libraries running on target
+#
+CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
+# CT_CC_GCC_LIBMUDFLAP is not set
+# CT_CC_GCC_LIBGOMP is not set
+# CT_CC_GCC_LIBSSP is not set
+
+#
+# Misc. obscure options.
+#
+# CT_CC_CXA_ATEXIT is not set
+CT_CC_GCC_DISABLE_PCH=y
+CT_CC_GCC_SJLJ_EXCEPTIONS=m
+CT_CC_GCC_LDBL_128=m
+
+#
+# C-library
+#
+CT_LIBC="eglibc"
+CT_LIBC_VERSION="2_15"
+CT_LIBC_eglibc=y
+# CT_LIBC_glibc is not set
+# CT_LIBC_uClibc is not set
+CT_LIBC_eglibc_AVAILABLE=y
+# CT_LIBC_EGLIBC_V_2_17 is not set
+# CT_LIBC_EGLIBC_V_2_16 is not set
+CT_LIBC_EGLIBC_V_2_15=y
+# CT_LIBC_EGLIBC_V_2_14 is not set
+# CT_LIBC_EGLIBC_V_2_13 is not set
+# CT_LIBC_EGLIBC_V_2_12 is not set
+# CT_LIBC_EGLIBC_V_2_11 is not set
+# CT_LIBC_EGLIBC_V_2_10 is not set
+# CT_LIBC_EGLIBC_V_2_9 is not set
+# CT_LIBC_EGLIBC_V_TRUNK is not set
+CT_EGLIBC_REVISION="HEAD"
+# CT_EGLIBC_HTTP is not set
+# CT_EGLIBC_CHECKOUT is not set
+CT_EGLIBC_OPT_SIZE=y
+# CT_EGLIBC_CUSTOM_CONFIG is not set
+CT_LIBC_glibc_AVAILABLE=y
+CT_LIBC_mingw_AVAILABLE=y
+CT_LIBC_newlib_AVAILABLE=y
+CT_LIBC_none_AVAILABLE=y
+CT_LIBC_uClibc_AVAILABLE=y
+CT_LIBC_SUPPORT_THREADS_ANY=y
+CT_LIBC_SUPPORT_NPTL=y
+CT_LIBC_SUPPORT_LINUXTHREADS=y
+CT_THREADS="nptl"
+
+#
+# Common C library options
+#
+CT_THREADS_NPTL=y
+# CT_THREADS_LINUXTHREADS is not set
+CT_LIBC_XLDD=y
+
+#
+# eglibc other options
+#
+CT_LIBC_glibc_familly=y
+CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
+CT_LIBC_GLIBC_CONFIGPARMS=""
+CT_LIBC_GLIBC_EXTRA_CFLAGS=""
+CT_LIBC_EXTRA_CC_ARGS=""
+# CT_LIBC_DISABLE_VERSIONING is not set
+CT_LIBC_OLDEST_ABI=""
+# CT_LIBC_GLIBC_FORCE_UNWIND is not set
+# CT_LIBC_GLIBC_USE_PORTS is not set
+CT_LIBC_ADDONS_LIST=""
+# CT_LIBC_LOCALES is not set
+# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
+# CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
+CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
+CT_LIBC_GLIBC_MIN_KERNEL_VERSION="2.6.27"
+CT_LIBC_GLIBC_MIN_KERNEL="2.6.27"
+
+#
+# Debug facilities
+#
+# CT_DEBUG_dmalloc is not set
+# CT_DEBUG_duma is not set
+# CT_DEBUG_gdb is not set
+# CT_DEBUG_ltrace is not set
+# CT_DEBUG_strace is not set
+
+#
+# Companion libraries
+#
+CT_COMPLIBS_NEEDED=y
+CT_GMP_NEEDED=y
+CT_MPFR_NEEDED=y
+CT_PPL_NEEDED=y
+CT_CLOOG_NEEDED=y
+CT_COMPLIBS=y
+CT_GMP=y
+CT_MPFR=y
+CT_PPL=y
+CT_CLOOG=y
+# CT_GMP_V_5_1_1 is not set
+# CT_GMP_V_5_0_2 is not set
+# CT_GMP_V_5_0_1 is not set
+CT_GMP_V_4_3_2=y
+# CT_GMP_V_4_3_1 is not set
+# CT_GMP_V_4_3_0 is not set
+CT_GMP_VERSION="4.3.2"
+# CT_MPFR_V_3_1_2 is not set
+# CT_MPFR_V_3_1_0 is not set
+# CT_MPFR_V_3_0_1 is not set
+# CT_MPFR_V_3_0_0 is not set
+CT_MPFR_V_2_4_2=y
+# CT_MPFR_V_2_4_1 is not set
+# CT_MPFR_V_2_4_0 is not set
+CT_MPFR_VERSION="2.4.2"
+# CT_PPL_V_0_11_2 is not set
+# CT_PPL_V_0_11_1 is not set
+# CT_PPL_V_0_11 is not set
+CT_PPL_V_0_10_2=y
+CT_PPL_VERSION="0.10.2"
+CT_PPL_NEEDS_FPERMISSIVE=y
+CT_CLOOG_V_0_15_11=y
+# CT_CLOOG_V_0_15_10 is not set
+# CT_CLOOG_V_0_15_9 is not set
+# CT_CLOOG_V_0_15_8 is not set
+# CT_CLOOG_V_0_15_7 is not set
+# CT_CLOOG_V_0_15_6 is not set
+CT_CLOOG_VERSION="0.15.11"
+CT_CLOOG_0_15_1x=y
+CT_CLOOG_NEEDS_AUTORECONF=y
+
+#
+# Companion libraries common options
+#
+# CT_COMPLIBS_CHECK is not set
Deleted: branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.19.0.config 2014-08-16 02:54:20 UTC (rev 6628)
@@ -1,475 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# crosstool-NG 1.19.0 Configuration
-# Wed Jan 22 05:59:57 2014
-#
-CT_CONFIGURE_has_xz=y
-CT_CONFIGURE_has_cvs=y
-CT_CONFIGURE_has_svn=y
-CT_MODULES=y
-
-#
-# Paths and misc options
-#
-
-#
-# crosstool-NG behavior
-#
-# CT_OBSOLETE is not set
-# CT_EXPERIMENTAL is not set
-# CT_DEBUG_CT is not set
-
-#
-# Paths
-#
-CT_LOCAL_TARBALLS_DIR=""
-CT_WORK_DIR="${CT_TOP_DIR}/.build"
-CT_PREFIX_DIR="${HOME}/astlinux/x-tools-1.19.0/${CT_TARGET}"
-CT_INSTALL_DIR="${CT_PREFIX_DIR}"
-CT_RM_RF_PREFIX_DIR=y
-CT_REMOVE_DOCS=y
-CT_INSTALL_DIR_RO=y
-CT_STRIP_ALL_TOOLCHAIN_EXECUTABLES=y
-
-#
-# Downloading
-#
-# CT_FORBID_DOWNLOAD is not set
-# CT_FORCE_DOWNLOAD is not set
-CT_CONNECT_TIMEOUT=10
-# CT_ONLY_DOWNLOAD is not set
-# CT_USE_MIRROR is not set
-
-#
-# Extracting
-#
-# CT_FORCE_EXTRACT is not set
-CT_OVERIDE_CONFIG_GUESS_SUB=y
-# CT_ONLY_EXTRACT is not set
-CT_PATCH_BUNDLED=y
-# CT_PATCH_LOCAL is not set
-# CT_PATCH_BUNDLED_LOCAL is not set
-# CT_PATCH_LOCAL_BUNDLED is not set
-# CT_PATCH_BUNDLED_FALLBACK_LOCAL is not set
-# CT_PATCH_LOCAL_FALLBACK_BUNDLED is not set
-# CT_PATCH_NONE is not set
-CT_PATCH_ORDER="bundled"
-
-#
-# Build behavior
-#
-CT_PARALLEL_JOBS=1
-CT_LOAD=""
-CT_USE_PIPES=y
-CT_EXTRA_CFLAGS_FOR_BUILD=""
-CT_EXTRA_LDFLAGS_FOR_BUILD=""
-CT_EXTRA_CFLAGS_FOR_HOST=""
-CT_EXTRA_LDFLAGS_FOR_HOST=""
-# CT_CONFIG_SHELL_SH is not set
-# CT_CONFIG_SHELL_ASH is not set
-CT_CONFIG_SHELL_BASH=y
-# CT_CONFIG_SHELL_CUSTOM is not set
-CT_CONFIG_SHELL="${bash}"
-
-#
-# Logging
-#
-# CT_LOG_ERROR is not set
-# CT_LOG_WARN is not set
-CT_LOG_INFO=y
-# CT_LOG_EXTRA is not set
-# CT_LOG_ALL is not set
-# CT_LOG_DEBUG is not set
-CT_LOG_LEVEL_MAX="INFO"
-# CT_LOG_SEE_TOOLS_WARN is not set
-CT_LOG_PROGRESS_BAR=y
-CT_LOG_TO_FILE=y
-CT_LOG_FILE_COMPRESS=y
-
-#
-# Target options
-#
-CT_ARCH="x86"
-CT_ARCH_SUPPORTS_32=y
-CT_ARCH_SUPPORTS_64=y
-CT_ARCH_SUPPORTS_WITH_ARCH=y
-CT_ARCH_SUPPORTS_WITH_CPU=y
-CT_ARCH_SUPPORTS_WITH_TUNE=y
-CT_ARCH_DEFAULT_32=y
-CT_ARCH_ARCH="i586"
-CT_ARCH_CPU=""
-CT_ARCH_TUNE=""
-CT_ARCH_32=y
-# CT_ARCH_64 is not set
-CT_ARCH_BITNESS=32
-CT_TARGET_CFLAGS=""
-CT_TARGET_LDFLAGS=""
-# CT_ARCH_alpha is not set
-# CT_ARCH_arm is not set
-# CT_ARCH_avr32 is not set
-# CT_ARCH_blackfin is not set
-# CT_ARCH_m68k is not set
-# CT_ARCH_mips is not set
-# CT_ARCH_powerpc is not set
-# CT_ARCH_s390 is not set
-# CT_ARCH_sh is not set
-# CT_ARCH_sparc is not set
-CT_ARCH_x86=y
-CT_ARCH_alpha_AVAILABLE=y
-CT_ARCH_arm_AVAILABLE=y
-CT_ARCH_avr32_AVAILABLE=y
-CT_ARCH_blackfin_AVAILABLE=y
-CT_ARCH_m68k_AVAILABLE=y
-CT_ARCH_microblaze_AVAILABLE=y
-CT_ARCH_mips_AVAILABLE=y
-CT_ARCH_powerpc_AVAILABLE=y
-CT_ARCH_s390_AVAILABLE=y
-CT_ARCH_sh_AVAILABLE=y
-CT_ARCH_sparc_AVAILABLE=y
-CT_ARCH_x86_AVAILABLE=y
-CT_ARCH_SUFFIX=""
-
-#
-# Generic target options
-#
-# CT_MULTILIB is not set
-CT_ARCH_USE_MMU=y
-
-#
-# Target optimisations
-#
-CT_ARCH_FLOAT=""
-
-#
-# Toolchain options
-#
-
-#
-# General toolchain options
-#
-CT_FORCE_SYSROOT=y
-CT_USE_SYSROOT=y
-CT_SYSROOT_NAME="sysroot"
-CT_SYSROOT_DIR_PREFIX=""
-CT_WANTS_STATIC_LINK=y
-# CT_STATIC_TOOLCHAIN is not set
-CT_TOOLCHAIN_PKGVERSION=""
-CT_TOOLCHAIN_BUGURL=""
-
-#
-# Tuple completion and aliasing
-#
-CT_TARGET_VENDOR="unknown"
-CT_TARGET_ALIAS_SED_EXPR=""
-CT_TARGET_ALIAS=""
-
-#
-# Toolchain type
-#
-CT_CROSS=y
-# CT_CANADIAN is not set
-CT_TOOLCHAIN_TYPE="cross"
-
-#
-# Build system
-#
-CT_BUILD=""
-CT_BUILD_PREFIX=""
-CT_BUILD_SUFFIX=""
-
-#
-# Misc options
-#
-# CT_TOOLCHAIN_ENABLE_NLS is not set
-
-#
-# Operating System
-#
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
-CT_KERNEL="linux"
-CT_KERNEL_VERSION="custom"
-# CT_KERNEL_bare_metal is not set
-CT_KERNEL_linux=y
-# CT_KERNEL_windows is not set
-CT_KERNEL_bare_metal_AVAILABLE=y
-CT_KERNEL_linux_AVAILABLE=y
-# CT_KERNEL_V_3_10 is not set
-# CT_KERNEL_V_3_9 is not set
-# CT_KERNEL_V_3_8 is not set
-# CT_KERNEL_V_3_7 is not set
-# CT_KERNEL_V_3_6 is not set
-# CT_KERNEL_V_3_5 is not set
-# CT_KERNEL_V_3_4 is not set
-# CT_KERNEL_V_3_3 is not set
-# CT_KERNEL_V_3_2 is not set
-# CT_KERNEL_V_3_1 is not set
-# CT_KERNEL_V_3_0 is not set
-# CT_KERNEL_V_2_6_39 is not set
-# CT_KERNEL_V_2_6_38 is not set
-# CT_KERNEL_V_2_6_37 is not set
-# CT_KERNEL_V_2_6_36 is not set
-# CT_KERNEL_V_2_6_33 is not set
-# CT_KERNEL_V_2_6_32 is not set
-# CT_KERNEL_V_2_6_31 is not set
-# CT_KERNEL_V_2_6_27 is not set
-CT_KERNEL_LINUX_CUSTOM=y
-CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-2.6.35.14.tar.gz"
-CT_KERNEL_windows_AVAILABLE=y
-
-#
-# Common kernel options
-#
-CT_SHARED_LIBS=y
-
-#
-# linux other options
-#
-CT_KERNEL_LINUX_VERBOSITY_0=y
-# CT_KERNEL_LINUX_VERBOSITY_1 is not set
-# CT_KERNEL_LINUX_VERBOSITY_2 is not set
-CT_KERNEL_LINUX_VERBOSE_LEVEL=0
-CT_KERNEL_LINUX_INSTALL_CHECK=y
-
-#
-# Binary utilities
-#
-CT_ARCH_BINFMT_ELF=y
-CT_BINUTILS="binutils"
-CT_BINUTILS_binutils=y
-
-#
-# GNU binutils
-#
-# CT_BINUTILS_V_2_22 is not set
-# CT_BINUTILS_V_2_21_53 is not set
-# CT_BINUTILS_V_2_21_1a is not set
-CT_BINUTILS_V_2_20_1a=y
-# CT_BINUTILS_V_2_19_1a is not set
-# CT_BINUTILS_V_2_18a is not set
-CT_BINUTILS_VERSION="2.20.1a"
-CT_BINUTILS_2_20_or_later=y
-CT_BINUTILS_2_19_or_later=y
-CT_BINUTILS_2_18_or_later=y
-CT_BINUTILS_HAS_HASH_STYLE=y
-CT_BINUTILS_GOLD_SUPPORTS_ARCH=y
-CT_BINUTILS_HAS_PKGVERSION_BUGURL=y
-CT_BINUTILS_FORCE_LD_BFD=y
-CT_BINUTILS_LINKER_LD=y
-CT_BINUTILS_LINKERS_LIST="ld"
-CT_BINUTILS_LINKER_DEFAULT="bfd"
-CT_BINUTILS_EXTRA_CONFIG_ARRAY=""
-# CT_BINUTILS_FOR_TARGET is not set
-
-#
-# binutils other options
-#
-
-#
-# C compiler
-#
-CT_CC="gcc"
-CT_CC_VERSION="4.4.7"
-CT_CC_CORE_PASSES_NEEDED=y
-CT_CC_gcc=y
-# CT_CC_GCC_SHOW_LINARO is not set
-# CT_CC_V_4_8_1 is not set
-# CT_CC_V_4_8_0 is not set
-# CT_CC_V_4_7_3 is not set
-# CT_CC_V_4_7_2 is not set
-# CT_CC_V_4_7_1 is not set
-# CT_CC_V_4_7_0 is not set
-# CT_CC_V_4_6_4 is not set
-# CT_CC_V_4_6_3 is not set
-# CT_CC_V_4_6_2 is not set
-# CT_CC_V_4_6_1 is not set
-# CT_CC_V_4_6_0 is not set
-# CT_CC_V_4_5_3 is not set
-# CT_CC_V_4_5_2 is not set
-# CT_CC_V_4_5_1 is not set
-# CT_CC_V_4_5_0 is not set
-CT_CC_V_4_4_7=y
-# CT_CC_V_4_4_6 is not set
-# CT_CC_V_4_4_5 is not set
-# CT_CC_V_4_4_4 is not set
-# CT_CC_V_4_4_3 is not set
-# CT_CC_V_4_4_2 is not set
-# CT_CC_V_4_4_1 is not set
-# CT_CC_V_4_4_0 is not set
-# CT_CC_V_4_3_6 is not set
-# CT_CC_V_4_3_5 is not set
-# CT_CC_V_4_3_4 is not set
-# CT_CC_V_4_3_3 is not set
-# CT_CC_V_4_3_2 is not set
-# CT_CC_V_4_3_1 is not set
-# CT_CC_V_4_2_4 is not set
-# CT_CC_V_4_2_2 is not set
-CT_CC_GCC_4_2_or_later=y
-CT_CC_GCC_4_3_or_later=y
-CT_CC_GCC_4_4=y
-CT_CC_GCC_4_4_or_later=y
-CT_CC_GCC_HAS_GRAPHITE=y
-CT_CC_GCC_USE_GRAPHITE=y
-# CT_CC_GCC_USE_LTO is not set
-CT_CC_GCC_HAS_PKGVERSION_BUGURL=y
-CT_CC_GCC_USE_GMP_MPFR=y
-# CT_CC_LANG_FORTRAN is not set
-CT_CC_SUPPORT_CXX=y
-CT_CC_SUPPORT_FORTRAN=y
-CT_CC_SUPPORT_JAVA=y
-CT_CC_SUPPORT_ADA=y
-CT_CC_SUPPORT_OBJC=y
-CT_CC_SUPPORT_OBJCXX=y
-
-#
-# Additional supported languages:
-#
-CT_CC_LANG_CXX=y
-# CT_CC_LANG_JAVA is not set
-
-#
-# gcc other options
-#
-CT_CC_ENABLE_CXX_FLAGS=""
-CT_CC_CORE_EXTRA_CONFIG_ARRAY=""
-CT_CC_EXTRA_CONFIG_ARRAY=""
-CT_CC_STATIC_LIBSTDCXX=y
-# CT_CC_GCC_SYSTEM_ZLIB is not set
-
-#
-# Optimisation features
-#
-
-#
-# Settings for libraries running on target
-#
-CT_CC_GCC_ENABLE_TARGET_OPTSPACE=y
-# CT_CC_GCC_LIBMUDFLAP is not set
-# CT_CC_GCC_LIBGOMP is not set
-# CT_CC_GCC_LIBSSP is not set
-
-#
-# Misc. obscure options.
-#
-# CT_CC_CXA_ATEXIT is not set
-CT_CC_GCC_DISABLE_PCH=y
-CT_CC_GCC_SJLJ_EXCEPTIONS=m
-CT_CC_GCC_LDBL_128=m
-
-#
-# C-library
-#
-CT_LIBC="eglibc"
-CT_LIBC_VERSION="2_15"
-CT_LIBC_eglibc=y
-# CT_LIBC_glibc is not set
-# CT_LIBC_uClibc is not set
-CT_LIBC_eglibc_AVAILABLE=y
-# CT_LIBC_EGLIBC_V_2_17 is not set
-# CT_LIBC_EGLIBC_V_2_16 is not set
-CT_LIBC_EGLIBC_V_2_15=y
-# CT_LIBC_EGLIBC_V_2_14 is not set
-# CT_LIBC_EGLIBC_V_2_13 is not set
-# CT_LIBC_EGLIBC_V_2_12 is not set
-# CT_LIBC_EGLIBC_V_2_11 is not set
-# CT_LIBC_EGLIBC_V_2_10 is not set
-# CT_LIBC_EGLIBC_V_2_9 is not set
-# CT_LIBC_EGLIBC_V_TRUNK is not set
-CT_EGLIBC_REVISION="HEAD"
-# CT_EGLIBC_HTTP is not set
-# CT_EGLIBC_CHECKOUT is not set
-CT_EGLIBC_OPT_SIZE=y
-# CT_EGLIBC_CUSTOM_CONFIG is not set
-CT_LIBC_glibc_AVAILABLE=y
-CT_LIBC_mingw_AVAILABLE=y
-CT_LIBC_newlib_AVAILABLE=y
-CT_LIBC_none_AVAILABLE=y
-CT_LIBC_uClibc_AVAILABLE=y
-CT_LIBC_SUPPORT_THREADS_ANY=y
-CT_LIBC_SUPPORT_NPTL=y
-CT_LIBC_SUPPORT_LINUXTHREADS=y
-CT_THREADS="nptl"
-
-#
-# Common C library options
-#
-CT_THREADS_NPTL=y
-# CT_THREADS_LINUXTHREADS is not set
-CT_LIBC_XLDD=y
-
-#
-# eglibc other options
-#
-CT_LIBC_glibc_familly=y
-CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY=""
-CT_LIBC_GLIBC_CONFIGPARMS=""
-CT_LIBC_GLIBC_EXTRA_CFLAGS=""
-CT_LIBC_EXTRA_CC_ARGS=""
-# CT_LIBC_DISABLE_VERSIONING is not set
-CT_LIBC_OLDEST_ABI=""
-# CT_LIBC_GLIBC_FORCE_UNWIND is not set
-# CT_LIBC_GLIBC_USE_PORTS is not set
-CT_LIBC_ADDONS_LIST=""
-# CT_LIBC_LOCALES is not set
-# CT_LIBC_GLIBC_KERNEL_VERSION_NONE is not set
-# CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS is not set
-CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN=y
-CT_LIBC_GLIBC_MIN_KERNEL_VERSION="2.6.27"
-CT_LIBC_GLIBC_MIN_KERNEL="2.6.27"
-
-#
-# Debug facilities
-#
-# CT_DEBUG_dmalloc is not set
-# CT_DEBUG_duma is not set
-# CT_DEBUG_gdb is not set
-# CT_DEBUG_ltrace is not set
-# CT_DEBUG_strace is not set
-
-#
-# Companion libraries
-#
-CT_COMPLIBS_NEEDED=y
-CT_GMP_NEEDED=y
-CT_MPFR_NEEDED=y
-CT_PPL_NEEDED=y
-CT_CLOOG_NEEDED=y
-CT_COMPLIBS=y
-CT_GMP=y
-CT_MPFR=y
-CT_PPL=y
-CT_CLOOG=y
-# CT_GMP_V_5_1_1 is not set
-# CT_GMP_V_5_0_2 is not set
-# CT_GMP_V_5_0_1 is not set
-CT_GMP_V_4_3_2=y
-# CT_GMP_V_4_3_1 is not set
-# CT_GMP_V_4_3_0 is not set
-CT_GMP_VERSION="4.3.2"
-# CT_MPFR_V_3_1_2 is not set
-# CT_MPFR_V_3_1_0 is not set
-# CT_MPFR_V_3_0_1 is not set
-# CT_MPFR_V_3_0_0 is not set
-CT_MPFR_V_2_4_2=y
-# CT_MPFR_V_2_4_1 is not set
-# CT_MPFR_V_2_4_0 is not set
-CT_MPFR_VERSION="2.4.2"
-# CT_PPL_V_0_11_2 is not set
-# CT_PPL_V_0_11_1 is not set
-# CT_PPL_V_0_11 is not set
-CT_PPL_V_0_10_2=y
-CT_PPL_VERSION="0.10.2"
-CT_PPL_NEEDS_FPERMISSIVE=y
-CT_CLOOG_V_0_15_11=y
-# CT_CLOOG_V_0_15_10 is not set
-# CT_CLOOG_V_0_15_9 is not set
-# CT_CLOOG_V_0_15_8 is not set
-# CT_CLOOG_V_0_15_7 is not set
-# CT_CLOOG_V_0_15_6 is not set
-CT_CLOOG_VERSION="0.15.11"
-CT_CLOOG_0_15_1x=y
-CT_CLOOG_NEEDS_AUTORECONF=y
-
-#
-# Companion libraries common options
-#
-# CT_COMPLIBS_CHECK is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/initrd.config 2014-08-16 02:54:20 UTC (rev 6628)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6595-dirty Configuration
-# Wed Jul 16 18:11:11 2014
+# Buildroot 2011.08-svn6627-dirty Configuration
+# Fri Aug 15 06:27:56 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -97,7 +97,7 @@
BR2_TOOLCHAIN_EXTERNAL=y
# BR2_TOOLCHAIN_CTNG is not set
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0/i586-unknown-linux-gnu"
+BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.19.0-3.2/i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_PREFIX="i586-unknown-linux-gnu"
BR2_TOOLCHAIN_EXTERNAL_GLIBC=y
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/Config.in 2014-08-16 02:54:20 UTC (rev 6628)
@@ -167,7 +167,6 @@
menu "Hardware handling"
comment "Network Interface Kernel Drivers"
-source "package/e1000/Config.in"
source "package/e1000e/Config.in"
source "package/igb/Config.in"
source "package/r8168/Config.in"
Modified: branches/1.0/package/e1000e/e1000e.mk
===================================================================
--- branches/1.0/package/e1000e/e1000e.mk 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/e1000e/e1000e.mk 2014-08-16 02:54:20 UTC (rev 6628)
@@ -27,12 +27,12 @@
endef
define E1000E_INSTALL_TARGET_CMDS
- $(INSTALL) -m 644 -D $(@D)/src/e1000e.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/e1000e/e1000e.ko
+ $(INSTALL) -m 644 -D $(@D)/src/e1000e.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
$(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
endef
define E1000E_UNINSTALL_TARGET_CMDS
- rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/e1000e/e1000e.ko
+ rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/intel/e1000e/e1000e.ko
$(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
endef
Modified: branches/1.0/package/igb/igb.mk
===================================================================
--- branches/1.0/package/igb/igb.mk 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/igb/igb.mk 2014-08-16 02:54:20 UTC (rev 6628)
@@ -27,12 +27,12 @@
endef
define IGB_INSTALL_TARGET_CMDS
- $(INSTALL) -m 644 -D $(@D)/src/igb.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/igb/igb.ko
+ $(INSTALL) -m 644 -D $(@D)/src/igb.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/intel/igb/igb.ko
$(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
endef
define IGB_UNINSTALL_TARGET_CMDS
- rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/igb/igb.ko
+ rm -rf $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/intel/igb/igb.ko
$(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
endef
Deleted: branches/1.0/package/iproute2/iproute2-get_dont_filter_cached.patch
===================================================================
--- branches/1.0/package/iproute2/iproute2-get_dont_filter_cached.patch 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/iproute2/iproute2-get_dont_filter_cached.patch 2014-08-16 02:54:20 UTC (rev 6628)
@@ -1,10 +0,0 @@
---- a/ip/iproute.c
-+++ b/ip/iproute.c
-@@ -1286,6 +1286,7 @@ int iproute_get(int argc, char **argv)
- memset(&req, 0, sizeof(req));
-
- iproute_reset_filter();
-+ filter.cloned = 2;
-
- req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
- req.n.nlmsg_flags = NLM_F_REQUEST;
Deleted: branches/1.0/package/iproute2/iproute2-xt-v6.patch
===================================================================
--- branches/1.0/package/iproute2/iproute2-xt-v6.patch 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/iproute2/iproute2-xt-v6.patch 2014-08-16 02:54:20 UTC (rev 6628)
@@ -1,39 +0,0 @@
-From: Andreas Henriksson <an...@fa...>
-Forwarded: yes
-Subject: [PATCH] iproute2: Fix building xt module against xtables version 6
-
-
-diff --git a/tc/m_xt.c b/tc/m_xt.c
-index 651a59e..13bf19f 100644
---- a/tc/m_xt.c
-+++ b/tc/m_xt.c
-@@ -160,9 +160,13 @@ static int parse_ipt(struct action_util *a,int *argc_p,
- return -1;
- }
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-- m->extra_opts,
-- &m->option_offset);
-+ xtables_merge_options(
-+#if (XTABLES_VERSION_CODE >= 6)
-+ tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
-+ m->extra_opts,
-+ &m->option_offset);
- } else {
- fprintf(stderr," failed to find target %s\n\n", optarg);
- return -1;
-@@ -305,7 +309,11 @@ print_ipt(struct action_util *au,FILE * f, struct rtattr *arg)
- }
-
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-+ xtables_merge_options(
-+#if (XTABLES_VERSION_CODE >= 6)
-+ tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
- } else {
Modified: branches/1.0/package/iproute2/iproute2.mk
===================================================================
--- branches/1.0/package/iproute2/iproute2.mk 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/iproute2/iproute2.mk 2014-08-16 02:54:20 UTC (rev 6628)
@@ -4,10 +4,9 @@
#
#############################################################
-IPROUTE2_VERSION = 2.6.35
+IPROUTE2_VERSION = 3.4.0
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.bz2
-#IPROUTE2_SITE = http://www.kernel.org/pub/linux/utils/net/iproute2
-IPROUTE2_SITE = http://files.astlinux.org
+IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
# If both iproute2 and busybox are selected, make certain we win
@@ -27,8 +26,6 @@
endif
define IPROUTE2_CONFIGURE_CMDS
- # Use kernel headers
- rm -r $(IPROUTE2_DIR)/include/netinet
# Cross-compile configure
$(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure
cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure
Modified: branches/1.0/package/r8168/r8168.mk
===================================================================
--- branches/1.0/package/r8168/r8168.mk 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/r8168/r8168.mk 2014-08-16 02:54:20 UTC (rev 6628)
@@ -16,7 +16,7 @@
LD=$(TARGET_LD) \
BASEDIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \
KERNELDIR=$(LINUX_DIR) \
- KFLAG=26x \
+ KFLAG=2x \
modules
define R8168_CONFIGURE_CMDS
@@ -24,12 +24,12 @@
endef
define R8168_INSTALL_TARGET_CMDS
- $(INSTALL) -m 644 -D $(@D)/src/r8168.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/r8168.ko
+ $(INSTALL) -m 644 -D $(@D)/src/r8168.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/realtek/r8168.ko
$(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
endef
define R8168_UNINSTALL_TARGET_CMDS
- rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/r8168.ko
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/realtek/r8168.ko
$(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
endef
Modified: branches/1.0/package/tg3/tg3.mk
===================================================================
--- branches/1.0/package/tg3/tg3.mk 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/package/tg3/tg3.mk 2014-08-16 02:54:20 UTC (rev 6628)
@@ -17,7 +17,7 @@
KVER=$(LINUX_VERSION_PROBED) \
BCMPROC=$(KERNEL_ARCH) \
BCMCFGDIR=$(LINUX_DIR) \
- BCMMODDIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net \
+ BCMMODDIR=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/broadcom \
BCMSRCDIR=$(LINUX_DIR) \
ARCH=$(KERNEL_ARCH)
@@ -26,12 +26,12 @@
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
+ $(INSTALL) -m 644 -D $(@D)/tg3.ko $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/broadcom/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
+ rm -f $(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED)/kernel/drivers/net/ethernet/broadcom/tg3.ko
$(HOST_DIR)/usr/sbin/depmod -ae -F $(LINUX_DIR)/System.map -b $(TARGET_DIR) -r $(LINUX_VERSION_PROBED)
endef
Added: branches/1.0/package/wanpipe/wanpipe-linux3.2-sk_for_each.patch
===================================================================
--- branches/1.0/package/wanpipe/wanpipe-linux3.2-sk_for_each.patch (rev 0)
+++ branches/1.0/package/wanpipe/wanpipe-linux3.2-sk_for_each.patch 2014-08-16 02:54:20 UTC (rev 6628)
@@ -0,0 +1,30 @@
+--- wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe.c.orig 2014-08-14 17:16:30.000000000 -0500
++++ wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe.c 2014-08-14 17:29:20.000000000 -0500
+@@ -1736,13 +1736,7 @@
+ }
+
+ read_lock(&wanpipe_sklist_lock);
+-#if defined(LINUX_3_0)
+- sk_for_each(sk, &wanpipe_sklist) {
+-#elif defined(LINUX_2_6)
+ sk_for_each(sk, node, &wanpipe_sklist) {
+-#else
+- for (sk = wanpipe_sklist; sk; sk = sk->next) {
+-#endif
+ switch (msg) {
+ case NETDEV_DOWN:
+ case NETDEV_UNREGISTER:
+--- wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c.orig 2014-08-14 17:16:51.000000000 -0500
++++ wanpipe-7.0.10/patches/kdrivers/src/wanrouter/af_wanpipe_datascope.c 2014-08-14 17:28:04.000000000 -0500
+@@ -152,11 +152,7 @@
+ #ifdef LINUX_2_6
+ {
+ struct hlist_node *node;
+-#ifdef LINUX_3_0
+- sk_for_each(parent_sk, &wanpipe_parent_sklist) {
+-#else
+ sk_for_each(parent_sk, node, &wanpipe_parent_sklist) {
+-#endif
+ if (SK_PRIV((parent_sk))->dev == dev) {
+ break;
+ }
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2014-08-10 14:31:15 UTC (rev 6627)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2014-08-16 02:54:20 UTC (rev 6628)
@@ -1,7 +1,6 @@
#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35.13
-# Wed Dec 21 21:49:18 2011
+# Automatically generated file; DO NOT EDIT.
+# Linux/i386 3.2.62 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -10,7 +9,6 @@
CONFIG_INSTRUCTION_DECODER=y
CONFIG_OUTPUT_FORMAT="elf32-i386"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_TIME=y
CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_CLOCKSOURCE_WATCHDOG=y
CONFIG_GENERIC_CLOCKEVENTS=y
@@ -39,7 +37,6 @@
CONFIG_HAVE_SETUP_PER_CPU_AREA=y
CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
# CONFIG_ZONE_DMA32 is not set
@@ -47,27 +44,20 @@
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_EARLY_RES=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_X86_32_SMP=y
CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
CONFIG_X86_32_LAZY_GS=y
CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-ecx -fcall-saved-edx"
CONFIG_KTIME_SCALAR=y
CONFIG_ARCH_CPU_PROBE_RELEASE=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
+CONFIG_HAVE_IRQ_WORK=y
+CONFIG_IRQ_WORK=y
#
# General setup
#
CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION="-astlinux"
@@ -75,57 +65,76 @@
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
CONFIG_KERNEL_GZIP=y
# CONFIG_KERNEL_BZIP2 is not set
# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
# CONFIG_KERNEL_LZO is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_POSIX_MQUEUE is not set
CONFIG_BSD_PROCESS_ACCT=y
# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_FHANDLE is not set
# CONFIG_TASKSTATS is not set
# CONFIG_AUDIT is not set
+CONFIG_HAVE_GENERIC_HARDIRQS=y
#
+# IRQ subsystem
+#
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_HAVE_SPARSE_IRQ=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+
+#
# RCU Subsystem
#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_TINY_RCU is not set
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_PREEMPT_RCU=y
# CONFIG_RCU_TRACE is not set
CONFIG_RCU_FANOUT=32
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_RCU_BOOST is not set
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
# CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
+# CONFIG_NAMESPACES is not set
+# CONFIG_SCHED_AUTOGROUP is not set
+# CONFIG_SYSFS_DEPRECATED is not set
# CONFIG_RELAY is not set
-# CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_RD_GZIP=y
# CONFIG_RD_BZIP2 is not set
# CONFIG_RD_LZMA is not set
+# CONFIG_RD_XZ is not set
# CONFIG_RD_LZO is not set
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
-CONFIG_EMBEDDED=y
+CONFIG_EXPERT=y
CONFIG_UID16=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
+# CONFIG_KALLSYMS_ALL is not set
CONFIG_HOTPLUG=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
CONFIG_PCSPKR_PLATFORM=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
CONFIG_BASE_FULL=y
CONFIG_FUTEX=y
CONFIG_EPOLL=y
@@ -134,6 +143,7 @@
CONFIG_EVENTFD=y
CONFIG_SHMEM=y
CONFIG_AIO=y
+CONFIG_EMBEDDED=y
CONFIG_HAVE_PERF_EVENTS=y
#
@@ -141,6 +151,7 @@
#
CONFIG_PERF_EVENTS=y
# CONFIG_PERF_COUNTERS is not set
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
CONFIG_VM_EVENT_COUNTERS=y
CONFIG_PCI_QUIRKS=y
CONFIG_COMPAT_BRK=y
@@ -150,6 +161,7 @@
# CONFIG_PROFILING is not set
CONFIG_HAVE_OPROFILE=y
CONFIG_KPROBES=y
+# CONFIG_JUMP_LABEL is not set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_KRETPROBES=y
CONFIG_HAVE_IOREMAP_PROT=y
@@ -158,16 +170,19 @@
CONFIG_HAVE_OPTPROBES=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
CONFIG_HAVE_DMA_ATTRS=y
+CONFIG_USE_GENERIC_SMP_HELPERS=y
CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
CONFIG_HAVE_DMA_API_DEBUG=y
CONFIG_HAVE_HW_BREAKPOINT=y
CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
#
# GCOV-based kernel profiling
#
-CONFIG_SLOW_WORK=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_SLABINFO=y
CONFIG_RT_MUTEXES=y
@@ -181,7 +196,8 @@
CONFIG_STOP_MACHINE=y
CONFIG_BLOCK=y
# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
+CONFIG_BLK_DEV_BSG=y
+# CONFIG_BLK_DEV_BSGLIB is not set
# CONFIG_BLK_DEV_INTEGRITY is not set
#
@@ -222,6 +238,7 @@
# CONFIG_INLINE_WRITE_UNLOCK_BH is not set
# CONFIG_INLINE_WRITE_UNLOCK_IRQ is not set
# CONFIG_INLINE_WRITE_UNLOCK_IRQRESTORE is not set
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
# CONFIG_FREEZER is not set
@@ -232,16 +249,16 @@
# CONFIG_NO_HZ is not set
CONFIG_HIGH_RES_TIMERS=y
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
CONFIG_SMP=y
-# CONFIG_SPARSE_IRQ is not set
CONFIG_X86_MPPARSE=y
# CONFIG_X86_BIGSMP is not set
CONFIG_X86_EXTENDED_PLATFORM=y
-# CONFIG_X86_ELAN is not set
-# CONFIG_X86_MRST is not set
+# CONFIG_X86_WANT_INTEL_MID is not set
# CONFIG_X86_RDC321X is not set
# CONFIG_X86_32_NON_STANDARD is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+# CONFIG_X86_32_IRIS is not set
CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_PARAVIRT_GUEST is not set
CONFIG_NO_BOOTMEM=y
@@ -263,19 +280,19 @@
# CONFIG_MEFFICEON is not set
# CONFIG_MWINCHIPC6 is not set
# CONFIG_MWINCHIP3D is not set
+# CONFIG_MELAN is not set
# CONFIG_MGEODEGX1 is not set
# CONFIG_MGEODE_LX is not set
# CONFIG_MCYRIXIII is not set
# CONFIG_MVIAC3_2 is not set
# CONFIG_MVIAC7 is not set
-# CONFIG_MPSC is not set
# CONFIG_MCORE2 is not set
# CONFIG_MATOM is not set
-# CONFIG_GENERIC_CPU is not set
CONFIG_X86_GENERIC=y
-CONFIG_X86_CPU=y
CONFIG_X86_INTERNODE_CACHE_SHIFT=6
CONFIG_X86_CMPXCHG=y
+CONFIG_CMPXCHG_LOCAL=y
+CONFIG_CMPXCHG_DOUBLE=y
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_X86_XADD=y
CONFIG_X86_PPRO_FENCE=y
@@ -299,7 +316,6 @@
CONFIG_HPET_EMULATE_RTC=y
CONFIG_DMI=y
# CONFIG_IOMMU_HELPER is not set
-# CONFIG_IOMMU_API is not set
CONFIG_NR_CPUS=8
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
@@ -307,6 +323,7 @@
# CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_PREEMPT=y
+CONFIG_PREEMPT_COUNT=y
CONFIG_X86_LOCAL_APIC=y
CONFIG_X86_IO_APIC=y
# CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS is not set
@@ -335,19 +352,21 @@
CONFIG_PAGE_OFFSET=0xC0000000
CONFIG_HIGHMEM=y
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+# CONFIG_ARCH_DMA_ADDR_T_64BIT is not set
CONFIG_ARCH_FLATMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ILLEGAL_POINTER_VALUE=0
CONFIG_SELECT_MEMORY_MODEL=y
CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_SPARSEMEM_STATIC=y
+CONFIG_HAVE_MEMBLOCK=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_COMPACTION is not set
# CONFIG_PHYS_ADDR_T_64BIT is not set
CONFIG_ZONE_DMA_FLAG=1
CONFIG_BOUNCE=y
@@ -356,14 +375,17 @@
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
# CONFIG_MEMORY_FAILURE is not set
+# CONFIG_TRANSPARENT_HUGEPAGE is not set
+# CONFIG_CLEANCACHE is not set
# CONFIG_HIGHPTE is not set
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
-CONFIG_X86_RESERVE_LOW_64K=y
+CONFIG_X86_RESERVE_LOW=64
# CONFIG_MATH_EMULATION is not set
CONFIG_MTRR=y
# CONFIG_MTRR_SANITIZER is not set
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
# CONFIG_EFI is not set
CONFIG_SECCOMP=y
# CONFIG_CC_STACKPROTECTOR is not set
@@ -386,16 +408,13 @@
#
# Power management and ACPI options
#
-CONFIG_PM=y
-# CONFIG_PM_DEBUG is not set
# CONFIG_SUSPEND is not set
# CONFIG_HIBERNATION is not set
# CONFIG_PM_RUNTIME is not set
CONFIG_ACPI=y
# CONFIG_ACPI_PROCFS is not set
CONFIG_ACPI_PROCFS_POWER=y
-# CONFIG_ACPI_POWER_METER is not set
-CONFIG_ACPI_SYSFS_POWER=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
CONFIG_ACPI_PROC_EVENT=y
# CONFIG_ACPI_AC is not set
# CONFIG_ACPI_BATTERY is not set
@@ -429,14 +448,12 @@
# CONFIG_PCI_GOBIOS is not set
# CONFIG_PCI_GOMMCONFIG is not set
# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
CONFIG_PCI_GOANY=y
CONFIG_PCI_BIOS=y
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_DOMAINS=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
-# CONFIG_DMAR is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
@@ -444,19 +461,25 @@
# CONFIG_PCIEASPM is not set
CONFIG_ARCH_SUPPORTS_MSI=y
CONFIG_PCI_MSI=y
+# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_STUB is not set
CONFIG_HT_IRQ=y
# CONFIG_PCI_IOV is not set
+# CONFIG_PCI_PRI is not set
+# CONFIG_PCI_PASID is not set
CONFIG_PCI_IOAPIC=y
+CONFIG_PCI_LABEL=y
CONFIG_ISA_DMA_API=y
# CONFIG_ISA is not set
# CONFIG_MCA is not set
CONFIG_SCx200=m
CONFIG_SCx200HR_TIMER=m
# CONFIG_OLPC is not set
-CONFIG_K8_NB=y
+CONFIG_ALIX=y
+CONFIG_AMD_NB=y
# CONFIG_PCCARD is not set
# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_RAPIDIO is not set
#
# Executable file formats / Emulations
@@ -467,6 +490,7 @@
# CONFIG_BINFMT_AOUT is not set
# CONFIG_BINFMT_MISC is not set
CONFIG_HAVE_ATOMIC_IOMAP=y
+CONFIG_HAVE_TEXT_POKE_SMP=y
CONFIG_NET=y
#
@@ -485,14 +509,14 @@
CONFIG_INET=y
CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE_STATS is not set
CONFIG_IP_MULTIPLE_TABLES=y
CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
# CONFIG_IP_PNP is not set
CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
CONFIG_NET_IPGRE=m
# CONFIG_NET_IPGRE_BROADCAST is not set
# CONFIG_IP_MROUTE is not set
@@ -536,6 +560,7 @@
CONFIG_IPV6_SUBTREES=y
# CONFIG_IPV6_MROUTE is not set
CONFIG_NETWORK_SECMARK=y
+# CONFIG_NETWORK_PHY_TIMESTAMPING is not set
CONFIG_NETFILTER=y
# CONFIG_NETFILTER_DEBUG is not set
CONFIG_NETFILTER_ADVANCED=y
@@ -548,10 +573,10 @@
CONFIG_NETFILTER_NETLINK_QUEUE=m
CONFIG_NETFILTER_NETLINK_LOG=m
CONFIG_NF_CONNTRACK=m
-# CONFIG_NF_CT_ACCT is not set
CONFIG_NF_CONNTRACK_MARK=y
CONFIG_NF_CONNTRACK_SECMARK=y
CONFIG_NF_CONNTRACK_EVENTS=y
+# CONFIG_NF_CONNTRACK_TIMESTAMP is not set
# CONFIG_NF_CT_PROTO_DCCP is not set
CONFIG_NF_CT_PROTO_GRE=m
CONFIG_NF_CT_PROTO_SCTP=m
@@ -560,7 +585,9 @@
CONFIG_NF_CONNTRACK_FTP=m
CONFIG_NF_CONNTRACK_H323=m
CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
CONFIG_NF_CONNTRACK_PPTP=m
# CONFIG_NF_CONNTRACK_SANE is not set
CONFIG_NF_CONNTRACK_SIP=m
@@ -578,12 +605,14 @@
#
# Xtables targets
#
+# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set
CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
# CONFIG_NETFILTER_XT_TARGET_CT is not set
CONFIG_NETFILTER_XT_TARGET_DSCP=m
CONFIG_NETFILTER_XT_TARGET_HL=m
+# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
# CONFIG_NETFILTER_XT_TARGET_LED is not set
CONFIG_NETFILTER_XT_TARGET_MARK=m
CONFIG_NETFILTER_XT_TARGET_NFLOG=m
@@ -599,13 +628,16 @@
#
# Xtables matches
#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set
CONFIG_NETFILTER_XT_MATCH_COMMENT=m
# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set
CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+# CONFIG_NETFILTER_XT_MATCH_CPU is not set
CONFIG_NETFILTER_XT_MATCH_DCCP=m
+# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set
CONFIG_NETFILTER_XT_MATCH_DSCP=m
CONFIG_NETFILTER_XT_MATCH_ESP=m
CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
@@ -633,6 +665,7 @@
CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
CONFIG_NETFILTER_XT_MATCH_TIME=m
CONFIG_NETFILTER_XT_MATCH_U32=m
+# CONFIG_IP_SET is not set
# CONFIG_IP_VS is not set
#
@@ -643,7 +676,6 @@
CONFIG_NF_CONNTRACK_PROC_COMPAT=y
# CONFIG_IP_NF_QUEUE is not set
CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
CONFIG_IP_NF_MATCH_AH=m
CONFIG_IP_NF_MATCH_ECN=m
CONFIG_IP_NF_MATCH_TTL=m
@@ -678,6 +710,7 @@
#
# IPv6: Netfilter Configuration
#
+CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_CONNTRACK_IPV6=m
# CONFIG_IP6_NF_QUEUE is not set
CONFIG_IP6_NF_IPTABLES=m
@@ -764,6 +797,7 @@
CONFIG_NET_SCH_PRIO=m
# CONFIG_NET_SCH_MULTIQ is not set
CONFIG_NET_SCH_RED=m
+# CONFIG_NET_SCH_SFB is not set
CONFIG_NET_SCH_SFQ=m
CONFIG_NET_SCH_TEQL=m
CONFIG_NET_SCH_TBF=m
@@ -771,6 +805,9 @@
CONFIG_NET_SCH_DSMARK=m
CONFIG_NET_SCH_NETEM=m
# CONFIG_NET_SCH_DRR is not set
+# CONFIG_NET_SCH_MQPRIO is not set
+# CONFIG_NET_SCH_CHOKE is not set
+# CONFIG_NET_SCH_QFQ is not set
CONFIG_NET_SCH_INGRESS=m
#
@@ -780,7 +817,6 @@
CONFIG_NET_CLS_BASIC=m
CONFIG_NET_CLS_TCINDEX=m
CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
CONFIG_NET_CLS_FW=m
CONFIG_NET_CLS_U32=m
CONFIG_CLS_U32_PERF=y
@@ -805,10 +841,15 @@
CONFIG_NET_ACT_PEDIT=m
# CONFIG_NET_ACT_SIMP is not set
# CONFIG_NET_ACT_SKBEDIT is not set
+# CONFIG_NET_ACT_CSUM is not set
CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
+CONFIG_DNS_RESOLVER=y
+# CONFIG_BATMAN_ADV is not set
CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
#
# Network testing
@@ -818,31 +859,7 @@
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-# CONFIG_BT_L2CAP_EXT_FEATURES is not set
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-# CONFIG_BT_MRVL is not set
-# CONFIG_BT_ATH3K is not set
+# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
CONFIG_FIB_RULES=y
# CONFIG_WIRELESS is not set
@@ -850,6 +867,8 @@
# CONFIG_RFKILL is not set
# CONFIG_NET_9P is not set
# CONFIG_CAIF is not set
+# CONFIG_CEPH_LIB is not set
+# CONFIG_NFC is not set
#
# Device Drivers
@@ -866,6 +885,8 @@
CONFIG_FW_LOADER=y
# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
# CONFIG_SYS_HYPERVISOR is not set
# CONFIG_CONNECTOR is not set
# CONFIG_MTD is not set
@@ -885,6 +906,7 @@
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_COW_COMMON is not set
CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
CONFIG_BLK_DEV_CRYPTOLOOP=m
#
@@ -900,10 +922,13 @@
# CONFIG_CDROM_PKTCDVD is not set
# CONFIG_ATA_OVER_ETH is not set
# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_RBD is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
CONFIG_MISC_DEVICES=y
# CONFIG_AD525X_DPOT is not set
# CONFIG_IBM_ASM is not set
# CONFIG_PHANTOM is not set
+# CONFIG_INTEL_MID_PTI is not set
# CONFIG_SGI_IOC4 is not set
# CONFIG_TIFM_CORE is not set
# CONFIG_ICS932S401 is not set
@@ -912,10 +937,19 @@
CONFIG_CS5535_MFGPT_DEFAULT_IRQ=7
CONFIG_CS5535_CLOCK_EVENT_SRC=m
# CONFIG_HP_ILO is not set
+# CONFIG_APDS9802ALS is not set
# CONFIG_ISL29003 is not set
+# CONFIG_ISL29020 is not set
# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_SENSORS_BH1780 is not set
+# CONFIG_SENSORS_BH1770 is not set
+# CONFIG_SENSORS_APDS990X is not set
+# CONFIG_HMC6352 is not set
# CONFIG_DS1682 is not set
# CONFIG_VMWARE_BALLOON is not set
+# CONFIG_BMP085 is not set
+# CONFIG_PCH_PHUB is not set
+# CONFIG_USB_SWITCH_FSA9480 is not set
# CONFIG_C2PORT is not set
#
@@ -926,6 +960,17 @@
# CONFIG_EEPROM_MAX6875 is not set
# CONFIG_EEPROM_93CX6 is not set
# CONFIG_CB710_CORE is not set
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# CONFIG_SENSORS_LIS3_I2C is not set
+
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_ALTERA_STAPL is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -965,11 +1010,14 @@
CONFIG_SCSI_SAS_LIBSAS=y
# CONFIG_SCSI_SAS_ATA is not set
CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
# CONFIG_SCSI_SRP_ATTRS is not set
CONFIG_SCSI_LOWLEVEL=y
# CONFIG_ISCSI_TCP is not set
+# CONFIG_ISCSI_BOOT_SYSFS is not set
+# CONFIG_SCSI_CXGB3_ISCSI is not set
+# CONFIG_SCSI_CXGB4_ISCSI is not set
# CONFIG_SCSI_BNX2_ISCSI is not set
+# CONFIG_SCSI_BNX2X_FCOE is not set
# CONFIG_BE2ISCSI is not set
CONFIG_BLK_DEV_3W_XXXX_RAID=y
# CONFIG_SCSI_HPSA is not set
@@ -984,10 +1032,11 @@
# CONFIG_AIC94XX_DEBUG is not set
CONFIG_SCSI_MVSAS=y
CONFIG_SCSI_MVSAS_DEBUG=y
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+# CONFIG_SCSI_MVUMI is not set
# CONFIG_SCSI_DPT_I2O is not set
# CONFIG_SCSI_ADVANSYS is not set
CONFIG_SCSI_ARCMSR=y
-# CONFIG_SCSI_ARCMSR_AER is not set
# CONFIG_MEGARAID_NEWGEN is not set
# CONFIG_MEGARAID_LEGACY is not set
CONFIG_MEGARAID_SAS=y
@@ -1004,6 +1053,7 @@
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_ISCI is not set
# CONFIG_SCSI_IPS is not set
# CONFIG_SCSI_INITIO is not set
# CONFIG_SCSI_INIA100 is not set
@@ -1036,6 +1086,7 @@
CONFIG_SATA_AHCI=y
# CONFIG_SATA_AHCI_PLATFORM is not set
CONFIG_SATA_INIC162X=y
+# CONFIG_SATA_ACARD_AHCI is not set
CONFIG_SATA_SIL24=y
CONFIG_ATA_SFF=y
@@ -1120,6 +1171,7 @@
CONFIG_ATA_GENERIC=y
CONFIG_PATA_LEGACY=y
# CONFIG_MD is not set
+# CONFIG_TARGET_CORE is not set
CONFIG_FUSION=y
CONFIG_FUSION_SPI=y
# CONFIG_FUSION_FC is not set
@@ -1131,58 +1183,68 @@
#
# IEEE 1394 (FireWire) support
#
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# The newer stack is recommended.
-#
# CONFIG_FIREWIRE is not set
-# CONFIG_IEEE1394 is not set
+# CONFIG_FIREWIRE_NOSY is not set
# CONFIG_I2O is not set
# CONFIG_MACINTOSH_DRIVERS is not set
CONFIG_NETDEVICES=y
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+# CONFIG_EQUALIZER is not set
+# CONFIG_NET_FC is not set
+CONFIG_MII=m
# CONFIG_IFB is not set
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
# CONFIG_MACVLAN is not set
-# CONFIG_EQUALIZER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
CONFIG_TUN=m
# CONFIG_VETH is not set
-# CONFIG_NET_SB1000 is not set
# CONFIG_ARCNET is not set
-CONFIG_PHYLIB=m
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_FORE200E is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_ATM_SOLOS is not set
#
-# MII PHY device drivers
+# CAIF transport drivers
#
-# CONFIG_MARVELL_PHY is not set
-# CONFIG_DAVICOM_PHY is not set
-# CONFIG_QSEMI_PHY is not set
-# CONFIG_LXT_PHY is not set
-# CONFIG_CICADA_PHY is not set
-# CONFIG_VITESSE_PHY is not set
-# CONFIG_SMSC_PHY is not set
-# CONFIG_BROADCOM_PHY is not set
-# CONFIG_ICPLUS_PHY is not set
-# CONFIG_REALTEK_PHY is not set
-# CONFIG_NATIONAL_PHY is not set
-# CONFIG_STE10XP is not set
-# CONFIG_LSI_ET1011C_PHY is not set
-# CONFIG_MICREL_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-# CONFIG_HAPPYMEAL is not set
-# CONFIG_SUNGEM is not set
-# CONFIG_CASSINI is not set
+CONFIG_ETHERNET=y
CONFIG_NET_VENDOR_3COM=y
CONFIG_VORTEX=m
CONFIG_TYPHOON=m
-# CONFIG_ETHOC is not set
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+# CONFIG_NET_VENDOR_ATHEROS is not set
+CONFIG_NET_VENDOR_BROADCOM=y
+# CONFIG_B44 is not set
+CONFIG_BNX2=m
+# CONFIG_CNIC is not set
+CONFIG_TIGON3=m
+# CONFIG_BNX2X is not set
+# CONFIG_NET_VENDOR_BROCADE is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CISCO is not set
# CONFIG_DNET is not set
+CONFIG_NET_VENDOR_DEC=y
CONFIG_NET_TULIP=y
# CONFIG_DE2104X is not set
CONFIG_TULIP=m
@@ -1193,76 +1255,115 @@
CONFIG_WINBOND_840=m
CONFIG_DM9102=m
CONFIG_ULI526X=m
-# CONFIG_HP100 is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMI...
[truncated message content] |
|
From: <abe...@us...> - 2014-08-18 02:59:45
|
Revision: 6636
http://sourceforge.net/p/astlinux/code/6636
Author: abelbeck
Date: 2014-08-18 02:59:35 +0000 (Mon, 18 Aug 2014)
Log Message:
-----------
new packages, flashrom and dmidecode, not enabled, user beware
Modified Paths:
--------------
branches/1.0/astlinux-ast11.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/dmidecode/
branches/1.0/package/dmidecode/Config.in
branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch
branches/1.0/package/dmidecode/dmidecode.mk
branches/1.0/package/flashrom/
branches/1.0/package/flashrom/Config.in
branches/1.0/package/flashrom/flashrom.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-08-17 18:51:59 UTC (rev 6635)
+++ branches/1.0/astlinux-ast11.config 2014-08-18 02:59:35 UTC (rev 6636)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6627-dirty Configuration
-# Fri Aug 15 06:27:55 2014
+# Buildroot 2011.08-svn6635-dirty Configuration
+# Sun Aug 17 21:48:38 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -343,6 +343,7 @@
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DMIDECODE is not set
# BR2_PACKAGE_DMRAID is not set
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
@@ -369,6 +370,7 @@
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FLASHROM is not set
BR2_PACKAGE_FXLOAD=y
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GDISK is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-08-17 18:51:59 UTC (rev 6635)
+++ branches/1.0/astlinux18.config 2014-08-18 02:59:35 UTC (rev 6636)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6627-dirty Configuration
-# Fri Aug 15 06:27:54 2014
+# Buildroot 2011.08-svn6635-dirty Configuration
+# Sun Aug 17 21:48:34 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -343,6 +343,7 @@
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DMIDECODE is not set
# BR2_PACKAGE_DMRAID is not set
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
@@ -369,6 +370,7 @@
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FLASHROM is not set
BR2_PACKAGE_FXLOAD=y
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GDISK is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-08-17 18:51:59 UTC (rev 6635)
+++ branches/1.0/initrd.config 2014-08-18 02:59:35 UTC (rev 6636)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6627-dirty Configuration
-# Fri Aug 15 06:27:56 2014
+# Buildroot 2011.08-svn6635-dirty Configuration
+# Sun Aug 17 21:49:01 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -314,6 +314,7 @@
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DMIDECODE is not set
# BR2_PACKAGE_DMRAID is not set
# BR2_PACKAGE_DOSFSTOOLS is not set
BR2_PACKAGE_E2FSPROGS=y
@@ -337,6 +338,7 @@
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FLASHROM is not set
# BR2_PACKAGE_FXLOAD is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GDISK is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-08-17 18:51:59 UTC (rev 6635)
+++ branches/1.0/package/Config.in 2014-08-18 02:59:35 UTC (rev 6636)
@@ -183,12 +183,14 @@
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/devmem2/Config.in"
endif
+source "package/dmidecode/Config.in"
source "package/dmraid/Config.in"
source "package/dosfstools/Config.in"
source "package/e2fsprogs/Config.in"
source "package/eeprog/Config.in"
source "package/fconfig/Config.in"
source "package/fis/Config.in"
+source "package/flashrom/Config.in"
source "package/fxload/Config.in"
source "package/gadgetfs-test/Config.in"
source "package/gdisk/Config.in"
Added: branches/1.0/package/dmidecode/Config.in
===================================================================
--- branches/1.0/package/dmidecode/Config.in (rev 0)
+++ branches/1.0/package/dmidecode/Config.in 2014-08-18 02:59:35 UTC (rev 6636)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_DMIDECODE
+ bool "dmidecode"
+ depends on BR2_i386 || BR2_x86_64
+ help
+ Dmidecode reports information about your system's hardware
+ as described in your system BIOS according to the SMBIOS/DMI
+ standard.
+
+ http://www.nongnu.org/dmidecode/
+
Added: branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch
===================================================================
--- branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch (rev 0)
+++ branches/1.0/package/dmidecode/dmidecode-build-system-fixes.patch 2014-08-18 02:59:35 UTC (rev 6636)
@@ -0,0 +1,35 @@
+Minor build system fixes
+
+Usual build system fixes to allow CC/CFLAGS/LDFLAGS to be overriden
+from the command line, and completed by additional flags from the
+Makefile.
+
+Signed-off-by: Thomas Petazzoni <tho...@fr...>
+
+Index: b/Makefile
+===================================================================
+--- a/Makefile
++++ b/Makefile
+@@ -12,9 +12,10 @@
+ # (at your option) any later version.
+ #
+
+-CC = gcc
+-CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
+- -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
++CC ?= gcc
++override CFLAGS += \
++ -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \
++ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef
+ #CFLAGS += -DBIGENDIAN
+ #CFLAGS += -DALIGNMENT_WORKAROUND
+
+@@ -23,7 +24,7 @@
+ #CFLAGS += -g
+
+ # Pass linker flags here
+-LDFLAGS =
++override LDFLAGS +=
+
+ DESTDIR =
+ prefix = /usr/local
Added: branches/1.0/package/dmidecode/dmidecode.mk
===================================================================
--- branches/1.0/package/dmidecode/dmidecode.mk (rev 0)
+++ branches/1.0/package/dmidecode/dmidecode.mk 2014-08-18 02:59:35 UTC (rev 6636)
@@ -0,0 +1,18 @@
+#############################################################
+#
+# dmidecode
+#
+#############################################################
+
+DMIDECODE_VERSION = 2.12
+DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode
+
+define DMIDECODE_BUILD_CMDS
+ $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define DMIDECODE_INSTALL_TARGET_CMDS
+ $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install
+endef
+
+$(eval $(call GENTARGETS,package,dmidecode))
Added: branches/1.0/package/flashrom/Config.in
===================================================================
--- branches/1.0/package/flashrom/Config.in (rev 0)
+++ branches/1.0/package/flashrom/Config.in 2014-08-18 02:59:35 UTC (rev 6636)
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_FLASHROM
+ bool "flashrom"
+ select BR2_PACKAGE_PCIUTILS
+ # dmidecode is only a runtime dependency
+ select BR2_PACKAGE_DMIDECODE
+ depends on BR2_i386 || BR2_x86_64
+ help
+ BIOS-updating utility.
+ Requires PCIUtils libraries.
+
+ http://flashrom.org/
+
Added: branches/1.0/package/flashrom/flashrom.mk
===================================================================
--- branches/1.0/package/flashrom/flashrom.mk (rev 0)
+++ branches/1.0/package/flashrom/flashrom.mk 2014-08-18 02:59:35 UTC (rev 6636)
@@ -0,0 +1,20 @@
+#############################################################
+#
+# flashrom
+#
+#############################################################
+FLASHROM_VERSION = 0.9.7
+FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2
+FLASHROM_SITE = http://download.flashrom.org/releases
+
+FLASHROM_DEPENDENCIES = pciutils
+
+define FLASHROM_BUILD_CMDS
+ $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define FLASHROM_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/sbin/flashrom
+endef
+
+$(eval $(call GENTARGETS,package,flashrom))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-08-17 18:51:59 UTC (rev 6635)
+++ branches/1.0/runnix-uclibc.config 2014-08-18 02:59:35 UTC (rev 6636)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6627-dirty Configuration
-# Fri Aug 15 06:27:56 2014
+# Buildroot 2011.08-svn6635-dirty Configuration
+# Sun Aug 17 21:48:54 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -488,6 +488,7 @@
#
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DMIDECODE is not set
#
# dmraid requires a toolchain with LARGEFILE support
@@ -503,6 +504,7 @@
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FLASHROM is not set
# BR2_PACKAGE_FXLOAD is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-08-17 18:51:59 UTC (rev 6635)
+++ branches/1.0/runnix.config 2014-08-18 02:59:35 UTC (rev 6636)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6627-dirty Configuration
-# Fri Aug 15 06:27:55 2014
+# Buildroot 2011.08-svn6635-dirty Configuration
+# Sun Aug 17 21:48:46 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -334,6 +334,7 @@
# BR2_PACKAGE_CDRKIT is not set
# BR2_PACKAGE_CRAMFS is not set
# BR2_PACKAGE_DBUS is not set
+# BR2_PACKAGE_DMIDECODE is not set
# BR2_PACKAGE_DMRAID is not set
BR2_PACKAGE_DOSFSTOOLS=y
BR2_PACKAGE_DOSFSTOOLS_MKDOSFS=y
@@ -360,6 +361,7 @@
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_FLASHROM is not set
# BR2_PACKAGE_FXLOAD is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
# BR2_PACKAGE_GDISK is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-08-19 20:37:36
|
Revision: 6639
http://sourceforge.net/p/astlinux/code/6639
Author: abelbeck
Date: 2014-08-19 20:37:32 +0000 (Tue, 19 Aug 2014)
Log Message:
-----------
php, dynamically define /etc/php.ini so 'date.timezone' is specified, manually define with /mnt/kd/php.ini.conf
Modified Paths:
--------------
branches/1.0/package/lighttpd/lighttpd.init
branches/1.0/package/lighttpd/lighttpd.mk
branches/1.0/package/php/php.mk
branches/1.0/package/webinterface/webinterface.mk
branches/1.0/project/astlinux/target_skeleton/etc/rc
Added Paths:
-----------
branches/1.0/package/lighttpd/php.ini.conf
Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init 2014-08-18 22:11:27 UTC (rev 6638)
+++ branches/1.0/package/lighttpd/lighttpd.init 2014-08-19 20:37:32 UTC (rev 6639)
@@ -2,6 +2,23 @@
. /etc/rc.conf
+gen_php_ini() {
+
+ if [ -f /mnt/kd/php.ini.conf ]; then
+ echo "; Autogenerated. Edit /mnt/kd/php.ini.conf file.
+" >/tmp/etc/php.ini
+ cat /mnt/kd/php.ini.conf >>/tmp/etc/php.ini
+ else
+ echo "; Autogenerated. Do not edit.
+; A manually generated php.ini will use /mnt/kd/php.ini.conf if it exists.
+" >/tmp/etc/php.ini
+ cat /stat/etc/php.ini.conf >>/tmp/etc/php.ini
+ fi
+
+ sed -i -e "s|@TIMEZONE@|${TIMEZONE}|g" \
+ /tmp/etc/php.ini
+}
+
init () {
mkdir -p /var/log/lighttpd
@@ -12,6 +29,9 @@
ln -snf /stat/var/www /var/www
fi
+ # Genearate /etc/php.ini PHP initialization file
+ gen_php_ini
+
# Genearate /etc/lighttpd.conf configuration file
if [ -f /mnt/kd/lighttpd.conf ]; then
echo "# Autogenerated. Edit /mnt/kd/lighttpd.conf file.
Modified: branches/1.0/package/lighttpd/lighttpd.mk
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.mk 2014-08-18 22:11:27 UTC (rev 6638)
+++ branches/1.0/package/lighttpd/lighttpd.mk 2014-08-19 20:37:32 UTC (rev 6639)
@@ -51,6 +51,7 @@
define LIGHTTPD_INSTALL_INITSCRIPT
$(INSTALL) -D -m 0644 package/lighttpd/lighttpd.conf $(TARGET_DIR)/stat/etc/lighttpd.conf
+ $(INSTALL) -D -m 0644 package/lighttpd/php.ini.conf $(TARGET_DIR)/stat/etc/php.ini.conf
$(INSTALL) -D -m 0755 package/lighttpd/lighttpd.init $(TARGET_DIR)/etc/init.d/lighttpd
$(INSTALL) -D -m 0644 package/lighttpd/lighttpd.logrotate $(TARGET_DIR)/etc/logrotate.d/lighttpd
ln -sf /tmp/etc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd.conf
Added: branches/1.0/package/lighttpd/php.ini.conf
===================================================================
--- branches/1.0/package/lighttpd/php.ini.conf (rev 0)
+++ branches/1.0/package/lighttpd/php.ini.conf 2014-08-19 20:37:32 UTC (rev 6639)
@@ -0,0 +1,19 @@
+display_errors = Off
+display_startup_errors = Off
+error_reporting = E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED
+log_errors = Off
+error_log = syslog
+
+output_buffering = 4096
+post_max_size = 10M
+upload_max_filesize = 8M
+session.gc_maxlifetime = 1440
+session.gc_probability = 100
+session.gc_divisor = 100
+max_execution_time = 300
+
+date.timezone = @TIMEZONE@
+
+; Required for PHP 5.3 and earlier
+magic_quotes_gpc = Off
+
Modified: branches/1.0/package/php/php.mk
===================================================================
--- branches/1.0/package/php/php.mk 2014-08-18 22:11:27 UTC (rev 6638)
+++ branches/1.0/package/php/php.mk 2014-08-19 20:37:32 UTC (rev 6639)
@@ -199,6 +199,7 @@
rm -rf $(TARGET_DIR)/usr/lib/php
rm -f $(TARGET_DIR)/usr/bin/phpize
rm -f $(TARGET_DIR)/usr/bin/php-config
+ ln -sf /tmp/etc/php.ini $(TARGET_DIR)/etc/php.ini
endef
PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP
Modified: branches/1.0/package/webinterface/webinterface.mk
===================================================================
--- branches/1.0/package/webinterface/webinterface.mk 2014-08-18 22:11:27 UTC (rev 6638)
+++ branches/1.0/package/webinterface/webinterface.mk 2014-08-19 20:37:32 UTC (rev 6639)
@@ -28,7 +28,6 @@
ifeq ($(strip $(BR2_PACKAGE_WEBINTERFACE_v2)),y)
rsync -a --exclude=".svn" package/webinterface/altweb/ $(TARGET_DIR)/stat/var/www/
- $(INSTALL) -D -m 644 package/webinterface/altweb/php.ini $(TARGET_DIR)/etc/php.ini
$(INSTALL) -D -m 644 package/webinterface/www/admin/.htpasswd $(TARGET_DIR)/stat/var/www/admin/.htpasswd
ifeq ($(strip $(BR2_PACKAGE_ASTERISK)),y)
@@ -51,7 +50,6 @@
webinterface-clean:
rm -rf $(TARGET_DIR)/stat/var/www
rm -f $(TARGET_DIR)/usr/sbin/ast-vmpass
- rm -f $(TARGET_DIR)/etc/php.ini
ifeq ($(strip $(BR2_PACKAGE_ASTERISK)),y)
$(SED) '/^\[general\]$$/,/^$$/{s/^enabled = yes$$/enabled = no/}' \
-e '/^\[webinterface\]$$/,/^$$/d' \
Modified: branches/1.0/project/astlinux/target_skeleton/etc/rc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/rc 2014-08-18 22:11:27 UTC (rev 6638)
+++ branches/1.0/project/astlinux/target_skeleton/etc/rc 2014-08-19 20:37:32 UTC (rev 6639)
@@ -333,6 +333,7 @@
if [ -f "/usr/share/zoneinfo/$TIMEZONE" ]; then
ln -sf "/usr/share/zoneinfo/$TIMEZONE" /tmp/etc/localtime
echo "$TIMEZONE" > /tmp/etc/timezone
+ echo "date.timezone = $TIMEZONE" > /tmp/etc/php.ini
else
echo "Invalid Timezone: $TIMEZONE" >&2
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-08-22 15:53:21
|
Revision: 6650
http://sourceforge.net/p/astlinux/code/6650
Author: abelbeck
Date: 2014-08-22 15:53:18 +0000 (Fri, 22 Aug 2014)
Log Message:
-----------
opensips, new package, disabled by default
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/unixodbc/unixodbc.init
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/opensips/
branches/1.0/package/opensips/Config.in
branches/1.0/package/opensips/opensips.cfg
branches/1.0/package/opensips/opensips.init
branches/1.0/package/opensips/opensips.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-08-20 20:39:37 UTC (rev 6649)
+++ branches/1.0/astlinux-ast11.config 2014-08-22 15:53:18 UTC (rev 6650)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6635-dirty Configuration
-# Sun Aug 17 21:48:38 2014
+# Buildroot 2011.08-svn6649-dirty Configuration
+# Fri Aug 22 10:50:22 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -180,6 +180,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_CLIX=y
+# BR2_PACKAGE_OPENSIPS is not set
BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-08-20 20:39:37 UTC (rev 6649)
+++ branches/1.0/astlinux18.config 2014-08-22 15:53:18 UTC (rev 6650)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6635-dirty Configuration
-# Sun Aug 17 21:48:34 2014
+# Buildroot 2011.08-svn6649-dirty Configuration
+# Fri Aug 22 10:50:20 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -180,6 +180,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_CLIX=y
+# BR2_PACKAGE_OPENSIPS is not set
BR2_PACKAGE_PROSODY=y
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-08-20 20:39:37 UTC (rev 6649)
+++ branches/1.0/initrd.config 2014-08-22 15:53:18 UTC (rev 6650)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6635-dirty Configuration
-# Sun Aug 17 21:49:01 2014
+# Buildroot 2011.08-svn6649-dirty Configuration
+# Fri Aug 22 10:50:26 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -161,6 +161,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
# BR2_PACKAGE_CLIX is not set
+# BR2_PACKAGE_OPENSIPS is not set
# BR2_PACKAGE_PROSODY is not set
#
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-08-20 20:39:37 UTC (rev 6649)
+++ branches/1.0/package/Config.in 2014-08-22 15:53:18 UTC (rev 6650)
@@ -16,6 +16,7 @@
source "package/fbflash/Config.in"
source "package/freeswitch/Config.in"
source "package/clix/Config.in"
+source "package/opensips/Config.in"
source "package/prosody/Config.in"
source "package/rhino/Config.in"
source "package/wanpipe/Config.in"
Added: branches/1.0/package/opensips/Config.in
===================================================================
--- branches/1.0/package/opensips/Config.in (rev 0)
+++ branches/1.0/package/opensips/Config.in 2014-08-22 15:53:18 UTC (rev 6650)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_OPENSIPS
+ bool "opensips"
+ default n
+ select BR2_PACKAGE_OPENSSL
+ help
+ OpenSIPS is a mature and flexible open source SIP server (RFC3261).
+
+ http://www.opensips.org
+
Added: branches/1.0/package/opensips/opensips.cfg
===================================================================
--- branches/1.0/package/opensips/opensips.cfg (rev 0)
+++ branches/1.0/package/opensips/opensips.cfg 2014-08-22 15:53:18 UTC (rev 6650)
@@ -0,0 +1,288 @@
+#
+# OpenSIPS residential configuration script
+# by OpenSIPS Solutions <te...@op...>
+#
+# This script was generated via "make menuconfig", from
+# the "Residential" scenario.
+# You can enable / disable more features / functionalities by
+# re-generating the scenario with different options.#
+#
+# Please refer to the Core CookBook at:
+# http://www.opensips.org/Resources/DocsCookbooks
+# for a explanation of possible statements, functions and parameters.
+#
+
+
+####### Global Parameters #########
+
+debug=3
+log_stderror=no
+log_facility=LOG_LOCAL0
+
+fork=yes
+children=4
+
+/* uncomment the following lines to enable debugging */
+#debug=6
+#fork=no
+#log_stderror=yes
+
+/* uncomment the next line to enable the auto temporary blacklisting of
+ not available destinations (default disabled) */
+#disable_dns_blacklist=no
+
+/* uncomment the next line to enable IPv6 lookup after IPv4 dns
+ lookup failures (default disabled) */
+#dns_try_ipv6=yes
+
+/* comment the next line to enable the auto discovery of local aliases
+ based on revers DNS on IPs */
+auto_aliases=no
+
+
+listen=udp:127.0.0.1:5065 # CUSTOMIZE ME
+
+
+disable_tcp=yes
+
+disable_tls=yes
+
+
+####### Modules Section ########
+
+#set module path
+mpath="/usr/lib/opensips/modules/"
+
+#### SIGNALING module
+loadmodule "signaling.so"
+
+#### StateLess module
+loadmodule "sl.so"
+
+#### Transaction Module
+loadmodule "tm.so"
+modparam("tm", "fr_timeout", 5)
+modparam("tm", "fr_inv_timeout", 30)
+modparam("tm", "restart_fr_on_each_reply", 0)
+modparam("tm", "onreply_avp_mode", 1)
+
+#### Record Route Module
+loadmodule "rr.so"
+/* do not append from tag to the RR (no need for this script) */
+modparam("rr", "append_fromtag", 0)
+
+#### MAX ForWarD module
+loadmodule "maxfwd.so"
+
+#### SIP MSG OPerationS module
+loadmodule "sipmsgops.so"
+
+#### FIFO Management Interface
+loadmodule "mi_fifo.so"
+modparam("mi_fifo", "fifo_name", "/tmp/opensips_fifo")
+modparam("mi_fifo", "fifo_mode", 0666)
+
+
+#### URI module
+loadmodule "uri.so"
+modparam("uri", "use_uri_table", 0)
+
+#### USeR LOCation module
+loadmodule "usrloc.so"
+modparam("usrloc", "nat_bflag", "NAT")
+modparam("usrloc", "db_mode", 0)
+
+#### REGISTRAR module
+loadmodule "registrar.so"
+modparam("registrar", "tcp_persistent_flag", "TCP_PERSISTENT")
+
+/* uncomment the next line not to allow more than 10 contacts per AOR */
+#modparam("registrar", "max_contacts", 10)
+
+#### ACCounting module
+loadmodule "acc.so"
+/* what special events should be accounted ? */
+modparam("acc", "early_media", 0)
+modparam("acc", "report_cancels", 0)
+/* by default we do not adjust the direct of the sequential requests.
+ if you enable this parameter, be sure the enable "append_fromtag"
+ in "rr" module */
+modparam("acc", "detect_direction", 0)
+modparam("acc", "failed_transaction_flag", "ACC_FAILED")
+/* account triggers (flags) */
+modparam("acc", "log_flag", "ACC_DO")
+modparam("acc", "log_missed_flag", "ACC_MISSED")
+
+
+####### Routing Logic ########
+
+# main request routing logic
+
+route{
+ if (!mf_process_maxfwd_header("10")) {
+ sl_send_reply("483","Too Many Hops");
+ exit;
+ }
+
+ if (has_totag()) {
+ # sequential requests within a dialog should
+ # take the path determined by record-routing
+ if (loose_route()) {
+
+ if (is_method("BYE")) {
+ setflag(ACC_DO); # do accounting ...
+ setflag(ACC_FAILED); # ... even if the transaction fails
+ } else if (is_method("INVITE")) {
+ # even if in most of the cases is useless, do RR for
+ # re-INVITEs alos, as some buggy clients do change route set
+ # during the dialog.
+ record_route();
+ }
+
+ # route it out to whatever destination was set by loose_route()
+ # in $du (destination URI).
+ route(relay);
+ } else {
+
+ if ( is_method("ACK") ) {
+ if ( t_check_trans() ) {
+ # non loose-route, but stateful ACK; must be an ACK after
+ # a 487 or e.g. 404 from upstream server
+ t_relay();
+ exit;
+ } else {
+ # ACK without matching transaction ->
+ # ignore and discard
+ exit;
+ }
+ }
+ sl_send_reply("404","Not here");
+ }
+ exit;
+ }
+
+ # CANCEL processing
+ if (is_method("CANCEL"))
+ {
+ if (t_check_trans())
+ t_relay();
+ exit;
+ }
+
+ t_check_trans();
+
+ if ( !(is_method("REGISTER") ) ) {
+ if (from_uri==myself)
+ {
+ } else {
+ # if caller is not local, then called number must be local
+ if (!uri==myself) {
+ send_reply("403","Rely forbidden");
+ exit;
+ }
+ }
+ }
+
+ # preloaded route checking
+ if (loose_route()) {
+ xlog("L_ERR",
+ "Attempt to route with preloaded Route's [$fu/$tu/$ru/$ci]");
+ if (!is_method("ACK"))
+ sl_send_reply("403","Preload Route denied");
+ exit;
+ }
+
+ # record routing
+ if (!is_method("REGISTER|MESSAGE"))
+ record_route();
+
+ # account only INVITEs
+ if (is_method("INVITE")) {
+
+ setflag(ACC_DO); # do accounting
+ }
+
+ if (!uri==myself) {
+ append_hf("P-hint: outbound\r\n");
+ route(relay);
+ }
+
+ # requests for my domain
+ if (is_method("PUBLISH|SUBSCRIBE"))
+ {
+ sl_send_reply("503", "Service Unavailable");
+ exit;
+ }
+
+ if (is_method("REGISTER"))
+ {
+ if ( 0 ) setflag(TCP_PERSISTENT);
+ if (!save("location"))
+ sl_reply_error();
+
+ exit;
+ }
+
+ if ($rU==NULL) {
+ # request with no Username in RURI
+ sl_send_reply("484","Address Incomplete");
+ exit;
+ }
+
+ # do lookup with method filtering
+ if (!lookup("location","m")) {
+ t_newtran();
+ t_reply("404", "Not Found");
+ exit;
+ }
+
+ # when routing via usrloc, log the missed calls also
+ setflag(ACC_MISSED);
+ route(relay);
+}
+
+
+route[relay] {
+ # for INVITEs enable some additional helper routes
+ if (is_method("INVITE")) {
+ t_on_branch("per_branch_ops");
+ t_on_reply("handle_nat");
+ t_on_failure("missed_call");
+ }
+
+ if (!t_relay()) {
+ send_reply("500","Internal Error");
+ };
+ exit;
+}
+
+
+
+
+branch_route[per_branch_ops] {
+ xlog("new branch at $ru\n");
+}
+
+
+onreply_route[handle_nat] {
+
+ xlog("incoming reply\n");
+}
+
+
+failure_route[missed_call] {
+ if (t_was_cancelled()) {
+ exit;
+ }
+
+ # uncomment the following lines if you want to block client
+ # redirect based on 3xx replies.
+ ##if (t_check_status("3[0-9][0-9]")) {
+ ##t_reply("404","Not found");
+ ## exit;
+ ##}
+
+}
+
+
+
Added: branches/1.0/package/opensips/opensips.init
===================================================================
--- branches/1.0/package/opensips/opensips.init (rev 0)
+++ branches/1.0/package/opensips/opensips.init 2014-08-22 15:53:18 UTC (rev 6650)
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+
+ if [ -d /mnt/kd/opensips ]; then
+ ln -snf /mnt/kd/opensips /tmp/etc/opensips
+ else
+ if [ -L /tmp/etc/opensips ]; then
+ rm -f /tmp/etc/opensips
+ fi
+ exit
+ fi
+}
+
+start () {
+
+ if [ -f /etc/opensips/opensips.cfg ]; then
+ echo "Starting opensips..."
+ opensips -u nobody -g nobody -P /var/run/opensips.pid
+ fi
+}
+
+stop () {
+
+ if [ -f /var/run/opensips.pid ]; then
+ echo "Stopping opensips..."
+ kill $(cat /var/run/opensips.pid)
+ rm -f /var/run/opensips.pid
+ fi
+}
+
+case $1 in
+
+init)
+ init
+ start
+ ;;
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Property changes on: branches/1.0/package/opensips/opensips.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/opensips/opensips.mk
===================================================================
--- branches/1.0/package/opensips/opensips.mk (rev 0)
+++ branches/1.0/package/opensips/opensips.mk 2014-08-22 15:53:18 UTC (rev 6650)
@@ -0,0 +1,81 @@
+#############################################################
+#
+# opensips
+#
+##############################################################
+
+OPENSIPS_VERSION = 1.11.2
+OPENSIPS_SOURCE = opensips-$(OPENSIPS_VERSION)_src.tar.gz
+OPENSIPS_SITE = http://www.opensips.org/pub/opensips/$(OPENSIPS_VERSION)/src
+OPENSIPS_DEPENDENCIES = openssl
+
+OPENSIPS_INCLUDE_MODULES =
+
+ifeq ($(strip $(BR2_PACKAGE_UNIXODBC)),y)
+OPENSIPS_DEPENDENCIES += unixodbc
+OPENSIPS_INCLUDE_MODULES += db_unixodbc
+endif
+
+OPENSIPS_EXCLUDE_MODULES = siptrace sipcapture cachedb_couchbase cachedb_memcached cachedb_cassandra cachedb_redis \
+ cachedb_mongodb db_berkeley db_oracle db_perlvdb db_unixodbc event_rabbitmq identity jabber json ldap lua mi_xmlrpc osp \
+ perl perlvdb python h350 snmpstats sngtc aaa_radius carrierroute db_http db_mysql db_postgres mmgeoip httpd \
+ b2b_logic cpl-c xmpp rls xcap_client presence presence_xml presence_mwi presence_dialoginfo \
+ pua pua_bla pua_mi pua_usrloc pua_xmpp pua_dialoginfo regex dialplan mi_http pi_http cachedb_sql \
+ mi_json presence_callinfo presence_xcapdiff
+
+define OPENSIPS_BUILD_CMDS
+ $(TARGET_CONFIGURE_OPTS) \
+ LOCALBASE="$(STAGING_DIR)/usr" \
+ SYSBASE="$(STAGING_DIR)/usr" \
+ CROSS_COMPILE=true \
+ TLS=1 \
+ CFLAGS='$(TARGET_CFLAGS)' \
+ LDFLAGS='$(TARGET_LDFLAGS)' \
+ $(MAKE) -C $(@D) \
+ prefix="" \
+ bin-prefix=/usr/ \
+ cfg-prefix=/ \
+ ARCH="i386" \
+ OS="linux" \
+ include_modules="$(OPENSIPS_INCLUDE_MODULES)" \
+ exclude_modules="$(OPENSIPS_EXCLUDE_MODULES)" \
+ all
+endef
+
+define OPENSIPS_INSTALL_TARGET_CMDS
+ $(INSTALL) -s -D -m 0755 $(@D)/opensips $(TARGET_DIR)/usr/sbin/opensips
+ # Install modules
+ (for i in `find $(@D)/modules -name \*.so`; \
+ do $(INSTALL) -s -D -m 0755 "$$i" $(TARGET_DIR)/usr/lib/opensips/modules/`basename "$$i"`; done)
+ # Install opensipsctl
+ $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctl.base $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.base
+ $(SED) 's:/usr/local/etc/opensips:/etc/opensips:g' \
+ $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.base
+ $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctl.base $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.ctlbase
+ $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctl.base $(TARGET_DIR)/usr/lib/opensips/opensipsctl/opensipsctl.fifo
+ $(INSTALL) -D -m 0755 $(@D)/scripts/opensipsctl $(TARGET_DIR)/usr/sbin/opensipsctl
+ $(SED) 's:/bin/sh:/bin/bash:' \
+ -e 's:/usr/local/etc/opensips:/etc/opensips:g' \
+ -e 's:/usr/local/lib/opensips:/usr/lib/opensips:g' \
+ $(TARGET_DIR)/usr/sbin/opensipsctl
+ $(INSTALL) -D -m 0640 $(@D)/scripts/opensipsctlrc $(TARGET_DIR)/stat/etc/opensips/opensipsctlrc
+ $(INSTALL) -D -m 0640 package/opensips/opensips.cfg $(TARGET_DIR)/stat/etc/opensips/opensips.cfg
+ $(INSTALL) -D -m 0755 package/opensips/opensips.init $(TARGET_DIR)/etc/init.d/opensips
+ ln -snf /tmp/etc/opensips $(TARGET_DIR)/etc/opensips
+ ln -sf ../../init.d/opensips $(TARGET_DIR)/etc/runlevels/default/S58opensips
+ ln -sf ../../init.d/opensips $(TARGET_DIR)/etc/runlevels/default/K02opensips
+endef
+
+define OPENSIPS_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/opensips
+ rm -rf $(TARGET_DIR)/usr/lib/opensips
+ rm -f $(TARGET_DIR)/usr/sbin/opensipsctl.base
+ rm -f $(TARGET_DIR)/usr/sbin/opensipsctl
+ rm -rf $(TARGET_DIR)/stat/etc/opensips
+ rm -f $(TARGET_DIR)/etc/init.d/opensips
+ rm -f $(TARGET_DIR)/etc/opensips
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S58opensips
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K02opensips
+endef
+
+$(eval $(call GENTARGETS,package,opensips))
Modified: branches/1.0/package/unixodbc/unixodbc.init
===================================================================
--- branches/1.0/package/unixodbc/unixodbc.init 2014-08-20 20:39:37 UTC (rev 6649)
+++ branches/1.0/package/unixodbc/unixodbc.init 2014-08-22 15:53:18 UTC (rev 6650)
@@ -102,6 +102,16 @@
Timeout=2000
"
install_odbc_dsn "asterisk-cdr" "$DATA"
+
+ if [ -x /usr/sbin/opensips ]; then
+ DATA="
+Description=OpenSIPS database
+Driver=SQLite3
+Database=/mnt/kd/opensips-odbc.sqlite3
+Timeout=2000
+"
+ install_odbc_dsn "opensips" "$DATA"
+ fi
}
stop () {
@@ -112,6 +122,9 @@
# Remove DSN's
remove_odbc_dsn "asterisk"
remove_odbc_dsn "asterisk-cdr"
+ if [ -x /usr/sbin/opensips ]; then
+ remove_odbc_dsn "opensips"
+ fi
}
case $1 in
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-08-20 20:39:37 UTC (rev 6649)
+++ branches/1.0/runnix-uclibc.config 2014-08-22 15:53:18 UTC (rev 6650)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6635-dirty Configuration
-# Sun Aug 17 21:48:54 2014
+# Buildroot 2011.08-svn6649-dirty Configuration
+# Fri Aug 22 10:50:24 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -221,6 +221,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
# BR2_PACKAGE_CLIX is not set
+# BR2_PACKAGE_OPENSIPS 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 2014-08-20 20:39:37 UTC (rev 6649)
+++ branches/1.0/runnix.config 2014-08-22 15:53:18 UTC (rev 6650)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6635-dirty Configuration
-# Sun Aug 17 21:48:46 2014
+# Buildroot 2011.08-svn6649-dirty Configuration
+# Fri Aug 22 10:50:23 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -163,6 +163,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
# BR2_PACKAGE_CLIX is not set
+# BR2_PACKAGE_OPENSIPS 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...> - 2014-08-22 18:00:22
|
Revision: 6651
http://sourceforge.net/p/astlinux/code/6651
Author: abelbeck
Date: 2014-08-22 18:00:14 +0000 (Fri, 22 Aug 2014)
Log Message:
-----------
rtpproxy, new package, disabled by default, version 1.3-beta.1. Started via opensips init.d
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux18.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/opensips/opensips.init
branches/1.0/runnix-uclibc.config
branches/1.0/runnix.config
Added Paths:
-----------
branches/1.0/package/rtpproxy/
branches/1.0/package/rtpproxy/Config.in
branches/1.0/package/rtpproxy/rtpproxy.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-08-22 15:53:18 UTC (rev 6650)
+++ branches/1.0/astlinux-ast11.config 2014-08-22 18:00:14 UTC (rev 6651)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6649-dirty Configuration
-# Fri Aug 22 10:50:22 2014
+# Buildroot 2011.08-svn6650-dirty Configuration
+# Fri Aug 22 12:57:53 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -182,6 +182,7 @@
BR2_PACKAGE_CLIX=y
# BR2_PACKAGE_OPENSIPS is not set
BR2_PACKAGE_PROSODY=y
+# BR2_PACKAGE_RTPPROXY is not set
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-08-22 15:53:18 UTC (rev 6650)
+++ branches/1.0/astlinux18.config 2014-08-22 18:00:14 UTC (rev 6651)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6649-dirty Configuration
-# Fri Aug 22 10:50:20 2014
+# Buildroot 2011.08-svn6650-dirty Configuration
+# Fri Aug 22 12:57:52 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -182,6 +182,7 @@
BR2_PACKAGE_CLIX=y
# BR2_PACKAGE_OPENSIPS is not set
BR2_PACKAGE_PROSODY=y
+# BR2_PACKAGE_RTPPROXY is not set
BR2_PACKAGE_RHINO=y
BR2_PACKAGE_WANPIPE=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-08-22 15:53:18 UTC (rev 6650)
+++ branches/1.0/initrd.config 2014-08-22 18:00:14 UTC (rev 6651)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6649-dirty Configuration
-# Fri Aug 22 10:50:26 2014
+# Buildroot 2011.08-svn6650-dirty Configuration
+# Fri Aug 22 12:57:56 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -163,6 +163,7 @@
# BR2_PACKAGE_CLIX is not set
# BR2_PACKAGE_OPENSIPS is not set
# BR2_PACKAGE_PROSODY is not set
+# BR2_PACKAGE_RTPPROXY is not set
#
# Audio and video libraries and applications
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-08-22 15:53:18 UTC (rev 6650)
+++ branches/1.0/package/Config.in 2014-08-22 18:00:14 UTC (rev 6651)
@@ -18,6 +18,7 @@
source "package/clix/Config.in"
source "package/opensips/Config.in"
source "package/prosody/Config.in"
+source "package/rtpproxy/Config.in"
source "package/rhino/Config.in"
source "package/wanpipe/Config.in"
endmenu
Modified: branches/1.0/package/opensips/opensips.init
===================================================================
--- branches/1.0/package/opensips/opensips.init 2014-08-22 15:53:18 UTC (rev 6650)
+++ branches/1.0/package/opensips/opensips.init 2014-08-22 18:00:14 UTC (rev 6651)
@@ -17,6 +17,16 @@
start () {
if [ -f /etc/opensips/opensips.cfg ]; then
+
+ if [ -x /usr/bin/rtpproxy -a -n "$RTPPROXY_IP" ]; then
+ echo "Starting rtpproxy..."
+
+ rtpproxy_socket="${RTPPROXY_SOCKET:-udp:127.0.0.1:7890}"
+ rtpproxy_tos="${RTPPROXY_TOS:-0x18}"
+
+ rtpproxy -l "$RTPPROXY_IP" -s "$rtpproxy_socket" -t "$rtpproxy_tos" -u "nobody:nobody"
+ fi
+
echo "Starting opensips..."
opensips -u nobody -g nobody -P /var/run/opensips.pid
fi
@@ -29,6 +39,12 @@
kill $(cat /var/run/opensips.pid)
rm -f /var/run/opensips.pid
fi
+
+ if [ -f /var/run/rtpproxy.pid ]; then
+ echo "Stopping rtpproxy..."
+ kill $(cat /var/run/rtpproxy.pid)
+ rm -f /var/run/rtpproxy.pid
+ fi
}
case $1 in
Added: branches/1.0/package/rtpproxy/Config.in
===================================================================
--- branches/1.0/package/rtpproxy/Config.in (rev 0)
+++ branches/1.0/package/rtpproxy/Config.in 2014-08-22 18:00:14 UTC (rev 6651)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_RTPPROXY
+ bool "rtpproxy"
+ default n
+ help
+ RTPProxy enables VoIP traverse NAT firewalls,
+ Relaying of voice, video or any RTP stream of data.
+
+ http://www.rtpproxy.org/
+
Added: branches/1.0/package/rtpproxy/rtpproxy.mk
===================================================================
--- branches/1.0/package/rtpproxy/rtpproxy.mk (rev 0)
+++ branches/1.0/package/rtpproxy/rtpproxy.mk 2014-08-22 18:00:14 UTC (rev 6651)
@@ -0,0 +1,11 @@
+#############################################################
+#
+# rtpproxy
+#
+#############################################################
+
+RTPPROXY_VERSION = 1.3-beta.1
+RTPPROXY_SITE = http://files.astlinux.org
+RTPPROXY_SOURCE = rtpproxy-$(RTPPROXY_VERSION).tar.gz
+
+$(eval $(call AUTOTARGETS,package,rtpproxy))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-08-22 15:53:18 UTC (rev 6650)
+++ branches/1.0/runnix-uclibc.config 2014-08-22 18:00:14 UTC (rev 6651)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6649-dirty Configuration
-# Fri Aug 22 10:50:24 2014
+# Buildroot 2011.08-svn6650-dirty Configuration
+# Fri Aug 22 12:57:55 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -223,6 +223,7 @@
# BR2_PACKAGE_CLIX is not set
# BR2_PACKAGE_OPENSIPS is not set
# BR2_PACKAGE_PROSODY is not set
+# BR2_PACKAGE_RTPPROXY 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 2014-08-22 15:53:18 UTC (rev 6650)
+++ branches/1.0/runnix.config 2014-08-22 18:00:14 UTC (rev 6651)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6649-dirty Configuration
-# Fri Aug 22 10:50:23 2014
+# Buildroot 2011.08-svn6650-dirty Configuration
+# Fri Aug 22 12:57:54 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -165,6 +165,7 @@
# BR2_PACKAGE_CLIX is not set
# BR2_PACKAGE_OPENSIPS is not set
# BR2_PACKAGE_PROSODY is not set
+# BR2_PACKAGE_RTPPROXY 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...> - 2014-08-24 14:11:16
|
Revision: 6654
http://sourceforge.net/p/astlinux/code/6654
Author: abelbeck
Date: 2014-08-24 14:10:59 +0000 (Sun, 24 Aug 2014)
Log Message:
-----------
kamailio, new package, disabled by default
Modified Paths:
--------------
branches/1.0/astlinux-ast11.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/kamailio/
branches/1.0/package/kamailio/Config.in
branches/1.0/package/kamailio/kamailio.cfg
branches/1.0/package/kamailio/kamailio.init
branches/1.0/package/kamailio/kamailio.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-08-24 00:16:10 UTC (rev 6653)
+++ branches/1.0/astlinux-ast11.config 2014-08-24 14:10:59 UTC (rev 6654)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6650-dirty Configuration
-# Fri Aug 22 12:57:53 2014
+# Buildroot 2011.08-svn6653-dirty Configuration
+# Sun Aug 24 09:09:42 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -180,6 +180,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_CLIX=y
+# BR2_PACKAGE_KAMAILIO is not set
# BR2_PACKAGE_OPENSIPS is not set
BR2_PACKAGE_PROSODY=y
# BR2_PACKAGE_RTPPROXY is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-08-24 00:16:10 UTC (rev 6653)
+++ branches/1.0/astlinux18.config 2014-08-24 14:10:59 UTC (rev 6654)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6650-dirty Configuration
-# Fri Aug 22 12:57:52 2014
+# Buildroot 2011.08-svn6653-dirty Configuration
+# Sun Aug 24 09:09:41 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -180,6 +180,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
BR2_PACKAGE_CLIX=y
+# BR2_PACKAGE_KAMAILIO is not set
# BR2_PACKAGE_OPENSIPS is not set
BR2_PACKAGE_PROSODY=y
# BR2_PACKAGE_RTPPROXY is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-08-24 00:16:10 UTC (rev 6653)
+++ branches/1.0/initrd.config 2014-08-24 14:10:59 UTC (rev 6654)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6650-dirty Configuration
-# Fri Aug 22 12:57:56 2014
+# Buildroot 2011.08-svn6653-dirty Configuration
+# Sun Aug 24 09:09:48 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -161,6 +161,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
# BR2_PACKAGE_CLIX is not set
+# BR2_PACKAGE_KAMAILIO is not set
# BR2_PACKAGE_OPENSIPS is not set
# BR2_PACKAGE_PROSODY is not set
# BR2_PACKAGE_RTPPROXY is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-08-24 00:16:10 UTC (rev 6653)
+++ branches/1.0/package/Config.in 2014-08-24 14:10:59 UTC (rev 6654)
@@ -16,6 +16,7 @@
source "package/fbflash/Config.in"
source "package/freeswitch/Config.in"
source "package/clix/Config.in"
+source "package/kamailio/Config.in"
source "package/opensips/Config.in"
source "package/prosody/Config.in"
source "package/rtpproxy/Config.in"
Added: branches/1.0/package/kamailio/Config.in
===================================================================
--- branches/1.0/package/kamailio/Config.in (rev 0)
+++ branches/1.0/package/kamailio/Config.in 2014-08-24 14:10:59 UTC (rev 6654)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_KAMAILIO
+ bool "kamailio"
+ default n
+ select BR2_PACKAGE_OPENSSL
+ help
+ Kamailio (formerly OpenSER) is an Open Source, rock solid, SIP Server
+
+ http://www.kamailio.org/
+
Added: branches/1.0/package/kamailio/kamailio.cfg
===================================================================
--- branches/1.0/package/kamailio/kamailio.cfg (rev 0)
+++ branches/1.0/package/kamailio/kamailio.cfg 2014-08-24 14:10:59 UTC (rev 6654)
@@ -0,0 +1,941 @@
+#!KAMAILIO
+#
+# Kamailio (OpenSER) SIP Server v4.1 - default configuration script
+# - web: http://www.kamailio.org
+# - git: http://sip-router.org
+#
+# Direct your questions about this file to: <sr-...@li...>
+#
+# Refer to the Core CookBook at http://www.kamailio.org/wiki/
+# for an explanation of possible statements, functions and parameters.
+#
+# Several features can be enabled using '#!define WITH_FEATURE' directives:
+#
+# *** To run in debug mode:
+# - define WITH_DEBUG
+#
+# *** To enable mysql:
+# - define WITH_MYSQL
+#
+# *** To enable authentication execute:
+# - enable mysql
+# - define WITH_AUTH
+# - add users using 'kamctl'
+#
+# *** To enable IP authentication execute:
+# - enable mysql
+# - enable authentication
+# - define WITH_IPAUTH
+# - add IP addresses with group id '1' to 'address' table
+#
+# *** To enable persistent user location execute:
+# - enable mysql
+# - define WITH_USRLOCDB
+#
+# *** To enable presence server execute:
+# - enable mysql
+# - define WITH_PRESENCE
+#
+# *** To enable nat traversal execute:
+# - define WITH_NAT
+# - install RTPProxy: http://www.rtpproxy.org
+# - start RTPProxy:
+# rtpproxy -l _your_public_ip_ -s udp:localhost:7722
+#
+# *** To enable PSTN gateway routing execute:
+# - define WITH_PSTN
+# - set the value of pstn.gw_ip
+# - check route[PSTN] for regexp routing condition
+#
+# *** To enable database aliases lookup execute:
+# - enable mysql
+# - define WITH_ALIASDB
+#
+# *** To enable speed dial lookup execute:
+# - enable mysql
+# - define WITH_SPEEDDIAL
+#
+# *** To enable multi-domain support execute:
+# - enable mysql
+# - define WITH_MULTIDOMAIN
+#
+# *** To enable TLS support execute:
+# - adjust CFGDIR/tls.cfg as needed
+# - define WITH_TLS
+#
+# *** To enable XMLRPC support execute:
+# - define WITH_XMLRPC
+# - adjust route[XMLRPC] for access policy
+#
+# *** To enable anti-flood detection execute:
+# - adjust pike and htable=>ipban settings as needed (default is
+# block if more than 16 requests in 2 seconds and ban for 300 seconds)
+# - define WITH_ANTIFLOOD
+#
+# *** To block 3XX redirect replies execute:
+# - define WITH_BLOCK3XX
+#
+# *** To enable VoiceMail routing execute:
+# - define WITH_VOICEMAIL
+# - set the value of voicemail.srv_ip
+# - adjust the value of voicemail.srv_port
+#
+# *** To enhance accounting execute:
+# - enable mysql
+# - define WITH_ACCDB
+# - add following columns to database
+#!ifdef ACCDB_COMMENT
+ ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default '';
+ ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default '';
+ ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
+#!endif
+
+####### Include Local Config If Exists #########
+import_file "kamailio-local.cfg"
+
+####### Defined Values #########
+
+# *** Value defines - IDs used later in config
+#!ifdef WITH_MYSQL
+# - database URL - used to connect to database server by modules such
+# as: auth_db, acc, usrloc, a.s.o.
+#!ifndef DBURL
+#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio"
+#!endif
+#!endif
+#!ifdef WITH_MULTIDOMAIN
+# - the value for 'use_domain' parameters
+#!define MULTIDOMAIN 1
+#!else
+#!define MULTIDOMAIN 0
+#!endif
+
+# - flags
+# FLT_ - per transaction (message) flags
+# FLB_ - per branch flags
+#!define FLT_ACC 1
+#!define FLT_ACCMISSED 2
+#!define FLT_ACCFAILED 3
+#!define FLT_NATS 5
+
+#!define FLB_NATB 6
+#!define FLB_NATSIPPING 7
+
+####### Global Parameters #########
+
+### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR
+#!ifdef WITH_DEBUG
+debug=4
+log_stderror=yes
+#!else
+debug=2
+log_stderror=no
+#!endif
+
+memdbg=5
+memlog=5
+
+log_facility=LOG_LOCAL0
+
+fork=yes
+children=4
+
+/* uncomment the next line to disable TCP (default on) */
+#disable_tcp=yes
+
+/* uncomment the next line to disable the auto discovery of local aliases
+ based on reverse DNS on IPs (default on) */
+#auto_aliases=no
+
+/* add local domain aliases */
+#alias="sip.mydomain.com"
+
+/* uncomment and configure the following line if you want Kamailio to
+ bind on a specific interface/port/proto (default bind on all available) */
+listen=udp:127.0.0.1:5065 # CUSTOMIZE ME
+
+/* port to listen to
+ * - can be specified more than once if needed to listen on many ports */
+port=5060
+
+#!ifdef WITH_TLS
+enable_tls=yes
+#!endif
+
+# life time of TCP connection when there is no traffic
+# - a bit higher than registration expires to cope with UA behind NAT
+tcp_connection_lifetime=3605
+
+####### Custom Parameters #########
+
+# These parameters can be modified runtime via RPC interface
+# - see the documentation of 'cfg_rpc' module.
+#
+# Format: group.id = value 'desc' description
+# Access: $sel(cfg_get.group.id) or @cfg_get.group.id
+#
+
+#!ifdef WITH_PSTN
+# PSTN GW Routing
+#
+# - pstn.gw_ip: valid IP or hostname as string value, example:
+# pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address"
+#
+# - by default is empty to avoid misrouting
+pstn.gw_ip = "" desc "PSTN GW Address"
+pstn.gw_port = "" desc "PSTN GW Port"
+#!endif
+
+#!ifdef WITH_VOICEMAIL
+# VoiceMail Routing on offline, busy or no answer
+#
+# - by default Voicemail server IP is empty to avoid misrouting
+voicemail.srv_ip = "" desc "VoiceMail IP Address"
+voicemail.srv_port = "5060" desc "VoiceMail Port"
+#!endif
+
+####### Modules Section ########
+
+# set paths to location of modules (to sources or installation folders)
+#!ifdef WITH_SRCPATH
+mpath="modules/"
+#!else
+mpath="/lib/kamailio/modules/"
+#!endif
+
+#!ifdef WITH_MYSQL
+loadmodule "db_mysql.so"
+#!endif
+
+loadmodule "mi_fifo.so"
+loadmodule "kex.so"
+loadmodule "corex.so"
+loadmodule "tm.so"
+loadmodule "tmx.so"
+loadmodule "sl.so"
+loadmodule "rr.so"
+loadmodule "pv.so"
+loadmodule "maxfwd.so"
+loadmodule "usrloc.so"
+loadmodule "registrar.so"
+loadmodule "textops.so"
+loadmodule "siputils.so"
+loadmodule "xlog.so"
+loadmodule "sanity.so"
+loadmodule "ctl.so"
+loadmodule "cfg_rpc.so"
+loadmodule "mi_rpc.so"
+loadmodule "acc.so"
+
+#!ifdef WITH_AUTH
+loadmodule "auth.so"
+loadmodule "auth_db.so"
+#!ifdef WITH_IPAUTH
+loadmodule "permissions.so"
+#!endif
+#!endif
+
+#!ifdef WITH_ALIASDB
+loadmodule "alias_db.so"
+#!endif
+
+#!ifdef WITH_SPEEDDIAL
+loadmodule "speeddial.so"
+#!endif
+
+#!ifdef WITH_MULTIDOMAIN
+loadmodule "domain.so"
+#!endif
+
+#!ifdef WITH_PRESENCE
+loadmodule "presence.so"
+loadmodule "presence_xml.so"
+#!endif
+
+#!ifdef WITH_NAT
+loadmodule "nathelper.so"
+loadmodule "rtpproxy.so"
+#!endif
+
+#!ifdef WITH_TLS
+loadmodule "tls.so"
+#!endif
+
+#!ifdef WITH_ANTIFLOOD
+loadmodule "htable.so"
+loadmodule "pike.so"
+#!endif
+
+#!ifdef WITH_XMLRPC
+loadmodule "xmlrpc.so"
+#!endif
+
+#!ifdef WITH_DEBUG
+loadmodule "debugger.so"
+#!endif
+
+# ----------------- setting module-specific parameters ---------------
+
+
+# ----- mi_fifo params -----
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
+
+
+# ----- tm params -----
+# auto-discard branches from previous serial forking leg
+modparam("tm", "failure_reply_mode", 3)
+# default retransmission timeout: 30sec
+modparam("tm", "fr_timer", 30000)
+# default invite retransmission timeout after 1xx: 120sec
+modparam("tm", "fr_inv_timer", 120000)
+
+
+# ----- rr params -----
+# add value to ;lr param to cope with most of the UAs
+modparam("rr", "enable_full_lr", 1)
+# do not append from tag to the RR (no need for this script)
+modparam("rr", "append_fromtag", 0)
+
+
+# ----- registrar params -----
+modparam("registrar", "method_filtering", 1)
+/* uncomment the next line to disable parallel forking via location */
+# modparam("registrar", "append_branches", 0)
+/* uncomment the next line not to allow more than 10 contacts per AOR */
+#modparam("registrar", "max_contacts", 10)
+# max value for expires of registrations
+modparam("registrar", "max_expires", 3600)
+# set it to 1 to enable GRUU
+modparam("registrar", "gruu_enabled", 0)
+
+
+# ----- acc params -----
+/* what special events should be accounted ? */
+modparam("acc", "early_media", 0)
+modparam("acc", "report_ack", 0)
+modparam("acc", "report_cancels", 0)
+/* by default ww do not adjust the direct of the sequential requests.
+ if you enable this parameter, be sure the enable "append_fromtag"
+ in "rr" module */
+modparam("acc", "detect_direction", 0)
+/* account triggers (flags) */
+modparam("acc", "log_flag", FLT_ACC)
+modparam("acc", "log_missed_flag", FLT_ACCMISSED)
+modparam("acc", "log_extra",
+ "src_user=$fU;src_domain=$fd;src_ip=$si;"
+ "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
+modparam("acc", "failed_transaction_flag", FLT_ACCFAILED)
+/* enhanced DB accounting */
+#!ifdef WITH_ACCDB
+modparam("acc", "db_flag", FLT_ACC)
+modparam("acc", "db_missed_flag", FLT_ACCMISSED)
+modparam("acc", "db_url", DBURL)
+modparam("acc", "db_extra",
+ "src_user=$fU;src_domain=$fd;src_ip=$si;"
+ "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
+#!endif
+
+
+# ----- usrloc params -----
+/* enable DB persistency for location entries */
+#!ifdef WITH_USRLOCDB
+modparam("usrloc", "db_url", DBURL)
+modparam("usrloc", "db_mode", 2)
+modparam("usrloc", "use_domain", MULTIDOMAIN)
+#!endif
+
+
+# ----- auth_db params -----
+#!ifdef WITH_AUTH
+modparam("auth_db", "db_url", DBURL)
+modparam("auth_db", "calculate_ha1", yes)
+modparam("auth_db", "password_column", "password")
+modparam("auth_db", "load_credentials", "")
+modparam("auth_db", "use_domain", MULTIDOMAIN)
+
+# ----- permissions params -----
+#!ifdef WITH_IPAUTH
+modparam("permissions", "db_url", DBURL)
+modparam("permissions", "db_mode", 1)
+#!endif
+
+#!endif
+
+
+# ----- alias_db params -----
+#!ifdef WITH_ALIASDB
+modparam("alias_db", "db_url", DBURL)
+modparam("alias_db", "use_domain", MULTIDOMAIN)
+#!endif
+
+
+# ----- speeddial params -----
+#!ifdef WITH_SPEEDDIAL
+modparam("speeddial", "db_url", DBURL)
+modparam("speeddial", "use_domain", MULTIDOMAIN)
+#!endif
+
+
+# ----- domain params -----
+#!ifdef WITH_MULTIDOMAIN
+modparam("domain", "db_url", DBURL)
+# register callback to match myself condition with domains list
+modparam("domain", "register_myself", 1)
+#!endif
+
+
+#!ifdef WITH_PRESENCE
+# ----- presence params -----
+modparam("presence", "db_url", DBURL)
+
+# ----- presence_xml params -----
+modparam("presence_xml", "db_url", DBURL)
+modparam("presence_xml", "force_active", 1)
+#!endif
+
+
+#!ifdef WITH_NAT
+# ----- rtpproxy params -----
+modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722")
+
+# ----- nathelper params -----
+modparam("nathelper", "natping_interval", 30)
+modparam("nathelper", "ping_nated_only", 1)
+modparam("nathelper", "sipping_bflag", FLB_NATSIPPING)
+modparam("nathelper", "sipping_from", "sip:pi...@ka...")
+
+# params needed for NAT traversal in other modules
+modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)")
+modparam("usrloc", "nat_bflag", FLB_NATB)
+#!endif
+
+
+#!ifdef WITH_TLS
+# ----- tls params -----
+modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg")
+#!endif
+
+#!ifdef WITH_ANTIFLOOD
+# ----- pike params -----
+modparam("pike", "sampling_time_unit", 2)
+modparam("pike", "reqs_density_per_unit", 16)
+modparam("pike", "remove_latency", 4)
+
+# ----- htable params -----
+# ip ban htable with autoexpire after 5 minutes
+modparam("htable", "htable", "ipban=>size=8;autoexpire=300;")
+#!endif
+
+#!ifdef WITH_XMLRPC
+# ----- xmlrpc params -----
+modparam("xmlrpc", "route", "XMLRPC");
+modparam("xmlrpc", "url_match", "^/RPC")
+#!endif
+
+#!ifdef WITH_DEBUG
+# ----- debugger params -----
+modparam("debugger", "cfgtrace", 1)
+#!endif
+
+####### Routing Logic ########
+
+
+# Main SIP request routing logic
+# - processing of any incoming SIP request starts with this route
+# - note: this is the same as route { ... }
+request_route {
+
+ # per request initial checks
+ route(REQINIT);
+
+ # NAT detection
+ route(NATDETECT);
+
+ # CANCEL processing
+ if (is_method("CANCEL"))
+ {
+ if (t_check_trans()) {
+ route(RELAY);
+ }
+ exit;
+ }
+
+ # handle requests within SIP dialogs
+ route(WITHINDLG);
+
+ ### only initial requests (no To tag)
+
+ t_check_trans();
+
+ # authentication
+ route(AUTH);
+
+ # record routing for dialog forming requests (in case they are routed)
+ # - remove preloaded route headers
+ remove_hf("Route");
+ if (is_method("INVITE|SUBSCRIBE"))
+ record_route();
+
+ # account only INVITEs
+ if (is_method("INVITE"))
+ {
+ setflag(FLT_ACC); # do accounting
+ }
+
+ # dispatch requests to foreign domains
+ route(SIPOUT);
+
+ ### requests for my local domains
+
+ # handle presence related requests
+ route(PRESENCE);
+
+ # handle registrations
+ route(REGISTRAR);
+
+ if ($rU==$null)
+ {
+ # request with no Username in RURI
+ sl_send_reply("484","Address Incomplete");
+ exit;
+ }
+
+ # dispatch destinations to PSTN
+ route(PSTN);
+
+ # user location service
+ route(LOCATION);
+}
+
+
+route[RELAY] {
+
+ # enable additional event routes for forwarded requests
+ # - serial forking, RTP relaying handling, a.s.o.
+ if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) {
+ if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH");
+ }
+ if (is_method("INVITE|SUBSCRIBE|UPDATE")) {
+ if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY");
+ }
+ if (is_method("INVITE")) {
+ if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE");
+ }
+
+ if (!t_relay()) {
+ sl_reply_error();
+ }
+ exit;
+}
+
+# Per SIP request initial checks
+route[REQINIT] {
+#!ifdef WITH_ANTIFLOOD
+ # flood dection from same IP and traffic ban for a while
+ # be sure you exclude checking trusted peers, such as pstn gateways
+ # - local host excluded (e.g., loop to self)
+ if(src_ip!=myself)
+ {
+ if($sht(ipban=>$si)!=$null)
+ {
+ # ip is already blocked
+ xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n");
+ exit;
+ }
+ if (!pike_check_req())
+ {
+ xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n");
+ $sht(ipban=>$si) = 1;
+ exit;
+ }
+ }
+#!endif
+
+ if (!mf_process_maxfwd_header("10")) {
+ sl_send_reply("483","Too Many Hops");
+ exit;
+ }
+
+ if(!sanity_check("1511", "7"))
+ {
+ xlog("Malformed SIP message from $si:$sp\n");
+ exit;
+ }
+}
+
+# Handle requests within SIP dialogs
+route[WITHINDLG] {
+ if (has_totag()) {
+ # sequential request withing a dialog should
+ # take the path determined by record-routing
+ if (loose_route()) {
+ route(DLGURI);
+ if (is_method("BYE")) {
+ setflag(FLT_ACC); # do accounting ...
+ setflag(FLT_ACCFAILED); # ... even if the transaction fails
+ }
+ else if ( is_method("ACK") ) {
+ # ACK is forwarded statelessy
+ route(NATMANAGE);
+ }
+ else if ( is_method("NOTIFY") ) {
+ # Add Record-Route for in-dialog NOTIFY as per RFC 6665.
+ record_route();
+ }
+ route(RELAY);
+ } else {
+ if (is_method("SUBSCRIBE") && uri == myself) {
+ # in-dialog subscribe requests
+ route(PRESENCE);
+ exit;
+ }
+ if ( is_method("ACK") ) {
+ if ( t_check_trans() ) {
+ # no loose-route, but stateful ACK;
+ # must be an ACK after a 487
+ # or e.g. 404 from upstream server
+ route(RELAY);
+ exit;
+ } else {
+ # ACK without matching transaction ... ignore and discard
+ exit;
+ }
+ }
+ sl_send_reply("404","Not here");
+ }
+ exit;
+ }
+}
+
+# Handle SIP registrations
+route[REGISTRAR] {
+ if (is_method("REGISTER"))
+ {
+ if(isflagset(FLT_NATS))
+ {
+ setbflag(FLB_NATB);
+ # uncomment next line to do SIP NAT pinging
+ ## setbflag(FLB_NATSIPPING);
+ }
+ if (!save("location"))
+ sl_reply_error();
+
+ exit;
+ }
+}
+
+# USER location service
+route[LOCATION] {
+
+#!ifdef WITH_SPEEDDIAL
+ # search for short dialing - 2-digit extension
+ if($rU=~"^[0-9][0-9]$")
+ if(sd_lookup("speed_dial"))
+ route(SIPOUT);
+#!endif
+
+#!ifdef WITH_ALIASDB
+ # search in DB-based aliases
+ if(alias_db_lookup("dbaliases"))
+ route(SIPOUT);
+#!endif
+
+ $avp(oexten) = $rU;
+ if (!lookup("location")) {
+ $var(rc) = $rc;
+ route(TOVOICEMAIL);
+ t_newtran();
+ switch ($var(rc)) {
+ case -1:
+ case -3:
+ send_reply("404", "Not Found");
+ exit;
+ case -2:
+ send_reply("405", "Method Not Allowed");
+ exit;
+ }
+ }
+
+ # when routing via usrloc, log the missed calls also
+ if (is_method("INVITE"))
+ {
+ setflag(FLT_ACCMISSED);
+ }
+
+ route(RELAY);
+ exit;
+}
+
+# Presence server route
+route[PRESENCE] {
+ if(!is_method("PUBLISH|SUBSCRIBE"))
+ return;
+
+ if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") {
+ route(TOVOICEMAIL);
+ # returns here if no voicemail server is configured
+ sl_send_reply("404", "No voicemail service");
+ exit;
+ }
+
+#!ifdef WITH_PRESENCE
+ if (!t_newtran())
+ {
+ sl_reply_error();
+ exit;
+ }
+
+ if(is_method("PUBLISH"))
+ {
+ handle_publish();
+ t_release();
+ } else if(is_method("SUBSCRIBE")) {
+ handle_subscribe();
+ t_release();
+ }
+ exit;
+#!endif
+
+ # if presence enabled, this part will not be executed
+ if (is_method("PUBLISH") || $rU==$null)
+ {
+ sl_send_reply("404", "Not here");
+ exit;
+ }
+ return;
+}
+
+# Authentication route
+route[AUTH] {
+#!ifdef WITH_AUTH
+
+#!ifdef WITH_IPAUTH
+ if((!is_method("REGISTER")) && allow_source_address())
+ {
+ # source IP allowed
+ return;
+ }
+#!endif
+
+ if (is_method("REGISTER") || from_uri==myself)
+ {
+ # authenticate requests
+ if (!auth_check("$fd", "subscriber", "1")) {
+ auth_challenge("$fd", "0");
+ exit;
+ }
+ # user authenticated - remove auth header
+ if(!is_method("REGISTER|PUBLISH"))
+ consume_credentials();
+ }
+ # if caller is not local subscriber, then check if it calls
+ # a local destination, otherwise deny, not an open relay here
+ if (from_uri!=myself && uri!=myself)
+ {
+ sl_send_reply("403","Not relaying");
+ exit;
+ }
+
+#!endif
+ return;
+}
+
+# Caller NAT detection route
+route[NATDETECT] {
+#!ifdef WITH_NAT
+ force_rport();
+ if (nat_uac_test("19")) {
+ if (is_method("REGISTER")) {
+ fix_nated_register();
+ } else {
+ if(is_first_hop())
+ set_contact_alias();
+ }
+ setflag(FLT_NATS);
+ }
+#!endif
+ return;
+}
+
+# RTPProxy control
+route[NATMANAGE] {
+#!ifdef WITH_NAT
+ if (is_request()) {
+ if(has_totag()) {
+ if(check_route_param("nat=yes")) {
+ setbflag(FLB_NATB);
+ }
+ }
+ }
+ if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB)))
+ return;
+
+ rtpproxy_manage("co");
+
+ if (is_request()) {
+ if (!has_totag()) {
+ if(t_is_branch_route()) {
+ add_rr_param(";nat=yes");
+ }
+ }
+ }
+ if (is_reply()) {
+ if(isbflagset(FLB_NATB)) {
+ if(is_first_hop())
+ set_contact_alias();
+ }
+ }
+#!endif
+ return;
+}
+
+# URI update for dialog requests
+route[DLGURI] {
+#!ifdef WITH_NAT
+ if(!isdsturiset()) {
+ handle_ruri_alias();
+ }
+#!endif
+ return;
+}
+
+# Routing to foreign domains
+route[SIPOUT] {
+ if (!uri==myself)
+ {
+ append_hf("P-hint: outbound\r\n");
+ route(RELAY);
+ }
+}
+
+# PSTN GW routing
+route[PSTN] {
+#!ifdef WITH_PSTN
+ # check if PSTN GW IP is defined
+ if (strempty($sel(cfg_get.pstn.gw_ip))) {
+ xlog("SCRIPT: PSTN rotuing enabled but pstn.gw_ip not defined\n");
+ return;
+ }
+
+ # route to PSTN dialed numbers starting with '+' or '00'
+ # (international format)
+ # - update the condition to match your dialing rules for PSTN routing
+ if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$"))
+ return;
+
+ # only local users allowed to call
+ if(from_uri!=myself) {
+ sl_send_reply("403", "Not Allowed");
+ exit;
+ }
+
+ if (strempty($sel(cfg_get.pstn.gw_port))) {
+ $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip);
+ } else {
+ $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":"
+ + $sel(cfg_get.pstn.gw_port);
+ }
+
+ route(RELAY);
+ exit;
+#!endif
+
+ return;
+}
+
+# XMLRPC routing
+#!ifdef WITH_XMLRPC
+route[XMLRPC] {
+ # allow XMLRPC from localhost
+ if ((method=="POST" || method=="GET")
+ && (src_ip==127.0.0.1)) {
+ # close connection only for xmlrpclib user agents (there is a bug in
+ # xmlrpclib: it waits for EOF before interpreting the response).
+ if ($hdr(User-Agent) =~ "xmlrpclib")
+ set_reply_close();
+ set_reply_no_connect();
+ dispatch_rpc();
+ exit;
+ }
+ send_reply("403", "Forbidden");
+ exit;
+}
+#!endif
+
+# route to voicemail server
+route[TOVOICEMAIL] {
+#!ifdef WITH_VOICEMAIL
+ if(!is_method("INVITE|SUBSCRIBE"))
+ return;
+
+ # check if VoiceMail server IP is defined
+ if (strempty($sel(cfg_get.voicemail.srv_ip))) {
+ xlog("SCRIPT: VoiceMail rotuing enabled but IP not defined\n");
+ return;
+ }
+ if(is_method("INVITE")) {
+ if($avp(oexten)==$null)
+ return;
+ $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip)
+ + ":" + $sel(cfg_get.voicemail.srv_port);
+ } else {
+ if($rU==$null)
+ return;
+ $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip)
+ + ":" + $sel(cfg_get.voicemail.srv_port);
+ }
+ route(RELAY);
+ exit;
+#!endif
+
+ return;
+}
+
+# manage outgoing branches
+branch_route[MANAGE_BRANCH] {
+ xdbg("new branch [$T_branch_idx] to $ru\n");
+ route(NATMANAGE);
+}
+
+# manage incoming replies
+onreply_route[MANAGE_REPLY] {
+ xdbg("incoming reply\n");
+ if(status=~"[12][0-9][0-9]")
+ route(NATMANAGE);
+}
+
+# manage failure routing cases
+failure_route[MANAGE_FAILURE] {
+ route(NATMANAGE);
+
+ if (t_is_canceled()) {
+ exit;
+ }
+
+#!ifdef WITH_BLOCK3XX
+ # block call redirect based on 3xx replies.
+ if (t_check_status("3[0-9][0-9]")) {
+ t_reply("404","Not found");
+ exit;
+ }
+#!endif
+
+#!ifdef WITH_VOICEMAIL
+ # serial forking
+ # - route to voicemail on busy or no answer (timeout)
+ if (t_check_status("486|408")) {
+ $du = $null;
+ route(TOVOICEMAIL);
+ exit;
+ }
+#!endif
+}
Added: branches/1.0/package/kamailio/kamailio.init
===================================================================
--- branches/1.0/package/kamailio/kamailio.init (rev 0)
+++ branches/1.0/package/kamailio/kamailio.init 2014-08-24 14:10:59 UTC (rev 6654)
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init () {
+
+ if [ -d /mnt/kd/kamailio ]; then
+ ln -snf /mnt/kd/kamailio /tmp/etc/kamailio
+ else
+ if [ -L /tmp/etc/kamailio ]; then
+ rm -f /tmp/etc/kamailio
+ fi
+ exit
+ fi
+}
+
+start () {
+
+ if [ -f /etc/kamailio/kamailio.cfg ]; then
+
+ if [ -x /usr/bin/rtpproxy -a -n "$RTPPROXY_IP" ]; then
+ echo "Starting rtpproxy..."
+
+ rtpproxy_socket="${RTPPROXY_SOCKET:-udp:127.0.0.1:7890}"
+ rtpproxy_tos="${RTPPROXY_TOS:-0x18}"
+
+ rtpproxy -l "$RTPPROXY_IP" -s "$rtpproxy_socket" -t "$rtpproxy_tos" -u "nobody:nobody"
+ fi
+
+ echo "Starting kamailio..."
+ kamailio -u nobody -g nobody -P /var/run/kamailio.pid
+ fi
+}
+
+stop () {
+
+ if [ -f /var/run/kamailio.pid ]; then
+ echo "Stopping kamailio..."
+ kill $(cat /var/run/kamailio.pid)
+ rm -f /var/run/kamailio.pid
+ fi
+
+ if [ -f /var/run/rtpproxy.pid ]; then
+ echo "Stopping rtpproxy..."
+ kill $(cat /var/run/rtpproxy.pid)
+ rm -f /var/run/rtpproxy.pid
+ fi
+}
+
+case $1 in
+
+init)
+ init
+ start
+ ;;
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Property changes on: branches/1.0/package/kamailio/kamailio.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/kamailio/kamailio.mk
===================================================================
--- branches/1.0/package/kamailio/kamailio.mk (rev 0)
+++ branches/1.0/package/kamailio/kamailio.mk 2014-08-24 14:10:59 UTC (rev 6654)
@@ -0,0 +1,87 @@
+#############################################################
+#
+# kamailio
+#
+##############################################################
+
+KAMAILIO_VERSION = 4.1.5
+KAMAILIO_SOURCE = kamailio-$(KAMAILIO_VERSION)_src.tar.gz
+KAMAILIO_SITE = http://kamailio.org/pub/kamailio/$(KAMAILIO_VERSION)/src
+KAMAILIO_DEPENDENCIES = openssl
+
+KAMAILIO_GROUP_MODULES = standard
+KAMAILIO_INCLUDE_MODULES = acc registrar usrloc
+KAMAILIO_EXCLUDE_MODULES =
+
+ifeq ($(strip $(BR2_PACKAGE_SQLITE)),y)
+KAMAILIO_DEPENDENCIES += sqlite
+KAMAILIO_INCLUDE_MODULES += db_sqlite
+endif
+
+KAMAILIO_ENV_ARGS = \
+ LOCALBASE="$(STAGING_DIR)/usr" \
+ SYSBASE="$(STAGING_DIR)/usr" \
+ CROSS_COMPILE=true \
+ TLS_HOOKS=1 \
+ CFLAGS='$(TARGET_CFLAGS)' \
+ LDFLAGS='$(TARGET_LDFLAGS)'
+
+KAMAILIO_MAKEFLAGS = \
+ prefix="" \
+ bin_dir=usr/sbin \
+ cfg_dir=etc/kamailio \
+ data_dir=usr/share/kamailio \
+ lib_dir=usr/lib/kamailio \
+ module_dir=usr/lib/kamailio \
+ cfg_target=/etc/kamailio/ \
+ group_include="$(KAMAILIO_GROUP_MODULES)" \
+ include_modules="$(KAMAILIO_INCLUDE_MODULES)" \
+ exclude_modules="$(KAMAILIO_EXCLUDE_MODULES)" \
+ modules_dirs="modules" \
+ ARCH="i386" \
+ OS="linux"
+
+define KAMAILIO_BUILD_CMDS
+ $(TARGET_CONFIGURE_OPTS) \
+ $(KAMAILIO_ENV_ARGS) \
+ $(MAKE) -C $(@D) \
+ $(KAMAILIO_MAKEFLAGS) \
+ FLAVOUR="kamailio" \
+ cfg
+
+ $(TARGET_CONFIGURE_OPTS) \
+ $(KAMAILIO_ENV_ARGS) \
+ $(MAKE) -C $(@D) \
+ $(KAMAILIO_MAKEFLAGS) \
+ all
+endef
+
+define KAMAILIO_INSTALL_TARGET_CMDS
+ $(TARGET_CONFIGURE_OPTS) \
+ $(KAMAILIO_ENV_ARGS) \
+ $(MAKE) -C $(@D) \
+ $(KAMAILIO_MAKEFLAGS) \
+ DESTDIR="$(TARGET_DIR)" \
+ install
+
+ mv $(TARGET_DIR)/etc/kamailio $(TARGET_DIR)/stat/etc/
+ $(INSTALL) -D -m 0644 package/kamailio/kamailio.cfg $(TARGET_DIR)/stat/etc/kamailio/kamailio.cfg
+ $(INSTALL) -D -m 0755 package/kamailio/kamailio.init $(TARGET_DIR)/etc/init.d/kamailio
+ ln -s /tmp/etc/kamailio $(TARGET_DIR)/etc/kamailio
+ ln -sf ../../init.d/kamailio $(TARGET_DIR)/etc/runlevels/default/S58kamailio
+ ln -sf ../../init.d/kamailio $(TARGET_DIR)/etc/runlevels/default/K02kamailio
+endef
+
+define KAMAILIO_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/kamailio
+ rm -rf $(TARGET_DIR)/lib/kamailio
+ rm -rf $(TARGET_DIR)/usr/lib/kamailio
+ rm -rf $(TARGET_DIR)/usr/share/kamailio
+ rm -rf $(TARGET_DIR)/stat/etc/kamailio
+ rm -f $(TARGET_DIR)/etc/init.d/kamailio
+ rm -f $(TARGET_DIR)/etc/kamailio
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S58kamailio
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K02kamailio
+endef
+
+$(eval $(call GENTARGETS,package,kamailio))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-08-24 00:16:10 UTC (rev 6653)
+++ branches/1.0/runnix-uclibc.config 2014-08-24 14:10:59 UTC (rev 6654)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6650-dirty Configuration
-# Fri Aug 22 12:57:55 2014
+# Buildroot 2011.08-svn6653-dirty Configuration
+# Sun Aug 24 09:09:47 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -221,6 +221,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
# BR2_PACKAGE_CLIX is not set
+# BR2_PACKAGE_KAMAILIO is not set
# BR2_PACKAGE_OPENSIPS is not set
# BR2_PACKAGE_PROSODY is not set
# BR2_PACKAGE_RTPPROXY is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-08-24 00:16:10 UTC (rev 6653)
+++ branches/1.0/runnix.config 2014-08-24 14:10:59 UTC (rev 6654)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6650-dirty Configuration
-# Fri Aug 22 12:57:54 2014
+# Buildroot 2011.08-svn6653-dirty Configuration
+# Sun Aug 24 09:09:44 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -163,6 +163,7 @@
# BR2_PACKAGE_FONULATOR is not set
# BR2_PACKAGE_FREESWITCH is not set
# BR2_PACKAGE_CLIX is not set
+# BR2_PACKAGE_KAMAILIO is not set
# BR2_PACKAGE_OPENSIPS is not set
# BR2_PACKAGE_PROSODY is not set
# BR2_PACKAGE_RTPPROXY is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-08-25 19:52:54
|
Revision: 6657
http://sourceforge.net/p/astlinux/code/6657
Author: abelbeck
Date: 2014-08-25 19:52:42 +0000 (Mon, 25 Aug 2014)
Log Message:
-----------
kamailio, add kamailio user/group, enable tls and a few more modules, configure kamctlrc. Devs, be sure to do a clean rebuild and update /mnt/kd/kamailio/kamctlrc because of the new kamailio user/group
Modified Paths:
--------------
branches/1.0/package/kamailio/kamailio.init
branches/1.0/package/kamailio/kamailio.mk
branches/1.0/project/astlinux/target_skeleton/etc/group
branches/1.0/project/astlinux/target_skeleton/etc/init.d/FIRSTRUN
branches/1.0/project/astlinux/target_skeleton/etc/passwd
branches/1.0/project/astlinux/target_skeleton/etc/shadow
branches/1.0/project/astlinux/target_skeleton/etc/shadow-
Added Paths:
-----------
branches/1.0/package/kamailio/etc/
branches/1.0/package/kamailio/etc/kamailio-basic.cfg
branches/1.0/package/kamailio/etc/kamailio.cfg
branches/1.0/package/kamailio/etc/tls.cfg
Removed Paths:
-------------
branches/1.0/package/kamailio/kamailio.cfg
Added: branches/1.0/package/kamailio/etc/kamailio-basic.cfg
===================================================================
--- branches/1.0/package/kamailio/etc/kamailio-basic.cfg (rev 0)
+++ branches/1.0/package/kamailio/etc/kamailio-basic.cfg 2014-08-25 19:52:42 UTC (rev 6657)
@@ -0,0 +1,613 @@
+#!KAMAILIO
+#
+# Kamailio (OpenSER) SIP Server v4.0 - default configuration script
+# - web: http://www.kamailio.org
+# - git: http://sip-router.org
+#
+# Direct your questions about this file to: <sr-...@li...>
+#
+# Refer to the Core CookBook at http://www.kamailio.org/wiki/
+# for an explanation of possible statements, functions and parameters.
+#
+# Several features can be enabled using '#!define WITH_FEATURE' directives:
+#
+# *** To run in debug mode:
+# - define WITH_DEBUG
+#
+# *** To enable mysql:
+# - define WITH_MYSQL
+#
+# *** To enable authentication execute:
+# - enable mysql
+# - define WITH_AUTH
+# - add users using 'kamctl'
+#
+# *** To enable IP authentication execute:
+# - enable mysql
+# - enable authentication
+# - define WITH_IPAUTH
+# - add IP addresses with group id '1' to 'address' table
+#
+# *** To enable persistent user location execute:
+# - enable mysql
+# - define WITH_USRLOCDB
+#
+# *** To enable nat traversal execute:
+# - define WITH_NAT
+# - install RTPProxy: http://www.rtpproxy.org
+# - start RTPProxy:
+# rtpproxy -l _your_public_ip_ -s udp:localhost:7722
+#
+# *** To enable TLS support execute:
+# - adjust CFGDIR/tls.cfg as needed
+# - define WITH_TLS
+#
+# *** To enhance accounting execute:
+# - enable mysql
+# - define WITH_ACCDB
+# - add following columns to database
+#!ifdef ACCDB_COMMENT
+ ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default '';
+ ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default '';
+ ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
+#!endif
+
+####### Include Local Config If Exists #########
+import_file "kamailio-local.cfg"
+
+####### Defined Values #########
+
+# *** Value defines - IDs used later in config
+#!define DBURL "sqlite:///mnt/kd/kamailio.sqlite3"
+#!ifdef WITH_MYSQL
+# - database URL - used to connect to database server by modules such
+# as: auth_db, acc, usrloc, a.s.o.
+#!ifndef DBURL
+#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio"
+#!endif
+#!endif
+#!define MULTIDOMAIN 0
+
+# - flags
+# FLT_ - per transaction (message) flags
+# FLB_ - per branch flags
+#!define FLT_ACC 1
+#!define FLT_ACCMISSED 2
+#!define FLT_ACCFAILED 3
+#!define FLT_NATS 5
+
+#!define FLB_NATB 6
+#!define FLB_NATSIPPING 7
+
+####### Global Parameters #########
+
+### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR
+#!ifdef WITH_DEBUG
+debug=4
+log_stderror=yes
+#!else
+debug=2
+log_stderror=no
+#!endif
+
+memdbg=5
+memlog=5
+
+log_facility=LOG_LOCAL0
+
+fork=yes
+children=4
+
+/* uncomment the next line to disable TCP (default on) */
+#disable_tcp=yes
+
+/* uncomment the next line to disable the auto discovery of local aliases
+ based on reverse DNS on IPs (default on) */
+#auto_aliases=no
+
+/* add local domain aliases */
+#alias="sip.mydomain.com"
+
+/* uncomment and configure the following line if you want Kamailio to
+ bind on a specific interface/port/proto (default bind on all available) */
+listen=udp:127.0.0.1:5065 # CUSTOMIZE ME
+
+/* port to listen to
+ * - can be specified more than once if needed to listen on many ports */
+port=5060
+
+#!ifdef WITH_TLS
+enable_tls=yes
+#!endif
+
+# life time of TCP connection when there is no traffic
+# - a bit higher than registration expires to cope with UA behind NAT
+tcp_connection_lifetime=3605
+
+####### Modules Section ########
+
+# set paths to location of modules (to sources or installation folders)
+#!ifdef WITH_SRCPATH
+mpath="modules_k:modules"
+#!else
+mpath="/lib/kamailio/modules/"
+#!endif
+
+#!ifdef WITH_MYSQL
+loadmodule "db_mysql.so"
+#!endif
+
+loadmodule "mi_fifo.so"
+loadmodule "kex.so"
+loadmodule "corex.so"
+loadmodule "tm.so"
+loadmodule "tmx.so"
+loadmodule "sl.so"
+loadmodule "rr.so"
+loadmodule "pv.so"
+loadmodule "maxfwd.so"
+loadmodule "usrloc.so"
+loadmodule "registrar.so"
+loadmodule "textops.so"
+loadmodule "siputils.so"
+loadmodule "xlog.so"
+loadmodule "sanity.so"
+loadmodule "ctl.so"
+loadmodule "cfg_rpc.so"
+loadmodule "mi_rpc.so"
+loadmodule "acc.so"
+
+#!ifdef WITH_AUTH
+loadmodule "auth.so"
+loadmodule "auth_db.so"
+#!ifdef WITH_IPAUTH
+loadmodule "permissions.so"
+#!endif
+#!endif
+
+#!ifdef WITH_NAT
+loadmodule "nathelper.so"
+loadmodule "rtpproxy.so"
+#!endif
+
+#!ifdef WITH_TLS
+loadmodule "tls.so"
+#!endif
+
+#!ifdef WITH_DEBUG
+loadmodule "debugger.so"
+#!endif
+
+# ----------------- setting module-specific parameters ---------------
+
+
+# ----- mi_fifo params -----
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
+
+
+# ----- tm params -----
+# auto-discard branches from previous serial forking leg
+modparam("tm", "failure_reply_mode", 3)
+# default retransmission timeout: 30sec
+modparam("tm", "fr_timer", 30000)
+# default invite retransmission timeout after 1xx: 120sec
+modparam("tm", "fr_inv_timer", 120000)
+
+
+# ----- rr params -----
+# add value to ;lr param to cope with most of the UAs
+modparam("rr", "enable_full_lr", 1)
+# do not append from tag to the RR (no need for this script)
+modparam("rr", "append_fromtag", 0)
+
+
+# ----- registrar params -----
+modparam("registrar", "method_filtering", 1)
+/* uncomment the next line to disable parallel forking via location */
+# modparam("registrar", "append_branches", 0)
+/* uncomment the next line not to allow more than 10 contacts per AOR */
+#modparam("registrar", "max_contacts", 10)
+# max value for expires of registrations
+modparam("registrar", "max_expires", 3600)
+# set it to 1 to enable GRUU
+modparam("registrar", "gruu_enabled", 0)
+
+
+# ----- acc params -----
+/* what special events should be accounted ? */
+modparam("acc", "early_media", 0)
+modparam("acc", "report_ack", 0)
+modparam("acc", "report_cancels", 0)
+/* by default ww do not adjust the direct of the sequential requests.
+ if you enable this parameter, be sure the enable "append_fromtag"
+ in "rr" module */
+modparam("acc", "detect_direction", 0)
+/* account triggers (flags) */
+modparam("acc", "log_flag", FLT_ACC)
+modparam("acc", "log_missed_flag", FLT_ACCMISSED)
+modparam("acc", "log_extra",
+ "src_user=$fU;src_domain=$fd;src_ip=$si;"
+ "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
+modparam("acc", "failed_transaction_flag", FLT_ACCFAILED)
+/* enhanced DB accounting */
+#!ifdef WITH_ACCDB
+modparam("acc", "db_flag", FLT_ACC)
+modparam("acc", "db_missed_flag", FLT_ACCMISSED)
+modparam("acc", "db_url", DBURL)
+modparam("acc", "db_extra",
+ "src_user=$fU;src_domain=$fd;src_ip=$si;"
+ "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
+#!endif
+
+
+# ----- usrloc params -----
+/* enable DB persistency for location entries */
+#!ifdef WITH_USRLOCDB
+modparam("usrloc", "db_url", DBURL)
+modparam("usrloc", "db_mode", 2)
+modparam("usrloc", "use_domain", MULTIDOMAIN)
+#!endif
+
+
+# ----- auth_db params -----
+#!ifdef WITH_AUTH
+modparam("auth_db", "db_url", DBURL)
+modparam("auth_db", "calculate_ha1", yes)
+modparam("auth_db", "password_column", "password")
+modparam("auth_db", "load_credentials", "")
+modparam("auth_db", "use_domain", MULTIDOMAIN)
+
+# ----- permissions params -----
+#!ifdef WITH_IPAUTH
+modparam("permissions", "db_url", DBURL)
+modparam("permissions", "db_mode", 1)
+#!endif
+
+#!endif
+
+
+#!ifdef WITH_NAT
+# ----- rtpproxy params -----
+modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722")
+
+# ----- nathelper params -----
+modparam("nathelper", "natping_interval", 30)
+modparam("nathelper", "ping_nated_only", 1)
+modparam("nathelper", "sipping_bflag", FLB_NATSIPPING)
+modparam("nathelper", "sipping_from", "sip:pi...@ka...")
+
+# params needed for NAT traversal in other modules
+modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)")
+modparam("usrloc", "nat_bflag", FLB_NATB)
+#!endif
+
+
+#!ifdef WITH_TLS
+# ----- tls params -----
+modparam("tls", "config", "/etc/kamailio/tls.cfg")
+#!endif
+
+#!ifdef WITH_DEBUG
+# ----- debugger params -----
+modparam("debugger", "cfgtrace", 1)
+#!endif
+
+####### Routing Logic ########
+
+
+# Main SIP request routing logic
+# - processing of any incoming SIP request starts with this route
+# - note: this is the same as route { ... }
+request_route {
+
+ # per request initial checks
+ route(REQINIT);
+
+ # NAT detection
+ route(NATDETECT);
+
+ # CANCEL processing
+ if (is_method("CANCEL")) {
+ if (t_check_trans()) {
+ route(RELAY);
+ }
+ exit;
+ }
+
+ # handle requests within SIP dialogs
+ route(WITHINDLG);
+
+ ### only initial requests (no To tag)
+
+ t_check_trans();
+
+ # authentication
+ route(AUTH);
+
+ # record routing for dialog forming requests (in case they are routed)
+ # - remove preloaded route headers
+ remove_hf("Route");
+ if (is_method("INVITE|SUBSCRIBE"))
+ record_route();
+
+ # account only INVITEs
+ if (is_method("INVITE")) {
+ setflag(FLT_ACC); # do accounting
+ }
+
+ # dispatch requests to foreign domains
+ route(SIPOUT);
+
+ ### requests for my local domains
+
+ # handle registrations
+ route(REGISTRAR);
+
+ if ($rU==$null) {
+ # request with no Username in RURI
+ sl_send_reply("484","Address Incomplete");
+ exit;
+ }
+
+ # user location service
+ route(LOCATION);
+}
+
+
+route[RELAY] {
+ # enable additional event routes for forwarded requests
+ # - serial forking, RTP relaying handling, a.s.o.
+ if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) {
+ if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH");
+ }
+ if (is_method("INVITE|SUBSCRIBE|UPDATE")) {
+ if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY");
+ }
+ if (is_method("INVITE")) {
+ if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE");
+ }
+
+ if (!t_relay()) {
+ sl_reply_error();
+ }
+ exit;
+}
+
+# Per SIP request initial checks
+route[REQINIT] {
+#!ifdef WITH_ANTIFLOOD
+ # flood dection from same IP and traffic ban for a while
+ # be sure you exclude checking trusted peers, such as pstn gateways
+ # - local host excluded (e.g., loop to self)
+ if(src_ip!=myself) {
+ if($sht(ipban=>$si)!=$null) {
+ # ip is already blocked
+ xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n");
+ exit;
+ }
+ if (!pike_check_req()) {
+ xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n");
+ $sht(ipban=>$si) = 1;
+ exit;
+ }
+ }
+#!endif
+
+ if (!mf_process_maxfwd_header("10")) {
+ sl_send_reply("483","Too Many Hops");
+ exit;
+ }
+
+ if(!sanity_check("1511", "7")) {
+ xlog("Malformed SIP message from $si:$sp\n");
+ exit;
+ }
+}
+
+# Handle requests within SIP dialogs
+route[WITHINDLG] {
+ if (has_totag()) {
+ # sequential request withing a dialog should
+ # take the path determined by record-routing
+ if (loose_route()) {
+ route(DLGURI);
+ if (is_method("BYE")) {
+ setflag(FLT_ACC); # do accounting ...
+ setflag(FLT_ACCFAILED); # ... even if the transaction fails
+ }
+ else if ( is_method("ACK") ) {
+ # ACK is forwarded statelessy
+ route(NATMANAGE);
+ }
+ else if ( is_method("NOTIFY") ) {
+ # Add Record-Route for in-dialog NOTIFY as per RFC 6665.
+ record_route();
+ }
+ route(RELAY);
+ } else {
+ if ( is_method("ACK") ) {
+ if ( t_check_trans() ) {
+ # no loose-route, but stateful ACK;
+ # must be an ACK after a 487
+ # or e.g. 404 from upstream server
+ route(RELAY);
+ exit;
+ } else {
+ # ACK without matching transaction ... ignore and discard
+ exit;
+ }
+ }
+ sl_send_reply("404","Not here");
+ }
+ exit;
+ }
+}
+
+# Handle SIP registrations
+route[REGISTRAR] {
+ if (is_method("REGISTER")) {
+ if(isflagset(FLT_NATS)) {
+ setbflag(FLB_NATB);
+ # uncomment next line to do SIP NAT pinging
+ ## setbflag(FLB_NATSIPPING);
+ }
+ if (!save("location"))
+ sl_reply_error();
+
+ exit;
+ }
+}
+
+# USER location service
+route[LOCATION] {
+ if (!lookup("location")) {
+ $var(rc) = $rc;
+ t_newtran();
+ switch ($var(rc)) {
+ case -1:
+ case -3:
+ send_reply("404", "Not Found");
+ exit;
+ case -2:
+ send_reply("405", "Method Not Allowed");
+ exit;
+ }
+ }
+
+ # when routing via usrloc, log the missed calls also
+ if (is_method("INVITE")) {
+ setflag(FLT_ACCMISSED);
+ }
+
+ route(RELAY);
+ exit;
+}
+
+
+# Authentication route
+route[AUTH] {
+#!ifdef WITH_AUTH
+
+#!ifdef WITH_IPAUTH
+ if((!is_method("REGISTER")) && allow_source_address()) {
+ # source IP allowed
+ return;
+ }
+#!endif
+
+ if (is_method("REGISTER") || from_uri==myself) {
+ # authenticate requests
+ if (!auth_check("$fd", "subscriber", "1")) {
+ auth_challenge("$fd", "0");
+ exit;
+ }
+ # user authenticated - remove auth header
+ if(!is_method("REGISTER|PUBLISH"))
+ consume_credentials();
+ }
+ # if caller is not local subscriber, then check if it calls
+ # a local destination, otherwise deny, not an open relay here
+ if (from_uri!=myself && uri!=myself) {
+ sl_send_reply("403","Not relaying");
+ exit;
+ }
+
+#!endif
+ return;
+}
+
+# Caller NAT detection route
+route[NATDETECT] {
+#!ifdef WITH_NAT
+ force_rport();
+ if (nat_uac_test("19")) {
+ if (is_method("REGISTER")) {
+ fix_nated_register();
+ } else {
+ add_contact_alias();
+ }
+ setflag(FLT_NATS);
+ }
+#!endif
+ return;
+}
+
+# RTPProxy control
+route[NATMANAGE] {
+#!ifdef WITH_NAT
+ if (is_request()) {
+ if(has_totag()) {
+ if(check_route_param("nat=yes")) {
+ setbflag(FLB_NATB);
+ }
+ }
+ }
+ if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB)))
+ return;
+
+ rtpproxy_manage("co");
+
+ if (is_request()) {
+ if (!has_totag()) {
+ if(t_is_branch_route()) {
+ add_rr_param(";nat=yes");
+ }
+ }
+ }
+ if (is_reply()) {
+ if(isbflagset(FLB_NATB)) {
+ add_contact_alias();
+ }
+ }
+#!endif
+ return;
+}
+
+# URI update for dialog requests
+route[DLGURI] {
+#!ifdef WITH_NAT
+ if(!isdsturiset()) {
+ handle_ruri_alias();
+ }
+#!endif
+ return;
+}
+
+# Routing to foreign domains
+route[SIPOUT] {
+ if (!uri==myself) {
+ append_hf("P-hint: outbound\r\n");
+ route(RELAY);
+ }
+}
+
+# manage outgoing branches
+branch_route[MANAGE_BRANCH] {
+ xdbg("new branch [$T_branch_idx] to $ru\n");
+ route(NATMANAGE);
+}
+
+# manage incoming replies
+onreply_route[MANAGE_REPLY] {
+ xdbg("incoming reply\n");
+ if(status=~"[12][0-9][0-9]")
+ route(NATMANAGE);
+}
+
+# manage failure routing cases
+failure_route[MANAGE_FAILURE] {
+ route(NATMANAGE);
+
+ if (t_is_canceled()) {
+ exit;
+ }
+}
Copied: branches/1.0/package/kamailio/etc/kamailio.cfg (from rev 6656, branches/1.0/package/kamailio/kamailio.cfg)
===================================================================
--- branches/1.0/package/kamailio/etc/kamailio.cfg (rev 0)
+++ branches/1.0/package/kamailio/etc/kamailio.cfg 2014-08-25 19:52:42 UTC (rev 6657)
@@ -0,0 +1,942 @@
+#!KAMAILIO
+#
+# Kamailio (OpenSER) SIP Server v4.1 - default configuration script
+# - web: http://www.kamailio.org
+# - git: http://sip-router.org
+#
+# Direct your questions about this file to: <sr-...@li...>
+#
+# Refer to the Core CookBook at http://www.kamailio.org/wiki/
+# for an explanation of possible statements, functions and parameters.
+#
+# Several features can be enabled using '#!define WITH_FEATURE' directives:
+#
+# *** To run in debug mode:
+# - define WITH_DEBUG
+#
+# *** To enable mysql:
+# - define WITH_MYSQL
+#
+# *** To enable authentication execute:
+# - enable mysql
+# - define WITH_AUTH
+# - add users using 'kamctl'
+#
+# *** To enable IP authentication execute:
+# - enable mysql
+# - enable authentication
+# - define WITH_IPAUTH
+# - add IP addresses with group id '1' to 'address' table
+#
+# *** To enable persistent user location execute:
+# - enable mysql
+# - define WITH_USRLOCDB
+#
+# *** To enable presence server execute:
+# - enable mysql
+# - define WITH_PRESENCE
+#
+# *** To enable nat traversal execute:
+# - define WITH_NAT
+# - install RTPProxy: http://www.rtpproxy.org
+# - start RTPProxy:
+# rtpproxy -l _your_public_ip_ -s udp:localhost:7722
+#
+# *** To enable PSTN gateway routing execute:
+# - define WITH_PSTN
+# - set the value of pstn.gw_ip
+# - check route[PSTN] for regexp routing condition
+#
+# *** To enable database aliases lookup execute:
+# - enable mysql
+# - define WITH_ALIASDB
+#
+# *** To enable speed dial lookup execute:
+# - enable mysql
+# - define WITH_SPEEDDIAL
+#
+# *** To enable multi-domain support execute:
+# - enable mysql
+# - define WITH_MULTIDOMAIN
+#
+# *** To enable TLS support execute:
+# - adjust CFGDIR/tls.cfg as needed
+# - define WITH_TLS
+#
+# *** To enable XMLRPC support execute:
+# - define WITH_XMLRPC
+# - adjust route[XMLRPC] for access policy
+#
+# *** To enable anti-flood detection execute:
+# - adjust pike and htable=>ipban settings as needed (default is
+# block if more than 16 requests in 2 seconds and ban for 300 seconds)
+# - define WITH_ANTIFLOOD
+#
+# *** To block 3XX redirect replies execute:
+# - define WITH_BLOCK3XX
+#
+# *** To enable VoiceMail routing execute:
+# - define WITH_VOICEMAIL
+# - set the value of voicemail.srv_ip
+# - adjust the value of voicemail.srv_port
+#
+# *** To enhance accounting execute:
+# - enable mysql
+# - define WITH_ACCDB
+# - add following columns to database
+#!ifdef ACCDB_COMMENT
+ ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default '';
+ ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default '';
+ ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
+ ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
+#!endif
+
+####### Include Local Config If Exists #########
+import_file "kamailio-local.cfg"
+
+####### Defined Values #########
+
+# *** Value defines - IDs used later in config
+#!define DBURL "sqlite:///mnt/kd/kamailio.sqlite3"
+#!ifdef WITH_MYSQL
+# - database URL - used to connect to database server by modules such
+# as: auth_db, acc, usrloc, a.s.o.
+#!ifndef DBURL
+#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio"
+#!endif
+#!endif
+#!ifdef WITH_MULTIDOMAIN
+# - the value for 'use_domain' parameters
+#!define MULTIDOMAIN 1
+#!else
+#!define MULTIDOMAIN 0
+#!endif
+
+# - flags
+# FLT_ - per transaction (message) flags
+# FLB_ - per branch flags
+#!define FLT_ACC 1
+#!define FLT_ACCMISSED 2
+#!define FLT_ACCFAILED 3
+#!define FLT_NATS 5
+
+#!define FLB_NATB 6
+#!define FLB_NATSIPPING 7
+
+####### Global Parameters #########
+
+### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR
+#!ifdef WITH_DEBUG
+debug=4
+log_stderror=yes
+#!else
+debug=2
+log_stderror=no
+#!endif
+
+memdbg=5
+memlog=5
+
+log_facility=LOG_LOCAL0
+
+fork=yes
+children=4
+
+/* uncomment the next line to disable TCP (default on) */
+#disable_tcp=yes
+
+/* uncomment the next line to disable the auto discovery of local aliases
+ based on reverse DNS on IPs (default on) */
+#auto_aliases=no
+
+/* add local domain aliases */
+#alias="sip.mydomain.com"
+
+/* uncomment and configure the following line if you want Kamailio to
+ bind on a specific interface/port/proto (default bind on all available) */
+listen=udp:127.0.0.1:5065 # CUSTOMIZE ME
+
+/* port to listen to
+ * - can be specified more than once if needed to listen on many ports */
+port=5060
+
+#!ifdef WITH_TLS
+enable_tls=yes
+#!endif
+
+# life time of TCP connection when there is no traffic
+# - a bit higher than registration expires to cope with UA behind NAT
+tcp_connection_lifetime=3605
+
+####### Custom Parameters #########
+
+# These parameters can be modified runtime via RPC interface
+# - see the documentation of 'cfg_rpc' module.
+#
+# Format: group.id = value 'desc' description
+# Access: $sel(cfg_get.group.id) or @cfg_get.group.id
+#
+
+#!ifdef WITH_PSTN
+# PSTN GW Routing
+#
+# - pstn.gw_ip: valid IP or hostname as string value, example:
+# pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address"
+#
+# - by default is empty to avoid misrouting
+pstn.gw_ip = "" desc "PSTN GW Address"
+pstn.gw_port = "" desc "PSTN GW Port"
+#!endif
+
+#!ifdef WITH_VOICEMAIL
+# VoiceMail Routing on offline, busy or no answer
+#
+# - by default Voicemail server IP is empty to avoid misrouting
+voicemail.srv_ip = "" desc "VoiceMail IP Address"
+voicemail.srv_port = "5060" desc "VoiceMail Port"
+#!endif
+
+####### Modules Section ########
+
+# set paths to location of modules (to sources or installation folders)
+#!ifdef WITH_SRCPATH
+mpath="modules/"
+#!else
+mpath="/lib/kamailio/modules/"
+#!endif
+
+#!ifdef WITH_MYSQL
+loadmodule "db_mysql.so"
+#!endif
+
+loadmodule "mi_fifo.so"
+loadmodule "kex.so"
+loadmodule "corex.so"
+loadmodule "tm.so"
+loadmodule "tmx.so"
+loadmodule "sl.so"
+loadmodule "rr.so"
+loadmodule "pv.so"
+loadmodule "maxfwd.so"
+loadmodule "usrloc.so"
+loadmodule "registrar.so"
+loadmodule "textops.so"
+loadmodule "siputils.so"
+loadmodule "xlog.so"
+loadmodule "sanity.so"
+loadmodule "ctl.so"
+loadmodule "cfg_rpc.so"
+loadmodule "mi_rpc.so"
+loadmodule "acc.so"
+
+#!ifdef WITH_AUTH
+loadmodule "auth.so"
+loadmodule "auth_db.so"
+#!ifdef WITH_IPAUTH
+loadmodule "permissions.so"
+#!endif
+#!endif
+
+#!ifdef WITH_ALIASDB
+loadmodule "alias_db.so"
+#!endif
+
+#!ifdef WITH_SPEEDDIAL
+loadmodule "speeddial.so"
+#!endif
+
+#!ifdef WITH_MULTIDOMAIN
+loadmodule "domain.so"
+#!endif
+
+#!ifdef WITH_PRESENCE
+loadmodule "presence.so"
+loadmodule "presence_xml.so"
+#!endif
+
+#!ifdef WITH_NAT
+loadmodule "nathelper.so"
+loadmodule "rtpproxy.so"
+#!endif
+
+#!ifdef WITH_TLS
+loadmodule "tls.so"
+#!endif
+
+#!ifdef WITH_ANTIFLOOD
+loadmodule "htable.so"
+loadmodule "pike.so"
+#!endif
+
+#!ifdef WITH_XMLRPC
+loadmodule "xmlrpc.so"
+#!endif
+
+#!ifdef WITH_DEBUG
+loadmodule "debugger.so"
+#!endif
+
+# ----------------- setting module-specific parameters ---------------
+
+
+# ----- mi_fifo params -----
+modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
+
+
+# ----- tm params -----
+# auto-discard branches from previous serial forking leg
+modparam("tm", "failure_reply_mode", 3)
+# default retransmission timeout: 30sec
+modparam("tm", "fr_timer", 30000)
+# default invite retransmission timeout after 1xx: 120sec
+modparam("tm", "fr_inv_timer", 120000)
+
+
+# ----- rr params -----
+# add value to ;lr param to cope with most of the UAs
+modparam("rr", "enable_full_lr", 1)
+# do not append from tag to the RR (no need for this script)
+modparam("rr", "append_fromtag", 0)
+
+
+# ----- registrar params -----
+modparam("registrar", "method_filtering", 1)
+/* uncomment the next line to disable parallel forking via location */
+# modparam("registrar", "append_branches", 0)
+/* uncomment the next line not to allow more than 10 contacts per AOR */
+#modparam("registrar", "max_contacts", 10)
+# max value for expires of registrations
+modparam("registrar", "max_expires", 3600)
+# set it to 1 to enable GRUU
+modparam("registrar", "gruu_enabled", 0)
+
+
+# ----- acc params -----
+/* what special events should be accounted ? */
+modparam("acc", "early_media", 0)
+modparam("acc", "report_ack", 0)
+modparam("acc", "report_cancels", 0)
+/* by default ww do not adjust the direct of the sequential requests.
+ if you enable this parameter, be sure the enable "append_fromtag"
+ in "rr" module */
+modparam("acc", "detect_direction", 0)
+/* account triggers (flags) */
+modparam("acc", "log_flag", FLT_ACC)
+modparam("acc", "log_missed_flag", FLT_ACCMISSED)
+modparam("acc", "log_extra",
+ "src_user=$fU;src_domain=$fd;src_ip=$si;"
+ "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
+modparam("acc", "failed_transaction_flag", FLT_ACCFAILED)
+/* enhanced DB accounting */
+#!ifdef WITH_ACCDB
+modparam("acc", "db_flag", FLT_ACC)
+modparam("acc", "db_missed_flag", FLT_ACCMISSED)
+modparam("acc", "db_url", DBURL)
+modparam("acc", "db_extra",
+ "src_user=$fU;src_domain=$fd;src_ip=$si;"
+ "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
+#!endif
+
+
+# ----- usrloc params -----
+/* enable DB persistency for location entries */
+#!ifdef WITH_USRLOCDB
+modparam("usrloc", "db_url", DBURL)
+modparam("usrloc", "db_mode", 2)
+modparam("usrloc", "use_domain", MULTIDOMAIN)
+#!endif
+
+
+# ----- auth_db params -----
+#!ifdef WITH_AUTH
+modparam("auth_db", "db_url", DBURL)
+modparam("auth_db", "calculate_ha1", yes)
+modparam("auth_db", "password_column", "password")
+modparam("auth_db", "load_credentials", "")
+modparam("auth_db", "use_domain", MULTIDOMAIN)
+
+# ----- permissions params -----
+#!ifdef WITH_IPAUTH
+modparam("permissions", "db_url", DBURL)
+modparam("permissions", "db_mode", 1)
+#!endif
+
+#!endif
+
+
+# ----- alias_db params -----
+#!ifdef WITH_ALIASDB
+modparam("alias_db", "db_url", DBURL)
+modparam("alias_db", "use_domain", MULTIDOMAIN)
+#!endif
+
+
+# ----- speeddial params -----
+#!ifdef WITH_SPEEDDIAL
+modparam("speeddial", "db_url", DBURL)
+modparam("speeddial", "use_domain", MULTIDOMAIN)
+#!endif
+
+
+# ----- domain params -----
+#!ifdef WITH_MULTIDOMAIN
+modparam("domain", "db_url", DBURL)
+# register callback to match myself condition with domains list
+modparam("domain", "register_myself", 1)
+#!endif
+
+
+#!ifdef WITH_PRESENCE
+# ----- presence params -----
+modparam("presence", "db_url", DBURL)
+
+# ----- presence_xml params -----
+modparam("presence_xml", "db_url", DBURL)
+modparam("presence_xml", "force_active", 1)
+#!endif
+
+
+#!ifdef WITH_NAT
+# ----- rtpproxy params -----
+modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722")
+
+# ----- nathelper params -----
+modparam("nathelper", "natping_interval", 30)
+modparam("nathelper", "ping_nated_only", 1)
+modparam("nathelper", "sipping_bflag", FLB_NATSIPPING)
+modparam("nathelper", "sipping_from", "sip:pi...@ka...")
+
+# params needed for NAT traversal in other modules
+modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)")
+modparam("usrloc", "nat_bflag", FLB_NATB)
+#!endif
+
+
+#!ifdef WITH_TLS
+# ----- tls params -----
+modparam("tls", "config", "/etc/kamailio/tls.cfg")
+#!endif
+
+#!ifdef WITH_ANTIFLOOD
+# ----- pike params -----
+modparam("pike", "sampling_time_unit", 2)
+modparam("pike", "reqs_density_per_unit", 16)
+modparam("pike", "remove_latency", 4)
+
+# ----- htable params -----
+# ip ban htable with autoexpire after 5 minutes
+modparam("htable", "htable", "ipban=>size=8;autoexpire=300;")
+#!endif
+
+#!ifdef WITH_XMLRPC
+# ----- xmlrpc params -----
+modparam("xmlrpc", "route", "XMLRPC");
+modparam("xmlrpc", "url_match", "^/RPC")
+#!endif
+
+#!ifdef WITH_DEBUG
+# ----- debugger params -----
+modparam("debugger", "cfgtrace", 1)
+#!endif
+
+####### Routing Logic ########
+
+
+# Main SIP request routing logic
+# - processing of any incoming SIP request starts with this route
+# - note: this is the same as route { ... }
+request_route {
+
+ # per request initial checks
+ route(REQINIT);
+
+ # NAT detection
+ route(NATDETECT);
+
+ # CANCEL processing
+ if (is_method("CANCEL"))
+ {
+ if (t_check_trans()) {
+ route(RELAY);
+ }
+ exit;
+ }
+
+ # handle requests within SIP dialogs
+ route(WITHINDLG);
+
+ ### only initial requests (no To tag)
+
+ t_check_trans();
+
+ # authentication
+ route(AUTH);
+
+ # record routing for dialog forming requests (in case they are routed)
+ # - remove preloaded route headers
+ remove_hf("Route");
+ if (is_method("INVITE|SUBSCRIBE"))
+ record_route();
+
+ # account only INVITEs
+ if (is_method("INVITE"))
+ {
+ setflag(FLT_ACC); # do accounting
+ }
+
+ # dispatch requests to foreign domains
+ route(SIPOUT);
+
+ ### requests for my local domains
+
+ # handle presence related requests
+ route(PRESENCE);
+
+ # handle registrations
+ route(REGISTRAR);
+
+ if ($rU==$null)
+ {
+ # request with no Username in RURI
+ sl_send_reply("484","Address Incomplete");
+ exit;
+ }
+
+ # dispatch destinations to PSTN
+ route(PSTN);
+
+ # user location service
+ route(LOCATION);
+}
+
+
+route[RELAY] {
+
+ # enable additional event routes for forwarded requests
+ # - serial forking, RTP relaying handling, a.s.o.
+ if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) {
+ if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH");
+ }
+ if (is_method("INVITE|SUBSCRIBE|UPDATE")) {
+ if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY");
+ }
+ if (is_method("INVITE")) {
+ if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE");
+ }
+
+ if (!t_relay()) {
+ sl_reply_error();
+ }
+ exit;
+}
+
+# Per SIP request initial checks
+route[REQINIT] {
+#!ifdef WITH_ANTIFLOOD
+ # flood dection from same IP and traffic ban for a while
+ # be sure you exclude checking trusted peers, such as pstn gateways
+ # - local host excluded (e.g., loop to self)
+ if(src_ip!=myself)
+ {
+ if($sht(ipban=>$si)!=$null)
+ {
+ # ip is already blocked
+ xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n");
+ exit;
+ }
+ if (!pike_check_req())
+ {
+ xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n");
+ $sht(ipban=>$si) = 1;
+ exit;
+ }
+ }
+#!endif
+
+ if (!mf_process_maxfwd_header("10")) {
+ sl_send_reply("483","Too Many Hops");
+ exit;
+ }
+
+ if(!sanity_check("1511", "7"))
+ {
+ xlog("Malformed SIP message from $si:$sp\n");
+ exit;
+ }
+}
+
+# Handle requests within SIP dialogs
+route[WITHINDLG] {
+ if (has_totag()) {
+ # sequential request withing a dialog should
+ # take the path determined by record-routing
+ if (loose_route()) {
+ route(DLGURI);
+ if (is_method("BYE")) {
+ setflag(FLT_ACC); # do accounting ...
+ setflag(FLT_ACCFAILED); # ... even if the transaction fails
+ }
+ else if ( is_method("ACK") ) {
+ # ACK is forwarded statelessy
+ route(NATMANAGE);
+ }
+ else if ( is_method("NOTIFY") ) {
+ # Add Record-Route for in-dialog NOTIFY as per RFC 6665.
+ record_route();
+ }
+ route(RELAY);
+ } else {
+ if (is_method("SUBSCRIBE") && uri == myself) {
+ # in-dialog subscribe requests
+ route(PRESENCE);
+ exit;
+ }
+ if ( is_method("ACK") ) {
+ if ( t_check_trans() ) {
+ # no loose-route, but stateful ACK;
+ # must be an ACK after a 487
+ # or e.g. 404 from upstream server
+ route(RELAY);
+ exit;
+ } else {
+ # ACK without matching transaction ... ignore and discard
+ exit;
+ }
+ }
+ sl_send_reply("404","Not here");
+ }
+ exit;
+ }
+}
+
+# Handle SIP registrations
+route[REGISTRAR] {
+ if (is_method("REGISTER"))
+ {
+ if(isflagset(FLT_NATS))
+ {
+ setbflag(FLB_NATB);
+ # uncomment next line to do SIP NAT pinging
+ ## setbflag(FLB_NATSIPPING);
+ }
+ if (!save("location"))
+ sl_reply_error();
+
+ exit;
+ }
+}
+
+# USER location service
+route[LOCATION] {
+
+#!ifdef WITH_SPEEDDIAL
+ # search for short dialing - 2-digit extension
+ if($rU=~"^[0-9][0-9]$")
+ if(sd_lookup("speed_dial"))
+ route(SIPOUT);
+#!endif
+
+#!ifdef WITH_ALIASDB
+ # search in DB-based aliases
+ if(alias_db_lookup("dbaliases"))
+ route(SIPOUT);
+#!endif
+
+ $avp(oexten) = $rU;
+ if (!lookup("location")) {
+ $var(rc) = $rc;
+ route(TOVOICEMAIL);
+ t_newtran();
+ switch ($var(rc)) {
+ case -1:
+ case -3:
+ send_reply("404", "Not Found");
+ exit;
+ case -2:
+ send_reply("405", "Method Not Allowed");
+ exit;
+ }
+ }
+
+ # when routing via usrloc, log the missed calls also
+ if (is_method("INVITE"))
+ {
+ setflag(FLT_ACCMISSED);
+ }
+
+ route(RELAY);
+ exit;
+}
+
+# Presence server route
+route[PRESENCE] {
+ if(!is_method("PUBLISH|SUBSCRIBE"))
+ return;
+
+ if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") {
+ route(TOVOICEMAIL);
+ # returns here if no voicemail server is configured
+ sl_send_reply("404", "No voicemail service");
+ exit;
+ }
+
+#!ifdef WITH_PRESENCE
+ if (!t_newtran())
+ {
+ sl_reply_error();
+ exit;
+ }
+
+ if(is_method("PUBLISH"))
+ {
+ handle_publish();
+ t_release();
+ } else if(is_method("SUBSCRIBE")) {
+ handle_subscribe();
+ t_release();
+ }
+ exit;
+#!endif
+
+ # if presence enabled, this part will not be executed
+ if (is_method("PUBLISH") || $rU==$null)
+ {
+ sl_send_reply("404", "Not here");
+ exit;
+ }
+ return;
+}
+
+# Authentication route
+route[AUTH] {
+#!ifdef WITH_AUTH
+
+#!ifdef WITH_IPAUTH
+ if((!is_method("REGISTER")) && allow_source_address())
+ {
+ # source IP allowed
+ return;
+ }
+#!endif
+
+ if (is_method("REGISTER") || from_uri==myself)
+ {
+ # authenticate requests
+ if (!auth_check("$fd", "subscriber", "1")) {
+ auth_challenge("$fd", "0");
+ exit;
+ }
+ # user authenticated - remove auth header
+ if(!is_method("REGISTER|PUBLISH"))
+ consume_credentials();
+ }
+ # if caller is not local subscriber, then check if it calls
+ # a local destination, otherwise deny, not an open relay here
+ if (from_uri!=myself && uri!=myself)
+ {
+ sl_send_reply("403","Not relaying");
+ exit;
+ }
+
+#!endif
+ return;
+}
+
+# Caller NAT detection route
+route[NATDETECT] {
+#!ifdef WITH_NAT
+ force_rport();
+ if (nat_uac_test("19")) {
+ if (is_method("REGISTER")) {
+ fix_nated_register();
+ } else {
+ if(is_first_hop())
+ set_contact_alias();
+ }
+ setflag(FLT_NATS);
+ }
+#!endif
+ return;
+}
+
+# RTPProxy control
+route[NATMANAGE] {
+#!ifdef WITH_NAT
+ if (is_request()) {
+ if(has_totag()) {
+ if(check_route_param("nat=yes")) {
+ setbflag(FLB_NATB);
+ }
+ }
+ }
+ if (!(isflagset(FLT_NATS) || isbflagset(FLB_NATB)))
+ return;
+
+ rtpproxy_manage("co");
+
+ if (is_request()) {
+ if (!has_totag()) {
+ if(t_is_branch_route()) {
+ add_rr_param(";nat=yes");
+ }
+ }
+ }
+ if (is_reply()) {
+ if(isbflagset(FLB_NATB)) {
+ if(is_first_hop())
+ set_contact_alias();
+ }
+ }
+#!endif
+ return;
+}
+
+# URI update for dialog requests
+route[DLGURI] {
+#!ifdef WITH_NAT
+ if(!isdsturiset()) {
+ handle_ruri_alias();
+ }
+#!endif
+ return;
+}
+
+# Routing to foreign domains
+route[SIPOUT] {
+ if (!uri==myself)
+ {
+ append_hf("P-hint: outbound\r\n");
+ route(RELAY);
+ }
+}
+
+# PSTN GW routing
+route[PSTN] {
+#!ifdef WITH_PSTN
+ # check if PSTN GW IP is defined
+ if (strempty($sel(cfg_get.pstn.gw_ip))) {
+ xlog("SCRIPT: PSTN rotuing enabled but pstn.gw_ip not defined\n");
+ return;
+ }
+
+ # route to PSTN dialed numbers starting with '+' or '00'
+ # (international format)
+ # - update the condition to match your dialing rules for PSTN routing
+ if(!($rU=~"^(\+|00)[1-9][0-9]{3,20}$"))
+ return;
+
+ # only local users allowed to call
+ if(from_uri!=myself) {
+ sl_send_reply("403", "Not Allowed");
+ exit;
+ }
+
+ if (strempty($sel(cfg_get.pstn.gw_port))) {
+ $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip);
+ } else {
+ $ru = "sip:" + $rU + "@" + $sel(cfg_get.pstn.gw_ip) + ":"
+ + $sel(cfg_get.pstn.gw_port);
+ }
+
+ route(RELAY);
+ exit;
+#!endif
+
+ return;
+}
+
+# XMLRPC routing
+#!ifdef WITH_XMLRPC
+route[XMLRPC] {
+ # allow XMLRPC from localhost
+ if ((method=="POST" || method=="GET")
+ && (src_ip==127.0.0.1)) {
+ # close connection only for xmlrpclib user agents (there is a bug in
+ # xmlrpclib: it waits for EOF before interpreting the response).
+ if ($hdr(User-Agent) =~ "xmlrpclib")
+ set_reply_close();
+ set_reply_no_connect();
+ dispatch_rpc();
+ exit;
+ }
+ send_reply("403", "Forbidden");
+ exit;
+}
+#!endif
+
+# route to voicemail server
+route[TOVOICEMAIL] {
+#!ifdef WITH_VOICEMAIL
+ if(!is_method("INVITE|SUBSCRIBE"))
+ return;
+
+ # check if VoiceMail server IP is defined
+ if (strempty($sel(cfg_get.voicemail.srv_ip))) {
+ xlog("SCRIPT: VoiceMail rotuing enabled but IP not defined\n");
+ return;
+ }
+ if(is_method("INVITE")) {
+ if($avp(oexten)==$null)
+ return;
+ $ru = "sip:" + $avp(oexten) + "@" + $sel(cfg_get.voicemail.srv_ip)
+ + ":" + $sel(cfg_get.voicemail.srv_port);
+ } else {
+ if($rU==$null)
+ return;
+ $ru = "sip:" + $rU + "@" + $sel(cfg_get.voicemail.srv_ip)
+ + ":" + $sel(cfg_get.voicemail.srv_port);
+ }
+ route(RELAY);
+ exit;
+#!endif
+
+ return;
+}
+
+# manage outgoing branches
+branch_route[MANAGE_BRANCH] {
+ xdbg("new branch [$T_branch_idx] to $ru\n");
+ route(NATMANAGE);
+}
+
+# manage incoming replies
+onreply_route[MANAGE_REPLY] {
+ xdbg("incoming reply\n");
+ if(status=~"[12][0-9][0-9]")
+ route(NATMANAGE);
+}
+
+# manage failure routing cases
+failure_route[MANAGE_FAILURE] {
+ route(NATMANAGE);
+
+ if (t_is_canceled()) {
+ exit;
+ }
+
+#!ifdef WITH_BLOCK3XX
+ # block call redirect based on 3xx replies.
+ if (t_check_status("3[0-9][0-9]")) {
+ t_reply("404","Not found");
+ exit;
+ }
+#!endif
+
+#!ifdef WITH_VOICEMAIL
+ # serial forking
+ # - route to voicemail on busy or no answer (timeout)
+ if (t_check_status("486|408")) {
+ $du = $null;
+ route(TOVOICEMAIL);
+ exit;
+ }
+#!endif
+}
Added: branches/1.0/package/kamailio/etc/tls.cfg
===================================================================
--- branches/1.0/package/kamailio/etc/tls.cfg (rev 0)
+++ branches/1.0/package/kamailio/etc/tls.cfg 2014-08-25 19:52:42 UTC (rev 6657)
@@ -0,0 +1,65 @@
+#
+# $Id$
+#
+# Example Kamailio TLS Configuration File
+#
+
+# This is the default server domain, settings
+# in this domain will be used for all incoming
+# connections that do not match any other server
+# domain in this configuration file.
+#
+# We do not enable anything else than TLSv1
+# over the public internet. Clients do not have
+# to present client certificates by default.
+#
+[server:default]
+method = TLSv1
+verify_certificate = no
+require_certificate = no
+private_key = /mnt/kd/kamailio/certs/server.key
+certificate = /mnt/kd/kamailio/certs/server.crt
+#ca_list = /mnt/kd/kamailio/certs/ca.crt
+#crl = /mnt/kd/kamailio/certs/crl.pem
+
+# This is the default client domain, settings
+# in this domain will be used for all outgoing
+# TLS connections that do not match any other
+# client domain in this configuration file.
+# We require that servers present valid certificate.
+#
+[client:default]
+verify_certificate = yes
+require_certificate = yes
+
+# This is an example server domain for TLS connections
+# received from the loopback interface. We allow
+# the use of SSLv2 and SSLv3 protocols here, we do
+# not require that clients present client certificates
+# but if they present it it must be valid. We also use
+# a special certificate and CA list for loopback
+# interface.
+#
+#[server:127.0.0.1:5061]
+#method = SSLv23
+#verify_certificate = yes
+#require_certificate = no
+#private_key = /mnt/kd/kamailio/certs/local_key.pem
+#certificate = /mnt/kd/kamailio/certs/local_cert.pem
+#verify_depth = 3
+#ca_list = local_ca.pem
+#crl = local_crl.pem
+
+# Special settings for the iptel.org public SIP
+# server. We do not verify the certificate of the
+# server because it can be expired. The server
+# implements authentication using SSL client
+# certificates so configure the client certificate
+# that was given to use by iptel.org staff here.
+#
+#[client:195.37.77.101:5061]
+#verify_certificate = no
+#certificate = /mnt/kd/kamailio/certs/iptel_client.pem
+#private_key = /mnt/kd/kamailio/certs/iptel_key.pem
+#ca_list = /mnt/kd/kamailio/certs/iptel_ca.pem
+#crl = /mnt/kd/kamailio/certs/iptel_crl.pem
Deleted: branches/1.0/package/kamailio/kamailio.cfg
===================================================================
--- branches/1.0/package/kamailio/kamailio.cfg 2014-08-24 21:12:21 UTC (rev 6656)
+++ branches/1.0/package/kamailio/kamailio.cfg 2014-08-25 19:52:42 UTC (rev 6657)
@@ -1,941 +0,0 @@
-#!KAMAILIO
-#
-# Kamailio (OpenSER) SIP Server v4.1 - default configuration script
-# - web: http://www.kamailio.org
-# - git: http://sip-router.org
-#
-# Direct your questions about this file to: <sr-...@li...>
-#
-# Refer to the Core CookBook at http://www.kamailio.org/wiki/
-# for an explanation of possible statements, functions and parameters.
-#
-# Several features can be enabled using '#!define WITH_FEATURE' directives:
-#
-# *** To run in debug mode:
-# - define WITH_DEBUG
-#
-# *** To enable mysql:
-# - define WITH_MYSQL
-#
-# *** To enable authentication execute:
-# - enable mysql
-# - define WITH_AUTH
-# - add users using 'kamctl'
-#
-# *** To enable IP authentication execute:
-# - enable mysql
-# - enable authentication
-# - define WITH_IPAUTH
-# - add IP addresses with group id '1' to 'address' table
-#
-# *** To enable persistent user location execute:
-# - enable mysql
-# - define WITH_USRLOCDB
-#
-# *** To enable presence server execute:
-# - enable mysql
-# - define WITH_PRESENCE
-#
-# *** To enable nat traversal execute:
-# - define WITH_NAT
-# - install RTPProxy: http://www.rtpproxy.org
-# - start RTPProxy:
-# rtpproxy -l _your_public_ip_ -s udp:localhost:7722
-#
-# *** To enable PSTN gateway routing execute:
-# - define WITH_PSTN
-# - set the value of pstn.gw_ip
-# - check route[PSTN] for regexp routing condition
-#
-# *** To enable database aliases lookup execute:
-# - enable mysql
-# - define WITH_ALIASDB
-#
-# *** To enable speed dial lookup execute:
-# - enable mysql
-# - define WITH_SPEEDDIAL
-#
-# *** To enable multi-domain support execute:
-# - enable mysql
-# - define WITH_MULTIDOMAIN
-#
-# *** To enable TLS support execute:
-# - adjust CFGDIR/tls.cfg as needed
-# - define WITH_TLS
-#
-# *** To enable XMLRPC support execute:
-# - define WITH_XMLRPC
-# - adjust route[XMLRPC] for access policy
-#
-# *** To enable anti-flood detection execute:
-# - adjust pike and htable=>ipban settings as needed (default is
-# block if more than 16 requests in 2 seconds and ban for 300 seconds)
-# - define WITH_ANTIFLOOD
-#
-# *** To block 3XX redirect replies execute:
-# - define WITH_BLOCK3XX
-#
-# *** To enable VoiceMail routing execute:
-# - define WITH_VOICEMAIL
-# - set the value of voicemail.srv_ip
-# - adjust the value of voicemail.srv_port
-#
-# *** To enhance accounting execute:
-# - enable mysql
-# - define WITH_ACCDB
-# - add following columns to database
-#!ifdef ACCDB_COMMENT
- ALTER TABLE acc ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
- ALTER TABLE acc ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
- ALTER TABLE acc ADD COLUMN src_ip varchar(64) NOT NULL default '';
- ALTER TABLE acc ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
- ALTER TABLE acc ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
- ALTER TABLE acc ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
- ALTER TABLE missed_calls ADD COLUMN src_user VARCHAR(64) NOT NULL DEFAULT '';
- ALTER TABLE missed_calls ADD COLUMN src_domain VARCHAR(128) NOT NULL DEFAULT '';
- ALTER TABLE missed_calls ADD COLUMN src_ip varchar(64) NOT NULL default '';
- ALTER TABLE missed_calls ADD COLUMN dst_ouser VARCHAR(64) NOT NULL DEFAULT '';
- ALTER TABLE missed_calls ADD COLUMN dst_user VARCHAR(64) NOT NULL DEFAULT '';
- ALTER TABLE missed_calls ADD COLUMN dst_domain VARCHAR(128) NOT NULL DEFAULT '';
-#!endif
-
-####### Include Local Config If Exists #########
-import_file "kamailio-local.cfg"
-
-####### Defined Values #########
-
-# *** Value defines - IDs used later in config
-#!ifdef WITH_MYSQL
-# - database URL - used to connect to database server by modules such
-# as: auth_db, acc, usrloc, a.s.o.
-#!ifndef DBURL
-#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio"
-#!endif
-#!endif
-#!ifdef WITH_MULTIDOMAIN
-# - the value for 'use_domain' parameters
-#!define MULTIDOMAIN 1
-#!else
-#!define MULTIDOMAIN 0
-#!endif
-
-# - flags
-# FLT_ - per transaction (message) flags
-# FLB_ - per branch flags
-#!define FLT_ACC 1
-#!define FLT_ACCMISSED 2
-#!define FLT_ACCFAILED 3
-#!define FLT_NATS 5
-
-#!define FLB_NATB 6
-#!define FLB_NATSIPPING 7
-
-####### Global Parameters #########
-
-### LOG Levels: 3=DBG, 2=INFO, 1=NOTICE, 0=WARN, -1=ERR
-#!ifdef WITH_DEBUG
-debug=4
-log_stderror=yes
-#!else
-debug=2
-log_stderror=no
-#!endif
-
-memdbg=5
-memlog=5
-
-log_facility=LOG_LOCAL0
-
-fork=yes
-children=4
-
-/* uncomment the next line to disable TCP (default on) */
-#disable_tcp=yes
-
-/* uncomment the next line to disable the auto discovery of local aliases
- based on reverse DNS on IPs (default on) */
-#auto_aliases=no
-
-/* add local domain aliases */
-#alias="sip.mydomain.com"
-
-/* uncomment and configure the following line if you want Kamailio to
- bind on a specific interface/port/proto (default bind on all available) */
-listen=udp:127.0.0.1:5065 # CUSTOMIZE ME
-
-/* port to listen to
- * - can be specified more than once if needed to listen on many ports */
-port=5060
-
-#!ifdef WITH_TLS
-enable_tls=yes
-#!endif
-
-# life time of TCP connection when there is no traffic
-# - a bit higher than registration expires to cope with UA behind NAT
-tcp_connection_lifetime=3605
-
-####### Custom Parameters #########
-
-# These parameters can be modified runtime via RPC interface
-# - see the documentation of 'cfg_rpc' module.
-#
-# Format: group.id = value 'desc' description
-# Access: $sel(cfg_get.group.id) or @cfg_get.group.id
-#
-
-#!ifdef WITH_PSTN
-# PSTN GW Routing
-#
-# - pstn.gw_ip: valid IP or hostname as string value, example:
-# pstn.gw_ip = "10.0.0.101" desc "My PSTN GW Address"
-#
-# - by default is empty to avoid misrouting
-pstn.gw_ip = "" desc "PSTN GW Address"
-pstn.gw_port = "" desc "PSTN GW Port"
-#!endif
-
-#!ifdef WITH_VOICEMAIL
-# VoiceMail Routing on offline, busy or no answer
-#
-# - by default Voicemail server IP is empty to avoid misrouting
-voicemail.srv_ip = "" desc "VoiceMail IP Address"
-voicemail.srv_port = "5060" desc "VoiceMail Port"
-#!endif
-
-####### Modules Section ########
-
-# set paths to location of modules (to sources or installation folders)
-#!ifdef WITH_SRCPATH
-mpath="modules/"
-#!else
-mpath="/lib/kamailio/modules/"
-#!endif
-
-#!ifdef WITH_MYSQL
-loadmodule "db_mysql.so"
-#!endif
-
-loadmodule "mi_fifo.so"
-loadmodule "kex.so"
-loadmodule "corex.so"
-loadmodule "tm.so"
-loadmodule "tmx.so"
-loadmodule "sl.so"
-loadmodule "rr.so"
-loadmodule "pv.so"
-loadmodule "maxfwd.so"
-loadmodule "usrloc.so"
-loadmodule "registrar.so"
-loadmodule "textops.so"
-loadmodule "siputils.so"
-loadmodule "xlog.so"
-loadmodule "sanity.so"
-loadmodule "ctl.so"
-loadmodule "cfg_rpc.so"
-loadmodule "mi_rpc.so"
-loadmodule "acc.so"
-
-#!ifdef WITH_AUTH
-loadmodule "auth.so"
-loadmodule "auth_db.so"
-#!ifdef WITH_IPAUTH
-loadmodule "permissions.so"
-#!endif
-#!endif
-
-#!ifdef WITH_ALIASDB
-loadmodule "alias_db.so"
-#!endif
-
-#!ifdef WITH_SPEEDDIAL
-loadmodule "speeddial.so"
-#!endif
-
-#!ifdef WITH_MULTIDOMAIN
-loadmodule "domain.so"
-#!endif
-
-#!ifdef WITH_PRESENCE
-loadmodule "presence.so"
-loadmodule "presence_xml.so"
-#!endif
-
-#!ifdef WITH_NAT
-loadmodule "nathelper.so"
-loadmodule "rtpproxy.so"
-#!endif
-
-#!ifdef WITH_TLS
-loadmodule "tls.so"
-#!endif
-
-#!ifdef WITH_ANTIFLOOD
-loadmodule "htable.so"
-loadmodule "pike.so"
-#!endif
-
-#!ifdef WITH_XMLRPC
-loadmodule "xmlrpc.so"
-#!endif
-
-#!ifdef WITH_DEBUG
-loadmodule "debugger.so"
-#!endif
-
-# ----------------- setting module-specific parameters ---------------
-
-
-# ----- mi_fifo params -----
-modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
-
-
-# ----- tm params -----
-# auto-discard branches from previous serial forking leg
-modparam("tm", "failure_reply_mode", 3)
-# default retransmission timeout: 30sec
-modparam("tm", "fr_timer", 30000)
-# default invite retransmission timeout after 1xx: 120sec
-modparam("tm", "fr_inv_timer", 120000)
-
-
-# ----- rr params -----
-# add value to ;lr param to cope with most of the UAs
-modparam("rr", "enable_full_lr", 1)
-# do not append from tag to the RR (no need for this script)
-modparam("rr", "append_fromtag", 0)
-
-
-# ----- registrar params -----
-modparam("registrar", "method_filtering", 1)
-/* uncomment the next line to disable parallel forking via location */
-# modparam("registrar", "append_branches", 0)
-/* uncomment the next line not to allow more than 10 contacts per AOR */
-#modparam("registrar", "max_contacts", 10)
-# max value for expires of registrations
-modparam("registrar", "max_expires", 3600)
-# set it to 1 to enable GRUU
-modparam("registrar", "gruu_enabled", 0)
-
-
-# ----- acc params -----
-/* what special events should be accounted ? */
-modparam("acc", "early_media", 0)
-modparam("acc", "report_ack", 0)
-modparam("acc", "report_cancels", 0)
-/* by default ww do not adjust the direct of the sequential requests.
- if you enable this parameter, be sure the enable "append_fromtag"
- in "rr" module */
-modparam("acc", "detect_direction", 0)
-/* account triggers (flags) */
-modparam("acc", "log_flag", FLT_ACC)
-modparam("acc", "log_missed_flag", FLT_ACCMISSED)
-modparam("acc", "log_extra",
- "src_user=$fU;src_domain=$fd;src_ip=$si;"
- "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
-modparam("acc", "failed_transaction_flag", FLT_ACCFAILED)
-/* enhanced DB accounting */
-#!ifdef WITH_ACCDB
-modparam("acc", "db_flag", FLT_ACC)
-modparam("acc", "db_missed_flag", FLT_ACCMISSED)
-modparam("acc", "db_url", DBURL)
-modparam("acc", "db_extra",
- "src_user=$fU;src_domain=$fd;src_ip=$si;"
- "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd")
-#!endif
-
-
-# ----- usrloc params -----
-/* enable DB persistency for location entries */
-#!ifdef WITH_USRLOCDB
-modparam("usrloc", "db_url", DBURL)
-modparam("usrloc", "db_mode", 2)
-modparam("usrloc", "use_domain", MULTIDOMAIN)
-#!endif
-
-
-# ----- auth_db params -----
-#!ifdef WITH_AUTH
-modparam("auth_db", "db_url", DBURL)
-modparam("auth_db", "calculate_ha1", yes)
-modparam("auth_db", "password_column", "password")
-modparam("auth_db", "load_credentials", "")
-modparam("auth_db", "use_domain", MULTIDOMAIN)
-
-# ----- permissions params -----
-#!ifdef WITH_IPAUTH
-modparam("permissions", "db_url", DBURL)
-modparam("permissions", "db_mode", 1)
-#!endif
-
-#!endif
-
-
-# ----- alias_db params -----
-#!ifdef WITH_ALIASDB
-modparam("alias_db", "db_url", DBURL)
-modparam("alias_db", "use_domain", MULTIDOMAIN)
-#!endif
-
-
-# ----- speeddial params -----
-#!ifdef WITH_SPEEDDIAL
-modparam("speeddial", "db_url", DBURL)
-modparam("speeddial", "use_domain", MULTIDOMAIN)
-#!endif
-
-
-# ----- domain params -----
-#!ifdef WITH_MULTIDOMAIN
-modparam("domain", "db_url", DBURL)
-# register callback to match myself condition with domains list
-modparam("domain", "register_myself", 1)
-#!endif
-
-
-#!ifdef WITH_PRESENCE
-# ----- presence params -----
-modparam("presence", "db_url", DBURL)
-
-# ----- presence_xml params -----
-modparam("presence_xml", "db_url", DBURL)
-modparam("presence_xml", "force_active", 1)
-#!endif
-
-
-#!ifdef WITH_NAT
-# ----- rtpproxy params -----
-modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722")
-
-# ----- nathelper params -----
-modparam("nathelper", "natping_interval", 30)
-modparam("nathelper", "ping_nated_only", 1)
-modparam("nathelper", "sipping_bflag", FLB_NATSIPPING)
-modparam("nathelper", "sipping_from", "sip:pi...@ka...")
-
-# params needed for NAT traversal in other modules
-modparam("nathelper|registrar", "received_avp", "$avp(RECEIVED)")
-modparam("usrloc", "nat_bflag", FLB_NATB)
-#!endif
-
-
-#!ifdef WITH_TLS
-# ----- tls params -----
-modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg")
-#!endif
-
-#!ifdef WITH_ANTIFLOOD
-# ----- pike params -----
-modparam("pike", "sampling_time_unit", 2)
-modparam("pike", "reqs_density_per_unit", 16)
-modparam("pike", "remove_latency", 4)
-
-# ----- htable params -----
-# ip ban htable with autoexpire after 5 minutes
-modparam("htable", "htable", "ipban=>size=8;autoexpire=300;")
-#!endif
-
-#!ifdef WITH_XMLRPC
-# ----- xmlrpc params -----
-modparam("xmlrpc", "route", "XMLRPC");
-modparam("xmlrpc", "url_match", "^/RPC")
-#!endif
-
-#!ifdef WITH_DEBUG
-# ----- debugger params -----
-modparam("debugger", "cfgtrace", 1)
-#!endif
-
-####### Routing Logic ########
-
-
-# Main SIP request routing logic
-# - processing of any incoming SIP request starts with this route
-# - note: this is the same as route { ... }
-request_route {
-
- # per request initial checks
- route(REQINIT);
-
- # NAT detection
- route(NATDETECT);
-
- # CANCEL processing
- if (is_method("CANCEL"))
- {
- if (t_check_trans()) {
- route(RELAY);
- }
- exit;
- }
-
- # handle requests within SIP dialogs
- route(WITHINDLG);
-
- ### only initial requests (no To tag)
-
- t_check_trans();
-
- # authentication
- route(AUTH);
-
- # record routing for dialog forming requests (in case they are routed)
- # - remove preloaded route headers
- remove_hf("Route");
- if (is_method("INVITE|SUBSCRIBE"))
- record_route();
-
- # account only INVITEs
- if (is_method("INVITE"))
- {
- setflag(FLT_ACC); # do accounting
- }
-
- # dispatch requests to foreign domains
- route(SIPOUT);
-
- ### requests for my local domains
-
- # handle presence related requests
- route(PRESENCE);
-
- # handle registrations
- route(REGISTRAR);
-
- if ($rU==$null)
- {
- # request with no Username in RURI
- sl_send_reply("484","Address Incomplete");
- exit;
- }
-
- # dispatch destinations to PSTN
- route(PSTN);
-
- # user location service
- route(LOCATION);
-}
-
-
-route[RELAY] {
-
- # enable additional event routes for forwarded requests
- # - serial forking, RTP relaying handling, a.s.o.
- if (is_method("INVITE|BYE|SUBSCRIBE|UPDATE")) {
- if(!t_is_set("branch_route")) t_on_branch("MANAGE_BRANCH");
- }
- if (is_method("INVITE|SUBSCRIBE|UPDATE")) {
- if(!t_is_set("onreply_route")) t_on_reply("MANAGE_REPLY");
- }
- if (is_method("INVITE")) {
- if(!t_is_set("failure_route")) t_on_failure("MANAGE_FAILURE");
- }
-
- if (!t_relay()) {
- sl_reply_error();
- }
- exit;
-}
-
-# Per SIP request initial checks
-route[REQINIT] {
-#!ifdef WITH_ANTIFLOOD
- # flood dection from same IP and traffic ban for a while
- # be sure you exclude checking trusted peers, such as pstn gateways
- # - local host excluded (e.g., loop to self)
- if(src_ip!=myself)
- {
- if($sht(ipban=>$si)!=$null)
- {
- # ip is already blocked
- xdbg("request from blocked IP - $rm from $fu (IP:$si:$sp)\n");
- exit;
- }
- if (!pike_check_req())
- {
- xlog("L_ALERT","ALERT: pike blocking $rm from $fu (IP:$si:$sp)\n");
- $sht(ipban=>$si) = 1;
- exit;
- }
- }
-#!endif
-
- if (!mf_process_maxfwd_header("10")) {
- sl_send_reply("483","Too Many Hops");
- exit;
- }
-
- if(!sanity_check("1511", "7"))
- {
- xlog("Malformed SIP message from $si:$sp\n");
- exit;
- }
-}
-
-# Handle requests within SIP dialogs
-route[WITHINDLG] {
- if (has_totag()) {
- # sequential request withing a dialog should
- # take the path determined by record-routing
- if (loose_route()) {
- route(DLGURI);
- if (is_method("BYE")) {
- setflag(FLT_ACC); # do accounting ...
- setflag(FLT_ACCFAILED); # ... even if the transaction fails
- }
- else if ( is_method("ACK") ) {
- # ACK is forwarded statelessy
- route(NATMANAGE);
- }
- else if ( is_method("NOTIFY") ) {
- # Add Record-Route for in-dialog NOTIFY as per RFC 6665.
- record_route();
- }
- route(RELAY);
- } else {
- if (is_method("SUBSCRIBE") && uri == myself) {
- # in-dialog subscribe requests
- route(PRESENCE);
- exit;
- }
- if ( is_method("ACK") ) {
- if ( t_check_trans() ) {
- # no loose-route, but stateful ACK;
- # must be an ACK after a 487
- # or e.g. 404 from upstream server
- route(RELAY);
- exit;
- } else {
- # ACK without matching transaction ... ignore and discard
- exit;
- }
- }
- sl_send_reply("404","Not here");
- }
- exit;
- }
-}
-
-# Handle SIP registrations
-route[REGISTRAR] {
- if (is_method("REGISTER"))
- {
- if(isflagset(FLT_NATS))
- {
- setbflag(FLB_NATB);
- # uncomment next line to do SIP NAT pinging
- ## setbflag(FLB_NATSIPPING);
- }
- if (!save("location"))
- sl_reply_error();
-
- exit;
- }
-}
-
-# USER location service
-route[LOCATION] {
-
-#!ifdef WITH_SPEEDDIAL
- # search for short dialing - 2-digit extension
- if($rU=~"^[0-9][0-9]$")
- if(sd_lookup("speed_dial"))
- route(SIPOUT);
-#!endif
-
-#!ifdef WITH_ALIASDB
- # search in DB-based aliases
- if(alias_db_lookup("dbaliases"))
- route(SIPOUT);
-#!endif
-
- $avp(oexten) = $rU;
- if (!lookup("location")) {
- $var(rc) = $rc;
- route(TOVOICEMAIL);
- t_newtran();
- switch ($var(rc)) {
- case -1:
- case -3:
- send_reply("404", "Not Found");
- exit;
- case -2:
- send_reply("405", "Method Not Allowed");
- exit;
- }
- }
-
- # when routing via usrloc, log the missed calls also
- if (is_method("INVITE"))
- {
- setflag(FLT_ACCMISSED);
- }
-
- route(RELAY);
- exit;
-}
-
-# Presence server route
-route[PRESENCE] {
- if(!is_method("PUBLISH|SUBSCRIBE"))
- return;
-
- if(is_method("SUBSCRIBE") && $hdr(Event)=="message-summary") {
- route(TOVOICEMAIL);
- # returns here if no voicemail server is configured
- sl_send_reply("404", "No voicemail service");
- exit;
- }
-
-#!ifdef WITH_PRESENCE
- if (!t_newtran())
- {
- sl_reply_error();
- exit;
- }
-
- if(is_method("PUBLISH"))
- {
- handle_publish();
- t_release();
- } else if(is_method("SUBSCRIBE")) {
- handle_subscribe();
- t_release();
- }
- exit;
-#!endif
-
- # if presence enabled, this part will not be executed
- if (is_method("PUBLISH") || $rU==$null)
- {
- sl_send_reply("404", "Not here");
- exit;
- }
- return;
-}
-
-# Authentication route
-route[AUTH] {
-#!ifdef WITH_AUTH
-
-#!ifdef WITH_IPAUTH
- if((!is_method("REGISTER")) && allow_source_address())
- {
- # source IP allowed
- return;
- }
-#!endif
-
- if (is_method("REGISTER") || from_uri==myself)
- {
- # authenticate requests
- if (!auth_check("$fd", "subscriber", "1")) {
- auth_challenge("$fd", "0");
- exit;
- }
- # user authenticated - remove auth header
- if(!is_method("REGISTER|PUBLISH"))
- consume_credentials();
- }
- # if caller is not local subscriber, then check if it calls
- # a local destination, otherwise deny, not an open relay here
- if (from_uri!=myself && uri!=myself)
- {
- ...
[truncated message content] |
|
From: <abe...@us...> - 2014-08-26 13:03:46
|
Revision: 6664
http://sourceforge.net/p/astlinux/code/6664
Author: abelbeck
Date: 2014-08-26 13:03:43 +0000 (Tue, 26 Aug 2014)
Log Message:
-----------
sipgrep, new package, version 2.0.0 very small C compiled binary like ngrep but for SIP, disabled for now but we probably want it included
Modified Paths:
--------------
branches/1.0/astlinux-ast11.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/sipgrep/
branches/1.0/package/sipgrep/Config.in
branches/1.0/package/sipgrep/sipgrep.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2014-08-26 01:40:59 UTC (rev 6663)
+++ branches/1.0/astlinux-ast11.config 2014-08-26 13:03:43 UTC (rev 6664)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6653-dirty Configuration
-# Sun Aug 24 09:09:42 2014
+# Buildroot 2011.08-svn6663-dirty Configuration
+# Tue Aug 26 07:57:48 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -778,6 +778,7 @@
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
BR2_PACKAGE_SHELLINABOX=y
+# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-08-26 01:40:59 UTC (rev 6663)
+++ branches/1.0/astlinux18.config 2014-08-26 13:03:43 UTC (rev 6664)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6653-dirty Configuration
-# Sun Aug 24 09:09:41 2014
+# Buildroot 2011.08-svn6663-dirty Configuration
+# Tue Aug 26 07:57:47 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -778,6 +778,7 @@
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
BR2_PACKAGE_SHELLINABOX=y
+# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2014-08-26 01:40:59 UTC (rev 6663)
+++ branches/1.0/initrd.config 2014-08-26 13:03:43 UTC (rev 6664)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6653-dirty Configuration
-# Sun Aug 24 09:09:48 2014
+# Buildroot 2011.08-svn6663-dirty Configuration
+# Tue Aug 26 07:57:53 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -621,6 +621,7 @@
# BR2_PACKAGE_RSYNC is not set
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
+# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2014-08-26 01:40:59 UTC (rev 6663)
+++ branches/1.0/package/Config.in 2014-08-26 13:03:43 UTC (rev 6664)
@@ -519,6 +519,7 @@
source "package/samba/Config.in"
source "package/ser2net/Config.in"
source "package/shellinabox/Config.in"
+source "package/sipgrep/Config.in"
source "package/socat/Config.in"
source "package/spawn-fcgi/Config.in"
source "package/squid/Config.in"
Added: branches/1.0/package/sipgrep/Config.in
===================================================================
--- branches/1.0/package/sipgrep/Config.in (rev 0)
+++ branches/1.0/package/sipgrep/Config.in 2014-08-26 13:03:43 UTC (rev 6664)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SIPGREP
+ bool "sipgrep"
+ default n
+ select BR2_PACKAGE_LIBPCAP
+ select BR2_PACKAGE_PCRE
+ help
+ Network grep for SIP.
+
+ https://github.com/adubovikov/sipgrep
Added: branches/1.0/package/sipgrep/sipgrep.mk
===================================================================
--- branches/1.0/package/sipgrep/sipgrep.mk (rev 0)
+++ branches/1.0/package/sipgrep/sipgrep.mk 2014-08-26 13:03:43 UTC (rev 6664)
@@ -0,0 +1,27 @@
+#############################################################
+#
+# sipgrep
+#
+#############################################################
+
+SIPGREP_VERSION = 2.0.0
+SIPGREP_SOURCE = sipgrep-$(SIPGREP_VERSION).tar.gz
+SIPGREP_SITE = http://files.astlinux.org
+#SIPGREP_SITE = https://github.com/adubovikov/sipgrep/releases
+SIPGREP_DEPENDENCIES = libpcap pcre
+
+SIPGREP_UNINSTALL_STAGING_OPT = --version
+
+SIPGREP_CONF_OPT += \
+ --with-pcap-includes=$(STAGING_DIR)/usr/include \
+ --enable-ipv6
+
+define SIPGREP_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/sipgrep $(TARGET_DIR)/usr/bin/sipgrep
+endef
+
+define SIPGREP_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/sipgrep
+endef
+
+$(eval $(call AUTOTARGETS,package,sipgrep))
Modified: branches/1.0/runnix-uclibc.config
===================================================================
--- branches/1.0/runnix-uclibc.config 2014-08-26 01:40:59 UTC (rev 6663)
+++ branches/1.0/runnix-uclibc.config 2014-08-26 13:03:43 UTC (rev 6664)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6653-dirty Configuration
-# Sun Aug 24 09:09:47 2014
+# Buildroot 2011.08-svn6663-dirty Configuration
+# Tue Aug 26 07:57:51 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -953,6 +953,7 @@
# BR2_PACKAGE_RSYNC is not set
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
+# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2014-08-26 01:40:59 UTC (rev 6663)
+++ branches/1.0/runnix.config 2014-08-26 13:03:43 UTC (rev 6664)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6653-dirty Configuration
-# Sun Aug 24 09:09:44 2014
+# Buildroot 2011.08-svn6663-dirty Configuration
+# Tue Aug 26 07:57:49 2014
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -657,6 +657,7 @@
# BR2_PACKAGE_RSYNC is not set
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
+# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-08-27 13:35:15
|
Revision: 6671
http://sourceforge.net/p/astlinux/code/6671
Author: abelbeck
Date: 2014-08-27 13:35:08 +0000 (Wed, 27 Aug 2014)
Log Message:
-----------
rc.conf, add variable ASTERISK_DAHDI_DISABLE, when 'yes' will disable Asterisk and DAHDI
Modified Paths:
--------------
branches/1.0/package/asterisk/asterisk.init
branches/1.0/package/dahdi-tools/dahdi.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/asterisk/asterisk.init
===================================================================
--- branches/1.0/package/asterisk/asterisk.init 2014-08-26 20:43:13 UTC (rev 6670)
+++ branches/1.0/package/asterisk/asterisk.init 2014-08-27 13:35:08 UTC (rev 6671)
@@ -178,6 +178,11 @@
fi
}
+if [ "$ASTERISK_DAHDI_DISABLE" = "yes" ]; then
+ echo "Disabled: Asterisk"
+ exit
+fi
+
case $1 in
init)
Modified: branches/1.0/package/dahdi-tools/dahdi.init
===================================================================
--- branches/1.0/package/dahdi-tools/dahdi.init 2014-08-26 20:43:13 UTC (rev 6670)
+++ branches/1.0/package/dahdi-tools/dahdi.init 2014-08-27 13:35:08 UTC (rev 6671)
@@ -55,6 +55,11 @@
done
}
+if [ "$ASTERISK_DAHDI_DISABLE" = "yes" ]; then
+ echo "Disabled: DAHDI"
+ exit
+fi
+
case $1 in
init)
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-08-26 20:43:13 UTC (rev 6670)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-08-27 13:35:08 UTC (rev 6671)
@@ -988,6 +988,9 @@
##
#DIALING_PREFIX_NUMBERS="00~0~49~"
+## Disable Asterisk and DAHDI when set to "yes", defaults to "no"
+#ASTERISK_DAHDI_DISABLE="no"
+
## Asterisk Verbose Logging Support
## This will automatically set the verbosity level after Asterisk
## starts up.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-08-30 23:25:51
|
Revision: 6679
http://sourceforge.net/p/astlinux/code/6679
Author: abelbeck
Date: 2014-08-30 23:25:47 +0000 (Sat, 30 Aug 2014)
Log Message:
-----------
kamailio, start rtpproxy automatically when WITH_NAT is defined, add RTPPROXY_PORT_RANGE, RTPPROXY_LISTEN_IP and RTPPROXY_LISTEN_IPV6 variables, remove RTPPROXY_IP and RTPPROXY_TOS variables
Modified Paths:
--------------
branches/1.0/package/kamailio/kamailio.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/kamailio/kamailio.init
===================================================================
--- branches/1.0/package/kamailio/kamailio.init 2014-08-29 23:41:17 UTC (rev 6678)
+++ branches/1.0/package/kamailio/kamailio.init 2014-08-30 23:25:47 UTC (rev 6679)
@@ -19,6 +19,26 @@
fi
}
+rtpproxy_enabled()
+{
+ local WITH_NAT='^#!define[ ][ ]*WITH_NAT[ ]*$'
+
+ if [ ! -x /usr/bin/rtpproxy ]; then
+ return 1
+ fi
+
+ if [ -f /etc/kamailio/kamailio-local.cfg ]; then
+ if grep -q -e "$WITH_NAT" /etc/kamailio/kamailio-local.cfg; then
+ return 0
+ fi
+ fi
+ if grep -q -e "$WITH_NAT" /etc/kamailio/kamailio.cfg; then
+ return 0
+ fi
+
+ return 1
+}
+
init () {
if [ -d /mnt/kd/kamailio ]; then
@@ -58,13 +78,18 @@
if [ -f /etc/kamailio/kamailio.cfg ]; then
- if [ -x /usr/bin/rtpproxy -a -n "$RTPPROXY_IP" ]; then
+ if rtpproxy_enabled; then
echo "Starting rtpproxy..."
rtpproxy_socket="${RTPPROXY_SOCKET:-udp:127.0.0.1:7722}"
- rtpproxy_tos="${RTPPROXY_TOS:-0x18}"
+ min_port="$(echo "$RTPPROXY_PORT_RANGE" | cut -s -d':' -f1)"
+ min_port="${min_port:-16384}"
+ max_port="$(echo "$RTPPROXY_PORT_RANGE" | cut -s -d':' -f2)"
+ max_port="${max_port:-16639}"
- rtpproxy -l "$RTPPROXY_IP" -s "$rtpproxy_socket" -t "$rtpproxy_tos" -u "kamailio:kamailio"
+ rtpproxy -u "kamailio:kamailio" -s "$rtpproxy_socket" -m "$min_port" -M "$max_port" \
+ ${RTPPROXY_LISTEN_IP:+-l "$RTPPROXY_LISTEN_IP"} \
+ ${RTPPROXY_LISTEN_IPV6:+-6 "$RTPPROXY_LISTEN_IPV6"}
fi
echo "Starting kamailio..."
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-08-29 23:41:17 UTC (rev 6678)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-08-30 23:25:47 UTC (rev 6679)
@@ -520,6 +520,13 @@
#LDAP_SERVER_CERT="" # Defaults to "/mnt/kd/ldap/certs/server.crt" using SIP-TLS cert
#LDAP_SERVER_KEY="" # Defaults to "/mnt/kd/ldap/certs/server.key" using SIP-TLS key
+## RTPproxy
+## RTPproxy is automatically enabled by Kamailio if installed
+#RTPPROXY_SOCKET="udp:127.0.0.1:7722" # Must match what Kamailio expects, defaults to "udp:127.0.0.1:7722"
+#RTPPROXY_PORT_RANGE="16384:16639" # UDP port range, defaults to 16384 through 16639
+#RTPPROXY_LISTEN_IP="0.0.0.0" # IPv4 listen address, defaults to "0.0.0.0"
+#RTPPROXY_LISTEN_IPV6="" # IPv6 listen address, defaults to none
+
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
## The "user" and "pass" are optional
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-09-02 22:32:20
|
Revision: 6687
http://sourceforge.net/p/astlinux/code/6687
Author: abelbeck
Date: 2014-09-02 22:32:11 +0000 (Tue, 02 Sep 2014)
Log Message:
-----------
kamailio, change rtpproxy to Daniel-Constantin Mierla's version which suports the 'advertise' option which is set by the new variable RTPPROXY_ADVERTISE_IP
Ref: https://github.com/miconda/rtpproxy
Modified Paths:
--------------
branches/1.0/package/kamailio/kamailio.init
branches/1.0/package/rtpproxy/rtpproxy.mk
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/kamailio/kamailio.init
===================================================================
--- branches/1.0/package/kamailio/kamailio.init 2014-09-02 12:58:58 UTC (rev 6686)
+++ branches/1.0/package/kamailio/kamailio.init 2014-09-02 22:32:11 UTC (rev 6687)
@@ -89,7 +89,8 @@
rtpproxy -u "kamailio:kamailio" -s "$rtpproxy_socket" -m "$min_port" -M "$max_port" \
${RTPPROXY_LISTEN_IP:+-l "$RTPPROXY_LISTEN_IP"} \
- ${RTPPROXY_LISTEN_IPV6:+-6 "$RTPPROXY_LISTEN_IPV6"}
+ ${RTPPROXY_LISTEN_IPV6:+-6 "$RTPPROXY_LISTEN_IPV6"} \
+ ${RTPPROXY_ADVERTISE_IP:+-A "$RTPPROXY_ADVERTISE_IP"}
fi
echo "Starting kamailio..."
Modified: branches/1.0/package/rtpproxy/rtpproxy.mk
===================================================================
--- branches/1.0/package/rtpproxy/rtpproxy.mk 2014-09-02 12:58:58 UTC (rev 6686)
+++ branches/1.0/package/rtpproxy/rtpproxy.mk 2014-09-02 22:32:11 UTC (rev 6687)
@@ -4,9 +4,9 @@
#
#############################################################
-RTPPROXY_VERSION = 1.3-beta.1
+RTPPROXY_VERSION = 2013-07-02
RTPPROXY_SITE = http://files.astlinux.org
-#RTPPROXY_SITE = https://github.com/sippy/rtpproxy/releases
+#RTPPROXY_SITE = https://github.com/miconda/rtpproxy
RTPPROXY_SOURCE = rtpproxy-$(RTPPROXY_VERSION).tar.gz
$(eval $(call AUTOTARGETS,package,rtpproxy))
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-09-02 12:58:58 UTC (rev 6686)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2014-09-02 22:32:11 UTC (rev 6687)
@@ -526,6 +526,7 @@
#RTPPROXY_PORT_RANGE="16384:16639" # UDP port range, defaults to 16384 through 16639
#RTPPROXY_LISTEN_IP="0.0.0.0" # IPv4 listen address, defaults to "0.0.0.0"
#RTPPROXY_LISTEN_IPV6="" # IPv6 listen address, defaults to none
+#RTPPROXY_ADVERTISE_IP="" # IPv4 public address to advertise, defaults to none
## Proxy ENV variables (http_proxy, ftp_proxy, etc.) for curl, wget, etc.
## Format: http://user:pass@proxyhost:proxyport"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-09-04 16:26:10
|
Revision: 6691
http://sourceforge.net/p/astlinux/code/6691
Author: abelbeck
Date: 2014-09-04 16:26:03 +0000 (Thu, 04 Sep 2014)
Log Message:
-----------
Enable 'sipgrep' in standard 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 2014-09-04 16:22:27 UTC (rev 6690)
+++ branches/1.0/astlinux-ast11.config 2014-09-04 16:26:03 UTC (rev 6691)
@@ -778,7 +778,7 @@
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
BR2_PACKAGE_SHELLINABOX=y
-# BR2_PACKAGE_SIPGREP is not set
+BR2_PACKAGE_SIPGREP=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2014-09-04 16:22:27 UTC (rev 6690)
+++ branches/1.0/astlinux18.config 2014-09-04 16:26:03 UTC (rev 6691)
@@ -778,7 +778,7 @@
# BR2_PACKAGE_SAMBA is not set
# BR2_PACKAGE_SER2NET is not set
BR2_PACKAGE_SHELLINABOX=y
-# BR2_PACKAGE_SIPGREP is not set
+BR2_PACKAGE_SIPGREP=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2014-10-02 20:23:12
|
Revision: 6741
http://sourceforge.net/p/astlinux/code/6741
Author: abelbeck
Date: 2014-10-02 20:23:01 +0000 (Thu, 02 Oct 2014)
Log Message:
-----------
refactor /etc/init.d/functions into multiple /etc/init.d/functions.d/ includes, use bash only when needed so it is now possible to set '/bin/sh -> busybox' if desired, though not sure it is desired. Note: a clean build is recommended after this commit
Modified Paths:
--------------
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/package/ipsec-tools/ipsec-xauth-up-down.sh
branches/1.0/package/ipsec-tools/racoon-ipsec
branches/1.0/package/ipsec-tools/racoon.init
branches/1.0/package/mdnsresponder/mdns.init
branches/1.0/package/openvpn/openvpn.init
branches/1.0/package/openvpn/openvpnclient.init
branches/1.0/package/pptpd/pptpd.init
branches/1.0/package/rp-pppoe/pppoe-restart
branches/1.0/package/zabbix/zabbix.init
branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
Added Paths:
-----------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/
branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/bash/
branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/bash/ipcalc
branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc
branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/network
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2014-10-02 20:23:01 UTC (rev 6741)
@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/bash/ipcalc
+. /etc/init.d/functions.d/network
+. /etc/init.d/functions.d/misc
dnscrypt_proxy_check()
{
Modified: branches/1.0/package/ipsec-tools/ipsec-xauth-up-down.sh
===================================================================
--- branches/1.0/package/ipsec-tools/ipsec-xauth-up-down.sh 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/ipsec-tools/ipsec-xauth-up-down.sh 2014-10-02 20:23:01 UTC (rev 6741)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# IPsec XAuth Phase1 Up / Down script
Modified: branches/1.0/package/ipsec-tools/racoon-ipsec
===================================================================
--- branches/1.0/package/ipsec-tools/racoon-ipsec 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/ipsec-tools/racoon-ipsec 2014-10-02 20:23:01 UTC (rev 6741)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
gen_dynamic_preamble()
{
@@ -569,7 +569,9 @@
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/bash/ipcalc
+. /etc/init.d/functions.d/network
+. /etc/init.d/functions.d/misc
prog="$(basename $0)"
Modified: branches/1.0/package/ipsec-tools/racoon.init
===================================================================
--- branches/1.0/package/ipsec-tools/racoon.init 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/ipsec-tools/racoon.init 2014-10-02 20:23:01 UTC (rev 6741)
@@ -2,7 +2,7 @@
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/misc
init()
{
Modified: branches/1.0/package/mdnsresponder/mdns.init
===================================================================
--- branches/1.0/package/mdnsresponder/mdns.init 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/mdnsresponder/mdns.init 2014-10-02 20:23:01 UTC (rev 6741)
@@ -2,7 +2,7 @@
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/network
MDNS=/usr/sbin/mDNSProxyResponderPosix
Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/openvpn/openvpn.init 2014-10-02 20:23:01 UTC (rev 6741)
@@ -1,7 +1,7 @@
#!/bin/sh
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/misc
# Define a few variables
# Lockfile
Modified: branches/1.0/package/openvpn/openvpnclient.init
===================================================================
--- branches/1.0/package/openvpn/openvpnclient.init 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/openvpn/openvpnclient.init 2014-10-02 20:23:01 UTC (rev 6741)
@@ -1,7 +1,7 @@
#!/bin/sh
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/misc
# Define a few variables
# Lockfile
Modified: branches/1.0/package/pptpd/pptpd.init
===================================================================
--- branches/1.0/package/pptpd/pptpd.init 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/pptpd/pptpd.init 2014-10-02 20:23:01 UTC (rev 6741)
@@ -4,7 +4,7 @@
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/misc
pid="/var/run/pptpd.pid"
Modified: branches/1.0/package/rp-pppoe/pppoe-restart
===================================================================
--- branches/1.0/package/rp-pppoe/pppoe-restart 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/rp-pppoe/pppoe-restart 2014-10-02 20:23:01 UTC (rev 6741)
@@ -13,7 +13,7 @@
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/network
delay=${PPPOE_RESTART_DELAY:-2}
Modified: branches/1.0/package/zabbix/zabbix.init
===================================================================
--- branches/1.0/package/zabbix/zabbix.init 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/package/zabbix/zabbix.init 2014-10-02 20:23:01 UTC (rev 6741)
@@ -2,7 +2,7 @@
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/network
agent_addr_port()
{
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions 2014-10-02 20:23:01 UTC (rev 6741)
@@ -1,280 +0,0 @@
-#
-# Function include file for init.d/
-#
-# Convention, begin included functions with SYS_
-# SYS_function_name()
-#
-
-SYS_gen_etc_hosts() {
- local ip hostip hostipv6 IFS
-
- # we deliberately leave out EXTIP
- for ip in $INTIP/$INTIPV6 $INT2IP/$INT2IPV6 $INT3IP/$INT3IPV6; do
- hostip="$(echo $ip | cut -d'/' -f1)"
- hostipv6="$(echo $ip | cut -d'/' -f2)"
- if [ -n "$hostip" ]; then
- # we only need the first non-empty one...
- break
- fi
- done
-
- echo "# Automatically generated from internal state.
-127.0.0.1 localhost${hostip:+
-$hostip $HOSTNAME.$DOMAIN $HOSTNAME}"
-
- if [ "$IPV6" = "yes" ]; then
- echo "
-::1 localhost ip6-localhost ip6-loopback${hostipv6:+
-$hostipv6 $HOSTNAME.$DOMAIN $HOSTNAME}
-"
- fi
-
- # DDHOST may not be a pure DNS Name, purify it
- if [ -n "$DDHOST" ]; then
- echo "$INTIP $(echo "$DDHOST" | sed 's/[, ].*//')"
- fi
-
- if [ -f /stat/etc/hosts ]; then
- echo ""
- cat /stat/etc/hosts
- fi
-
- if [ -f /mnt/kd/hosts ]; then
- echo ""
- cat /mnt/kd/hosts
- fi
-
- if [ -n "$STATICHOSTS" ]; then
-
- echo "
-# generated from STATICHOSTS in rc.conf"
-
- IFS=$'\n'
- for i in $STATICHOSTS; do
- echo "$i" | awk -F~ '{ print $2 "\t" $1 ($4 == "" ? "" : "\t# "$4); }'
- done
- fi
-}
-
-SYS_is_vpn_type()
-{
- # args: vpn_type
- local vpn IFS
-
- unset IFS
- for vpn in $VPN; do
- if [ "$vpn" = "$1" ]; then
- return 0
- fi
- done
-
- return 1
-}
-
-_inordinal()
-{
- if [ $# -lt 1 ]; then
- echo "_ismember: wrong number of args" >&2
- exit 1
- fi
-
- local ARG="$1" ELEM
- shift
-
- local -i nth=1
-
- for ELEM in "$@"; do
- if [ "$ARG" = "$ELEM" ]; then
- echo $nth
- return
- fi
- let nth++
- done
-
- echo 0
-}
-
-_ismember()
-{
- [ `_inordinal "$@"` != 0 ]
-}
-
-declare -ir UINT_MAX=4294967295
-declare -ir UCHAR_MAX=255
-
-_isnum()
-{
- if [ $# -ne 1 ]; then
- echo "_isnum: wrong number of args" >&2
- exit 1
- fi
-
- [ $(expr "$1" : "[0-9][0-9]*$") -ne 0 ]
-}
-
-_ishexnum()
-{
- if [ $# -ne 1 ]; then
- echo "_isnum: wrong number of args" >&2
- exit 1
- fi
-
- [ $(expr "$1" : "0x[0-9a-fA-F][0-9a-fA-F]*$") -ne 0 ]
-}
-
-_ispowerof2()
-{
- if [ $# -ne 1 ]; then
- echo "_ispowerof2: wrong number of args" >&2
- exit 1
- elif ! _isnum "$1"; then
- echo "_ispowerof2: not an integer" >&2
- exit 1
- fi
-
- local -i NUM="$1" DEC
-
- DEC=$(($NUM - 1))
-
- [ $(($NUM & $DEC)) -eq 0 ]
-}
-
-_isvalidmask()
-{
- if [ $# -ne 1 ]; then
- echo "_isvalidmask: wrong number of args" >&2
- exit 1
- elif ! _isnum "$1" && ! _ishexnum "$1"; then
- echo "_isvalidmask: not an integer" >&2
- exit 1
- fi
-
- # the assignment will take care of radix conversion
- local -i NUM="$1"
-
- # can't use ~$NUM so we XOR it with UINT_MAX
- _ispowerof2 $((($NUM ^ $UINT_MAX) + 1))
-}
-
-_isdottedquad()
-{
- if [ $# -ne 1 ]; then
- echo "_isdottedquad: wrong number of args" >&2
- exit 1
- fi
-
- local ARG="$1" IFS INT VAL=0
-
- if [ $(expr "$ARG" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$') -eq 0 ]; then
- return 1
- fi
-
- IFS='.'
- for INT in $ARG; do
- if [ "$INT" -gt $UCHAR_MAX ]; then
- return 1
- fi
- VAL=$((($VAL << 8) + $INT))
- done
-
- # send me to /dev/null if you only want to syntax-check
- echo $VAL
-
- return 0
-}
-
-_mkdottedquad()
-{
- if [ $# -ne 1 ]; then
- echo "_mkdottedquad: wrong number of args" >&2
- exit 1
- elif ! _isnum "$1"; then
- echo "_mkdottedquad: not an integer" >&2
- exit 1
- fi
-
- local -i INT="$1" VAL=0 UNIT
- local STR=
-
- if [ $INT -gt $UINT_MAX ]; then
- echo "_mkdottedquad: out-of-bounds" >&2
- exit 1
- fi
-
- for UNIT in 16777216 65536 256 1; do
- VAL=$(($INT / $UNIT))
- STR="$STR${STR:+.}$VAL"
- INT=$(($INT % $UNIT))
- done
-
- echo $STR
-}
-
-isextppp()
-{
- local ext="$1"
-
- if [ -n "$PPPOEUSER" -a -n "$PPPOEPASS" -a -n "$PPPOEIF" ]; then
- if [ "$EXTIF" = "ppp0" -o "$EXTIF" = "$PPPOEIF" ]; then
- if [ -z "$ext" -o "$ext" = "extif" ]; then
- return 0
- fi
- elif [ "$EXT2IF" = "ppp0" -o "$EXT2IF" = "$PPPOEIF" ]; then
- if [ -z "$ext" -o "$ext" = "ext2if" ]; then
- return 0
- fi
- fi
- fi
-
- return 1
-}
-
-get_numeric_ip_version()
-{
- case $1 in
- 0/0)
- ;;
- [0-9][0-9.][0-9.][0-9.][0-9.]*.*[0-9])
- return 4
- ;;
- [0-9]*.*/*[0-9]|[0-9]/*[0-9]|[1-9][0-9]/*[0-9]|[12][0-9][0-9]/*[0-9])
- return 4
- ;;
- *:*)
- return 6
- ;;
- esac
-
- return 0
-}
-
-# moved from racoon.init because they're generically useful.
-
-findintf()
-{
- ip -o addr show to "$1" \
- | awk '{ print $2; }'
-}
-
-findip()
-{
- ip -o addr show to "$1" \
- | awk '{ split($4, field, "/"); print field[1]; }'
-}
-
-find_ip_from_if()
-{
- ip -o addr show dev "$1" \
- | awk '$3 == "inet" { split($4, field, "/"); print field[1]; nextfile; }'
-}
-
-nthfield()
-{
- echo "${!1}" | cut "-d$2" "-f$3"
-}
-
-fields()
-{
- echo "${!1}" | awk "-F$2" '{ print NF; }'
-}
-
Added: branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/bash/ipcalc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/bash/ipcalc (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/bash/ipcalc 2014-10-02 20:23:01 UTC (rev 6741)
@@ -0,0 +1,147 @@
+#
+# Function include file for init.d/
+#
+# IP Calc Tools
+#
+# Requires: bash
+#
+
+_inordinal()
+{
+ if [ $# -lt 1 ]; then
+ echo "_ismember: wrong number of args" >&2
+ exit 1
+ fi
+
+ local ARG="$1" ELEM
+ shift
+
+ local -i nth=1
+
+ for ELEM in "$@"; do
+ if [ "$ARG" = "$ELEM" ]; then
+ echo $nth
+ return
+ fi
+ let nth++
+ done
+
+ echo 0
+}
+
+_ismember()
+{
+ [ `_inordinal "$@"` != 0 ]
+}
+
+declare -ir UINT_MAX=4294967295
+declare -ir UCHAR_MAX=255
+
+_isnum()
+{
+ if [ $# -ne 1 ]; then
+ echo "_isnum: wrong number of args" >&2
+ exit 1
+ fi
+
+ [ $(expr "$1" : "[0-9][0-9]*$") -ne 0 ]
+}
+
+_ishexnum()
+{
+ if [ $# -ne 1 ]; then
+ echo "_isnum: wrong number of args" >&2
+ exit 1
+ fi
+
+ [ $(expr "$1" : "0x[0-9a-fA-F][0-9a-fA-F]*$") -ne 0 ]
+}
+
+_ispowerof2()
+{
+ if [ $# -ne 1 ]; then
+ echo "_ispowerof2: wrong number of args" >&2
+ exit 1
+ elif ! _isnum "$1"; then
+ echo "_ispowerof2: not an integer" >&2
+ exit 1
+ fi
+
+ local -i NUM="$1" DEC
+
+ DEC=$(($NUM - 1))
+
+ [ $(($NUM & $DEC)) -eq 0 ]
+}
+
+_isvalidmask()
+{
+ if [ $# -ne 1 ]; then
+ echo "_isvalidmask: wrong number of args" >&2
+ exit 1
+ elif ! _isnum "$1" && ! _ishexnum "$1"; then
+ echo "_isvalidmask: not an integer" >&2
+ exit 1
+ fi
+
+ # the assignment will take care of radix conversion
+ local -i NUM="$1"
+
+ # can't use ~$NUM so we XOR it with UINT_MAX
+ _ispowerof2 $((($NUM ^ $UINT_MAX) + 1))
+}
+
+_isdottedquad()
+{
+ if [ $# -ne 1 ]; then
+ echo "_isdottedquad: wrong number of args" >&2
+ exit 1
+ fi
+
+ local ARG="$1" IFS INT VAL=0
+
+ if [ $(expr "$ARG" : '[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*$') -eq 0 ]; then
+ return 1
+ fi
+
+ IFS='.'
+ for INT in $ARG; do
+ if [ "$INT" -gt $UCHAR_MAX ]; then
+ return 1
+ fi
+ VAL=$((($VAL << 8) + $INT))
+ done
+
+ # send me to /dev/null if you only want to syntax-check
+ echo $VAL
+
+ return 0
+}
+
+_mkdottedquad()
+{
+ if [ $# -ne 1 ]; then
+ echo "_mkdottedquad: wrong number of args" >&2
+ exit 1
+ elif ! _isnum "$1"; then
+ echo "_mkdottedquad: not an integer" >&2
+ exit 1
+ fi
+
+ local -i INT="$1" VAL=0 UNIT
+ local STR=
+
+ if [ $INT -gt $UINT_MAX ]; then
+ echo "_mkdottedquad: out-of-bounds" >&2
+ exit 1
+ fi
+
+ for UNIT in 16777216 65536 256 1; do
+ VAL=$(($INT / $UNIT))
+ STR="$STR${STR:+.}$VAL"
+ INT=$(($INT % $UNIT))
+ done
+
+ echo $STR
+}
+
Added: branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/misc 2014-10-02 20:23:01 UTC (rev 6741)
@@ -0,0 +1,75 @@
+#
+# Function include file for init.d/
+#
+# Miscellaneous Tools
+#
+# Convention, begin included functions with SYS_
+# SYS_function_name()
+#
+
+SYS_gen_etc_hosts() {
+ local ip hostip hostipv6 IFS
+
+ # we deliberately leave out EXTIP
+ for ip in $INTIP/$INTIPV6 $INT2IP/$INT2IPV6 $INT3IP/$INT3IPV6; do
+ hostip="$(echo $ip | cut -d'/' -f1)"
+ hostipv6="$(echo $ip | cut -d'/' -f2)"
+ if [ -n "$hostip" ]; then
+ # we only need the first non-empty one...
+ break
+ fi
+ done
+
+ echo "# Automatically generated from internal state.
+127.0.0.1 localhost${hostip:+
+$hostip $HOSTNAME.$DOMAIN $HOSTNAME}"
+
+ if [ "$IPV6" = "yes" ]; then
+ echo "
+::1 localhost ip6-localhost ip6-loopback${hostipv6:+
+$hostipv6 $HOSTNAME.$DOMAIN $HOSTNAME}
+"
+ fi
+
+ # DDHOST may not be a pure DNS Name, purify it
+ if [ -n "$DDHOST" ]; then
+ echo "$INTIP $(echo "$DDHOST" | sed 's/[, ].*//')"
+ fi
+
+ if [ -f /stat/etc/hosts ]; then
+ echo ""
+ cat /stat/etc/hosts
+ fi
+
+ if [ -f /mnt/kd/hosts ]; then
+ echo ""
+ cat /mnt/kd/hosts
+ fi
+
+ if [ -n "$STATICHOSTS" ]; then
+
+ echo "
+# generated from STATICHOSTS in rc.conf"
+
+ IFS=$'\n'
+ for i in $STATICHOSTS; do
+ echo "$i" | awk -F~ '{ print $2 "\t" $1 ($4 == "" ? "" : "\t# "$4); }'
+ done
+ fi
+}
+
+SYS_is_vpn_type()
+{
+ # args: vpn_type
+ local vpn IFS
+
+ unset IFS
+ for vpn in $VPN; do
+ if [ "$vpn" = "$1" ]; then
+ return 0
+ fi
+ done
+
+ return 1
+}
+
Added: branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/network (rev 0)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/functions.d/network 2014-10-02 20:23:01 UTC (rev 6741)
@@ -0,0 +1,62 @@
+#
+# Function include file for init.d/
+#
+# Network Tools
+#
+
+isextppp()
+{
+ local ext="$1"
+
+ if [ -n "$PPPOEUSER" -a -n "$PPPOEPASS" -a -n "$PPPOEIF" ]; then
+ if [ "$EXTIF" = "ppp0" -o "$EXTIF" = "$PPPOEIF" ]; then
+ if [ -z "$ext" -o "$ext" = "extif" ]; then
+ return 0
+ fi
+ elif [ "$EXT2IF" = "ppp0" -o "$EXT2IF" = "$PPPOEIF" ]; then
+ if [ -z "$ext" -o "$ext" = "ext2if" ]; then
+ return 0
+ fi
+ fi
+ fi
+
+ return 1
+}
+
+get_numeric_ip_version()
+{
+ case $1 in
+ 0/0)
+ ;;
+ [0-9][0-9.][0-9.][0-9.][0-9.]*.*[0-9])
+ return 4
+ ;;
+ [0-9]*.*/*[0-9]|[0-9]/*[0-9]|[1-9][0-9]/*[0-9]|[12][0-9][0-9]/*[0-9])
+ return 4
+ ;;
+ *:*)
+ return 6
+ ;;
+ esac
+
+ return 0
+}
+
+findintf()
+{
+ ip -o addr show to "$1" \
+ | awk '{ print $2; }'
+}
+
+findip()
+{
+ ip -o addr show to "$1" \
+ | awk '{ split($4, field, "/"); print field[1]; }'
+}
+
+find_ip_from_if()
+{
+ ip -o addr show dev "$1" \
+ | awk '$3 == "inet" { split($4, field, "/"); print field[1]; nextfile; }'
+}
+
Modified: branches/1.0/project/astlinux/target_skeleton/etc/init.d/network
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2014-10-01 21:37:51 UTC (rev 6740)
+++ branches/1.0/project/astlinux/target_skeleton/etc/init.d/network 2014-10-02 20:23:01 UTC (rev 6741)
@@ -1,9 +1,15 @@
-#!/bin/sh
+#!/bin/bash
. /etc/rc.conf
-. /etc/init.d/functions
+. /etc/init.d/functions.d/network
+. /etc/init.d/functions.d/misc
+nthfield()
+{
+ echo "${!1}" | cut "-d$2" "-f$3"
+}
+
create_nasX()
{
local name list type tag value VPI VCI ATMINFO CARD IF="$1" IFS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X