Menu
▾
▴
astlinux-commits
|
From: <abe...@us...> - 2016-09-09 15:27:35
|
Revision: 7826
http://sourceforge.net/p/astlinux/code/7826
Author: abelbeck
Date: 2016-09-09 15:27:32 +0000 (Fri, 09 Sep 2016)
Log Message:
-----------
default configs, enable packages 'ipset' and library 'libmnl'
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-09-09 15:11:39 UTC (rev 7825)
+++ branches/1.0/astlinux-ast11.config 2016-09-09 15:27:32 UTC (rev 7826)
@@ -604,7 +604,7 @@
# BR2_PACKAGE_NEON_NOXML is not set
# BR2_PACKAGE_NEON_EXPAT is not set
BR2_PACKAGE_NEON_LIBXML2=y
-# BR2_PACKAGE_LIBMNL is not set
+BR2_PACKAGE_LIBMNL=y
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
@@ -723,7 +723,7 @@
BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPSET=y
BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-09-09 15:11:39 UTC (rev 7825)
+++ branches/1.0/astlinux-ast13.config 2016-09-09 15:27:32 UTC (rev 7826)
@@ -604,7 +604,7 @@
# BR2_PACKAGE_NEON_NOXML is not set
# BR2_PACKAGE_NEON_EXPAT is not set
BR2_PACKAGE_NEON_LIBXML2=y
-# BR2_PACKAGE_LIBMNL is not set
+BR2_PACKAGE_LIBMNL=y
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
@@ -723,7 +723,7 @@
BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPSET=y
BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-09-09 15:11:39 UTC (rev 7825)
+++ branches/1.0/astlinux18.config 2016-09-09 15:27:32 UTC (rev 7826)
@@ -604,7 +604,7 @@
# BR2_PACKAGE_NEON_NOXML is not set
# BR2_PACKAGE_NEON_EXPAT is not set
BR2_PACKAGE_NEON_LIBXML2=y
-# BR2_PACKAGE_LIBMNL is not set
+BR2_PACKAGE_LIBMNL=y
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
@@ -723,7 +723,7 @@
BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPSET=y
BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-09-09 15:11:39 UTC (rev 7825)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-09-09 15:27:32 UTC (rev 7826)
@@ -585,7 +585,7 @@
# BR2_PACKAGE_NEON_NOXML is not set
# BR2_PACKAGE_NEON_EXPAT is not set
BR2_PACKAGE_NEON_LIBXML2=y
-# BR2_PACKAGE_LIBMNL is not set
+BR2_PACKAGE_LIBMNL=y
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
@@ -704,7 +704,7 @@
BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPSET=y
BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-09-09 15:11:39 UTC (rev 7825)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-09-09 15:27:32 UTC (rev 7826)
@@ -585,7 +585,7 @@
# BR2_PACKAGE_NEON_NOXML is not set
# BR2_PACKAGE_NEON_EXPAT is not set
BR2_PACKAGE_NEON_LIBXML2=y
-# BR2_PACKAGE_LIBMNL is not set
+BR2_PACKAGE_LIBMNL=y
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
@@ -704,7 +704,7 @@
BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPSET=y
BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
Modified: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 2016-09-09 15:11:39 UTC (rev 7825)
+++ branches/1.0/x86_64-configs/astlinux18.config 2016-09-09 15:27:32 UTC (rev 7826)
@@ -585,7 +585,7 @@
# BR2_PACKAGE_NEON_NOXML is not set
# BR2_PACKAGE_NEON_EXPAT is not set
BR2_PACKAGE_NEON_LIBXML2=y
-# BR2_PACKAGE_LIBMNL is not set
+BR2_PACKAGE_LIBMNL=y
# BR2_PACKAGE_LIBNET is not set
# BR2_PACKAGE_LIBNFNETLINK is not set
# BR2_PACKAGE_LIBNL is not set
@@ -704,7 +704,7 @@
BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-# BR2_PACKAGE_IPSET is not set
+BR2_PACKAGE_IPSET=y
BR2_PACKAGE_IPTABLES=y
# BR2_PACKAGE_IW is not set
# BR2_PACKAGE_KISMET is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-09-29 17:07:44
|
Revision: 7868
http://sourceforge.net/p/astlinux/code/7868
Author: abelbeck
Date: 2016-09-29 17:07:42 +0000 (Thu, 29 Sep 2016)
Log Message:
-----------
lighttpd, web interface, force HTTPS for /admin/ Authentication, default to both HTTP and HTTPS serving the web interace
Modified Paths:
--------------
branches/1.0/package/lighttpd/lighttpd.conf
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf 2016-09-29 13:45:11 UTC (rev 7867)
+++ branches/1.0/package/lighttpd/lighttpd.conf 2016-09-29 17:07:42 UTC (rev 7868)
@@ -7,7 +7,8 @@
"mod_auth",
"mod_alias",
"mod_fastcgi",
- "mod_proxy" )
+ "mod_proxy",
+ "mod_redirect" )
server.document-root = "@HTTPDIR@"
server.errorlog-use-syslog = "enable"
@@ -124,7 +125,10 @@
auth.backend = "htpasswd"
auth.backend.htpasswd.userfile = "/var/www/admin/.htpasswd"
-auth.require = ( "/admin/cli/" =>
+
+## Require HTTPS for /admin/ Authentication
+$HTTP["scheme"] == "https" {
+ auth.require = ( "/admin/cli/" =>
(
"method" => "basic",
"realm" => "admin",
@@ -155,6 +159,13 @@
"require" => "valid-user"
)
)
+}
+## Redirect HTTP to HTTPS for /admin/ Authentication
+$HTTP["scheme"] == "http" {
+ $HTTP["host"] =~ "^(.*)$" {
+ url.redirect = ( "^/(admin/.*)$" => "https://%1/$1" )
+ }
+}
@CLI_PROXY_SERVER@$HTTP["scheme"] == "https" {
@CLI_PROXY_SERVER@ proxy.server += ( "/admin/cli/" =>
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-09-29 13:45:11 UTC (rev 7867)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2016-09-29 17:07:42 UTC (rev 7868)
@@ -371,10 +371,10 @@
## HTTP Server
## If you set HTTPDIR, serve files from that directory.
-HTTPDIR="/tftpboot"
+HTTPDIR="/stat/var/www" # Define the location to serve HTTP from
HTTP_LISTING="yes"
HTTP_ACCESSLOG="no" # Enable access logging in /var/log/lighttpd/access.log
-HTTPCGI="no"
+HTTPCGI="yes"
## HTTP and HTTPS /phoneprov/ directory server, useful for IP Phone provisioning
## If the directory "/mnt/kd/phoneprov/" exists, this will be served as /phoneprov/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-01 12:48:20
|
Revision: 7905
http://sourceforge.net/p/astlinux/code/7905
Author: abelbeck
Date: 2016-11-01 12:48:17 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
mark release 'astlinux-1.2.8'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-10-21 14:34:51 UTC (rev 7904)
+++ branches/1.0/docs/ChangeLog.txt 2016-11-01 12:48:17 UTC (rev 7905)
@@ -8,7 +8,7 @@
Additions for AstLinux 1.2.8:
=============================
-Released @TBD@
+Released 2016-11-01
** Build System
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-10-21 14:34:51 UTC (rev 7904)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-11-01 12:48:17 UTC (rev 7905)
@@ -1 +1 @@
-svn
+astlinux-1.2.8
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-01 12:48:28
|
Revision: 7907
http://sourceforge.net/p/astlinux/code/7907
Author: abelbeck
Date: 2016-11-01 12:48:25 +0000 (Tue, 01 Nov 2016)
Log Message:
-----------
return to release 'svn'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2016-11-01 12:48:22 UTC (rev 7906)
+++ branches/1.0/docs/ChangeLog.txt 2016-11-01 12:48:25 UTC (rev 7907)
@@ -5,6 +5,12 @@
=== docs/ChangeLog.txt
=========================================================
+Additions for AstLinux 1.2.9:
+=============================
+
+Released @TBD@
+
+
Additions for AstLinux 1.2.8:
=============================
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-11-01 12:48:22 UTC (rev 7906)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2016-11-01 12:48:25 UTC (rev 7907)
@@ -1 +1 @@
-astlinux-1.2.8
+svn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-02 15:26:04
|
Revision: 7908
http://sourceforge.net/p/astlinux/code/7908
Author: abelbeck
Date: 2016-11-02 15:26:01 +0000 (Wed, 02 Nov 2016)
Log Message:
-----------
Remove Asterisk 1.8 support, also remove related packages: asterisk-app_notify and asterisk-gui
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/package/Config.in
branches/1.0/package/asterisk/Config.in
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/asterisk-codec-silk/Config.in
branches/1.0/package/webinterface/webinterface.mk
branches/1.0/scripts/beta-run-image-upload
branches/1.0/scripts/master-build
branches/1.0/scripts/master-upload
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Removed Paths:
-------------
branches/1.0/astlinux18.config
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch
branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch
branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
branches/1.0/package/asterisk-app_notify/
branches/1.0/package/asterisk-gui/
branches/1.0/project/astlinux/asterisk.makeopts-1
branches/1.0/x86_64-configs/astlinux18.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/astlinux-ast11.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:10 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:10 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -157,7 +157,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
BR2_PACKAGE_ASTERISK_v11=y
# BR2_PACKAGE_ASTERISK_v13 is not set
@@ -171,7 +170,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/astlinux-ast13.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:15 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:10 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -157,7 +157,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
# BR2_PACKAGE_ASTERISK_v11 is not set
BR2_PACKAGE_ASTERISK_v13=y
@@ -171,7 +170,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Deleted: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/astlinux18.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,929 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:04 2016
-#
-BR2_HAVE_DOT_CONFIG=y
-# BR2_arm is not set
-# BR2_armeb is not set
-# BR2_avr32 is not set
-# BR2_bfin is not set
-BR2_i386=y
-# BR2_mips is not set
-# BR2_mipsel is not set
-# BR2_powerpc is not set
-# BR2_sh is not set
-# BR2_sh64 is not set
-# BR2_sparc is not set
-# BR2_x86_64 is not set
-# BR2_xtensa is not set
-# BR2_x86_i386 is not set
-# BR2_x86_i486 is not set
-BR2_x86_i586=y
-# BR2_x86_i686 is not set
-# BR2_x86_pentiumpro is not set
-# BR2_x86_pentium_mmx is not set
-# BR2_x86_pentium_m is not set
-# BR2_x86_pentium2 is not set
-# BR2_x86_pentium3 is not set
-# BR2_x86_pentium4 is not set
-# BR2_x86_prescott is not set
-# BR2_x86_nocona is not set
-# BR2_x86_core2 is not set
-# BR2_x86_k6 is not set
-# BR2_x86_k6_2 is not set
-# BR2_x86_athlon is not set
-# BR2_x86_athlon_4 is not set
-# BR2_x86_opteron is not set
-# BR2_x86_opteron_sse3 is not set
-# BR2_x86_barcelona is not set
-# BR2_x86_geode is not set
-# BR2_x86_c3 is not set
-# BR2_x86_c32 is not set
-# BR2_x86_winchip_c6 is not set
-# BR2_x86_winchip2 is not set
-BR2_ARCH="i586"
-BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="i586"
-BR2_GCC_TARGET_ARCH="i586"
-
-#
-# Build options
-#
-
-#
-# Commands
-#
-BR2_WGET="toolchain/getter_script.sh"
-BR2_SVN="svn"
-BR2_BZR="bzr"
-BR2_GIT="git"
-BR2_ZCAT="gzip -d -c"
-BR2_BZCAT="bzcat"
-BR2_XZCAT="xzcat"
-BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(TOPDIR)/dl"
-BR2_HOST_DIR="$(BASE_DIR)/host"
-
-#
-# Mirrors and Download locations
-#
-BR2_PRIMARY_SITE=""
-BR2_BACKUP_SITE=""
-BR2_SOURCEFORGE_MIRROR="iweb"
-BR2_KERNEL_MIRROR="http://www.kernel.org/pub"
-BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
-BR2_DEBIAN_MIRROR="http://ftp.debian.org"
-BR2_JLEVEL=1
-# BR2_CCACHE is not set
-# BR2_DEPRECATED is not set
-# BR2_ENABLE_DEBUG is not set
-BR2_STRIP_strip=y
-# BR2_STRIP_sstrip is not set
-# BR2_STRIP_none is not set
-# BR2_OPTIMIZE_0 is not set
-# BR2_OPTIMIZE_1 is not set
-# BR2_OPTIMIZE_2 is not set
-# BR2_OPTIMIZE_3 is not set
-BR2_OPTIMIZE_S=y
-# BR2_PREFER_STATIC_LIB is not set
-# BR2_HAVE_DOCUMENTATION is not set
-# BR2_HAVE_DEVFILES is not set
-
-#
-# Toolchain
-#
-# BR2_TOOLCHAIN_BUILDROOT is not set
-BR2_TOOLCHAIN_EXTERNAL=y
-# BR2_TOOLCHAIN_CTNG is not set
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="$(HOME)/astlinux/x-tools-1.20.0-3.2p1/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
-# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC is not set
-BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-BR2_TOOLCHAIN_EXTERNAL_CXX=y
-
-#
-# Gdb Options
-#
-# BR2_PACKAGE_GDB is not set
-# BR2_PACKAGE_GDB_SERVER is not set
-BR2_LARGEFILE=y
-BR2_INET_IPV6=y
-BR2_INET_RPC=y
-BR2_USE_WCHAR=y
-BR2_ENABLE_LOCALE=y
-BR2_INSTALL_LIBSTDCPP=y
-BR2_TOOLCHAIN_HAS_THREADS=y
-BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS=y
-BR2_ENABLE_LOCALE_PURGE=y
-BR2_ENABLE_LOCALE_WHITELIST=""
-BR2_USE_MMU=y
-BR2_TARGET_OPTIMIZATION="-pipe"
-BR2_TARGET_LDFLAGS=""
-
-#
-# System configuration
-#
-BR2_TARGET_GENERIC_HOSTNAME=""
-BR2_TARGET_GENERIC_ISSUE=""
-# BR2_ROOTFS_DEVICE_CREATION_STATIC is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS is not set
-# BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV is not set
-BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_UDEV=y
-BR2_ROOTFS_DEVICE_TABLE="project/astlinux/device_table.txt"
-# BR2_ROOTFS_SKELETON_DEFAULT is not set
-BR2_ROOTFS_SKELETON_CUSTOM=y
-BR2_ROOTFS_SKELETON_CUSTOM_PATH="project/astlinux/target_skeleton"
-BR2_ROOTFS_POST_BUILD_SCRIPT="scripts/astlinux-post-build"
-
-#
-# Package Selection for the target
-#
-BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_16_X is not set
-# BR2_BUSYBOX_VERSION_1_17_X is not set
-# BR2_BUSYBOX_VERSION_1_18_X is not set
-BR2_BUSYBOX_VERSION_1_19_X=y
-# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.19.4"
-BR2_PACKAGE_BUSYBOX_CONFIG="project/astlinux/busybox.config"
-# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
-# BR2_PACKAGE_CUSTOMIZE is not set
-
-#
-# Asterisk, XMPP and telephony applications
-#
-BR2_PACKAGE_ASTERISK=y
-BR2_PACKAGE_ASTERISK_v1_8=y
-# BR2_PACKAGE_ASTERISK_v11 is not set
-# BR2_PACKAGE_ASTERISK_v13 is not set
-
-#
-# cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)
-#
-
-#
-# app_voicemail=IMAP_STORAGE - disabled (requires UW_IMAP)
-#
-# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
-BR2_PACKAGE_ASTERISK_APP_NOTIFY=y
-BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
-BR2_PACKAGE_PHONEPROV_TOOLS=y
-BR2_PACKAGE_DAHDI_LINUX=y
-BR2_PACKAGE_DAHDI_OSLEC=y
-BR2_PACKAGE_DAHDI_HFCS=y
-# BR2_PACKAGE_DAHDI_NO_CARD_FIRMWARE is not set
-BR2_PACKAGE_DAHDI_TOOLS=y
-# 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
-BR2_PACKAGE_RHINO=y
-BR2_PACKAGE_WANPIPE=y
-
-#
-# Audio and video libraries and applications
-#
-# BR2_PACKAGE_ALSA_LIB is not set
-# BR2_PACKAGE_ALSA_UTILS is not set
-# BR2_PACKAGE_AUMIX is not set
-BR2_PACKAGE_BEEP=y
-# BR2_PACKAGE_FAAD2 is not set
-# BR2_PACKAGE_FLAC is not set
-# BR2_PACKAGE_FFMPEG is not set
-# BR2_PACKAGE_GSTREAMER is not set
-# BR2_PACKAGE_LAME is not set
-# BR2_PACKAGE_LIBAO is not set
-# BR2_PACKAGE_LIBCDAUDIO is not set
-# BR2_PACKAGE_LIBCUE is not set
-# BR2_PACKAGE_LIBCUEFILE is not set
-# BR2_PACKAGE_LIBDVDREAD is not set
-# BR2_PACKAGE_LIBDVDNAV is not set
-# BR2_PACKAGE_LIBID3TAG is not set
-BR2_PACKAGE_LIBMAD=y
-# BR2_PACKAGE_LIBMMS is not set
-# BR2_PACKAGE_LIBMPD is not set
-# BR2_PACKAGE_LIBMPEG2 is not set
-# BR2_PACKAGE_LIBOGG is not set
-# BR2_PACKAGE_LIBREPLAYGAIN is not set
-# BR2_PACKAGE_LIBSAMPLERATE is not set
-# BR2_PACKAGE_LIBSNDFILE is not set
-# BR2_PACKAGE_LIBTHEORA is not set
-# BR2_PACKAGE_LIBVORBIS is not set
-# BR2_PACKAGE_LIVE555 is not set
-# BR2_PACKAGE_MADPLAY is not set
-# BR2_PACKAGE_MPD is not set
-# BR2_PACKAGE_MPG123 is not set
-# BR2_PACKAGE_MPLAYER is not set
-# BR2_PACKAGE_MUSEPACK is not set
-BR2_PACKAGE_SOX=y
-# BR2_PACKAGE_SPEEX is not set
-# BR2_PACKAGE_TAGLIB is not set
-# BR2_PACKAGE_TREMOR is not set
-# BR2_PACKAGE_VORBIS_TOOLS is not set
-# BR2_PACKAGE_WAVPACK is not set
-
-#
-# Compressors and decompressors
-#
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_XZ is not set
-
-#
-# Debugging, profiling and benchmark
-#
-# BR2_PACKAGE_BONNIE is not set
-# BR2_PACKAGE_DHRYSTONE is not set
-# BR2_PACKAGE_DMALLOC is not set
-BR2_PACKAGE_KEXEC=y
-# BR2_PACKAGE_KEXEC_ZLIB is not set
-# BR2_PACKAGE_LMBENCH is not set
-# BR2_PACKAGE_LSOF is not set
-# BR2_PACKAGE_LTP_TESTSUITE is not set
-# BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_MEMSTAT is not set
-# BR2_PACKAGE_NETPERF is not set
-BR2_PACKAGE_STRACE=y
-# BR2_PACKAGE_WHETSTONE is not set
-# BR2_PACKAGE_VALGRIND is not set
-
-#
-# Development tools
-#
-# BR2_PACKAGE_AUTOCONF is not set
-# BR2_PACKAGE_AUTOMAKE is not set
-# BR2_PACKAGE_BISON is not set
-# BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CCACHE is not set
-# BR2_PACKAGE_CVS is not set
-# BR2_PACKAGE_DISTCC is not set
-BR2_PACKAGE_FLEX=y
-BR2_PACKAGE_FOSSIL=y
-# BR2_PACKAGE_GMP is not set
-# BR2_PACKAGE_GPERF is not set
-# BR2_PACKAGE_MAKE is not set
-# BR2_PACKAGE_MPC is not set
-# BR2_PACKAGE_MPFR is not set
-BR2_PACKAGE_LIBTOOL=y
-# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_PKG_CONFIG is not set
-# BR2_PACKAGE_SSTRIP is not set
-
-#
-# Games
-#
-# BR2_PACKAGE_GNUCHESS is not set
-# BR2_PACKAGE_PRBOOM is not set
-
-#
-# Graphic libraries and applications (graphic/text)
-#
-
-#
-# Graphic applications
-#
-# BR2_PACKAGE_RRDTOOL is not set
-
-#
-# graphic libraries
-#
-# BR2_PACKAGE_DIRECTFB is not set
-# BR2_PACKAGE_FBDUMP is not set
-# BR2_PACKAGE_FBGRAB is not set
-# BR2_PACKAGE_FBV is not set
-# BR2_PACKAGE_IMAGEMAGICK is not set
-# BR2_PACKAGE_LINUX_FUSION is not set
-# BR2_PACKAGE_SDL is not set
-
-#
-# other GUIs
-#
-# BR2_PACKAGE_QT is not set
-
-#
-# X libraries and helper libraries
-#
-# BR2_PACKAGE_LIBERATION is not set
-
-#
-# X Window managers
-#
-
-#
-# X applications
-#
-# BR2_PACKAGE_GOB2 is not set
-
-#
-# midori requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-
-#
-# Network Interface Kernel Drivers
-#
-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
-# 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
-BR2_PACKAGE_DOSFSTOOLS_DOSFSCK=y
-BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL=y
-BR2_PACKAGE_E2FSPROGS=y
-BR2_PACKAGE_E2FSPROGS_BADBLOCKS=y
-BR2_PACKAGE_E2FSPROGS_CHATTR=y
-# BR2_PACKAGE_E2FSPROGS_DEBUGFS is not set
-BR2_PACKAGE_E2FSPROGS_DUMPE2FS=y
-BR2_PACKAGE_E2FSPROGS_E2FREEFRAG=y
-BR2_PACKAGE_E2FSPROGS_E2FSCK=y
-# BR2_PACKAGE_E2FSPROGS_E2IMAGE is not set
-BR2_PACKAGE_E2FSPROGS_E2LABEL=y
-BR2_PACKAGE_E2FSPROGS_E2UNDO=y
-BR2_PACKAGE_E2FSPROGS_FILEFRAG=y
-BR2_PACKAGE_E2FSPROGS_FSCK=y
-BR2_PACKAGE_E2FSPROGS_LOGSAVE=y
-BR2_PACKAGE_E2FSPROGS_LSATTR=y
-BR2_PACKAGE_E2FSPROGS_MKE2FS=y
-BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND=y
-# BR2_PACKAGE_E2FSPROGS_RESIZE2FS is not set
-BR2_PACKAGE_E2FSPROGS_TUNE2FS=y
-# 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
-# BR2_PACKAGE_GENEXT2FS is not set
-# BR2_PACKAGE_GENROMFS is not set
-# BR2_PACKAGE_GPSD is not set
-# BR2_PACKAGE_GVFS is not set
-# BR2_PACKAGE_HWDATA is not set
-# BR2_PACKAGE_I2C_TOOLS is not set
-# BR2_PACKAGE_INPUT_EVENT_DAEMON is not set
-# BR2_PACKAGE_INPUT_TOOLS is not set
-# BR2_PACKAGE_IOSTAT is not set
-# BR2_PACKAGE_IRDA_UTILS is not set
-# BR2_PACKAGE_KBD is not set
-# BR2_PACKAGE_LIBV4L is not set
-BR2_PACKAGE_LM_SENSORS=y
-
-#
-# lm-sensors tools
-#
-BR2_PACKAGE_LM_SENSORS_SENSORS=y
-# BR2_PACKAGE_LM_SENSORS_FANCONTROL is not set
-# BR2_PACKAGE_LM_SENSORS_ISADUMP is not set
-# BR2_PACKAGE_LM_SENSORS_ISASET is not set
-# BR2_PACKAGE_LM_SENSORS_PWMCONFIG is not set
-# BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT is not set
-# BR2_PACKAGE_LSUIO is not set
-# BR2_PACKAGE_LVM2 is not set
-# BR2_PACKAGE_MAKEDEVS is not set
-# BR2_PACKAGE_MDADM is not set
-# BR2_PACKAGE_MEMTEST is not set
-# BR2_PACKAGE_MEMTESTER is not set
-BR2_PACKAGE_MONIT=y
-# BR2_PACKAGE_MTD is not set
-# BR2_PACKAGE_NTFS_3G is not set
-# BR2_PACKAGE_NTFSPROGS is not set
-BR2_PACKAGE_PCIUTILS=y
-# BR2_PACKAGE_RNG_TOOLS is not set
-# BR2_PACKAGE_SDPARM is not set
-# BR2_PACKAGE_SETSERIAL is not set
-BR2_PACKAGE_SMARTMONTOOLS=y
-# BR2_PACKAGE_SQUASHFS is not set
-# BR2_PACKAGE_SREDIRD is not set
-# BR2_PACKAGE_SSHFS is not set
-BR2_PACKAGE_STATSERIAL=y
-# BR2_PACKAGE_SYSSTAT is not set
-# BR2_PACKAGE_TI_UTILS is not set
-# BR2_PACKAGE_UBOOT_TOOLS is not set
-BR2_PACKAGE_UDEV=y
-# BR2_PACKAGE_UDEV_ALL_EXTRAS is not set
-# BR2_PACKAGE_USB_MODESWITCH is not set
-# BR2_PACKAGE_USBMOUNT is not set
-BR2_PACKAGE_USBUTILS=y
-# BR2_PACKAGE_USBUTILS_ZLIB is not set
-# BR2_PACKAGE_WIPE is not set
-# BR2_PACKAGE_XFSPROGS is not set
-BR2_PACKAGE_ZABBIX=y
-BR2_PACKAGE_ZABBIX_PROXY=y
-
-#
-# Interpreter languages and scripting
-#
-BR2_PACKAGE_BC=y
-# BR2_PACKAGE_HASERL is not set
-BR2_PACKAGE_LUA=y
-
-#
-# LUA libraries/modules
-#
-# BR2_PACKAGE_CGILUA is not set
-# BR2_PACKAGE_COPAS is not set
-# BR2_PACKAGE_COXPCALL is not set
-BR2_PACKAGE_LUAEXPAT=y
-BR2_PACKAGE_LUAFILESYSTEM=y
-BR2_PACKAGE_LUASEC=y
-BR2_PACKAGE_LUASOCKET=y
-# BR2_PACKAGE_WSAPI is not set
-# BR2_PACKAGE_XAVANTE is not set
-BR2_PACKAGE_PERL=y
-BR2_PACKAGE_PHP=y
-BR2_PACKAGE_PHP_CGI=y
-BR2_PACKAGE_PHP_SAPI_CGI=y
-# BR2_PACKAGE_PHP_SAPI_CLI is not set
-# BR2_PACKAGE_PHP_SAPI_FPM is not set
-# BR2_PACKAGE_PHP_SAPI_CLI_CGI is not set
-# BR2_PACKAGE_PHP_SAPI_CLI_FPM is not set
-
-#
-# PHP Extensions
-#
-BR2_PACKAGE_PHP_EXT_TIMEZONEDB=y
-# BR2_PACKAGE_PHP_EXT_SOCKETS is not set
-BR2_PACKAGE_PHP_EXT_POSIX=y
-BR2_PACKAGE_PHP_EXT_SESSION=y
-BR2_PACKAGE_PHP_EXT_HASH=y
-BR2_PACKAGE_PHP_EXT_OPENSSL=y
-# BR2_PACKAGE_PHP_EXT_CURL is not set
-BR2_PACKAGE_PHP_EXT_LIBXML2=y
-BR2_PACKAGE_PHP_EXT_XMLPARSER=y
-BR2_PACKAGE_PHP_EXT_SIMPLEXML=y
-BR2_PACKAGE_PHP_EXT_ZLIB=y
-# BR2_PACKAGE_PHP_EXT_EXIF is not set
-# BR2_PACKAGE_PHP_EXT_FTP is not set
-# BR2_PACKAGE_PHP_EXT_GETTEXT is not set
-# BR2_PACKAGE_PHP_EXT_GMP is not set
-BR2_PACKAGE_PHP_EXT_JSON=y
-BR2_PACKAGE_PHP_EXT_TOKENIZER=y
-# BR2_PACKAGE_PHP_EXT_READLINE is not set
-# BR2_PACKAGE_PHP_EXT_PCNTL is not set
-# BR2_PACKAGE_PHP_EXT_SYSVMSG is not set
-# BR2_PACKAGE_PHP_EXT_SYSVSEM is not set
-# BR2_PACKAGE_PHP_EXT_SYSVSHM is not set
-BR2_PACKAGE_PHP_EXT_ZIP=y
-BR2_PACKAGE_PHP_EXT_CTYPE=y
-BR2_PACKAGE_PHP_EXT_FILTER=y
-# BR2_PACKAGE_PHP_EXT_CALENDAR is not set
-
-#
-# Database extensions
-#
-BR2_PACKAGE_PHP_EXT_PDO=y
-BR2_PACKAGE_PHP_EXT_PDO_SQLITE=y
-# BR2_PACKAGE_PHP_EXT_PDO_MYSQL is not set
-# BR2_PACKAGE_PYTHON is not set
-# BR2_PACKAGE_RUBY is not set
-# BR2_PACKAGE_TCL is not set
-BR2_PACKAGE_WEBINTERFACE=y
-# BR2_PACKAGE_WEBINTERFACE_v1 is not set
-BR2_PACKAGE_WEBINTERFACE_v2=y
-
-#
-# Libraries
-#
-
-#
-# Compression and decompression
-#
-# BR2_PACKAGE_LIBARCHIVE is not set
-BR2_PACKAGE_LZO=y
-BR2_PACKAGE_SPANDSP=y
-BR2_PACKAGE_ZLIB=y
-
-#
-# Crypto
-#
-# BR2_PACKAGE_BEECRYPT is not set
-BR2_PACKAGE_CA_CERTIFICATES=y
-# BR2_PACKAGE_GNUTLS is not set
-# BR2_PACKAGE_LIBGCRYPT is not set
-# BR2_PACKAGE_LIBGPG_ERROR is not set
-# BR2_PACKAGE_LIBNSS is not set
-BR2_PACKAGE_OPENSSL=y
-BR2_PACKAGE_OPENSSL_BIN=y
-BR2_PACKAGE_OPENSSL_ENGINES=y
-# BR2_PACKAGE_OPENSSL_OCF is not set
-BR2_PACKAGE_LIBSODIUM=y
-BR2_PACKAGE_LIBSRTP=y
-
-#
-# Database
-#
-# BR2_PACKAGE_BERKELEYDB is not set
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
-BR2_PACKAGE_SQLITEODBC=y
-BR2_PACKAGE_UNIXODBC=y
-
-#
-# Filesystem
-#
-# BR2_PACKAGE_GAMIN is not set
-# BR2_PACKAGE_LIBCONFIG is not set
-# BR2_PACKAGE_LIBCONFUSE is not set
-# BR2_PACKAGE_LIBFUSE is not set
-# BR2_PACKAGE_LIBLOCKFILE is not set
-BR2_PACKAGE_LIBSYSFS=y
-
-#
-# Graphics
-#
-# BR2_PACKAGE_ATK is not set
-# BR2_PACKAGE_CAIRO is not set
-# BR2_PACKAGE_FONTCONFIG is not set
-# BR2_PACKAGE_FREETYPE is not set
-BR2_PACKAGE_JPEG=y
-# BR2_PACKAGE_LIBART is not set
-# BR2_PACKAGE_LIBEXIF is not set
-# BR2_PACKAGE_GDK_PIXBUF is not set
-# BR2_PACKAGE_LIBPNG is not set
-# BR2_PACKAGE_LIBRAW is not set
-# BR2_PACKAGE_LIBSVGTINY is not set
-# BR2_PACKAGE_LIBUNGIF is not set
-# BR2_PACKAGE_PANGO is not set
-# BR2_PACKAGE_PIXMAN is not set
-BR2_PACKAGE_TIFF=y
-
-#
-# webkit requires C++, WCHAR in toolchain and libgtk2
-#
-
-#
-# Hardware handling
-#
-# BR2_PACKAGE_LIBAIO is not set
-# BR2_PACKAGE_LIBRAW1394 is not set
-# BR2_PACKAGE_TSLIB is not set
-# BR2_PACKAGE_LIBHID is not set
-# BR2_PACKAGE_LIBIQRF is not set
-BR2_PACKAGE_LIBUSB=y
-BR2_PACKAGE_LIBUSB_COMPAT=y
-
-#
-# Networking
-#
-# BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
-BR2_PACKAGE_LIBCURL=y
-BR2_PACKAGE_CURL=y
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_LIBEXOSIP2 is not set
-BR2_PACKAGE_LIBIDN=y
-# BR2_PACKAGE_LIBIDN_BINARY is not set
-# BR2_PACKAGE_LIBMICROHTTPD is not set
-BR2_PACKAGE_NEON=y
-BR2_PACKAGE_NEON_ZLIB=y
-BR2_PACKAGE_NEON_SSL=y
-# BR2_PACKAGE_NEON_NOXML is not set
-# BR2_PACKAGE_NEON_EXPAT is not set
-BR2_PACKAGE_NEON_LIBXML2=y
-BR2_PACKAGE_LIBMNL=y
-# BR2_PACKAGE_LIBNET is not set
-# BR2_PACKAGE_LIBNFNETLINK is not set
-# BR2_PACKAGE_LIBNL is not set
-BR2_PACKAGE_LIBPCAP=y
-# BR2_PACKAGE_PJSIP is not set
-# BR2_PACKAGE_LIBOSIP2 is not set
-BR2_PACKAGE_LIBPRI=y
-# BR2_PACKAGE_LIBRSYNC is not set
-# BR2_PACKAGE_LIBSOUP is not set
-# BR2_PACKAGE_LIBUPNP is not set
-# BR2_PACKAGE_LIBURIPARSER is not set
-BR2_PACKAGE_LINUX_ATM=y
-
-#
-# Other
-#
-# BR2_PACKAGE_LIBARGTABLE2 is not set
-# 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_LIBELF=y
-# BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBFB is not set
-# BR2_PACKAGE_LIBFFI is not set
-# BR2_PACKAGE_LIBGLIB2 is not set
-BR2_PACKAGE_LIBICAL=y
-# BR2_PACKAGE_LIBNSPR is not set
-# BR2_PACKAGE_LIBSIGC is not set
-# BR2_PACKAGE_ORC is not set
-
-#
-# Text and terminal handling
-#
-# BR2_PACKAGE_ENCHANT is not set
-# BR2_PACKAGE_ICU is not set
-BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
-BR2_PACKAGE_NEWT=y
-BR2_PACKAGE_PCRE=y
-BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
-BR2_PACKAGE_SLANG=y
-
-#
-# JSON/XML
-#
-BR2_PACKAGE_EXPAT=y
-# BR2_PACKAGE_EZXML is not set
-BR2_PACKAGE_IKSEMEL=y
-# BR2_PACKAGE_JANSSON is not set
-# BR2_PACKAGE_LIBROXML is not set
-BR2_PACKAGE_LIBXML2=y
-# BR2_PACKAGE_LIBXSLT is not set
-# BR2_PACKAGE_LIBYAML is not set
-# BR2_PACKAGE_MXML is not set
-# BR2_PACKAGE_XERCES is not set
-# BR2_PACKAGE_YAJL is not set
-
-#
-# Miscellaneous
-#
-BR2_PACKAGE_HTPASSWD=y
-BR2_PACKAGE_MAC2VENDOR=y
-# BR2_PACKAGE_QEMU is not set
-# BR2_PACKAGE_SHARED_MIME_INFO is not set
-BR2_PACKAGE_ZONEINFO=y
-
-#
-# Networking applications
-#
-# BR2_PACKAGE_APCUPSD is not set
-# BR2_PACKAGE_ARGUS is not set
-BR2_PACKAGE_ARNOFW=y
-BR2_PACKAGE_ARP_SCAN=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-# BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY is not set
-# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BLUEZ_UTILS is not set
-# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BMON is not set
-BR2_PACKAGE_BRIDGE=y
-# BR2_PACKAGE_BWM_NG is not set
-# BR2_PACKAGE_CAN_UTILS is not set
-# BR2_PACKAGE_CTORRENT is not set
-# BR2_PACKAGE_CUPS is not set
-BR2_PACKAGE_DARKSTAT=y
-BR2_PACKAGE_DDCLIENT=y
-BR2_PACKAGE_DHCPDUMP=y
-# BR2_PACKAGE_DIBBLER is not set
-BR2_PACKAGE_DNSCRYPT_PROXY=y
-BR2_PACKAGE_DNSMASQ=y
-BR2_PACKAGE_DNSMASQ_TFTP=y
-BR2_PACKAGE_DNSMASQ_DHCP=y
-# BR2_PACKAGE_DNSMASQ_IDN is not set
-# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_EBTABLES is not set
-BR2_PACKAGE_ETHTOOL=y
-BR2_PACKAGE_FPING=y
-# BR2_PACKAGE_HOSTAPD is not set
-# BR2_PACKAGE_IFPLUGD is not set
-BR2_PACKAGE_IFTOP=y
-BR2_PACKAGE_IPERF=y
-BR2_PACKAGE_IPERF3=y
-BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPSEC_TOOLS=y
-BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT=y
-BR2_PACKAGE_IPSEC_TOOLS_NATT=y
-BR2_PACKAGE_IPSEC_TOOLS_FRAG=y
-# BR2_PACKAGE_IPSEC_TOOLS_STATS is not set
-# BR2_PACKAGE_IPSEC_TOOLS_READLINE is not set
-BR2_PACKAGE_IPSEC_SECCTX_DISABLE=y
-# BR2_PACKAGE_IPSEC_SECCTX_ENABLE is not set
-# BR2_PACKAGE_IPSEC_SECCTX_KERNEL is not set
-BR2_PACKAGE_IPSET=y
-BR2_PACKAGE_IPTABLES=y
-# BR2_PACKAGE_IW is not set
-# BR2_PACKAGE_KISMET is not set
-# BR2_PACKAGE_XL2TP is not set
-BR2_PACKAGE_LIGHTTPD=y
-BR2_PACKAGE_LIGHTTPD_OPENSSL=y
-# BR2_PACKAGE_LIGHTTPD_ZLIB is not set
-# BR2_PACKAGE_LIGHTTPD_BZIP2 is not set
-BR2_PACKAGE_LIGHTTPD_PCRE=y
-# BR2_PACKAGE_LIGHTTPD_WEBDAV is not set
-# BR2_PACKAGE_LINKS is not set
-# BR2_PACKAGE_LRZSZ is not set
-# BR2_PACKAGE_MII_DIAG is not set
-BR2_PACKAGE_MINIUPNPD=y
-# BR2_PACKAGE_MROUTED is not set
-BR2_PACKAGE_MSMTP=y
-BR2_PACKAGE_MTR=y
-# BR2_PACKAGE_MUTT is not set
-# BR2_PACKAGE_NBD is not set
-# BR2_PACKAGE_NCFTP is not set
-# BR2_PACKAGE_NETPLUG is not set
-BR2_PACKAGE_NETSNMP=y
-# BR2_PACKAGE_NETSTAT_NAT is not set
-# BR2_PACKAGE_NFS_UTILS is not set
-# BR2_PACKAGE_NGIRCD is not set
-BR2_PACKAGE_NGREP=y
-# BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
-BR2_PACKAGE_NUT=y
-# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
-# BR2_PACKAGE_NUTTCP is not set
-# BR2_PACKAGE_OLSR is not set
-BR2_PACKAGE_OPENLDAP=y
-BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
-BR2_PACKAGE_OPENSSH=y
-BR2_PACKAGE_OPENVPN=y
-BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
-BR2_PACKAGE_P910ND=y
-# BR2_PACKAGE_PORTMAP is not set
-BR2_PACKAGE_PPPD=y
-# BR2_PACKAGE_PPPD_FILTER is not set
-# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RP_PPPOE=y
-# BR2_PACKAGE_PPTP_LINUX is not set
-BR2_PACKAGE_PPTPD=y
-# BR2_PACKAGE_PROFTPD is not set
-# BR2_PACKAGE_QUAGGA is not set
-# BR2_PACKAGE_RSH_REDONE is not set
-BR2_PACKAGE_RSYNC=y
-# BR2_PACKAGE_SAMBA is not set
-# BR2_PACKAGE_SER2NET is not set
-BR2_PACKAGE_SHELLINABOX=y
-BR2_PACKAGE_SIPGREP=y
-BR2_PACKAGE_SIPSAK=y
-# BR2_PACKAGE_SOCAT is not set
-# BR2_PACKAGE_SPAWN_FCGI is not set
-# BR2_PACKAGE_SQUID is not set
-BR2_PACKAGE_STUNNEL=y
-BR2_PACKAGE_TCPDUMP=y
-# BR2_PACKAGE_TCPDUMP_SMB is not set
-# BR2_PACKAGE_TCPREPLAY is not set
-# BR2_PACKAGE_TINYPROXY is not set
-# BR2_PACKAGE_TN5250 is not set
-# BR2_PACKAGE_TTCP is not set
-# BR2_PACKAGE_UDPCAST is not set
-BR2_PACKAGE_UNBOUND=y
-# BR2_PACKAGE_UW_IMAP is not set
-# BR2_PACKAGE_VPNC is not set
-BR2_PACKAGE_VSFTPD=y
-# BR2_PACKAGE_VTUN is not set
-BR2_PACKAGE_WIDE_DHCPV6=y
-# BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
-
-#
-# Package managers
-#
-# BR2_PACKAGE_IPKG is not set
-
-#
-# Shell and utilities
-#
-# BR2_PACKAGE_AT is not set
-BR2_PACKAGE_BASH=y
-BR2_PACKAGE_BASH_DEFAULT_SHELL=y
-BR2_PACKAGE_DIALOG=y
-# BR2_PACKAGE_FILE is not set
-# BR2_PACKAGE_INOTIFY_TOOLS is not set
-# BR2_PACKAGE_LOCKFILE_PROGS is not set
-BR2_PACKAGE_LOGROTATE=y
-BR2_PACKAGE_SCREEN=y
-BR2_PACKAGE_SUDO=y
-# BR2_PACKAGE_WHICH is not set
-# BR2_PACKAGE_XMLSTARLET is not set
-
-#
-# System tools
-#
-# BR2_PACKAGE_ACL is not set
-# BR2_PACKAGE_ATTR is not set
-BR2_PACKAGE_HTOP=y
-BR2_PACKAGE_MODULE_INIT_TOOLS=y
-BR2_PACKAGE_UTIL_LINUX=y
-# BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
-# BR2_PACKAGE_UTIL_LINUX_FSCK is not set
-# BR2_PACKAGE_UTIL_LINUX_LIBMOUNT is not set
-BR2_PACKAGE_UTIL_LINUX_LIBUUID=y
-# BR2_PACKAGE_UTIL_LINUX_UUIDD is not set
-BR2_PACKAGE_UTIL_LINUX_LIBBLKID=y
-# BR2_PACKAGE_UTIL_LINUX_AGETTY is not set
-# BR2_PACKAGE_UTIL_LINUX_CRAMFS is not set
-# BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT is not set
-# BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT is not set
-# BR2_PACKAGE_UTIL_LINUX_FALLOCATE is not set
-# BR2_PACKAGE_UTIL_LINUX_UNSHARE is not set
-# BR2_PACKAGE_UTIL_LINUX_RENAME is not set
-BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS=y
-# BR2_PACKAGE_UTIL_LINUX_WALL is not set
-# BR2_PACKAGE_UTIL_LINUX_ARCH is not set
-# BR2_PACKAGE_UTIL_LINUX_INIT is not set
-# BR2_PACKAGE_UTIL_LINUX_KILL is not set
-# BR2_PACKAGE_UTIL_LINUX_LAST is not set
-# BR2_PACKAGE_UTIL_LINUX_MESG is not set
-# BR2_PACKAGE_UTIL_LINUX_PARTX is not set
-# BR2_PACKAGE_UTIL_LINUX_RAW is not set
-# BR2_PACKAGE_UTIL_LINUX_RESET is not set
-# BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS is not set
-# BR2_PACKAGE_UTIL_LINUX_WRITE is not set
-
-#
-# Text editors and viewers
-#
-# 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
-
-#
-# Filesystem images
-#
-# BR2_TARGET_ROOTFS_CRAMFS is not set
-# BR2_TARGET_ROOTFS_CLOOP is not set
-BR2_TARGET_ROOTFS_EXT2=y
-BR2_TARGET_ROOTFS_EXT2_BLOCKS=0
-BR2_TARGET_ROOTFS_EXT2_INODES=0
-BR2_TARGET_ROOTFS_EXT2_RESBLKS=0
-BR2_TARGET_ROOTFS_EXT2_NONE=y
-# BR2_TARGET_ROOTFS_EXT2_GZIP is not set
-# BR2_TARGET_ROOTFS_EXT2_BZIP2 is not set
-# BR2_TARGET_ROOTFS_EXT2_LZMA is not set
-# BR2_TARGET_ROOTFS_JFFS2 is not set
-# BR2_TARGET_ROOTFS_UBIFS is not set
-BR2_TARGET_ROOTFS_SQUASHFS=y
-BR2_TARGET_ROOTFS_SQUASHFS4=y
-BR2_TARGET_ROOTFS_SQUASHFS4_GZIP=y
-# BR2_TARGET_ROOTFS_SQUASHFS4_LZMA is not set
-# BR2_TARGET_ROOTFS_SQUASHFS4_LZO is not set
-# BR2_TARGET_ROOTFS_SQUASHFS4_XZ is not set
-# BR2_TARGET_ROOTFS_TAR is not set
-# BR2_TARGET_ROOTFS_CPIO is not set
-# BR2_TARGET_ROOTFS_ISO9660 is not set
-# BR2_TARGET_ROOTFS_INITRAMFS is not set
-# BR2_TARGET_ROOTFS_ROMFS is not set
-
-#
-# Bootloaders
-#
-# BR2_TARGET_BAREBOX is not set
-# BR2_TARGET_GRUB is not set
-# BR2_TARGET_SYSLINUX is not set
-BR2_TARGET_RUNNIX=y
-BR2_TARGET_RUNNIX_NDEV=""
-# BR2_TARGET_UBOOT is not set
-
-#
-# Kernel
-#
-BR2_LINUX_KERNEL=y
-# BR2_LINUX_KERNEL_2_6_39 is not set
-# 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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
-BR2_LINUX_KERNEL_VERSION="custom"
-BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
-# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
-BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
-BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="project/astlinux/geni586/linux.config"
-BR2_LINUX_KERNEL_BZIMAGE=y
-# BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM is not set
-BR2_LINUX_KERNEL_INSTALL_TARGET=y
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/Config.in 2016-11-02 15:26:01 UTC (rev 7908)
@@ -5,10 +5,8 @@
menu "Asterisk, XMPP and telephony applications"
source "package/asterisk/Config.in"
-source "package/asterisk-app_notify/Config.in"
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"
Modified: branches/1.0/package/asterisk/Config.in
===================================================================
--- branches/1.0/package/asterisk/Config.in 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/Config.in 2016-11-02 15:26:01 UTC (rev 7908)
@@ -14,24 +14,19 @@
choice
prompt "Asterisk Version"
depends on BR2_PACKAGE_ASTERISK
- default BR2_PACKAGE_ASTERISK_v1_8
+ default BR2_PACKAGE_ASTERISK_v11
help
Select which version of Asterisk to compile and install.
- config BR2_PACKAGE_ASTERISK_v1_8
- bool "Asterisk v1.8.x"
- help
- Asterisk Long Term Stable Release.
-
config BR2_PACKAGE_ASTERISK_v11
bool "Asterisk v11.x"
help
- Asterisk Long Term Release.
+ Asterisk LTS Series
config BR2_PACKAGE_ASTERISK_v13
bool "Asterisk v13.x"
help
- Asterisk Long Term Release.
+ Asterisk LTS Series
endchoice
comment "cdr_mysql, app_mysql and res_config_mysql - disabled (requires MYSQL_CLIENT)"
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-001-1.8.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,140 +0,0 @@
-diff --git a/configs/http.conf.sample b/configs/http.conf.sample
-index 1a7f4fd..9a06fcf 100644
---- a/configs/http.conf.sample
-+++ b/configs/http.conf.sample
-@@ -67,10 +67,31 @@ bindaddr=127.0.0.1
- ; If no path is given for tlscertfile or tlsprivatekey, default is to look in current
- ; directory. If no tlsprivatekey is given, default is to search tlscertfile for private key.
- ;
-+;
- ; To produce a certificate you can e.g. use openssl. This places both the cert and
- ; private in same .pem file.
- ; openssl req -new -x509 -days 365 -nodes -out /tmp/foo.pem -keyout /tmp/foo.pem
- ;
-+; tlscipher= ; The list of allowed ciphers
-+; ; if none are specified the following cipher
-+; ; list will be used instead:
-+; ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:
-+; ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:
-+; kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:
-+; ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:
-+; ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:
-+; DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:
-+; AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:
-+; AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:
-+; !EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA
-+;
-+; tlsdisablev1=yes ; Disable TLSv1 support - if not set this defaults to "yes"
-+; tlsdisablev11=yes ; Disable TLSv1.1 support - if not set this defaults to "no"
-+; tlsdisablev12=yes ; Disable TLSv1.2 support - if not set this defaults to "no"
-+;
-+; tlsservercipherorder=yes ; Use the server preference order instead of the client order
-+; ; Defaults to "yes"
-+;
- ; The post_mappings section maps URLs to real paths on the filesystem. If a
- ; POST is done from within an authenticated manager session to one of the
- ; configured POST mappings, then any files in the POST will be placed in the
-diff --git a/include/asterisk/tcptls.h b/include/asterisk/tcptls.h
-index f3f5e1f..eb7166f 100644
---- a/include/asterisk/tcptls.h
-+++ b/include/asterisk/tcptls.h
-@@ -79,7 +79,15 @@ enum ast_ssl_flags {
- /*! Use SSLv3 for outgoing client connections */
- AST_SSL_SSLV3_CLIENT = (1 << 4),
- /*! Use TLSv1 for outgoing client connections */
-- AST_SSL_TLSV1_CLIENT = (1 << 5)
-+ AST_SSL_TLSV1_CLIENT = (1 << 5),
-+ /*! Use server cipher order instead of the client order */
-+ AST_SSL_SERVER_CIPHER_ORDER = (1 << 6),
-+ /*! Disable TLSv1 support */
-+ AST_SSL_DISABLE_TLSV1 = (1 << 7),
-+ /*! Disable TLSv1.1 support */
-+ AST_SSL_DISABLE_TLSV11 = (1 << 8),
-+ /*! Disable TLSv1.2 support */
-+ AST_SSL_DISABLE_TLSV12 = (1 << 9),
- };
-
- struct ast_tls_config {
-diff --git a/main/http.c b/main/http.c
-index 9bebbe7..4bfa985 100644
---- a/main/http.c
-+++ b/main/http.c
-@@ -1118,10 +1118,13 @@ static int __ast_http_load(int reload)
- }
- http_tls_cfg.pvtfile = ast_strdup("");
-
-+ /* Apply modern intermediate settings according to the Mozilla OpSec team as of July 30th, 2015 but disable TLSv1 */
-+ ast_set_flag(&http_tls_cfg.flags, AST_SSL_DISABLE_TLSV1 | AST_SSL_SERVER_CIPHER_ORDER);
-+
- if (http_tls_cfg.cipher) {
- ast_free(http_tls_cfg.cipher);
- }
-- http_tls_cfg.cipher = ast_strdup("");
-+ http_tls_cfg.cipher = ast_strdup("ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA");
-
- AST_RWLIST_WRLOCK(&uri_redirects);
- while ((redirect = AST_RWLIST_REMOVE_HEAD(&uri_redirects, entry))) {
-@@ -1146,8 +1149,6 @@ static int __ast_http_load(int reload)
- && strcasecmp(v->name, "tlsdontverifyserver")
- && strcasecmp(v->name, "tlsclientmethod")
- && strcasecmp(v->name, "sslclientmethod")
-- && strcasecmp(v->name, "tlscipher")
-- && strcasecmp(v->name, "sslcipher")
- && !ast_tls_read_conf(&http_tls_cfg, &https_desc, v->name, v->value)) {
- continue;
- }
-diff --git a/main/tcptls.c b/main/tcptls.c
-index a5a2af6..f73c2aa 100644
---- a/main/tcptls.c
-+++ b/main/tcptls.c
-@@ -749,6 +749,7 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
- return 0;
- #else
- int disable_ssl = 0;
-+ long ssl_opts = 0;
-
- if (!cfg->enabled)
- return 0;
-@@ -793,11 +794,24 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
- * them. SSLv23_*_method supports TLSv1+.
- */
- if (disable_ssl) {
-- long ssl_opts;
-+ ssl_opts |= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-+ }
-+
-+ if (ast_test_flag(&cfg->flags, AST_SSL_SERVER_CIPHER_ORDER)) {
-+ ssl_opts |= SSL_OP_CIPHER_SERVER_PREFERENCE;
-+ }
-
-- ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
-- SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV1)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1;
- }
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV11)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_1;
-+ }
-+ if (ast_test_flag(&cfg->flags, AST_SSL_DISABLE_TLSV12)) {
-+ ssl_opts |= SSL_OP_NO_TLSv1_2;
-+ }
-+
-+ SSL_CTX_set_options(cfg->ssl_ctx, ssl_opts);
-
- SSL_CTX_set_verify(cfg->ssl_ctx,
- ast_test_flag(&cfg->flags, AST_SSL_VERIFY_CLIENT) ? SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT : SSL_VERIFY_NONE,
-@@ -1109,6 +1123,14 @@ int ast_tls_read_conf(struct ast_tls_config *tls_cfg, struct ast_tcptls_session_
- ast_clear_flag(&tls_cfg->flags, AST_SSL_TLSV1_CLIENT);
- ast_clear_flag(&tls_cfg->flags, AST_SSL_SSLV3_CLIENT);
- }
-+ } else if (!strcasecmp(varname, "tlsservercipherorder")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_SERVER_CIPHER_ORDER);
-+ } else if (!strcasecmp(varname, "tlsdisablev1")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV1);
-+ } else if (!strcasecmp(varname, "tlsdisablev11")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV11);
-+ } else if (!strcasecmp(varname, "tlsdisablev12")) {
-+ ast_set2_flag(&tls_cfg->flags, ast_true(value), AST_SSL_DISABLE_TLSV12);
- } else {
- return -1;
- }
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-002-1.8.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,18 +0,0 @@
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index 5de304a..277eec7 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -3771,6 +3771,13 @@ static int retrans_pkt(const void *data)
- }
-
- /* For non-invites, a maximum of 4 secs */
-+ if (INT_MAX / pkt->timer_a < pkt->timer_t1) {
-+ /*
-+ * Uh Oh, we will have an integer overflow.
-+ * Recalculate previous timeout time instead.
-+ */
-+ pkt->timer_a = pkt->timer_a / 2;
-+ }
- siptimer_a = pkt->timer_t1 * pkt->timer_a; /* Double each time */
- if (pkt->method != SIP_INVITE && siptimer_a > 4000) {
- siptimer_a = 4000;
Deleted: branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-AST-2016-003-1.8.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,28 +0,0 @@
-diff --git a/main/udptl.c b/main/udptl.c
-index a8244e8..6960487 100644
---- a/main/udptl.c
-+++ b/main/udptl.c
-@@ -231,16 +231,15 @@ static int decode_open_type(uint8_t *buf, unsigned int limit, unsigned int *len,
- if (decode_length(buf, limit, len, &octet_cnt) != 0)
- return -1;
-
-- if (octet_cnt > 0) {
-- /* Make sure the buffer contains at least the number of bits requested */
-- if ((*len + octet_cnt) > limit)
-- return -1;
--
-- *p_num_octets = octet_cnt;
-- *p_object = &buf[*len];
-- *len += octet_cnt;
-+ /* Make sure the buffer contains at least the number of bits requested */
-+ if ((*len + octet_cnt) > limit) {
-+ return -1;
- }
-
-+ *p_num_octets = octet_cnt;
-+ *p_object = &buf[*len];
-+ *len += octet_cnt;
-+
- return 0;
- }
- /*- End of function --------------------------------------------------------*/
Deleted: branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-configure-cross-fix.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,16 +0,0 @@
---- asterisk-1.8.25.0/configure.ac.orig 2014-01-24 16:52:23.000000000 -0600
-+++ asterisk-1.8.25.0/configure.ac 2014-01-24 16:55:14.000000000 -0600
-@@ -2319,11 +2319,13 @@
- AC_OUTPUT
-
- ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak2
-+if test "${cross_compiling}" = "no"; then
- if test "x${ac_cv_path_CMP}" = "x:"; then
- ( cd `pwd`/menuselect && ./configure )
- else if ${ac_cv_path_CMP} -s makeopts.acbak makeopts.acbak2; then : ; else
- ( cd `pwd`/menuselect && ./configure )
- fi ; fi
-+fi
-
- rm makeopts.acbak makeopts.acbak2
-
Deleted: branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-extension-changed-verbosity-chan_sip.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,11 +0,0 @@
---- asterisk-1.8.32.3/channels/chan_sip.c.orig 2015-04-23 10:15:19.000000000 -0500
-+++ asterisk-1.8.32.3/channels/chan_sip.c 2015-04-23 10:15:40.000000000 -0500
-@@ -15128,7 +15128,7 @@
- ast_set_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE);
- }
- }
-- ast_verb(2, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
-+ ast_verb(5, "Extension Changed %s[%s] new state %s for Notify User %s %s\n", exten, context, ast_extension_state2str(state), p->username,
- ast_test_flag(&p->flags[1], SIP_PAGE2_STATECHANGEQUEUE) ? "(queued)" : "");
-
- sip_pvt_unlock(p);
Deleted: branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-srtp-openssl-random.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,30 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=res%2Fres_srtp.c;h=0193eb6036d2b29b32ffc9a00888503b6c7748b0;hp=54ce9e77d88f43768aedc040f5a52318512cd16a;hb=effa207bc420893d7d62e2acc674746b888d09eb;hpb=99efb23d111f596dadfeaa09c5710987fa03261c
-
-diff --git a/res/res_srtp.c b/res/res_srtp.c
-index 54ce9e7..0193eb6 100644
---- a/res/res_srtp.c
-+++ b/res/res_srtp.c
-@@ -41,6 +41,10 @@
-
- #include <srtp/srtp.h>
-+#ifdef HAVE_OPENSSL
-+#include <openssl/rand.h>
-+#else
- #include <srtp/crypto_kernel.h>
-+#endif
-
- #include "asterisk/lock.h"
- #include "asterisk/sched.h"
-@@ -305,7 +309,11 @@ static int ast_srtp_policy_set_master_key(struct ast_srtp_policy *policy, const
-
- static int ast_srtp_get_random(unsigned char *key, size_t len)
- {
-+#ifdef HAVE_OPENSSL
-+ return RAND_bytes(key, len) > 0 ? 0: -1;
-+#else
- return crypto_get_random(key, len) != err_status_ok ? -1: 0;
-+#endif
- }
-
- static void ast_srtp_set_cb(struct ast_srtp *srtp, const struct ast_srtp_cb *cb, void *data)
-
Deleted: branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk-1.8-voicemail-multiple-recipients.patch 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,155 +0,0 @@
---- asterisk-1.8.29.0/apps/app_voicemail.c.orig 2014-05-09 17:18:59.000000000 -0500
-+++ asterisk-1.8.29.0/apps/app_voicemail.c 2014-08-09 11:49:46.000000000 -0500
-@@ -643,7 +643,7 @@
- char mailbox[AST_MAX_EXTENSION]; /*!< Mailbox id, unique within vm context */
- char password[80]; /*!< Secret pin code, numbers only */
- char fullname[80]; /*!< Full name, for directory app */
-- char email[80]; /*!< E-mail address */
-+ char *email; /*!< E-mail address */
- char *emailsubject; /*!< E-mail subject */
- char *emailbody; /*!< E-mail body */
- char pager[80]; /*!< E-mail address to pager (no attachment) */
-@@ -1044,6 +1044,8 @@
- vmu->maxdeletedmsg = maxdeletedmsg;
- }
- vmu->volgain = volgain;
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
- ast_free(vmu->emailsubject);
- vmu->emailsubject = NULL;
- ast_free(vmu->emailbody);
-@@ -1340,7 +1342,8 @@
- } else if (!strcasecmp(var->name, "pager")) {
- ast_copy_string(retval->pager, var->value, sizeof(retval->pager));
- } else if (!strcasecmp(var->name, "email")) {
-- ast_copy_string(retval->email, var->value, sizeof(retval->email));
-+ ast_free(retval->email);
-+ retval->email = ast_strdup(var->value);
- } else if (!strcasecmp(var->name, "fullname")) {
- ast_copy_string(retval->fullname, var->value, sizeof(retval->fullname));
- } else if (!strcasecmp(var->name, "context")) {
-@@ -1467,6 +1470,7 @@
- if ((vmu = (ivm ? ivm : ast_malloc(sizeof(*vmu))))) {
- *vmu = *cur;
- if (!ivm) {
-+ vmu->email = ast_strdup(cur->email);
- vmu->emailbody = ast_strdup(cur->emailbody);
- vmu->emailsubject = ast_strdup(cur->emailsubject);
- }
-@@ -1762,6 +1766,9 @@
- {
- if (ast_test_flag(vmu, VM_ALLOCED)) {
-
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
-+
- ast_free(vmu->emailbody);
- vmu->emailbody = NULL;
-
-@@ -2299,7 +2306,7 @@
- * of this function, we will revert back to an empty string if tempcopy
- * is 1.
- */
-- ast_copy_string(vmu->email, vmu->imapuser, sizeof(vmu->email));
-+ vmu->email = ast_strdup(vmu->imapuser);
- tempcopy = 1;
- }
-
-@@ -2311,8 +2318,10 @@
- command hangs. */
- if (!(p = vm_mkftemp(tmp))) {
- ast_log(AST_LOG_WARNING, "Unable to store '%s' (can't create temporary file)\n", fn);
-- if (tempcopy)
-- *(vmu->email) = '\0';
-+ if (tempcopy) {
-+ ast_free(vmu->email);
-+ vmu->email = NULL;
-+ }
- return -1;
- }
-
-@@ -4584,6 +4593,9 @@
- struct ast_str *str1 = ast_str_create(16), *str2 = ast_str_create(16);
- char *greeting_attachment;
- char filename[256];
-+ int first_line;
-+ char *emailsbuf;
-+ char *email;
-
- if (!str1 || !str2) {
- ast_free(str1);
-@@ -4625,7 +4637,7 @@
- ast_str_substitute_variables(&str1, 0, ast, fromstring);
-
- if (check_mime(ast_str_buffer(str1))) {
-- int first_line = 1;
-+ first_line = 1;
- ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("From: "), strlen(who) + 3);
- while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
- *ptr = '\0';
-@@ -4646,20 +4658,25 @@
- fprintf(p, "From: Asterisk PBX <%s>" ENDL, who);
- }
-
-- if (check_mime(vmu->fullname)) {
-- int first_line = 1;
-- char *ptr;
-- ast_str_encode_mime(&str2, 0, vmu->fullname, strlen("To: "), strlen(vmu->email) + 3);
-- while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-- *ptr = '\0';
-- fprintf(p, "%s %s" ENDL, first_line ? "To:" : "", ast_str_buffer(str2));
-- first_line = 0;
-- /* Substring is smaller, so this will never grow */
-- ast_str_set(&str2, 0, "%s", ptr + 1);
-+ emailsbuf = ast_strdupa(vmu->email);
-+ fprintf(p, "To:");
-+ first_line = 1;
-+ while ((email = strsep(&emailsbuf, "|"))) {
-+ char *next = emailsbuf;
-+ if (check_mime(vmu->fullname)) {
-+ char *ptr;
-+ ast_str_encode_mime(&str2, 0, vmu->fullname, first_line ? strlen("To: ") : 0, strlen(email) + 3 + (next ? strlen(",") : 0));
-+ while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-+ *ptr = '\0';
-+ fprintf(p, " %s" ENDL, ast_str_buffer(str2));
-+ /* Substring is smaller, so this will never grow */
-+ ast_str_set(&str2, 0, "%s", ptr + 1);
-+ }
-+ fprintf(p, " %s <%s>%s" ENDL, ast_str_buffer(str2), email, next ? "," : "");
-+ } else {
-+ fprintf(p, " %s <%s>%s" ENDL, ast_str_quote(&str2, 0, vmu->fullname), email, next ? "," : "");
- }
-- fprintf(p, "%s %s <%s>" ENDL, first_line ? "To:" : "", ast_str_buffer(str2), vmu->email);
-- } else {
-- fprintf(p, "To: %s <%s>" ENDL, ast_str_quote(&str2, 0, vmu->fullname), vmu->email);
-+ first_line = 0;
- }
-
- if (!ast_strlen_zero(emailsubject) || !ast_strlen_zero(vmu->emailsubject)) {
-@@ -4669,7 +4686,7 @@
- prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, category, flag);
- ast_str_substitute_variables(&str1, 0, ast, e_subj);
- if (check_mime(ast_str_buffer(str1))) {
-- int first_line = 1;
-+ first_line = 1;
- char *ptr;
- ast_str_encode_mime(&str2, 0, ast_str_buffer(str1), strlen("Subject: "), 0);
- while ((ptr = strchr(ast_str_buffer(str2), ' '))) {
-@@ -10841,7 +10858,7 @@
- ast_copy_string(vmu->fullname, s, sizeof(vmu->fullname));
- }
- if (stringp && (s = strsep(&stringp, ","))) {
-- ast_copy_string(vmu->email, s, sizeof(vmu->email));
-+ vmu->email = ast_strdup(s);
- }
- if (stringp && (s = strsep(&stringp, ","))) {
- ast_copy_string(vmu->pager, s, sizeof(vmu->pager));
-@@ -13001,7 +13018,7 @@
- }
-
- populate_defaults(vmu);
-- ast_copy_string(vmu->email, "te...@ex...", sizeof(vmu->email));
-+ vmu->email = ast_strdup("te...@ex...");
- #ifdef IMAP_STORAGE
- /* TODO When we set up the IMAP server test, we'll need to have credentials for the VMU structure added here */
- #endif
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-11-02 15:26:01 UTC (rev 7908)
@@ -3,13 +3,13 @@
# asterisk
#
##############################################################
-ifeq ($(BR2_PACKAGE_ASTERISK_v1_8),y)
-ASTERISK_VERSION := 1.8.32.3
+ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
+ASTERISK_VERSION := 11.23.1
else
- ifeq ($(BR2_PACKAGE_ASTERISK_v11),y)
-ASTERISK_VERSION := 11.23.1
+ ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
+ASTERISK_VERSION := 13.11.2
else
-ASTERISK_VERSION := 13.11.2
+ASTERISK_VERSION := 15.0.0
endif
endif
ASTERISK_SOURCE := asterisk-$(ASTERISK_VERSION).tar.gz
@@ -30,7 +30,6 @@
##
ASTERISK_VERSION_SINGLE := $(call ndots,1,1,$(ASTERISK_VERSION))
ASTERISK_VERSION_TUPLE := $(call ndots,1,2,$(ASTERISK_VERSION))
-ASTERISK_VERSION_TRIPLE := $(call ndots,1,3,$(ASTERISK_VERSION))
ASTERISK_GLOBAL_MAKEOPTS := $(BASE_DIR)/../project/astlinux/asterisk.makeopts-$(ASTERISK_VERSION_SINGLE)
@@ -159,7 +158,6 @@
endif
endif
-ifneq ($(ASTERISK_VERSION_SINGLE),1)
ifneq ($(ASTERISK_VERSION_SINGLE),11)
ifeq ($(strip $(BR2_PACKAGE_PJSIP)),y)
@@ -193,7 +191,6 @@
endif
endif
-endif
$(DL_DIR)/$(ASTERISK_SOURCE):
$(WGET) -P $(DL_DIR) $(ASTERISK_SITE)/$(ASTERISK_SOURCE)
@@ -203,14 +200,8 @@
touch $@
$(ASTERISK_DIR)/.patched: $(ASTERISK_DIR)/.source
-ifeq ($(ASTERISK_VERSION_SINGLE),1)
- toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TUPLE)-\*.patch
- toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TRIPLE)-\*.patch
-else
toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_SINGLE)-\*.patch
toolchain/patch-kernel.sh $(ASTERISK_DIR) package/asterisk/ asterisk-$(ASTERISK_VERSION_TUPLE)-\*.patch
-endif
-
touch $@
$(ASTERISK_DIR)/.configured: $(ASTERISK_DIR)/.patched | host-automake host-pkg-config host-ncurses host-bison host-flex host-libxml2 \
@@ -263,12 +254,8 @@
menuselect/menuselect --enable IMAP_STORAGE menuselect.makeopts; \
)
endif
- ifneq ($(ASTERISK_VERSION_SINGLE),1)
(cd $(ASTERISK_DIR); \
menuselect/menuselect --enable app_meetme --enable app_page menuselect.makeopts; \
- )
- endif
- (cd $(ASTERISK_DIR); \
menuselect/menuselect --enable res_pktccops menuselect.makeopts; \
menuselect/menuselect --disable CORE-SOUNDS-EN-GSM --disable MOH-OPSOUND-WAV menuselect.makeopts; \
menuselect/menuselect --disable BUILD_NATIVE menuselect.makeopts; \
@@ -308,10 +295,8 @@
rmdir $(TARGET_DIR)/var/lib/asterisk
rm -f $(TARGET_DIR)/stat/var/lib/asterisk/astdb
ln -sf /var/db/astdb $(TARGET_DIR)/stat/var/lib/asterisk/astdb
-ifneq ($(ASTERISK_VERSION_SINGLE),1)
rm -f $(TARGET_DIR)/stat/var/lib/asterisk/astdb.sqlite3
ln -sf /var/db/astdb.sqlite3 $(TARGET_DIR)/stat/var/lib/asterisk/astdb.sqlite3
-endif
mkdir -p $(TARGET_DIR)/stat/var/spool
mv $(TARGET_DIR)/var/spool/asterisk $(TARGET_DIR)/stat/var/spool/
touch -c $(TARGET_DIR)/$(ASTERISK_TARGET_BINARY)
Modified: branches/1.0/package/asterisk-codec-silk/Config.in
===================================================================
--- branches/1.0/package/asterisk-codec-silk/Config.in 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/asterisk-codec-silk/Config.in 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
config BR2_PACKAGE_ASTERISK_CODEC_SILK
bool "asterisk-codec-silk"
default n
- depends on BR2_PACKAGE_ASTERISK && ( ! BR2_PACKAGE_ASTERISK_v1_8 )
+ depends on BR2_PACKAGE_ASTERISK
help
SILK CODEC developed by Skype (owned by Microsoft)
License supplied by Digium in x86 binary form.
Modified: branches/1.0/package/webinterface/webinterface.mk
===================================================================
--- branches/1.0/package/webinterface/webinterface.mk 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/package/webinterface/webinterface.mk 2016-11-02 15:26:01 UTC (rev 7908)
@@ -12,11 +12,7 @@
endif
ifeq ($(strip $(BR2_PACKAGE_ASTERISK)),y)
-ifeq ($(strip $(BR2_PACKAGE_ASTERISK_GUI)),y)
-webinterface-install: asterisk asterisk-gui
-else
webinterface-install: asterisk
-endif
else
webinterface-install:
endif
Deleted: branches/1.0/project/astlinux/asterisk.makeopts-1
===================================================================
--- branches/1.0/project/astlinux/asterisk.makeopts-1 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/project/astlinux/asterisk.makeopts-1 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,31 +0,0 @@
-MENUSELECT_APPS=app_ivrdemo app_osplookup app_skel
-MENUSELECT_CDR=cdr_odbc cdr_pgsql cdr_radius cdr_sqlite cdr_tds
-MENUSELECT_CHANNELS=chan_alsa chan_h323 chan_nbs chan_vpb
-MENUSELECT_CODECS=codec_speex
-MENUSELECT_FORMATS=format_ogg_vorbis
-MENUSELECT_FUNCS=func_odbc
-MENUSELECT_RES=res_config_odbc res_config_pgsql res_odbc res_snmp
-MENUSELECT_OPTS_app_voicemail=
-MENUSELECT_CFLAGS=LOADABLE_MODULES
-MENUSELECT_EMBED=
-MENUSELECT_CORE_SOUNDS=
-MENUSELECT_MOH=
-MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_BUILD_DEPS=res_adsi chan_local app_meetme res_monitor res_smdi res_features DEBUG_THREADS
-MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_radius
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_sqlite
-MENUSELECT_DEPSFAILED=MENUSELECT_CDR=cdr_tds
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_alsa
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_h323
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
-MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_vpb
-MENUSELECT_DEPSFAILED=MENUSELECT_CODECS=codec_speex
-MENUSELECT_DEPSFAILED=MENUSELECT_FORMATS=format_ogg_vorbis
-MENUSELECT_DEPSFAILED=MENUSELECT_FUNCS=func_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_config_pgsql
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_odbc
-MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_snmp
Modified: branches/1.0/scripts/beta-run-image-upload
===================================================================
--- branches/1.0/scripts/beta-run-image-upload 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/scripts/beta-run-image-upload 2016-11-02 15:26:01 UTC (rev 7908)
@@ -84,10 +84,6 @@
set_asterisk_version()
{
case $1 in
- ast18)
- FIRMWARE="ast18-firmware-1.x"
- MIRROR_FIRMWARE="$FIRMWARE"
- ;;
ast11)
FIRMWARE="ast11-firmware-1.x"
MIRROR_FIRMWARE="$FIRMWARE"
@@ -137,7 +133,7 @@
# Remove pre-existing ChangeLog.txt and version.txt
delete_dir "$CHANGELOG_DIR"
-for asterisk in ast18 ast11 ast13; do
+for asterisk in ast11 ast13; do
set_asterisk_version $asterisk
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/scripts/master-build 2016-11-02 15:26:01 UTC (rev 7908)
@@ -78,12 +78,6 @@
set_asterisk_version()
{
case $1 in
- ast18)
- CONFIG="astlinux18.config"
- ASTERISK_VERSION="$(awk -F'=' '/^ASTERISK_VERSION/ { if ($2 ~ /^ *1.8/) {print $2; exit} }' package/asterisk/asterisk.mk)"
- ASTERISK_VERSION="asterisk-${ASTERISK_VERSION// /}"
- FIRMWARE="ast18-firmware-1.x"
- ;;
ast11)
CONFIG="astlinux-ast11.config"
ASTERISK_VERSION="$(awk -F'=' '/^ASTERISK_VERSION/ { if ($2 ~ /^ *11./) {print $2; exit} }' package/asterisk/asterisk.mk)"
@@ -161,10 +155,10 @@
rm -f initrd.img
#
-# Build Asterisk 1.8, 11 and 13 versions of AstLinux
+# Build Asterisk 11 and 13 versions of AstLinux
#
-for asterisk in ast18 ast11 ast13; do
+for asterisk in ast11 ast13; do
set_asterisk_version $asterisk
Modified: branches/1.0/scripts/master-upload
===================================================================
--- branches/1.0/scripts/master-upload 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/scripts/master-upload 2016-11-02 15:26:01 UTC (rev 7908)
@@ -78,10 +78,6 @@
set_asterisk_version()
{
case $1 in
- ast18)
- FIRMWARE="ast18-firmware-1.x"
- MIRROR_FIRMWARE="$FIRMWARE"
- ;;
ast11)
FIRMWARE="ast11-firmware-1.x"
MIRROR_FIRMWARE="$FIRMWARE"
@@ -128,7 +124,7 @@
fi
-for asterisk in ast18 ast11 ast13; do
+for asterisk in ast11 ast13; do
set_asterisk_version $asterisk
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:35 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:11 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -138,7 +138,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
BR2_PACKAGE_ASTERISK_v11=y
# BR2_PACKAGE_ASTERISK_v13 is not set
@@ -152,7 +151,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-01 12:48:25 UTC (rev 7907)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-02 15:26:01 UTC (rev 7908)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7702-dirty Configuration
-# Sat Jun 4 17:22:37 2016
+# Buildroot astlinux-1.x-svn7907-dirty Configuration
+# Wed Nov 2 08:46:11 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -138,7 +138,6 @@
# Asterisk, XMPP and telephony applications
#
BR2_PACKAGE_ASTERISK=y
-# BR2_PACKAGE_ASTERISK_v1_8 is not set
# BR2_PACKAGE_ASTERISK_v11 is not set
BR2_PACKAGE_ASTERISK_v13=y
@@ -152,7 +151,6 @@
# BR2_PACKAGE_ASTERISK_MENUSELECT is not set
BR2_PACKAGE_ASTERISK_CODEC_SILK=y
BR2_PACKAGE_ASTERISK_FOP2=y
-# BR2_PACKAGE_ASTERISK_GUI is not set
BR2_PACKAGE_PHONEPROV_TOOLS=y
BR2_PACKAGE_DAHDI_LINUX=y
BR2_PACKAGE_DAHDI_OSLEC=y
Deleted: branches/1.0/x86_64-configs/astlinux18.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux18.config 20...
[truncated message content] |
|
From: <abe...@us...> - 2016-11-03 13:21:20
|
Revision: 7911
http://sourceforge.net/p/astlinux/code/7911
Author: abelbeck
Date: 2016-11-03 13:21:17 +0000 (Thu, 03 Nov 2016)
Log Message:
-----------
whois, new package
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/whois/
branches/1.0/package/whois/Config.in
branches/1.0/package/whois/whois.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/astlinux-ast11.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7907-dirty Configuration
-# Wed Nov 2 08:46:10 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:06 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -803,6 +803,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
+BR2_PACKAGE_WHOIS=y
BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/astlinux-ast13.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7907-dirty Configuration
-# Wed Nov 2 08:46:10 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:08 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -803,6 +803,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
+BR2_PACKAGE_WHOIS=y
BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/initrd.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:13 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -649,6 +649,7 @@
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WHOIS is not set
# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/package/Config.in 2016-11-03 13:21:17 UTC (rev 7911)
@@ -555,6 +555,7 @@
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/wget/Config.in"
endif
+source "package/whois/Config.in"
source "package/wide-dhcpv6/Config.in"
source "package/wireless_tools/Config.in"
source "package/wpa_supplicant/Config.in"
Added: branches/1.0/package/whois/Config.in
===================================================================
--- branches/1.0/package/whois/Config.in (rev 0)
+++ branches/1.0/package/whois/Config.in 2016-11-03 13:21:17 UTC (rev 7911)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_WHOIS
+ bool "whois"
+ depends on BR2_USE_WCHAR # gettext
+ help
+ Improved whois client.
+
+ http://www.linux.it/~md/software/
+
+ https://github.com/rfc1036/whois
+
Added: branches/1.0/package/whois/whois.mk
===================================================================
--- branches/1.0/package/whois/whois.mk (rev 0)
+++ branches/1.0/package/whois/whois.mk 2016-11-03 13:21:17 UTC (rev 7911)
@@ -0,0 +1,31 @@
+################################################################################
+#
+# whois
+#
+################################################################################
+
+WHOIS_VERSION = 5.2.13
+WHOIS_SITE = http://ftp.debian.org/debian/pool/main/w/whois
+WHOIS_SOURCE = whois_$(WHOIS_VERSION).tar.xz
+
+# take precedence over busybox implementation
+WHOIS_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox)
+
+define WHOIS_CONFIGURE_CMDS
+ # Not all perl's include 'autodie' module
+ $(SED) '/^use autodie;/d' $(@D)/make_version_h.pl
+endef
+
+define WHOIS_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" -C $(@D)
+endef
+
+define WHOIS_INSTALL_TARGET_CMDS
+ $(INSTALL) -m 0755 -D $(@D)/whois $(TARGET_DIR)/usr/bin/whois
+endef
+
+define WHOIS_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/bin/whois
+endef
+
+$(eval $(call GENTARGETS,package,whois))
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/runnix-iso.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:16 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -689,6 +689,7 @@
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WGET is not set
+# BR2_PACKAGE_WHOIS is not set
# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/runnix.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:15 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -690,6 +690,7 @@
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WGET is not set
+# BR2_PACKAGE_WHOIS is not set
# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7907-dirty Configuration
-# Wed Nov 2 08:46:11 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:19 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -784,6 +784,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
+BR2_PACKAGE_WHOIS=y
BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7907-dirty Configuration
-# Wed Nov 2 08:46:11 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:27 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -784,6 +784,7 @@
# BR2_PACKAGE_VPNC is not set
BR2_PACKAGE_VSFTPD=y
# BR2_PACKAGE_VTUN is not set
+BR2_PACKAGE_WHOIS=y
BR2_PACKAGE_WIDE_DHCPV6=y
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-11-03 04:14:25 UTC (rev 7910)
+++ branches/1.0/x86_64-configs/initrd.config 2016-11-03 13:21:17 UTC (rev 7911)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn7604-dirty Configuration
-# Tue Mar 22 12:22:58 2016
+# Buildroot astlinux-1.x-svn7910-dirty Configuration
+# Thu Nov 3 08:17:28 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -630,6 +630,7 @@
# BR2_PACKAGE_VPNC is not set
# BR2_PACKAGE_VSFTPD is not set
# BR2_PACKAGE_VTUN is not set
+# BR2_PACKAGE_WHOIS is not set
# BR2_PACKAGE_WIDE_DHCPV6 is not set
# BR2_PACKAGE_WIRELESS_TOOLS is not set
# BR2_PACKAGE_WPA_SUPPLICANT is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-03 14:57:45
|
Revision: 7914
http://sourceforge.net/p/astlinux/code/7914
Author: abelbeck
Date: 2016-11-03 14:57:42 +0000 (Thu, 03 Nov 2016)
Log Message:
-----------
FOP2, minor version bump to 2.31.05
Modified Paths:
--------------
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2016-11-03 14:38:11 UTC (rev 7913)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2016-11-03 14:57:42 UTC (rev 7914)
@@ -3,7 +3,7 @@
# asterisk-fop2
#
#############################################################
-ASTERISK_FOP2_VERSION = 2.31.04
+ASTERISK_FOP2_VERSION = 2.31.05
ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
ASTERISK_FOP2_SITE = http://download2.fop2.com
# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-11-03 14:38:11 UTC (rev 7913)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2016-11-03 14:57:42 UTC (rev 7914)
@@ -248,7 +248,7 @@
if ! RAM_needed_MB 475; then
finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
fi
- SRC_URL="https://files.astlinux-project.org/fop2-2.31.04-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
+ SRC_URL="https://files.astlinux-project.org/fop2-2.31.05-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
;;
show)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-04 22:26:55
|
Revision: 7928
http://sourceforge.net/p/astlinux/code/7928
Author: abelbeck
Date: 2016-11-04 22:26:53 +0000 (Fri, 04 Nov 2016)
Log Message:
-----------
No longer enable 'wanpipe' for standard builds, use a custom build to enable it
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/scripts/master-build
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-04 22:16:28 UTC (rev 7927)
+++ branches/1.0/astlinux-ast11.config 2016-11-04 22:26:53 UTC (rev 7928)
@@ -184,7 +184,7 @@
BR2_PACKAGE_PROSODY=y
# BR2_PACKAGE_RTPPROXY is not set
BR2_PACKAGE_RHINO=y
-BR2_PACKAGE_WANPIPE=y
+# BR2_PACKAGE_WANPIPE is not set
#
# Audio and video libraries and applications
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-04 22:16:28 UTC (rev 7927)
+++ branches/1.0/astlinux-ast13.config 2016-11-04 22:26:53 UTC (rev 7928)
@@ -184,7 +184,7 @@
BR2_PACKAGE_PROSODY=y
# BR2_PACKAGE_RTPPROXY is not set
BR2_PACKAGE_RHINO=y
-BR2_PACKAGE_WANPIPE=y
+# BR2_PACKAGE_WANPIPE is not set
#
# Audio and video libraries and applications
Modified: branches/1.0/scripts/master-build
===================================================================
--- branches/1.0/scripts/master-build 2016-11-04 22:16:28 UTC (rev 7927)
+++ branches/1.0/scripts/master-build 2016-11-04 22:26:53 UTC (rev 7928)
@@ -65,9 +65,6 @@
# disable BR2_PACKAGE_RHINO
sed -i 's:^BR2_PACKAGE_RHINO=y.*$:# BR2_PACKAGE_RHINO is not set:' .config
- # disable BR2_PACKAGE_WANPIPE
- sed -i 's:^BR2_PACKAGE_WANPIPE=y.*$:# BR2_PACKAGE_WANPIPE is not set:' .config
-
# disable BR2_PACKAGE_DAHDI_HFCS
sed -i 's:^BR2_PACKAGE_DAHDI_HFCS=y.*$:# BR2_PACKAGE_DAHDI_HFCS is not set:' .config
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-04 22:16:28 UTC (rev 7927)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-04 22:26:53 UTC (rev 7928)
@@ -165,7 +165,7 @@
BR2_PACKAGE_PROSODY=y
# BR2_PACKAGE_RTPPROXY is not set
BR2_PACKAGE_RHINO=y
-BR2_PACKAGE_WANPIPE=y
+# BR2_PACKAGE_WANPIPE is not set
#
# Audio and video libraries and applications
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-04 22:16:28 UTC (rev 7927)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-04 22:26:53 UTC (rev 7928)
@@ -165,7 +165,7 @@
BR2_PACKAGE_PROSODY=y
# BR2_PACKAGE_RTPPROXY is not set
BR2_PACKAGE_RHINO=y
-BR2_PACKAGE_WANPIPE=y
+# BR2_PACKAGE_WANPIPE is not set
#
# Audio and video libraries and applications
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-12 01:15:19
|
Revision: 7948
http://sourceforge.net/p/astlinux/code/7948
Author: abelbeck
Date: 2016-11-12 01:15:17 +0000 (Sat, 12 Nov 2016)
Log Message:
-----------
strongswan, new package, disabled and no configuration yet, for testing. Adds 741 kB compressed 2292 kB uncompressed to image
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/strongswan/
branches/1.0/package/strongswan/Config.in
branches/1.0/package/strongswan/ipsec.init
branches/1.0/package/strongswan/strongswan.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/astlinux-ast11.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:06 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:27 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -790,6 +790,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/astlinux-ast13.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:08 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:28 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -790,6 +790,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/initrd.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:13 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:29 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -637,6 +637,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
# BR2_PACKAGE_STUNNEL is not set
# BR2_PACKAGE_TCPDUMP is not set
# BR2_PACKAGE_TCPREPLAY is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/package/Config.in 2016-11-12 01:15:17 UTC (rev 7948)
@@ -534,6 +534,7 @@
source "package/socat/Config.in"
source "package/spawn-fcgi/Config.in"
source "package/squid/Config.in"
+source "package/strongswan/Config.in"
source "package/stunnel/Config.in"
source "package/tcpdump/Config.in"
source "package/tcpreplay/Config.in"
Added: branches/1.0/package/strongswan/Config.in
===================================================================
--- branches/1.0/package/strongswan/Config.in (rev 0)
+++ branches/1.0/package/strongswan/Config.in 2016-11-12 01:15:17 UTC (rev 7948)
@@ -0,0 +1,51 @@
+menuconfig BR2_PACKAGE_STRONGSWAN
+ bool "strongswan"
+ select BR2_PACKAGE_OPENSSL
+ help
+ strongSwan is an OpenSource IPsec implementation for the
+ Linux operating system. It is based on the discontinued
+ FreeS/WAN project and the X.509 patch.
+
+ The focus is on:
+ - simplicity of configuration
+ - strong encryption and authentication methods
+ - powerful IPsec policies supporting large and complex VPN networks
+
+ strongSwan provide many plugins. Only a few are presented here.
+
+ https://www.strongswan.org/
+
+if BR2_PACKAGE_STRONGSWAN
+
+config BR2_PACKAGE_STRONGSWAN_AF_ALG
+ bool "Enable AF_ALG crypto interface to Linux Crypto API"
+
+config BR2_PACKAGE_STRONGSWAN_CHARON
+ bool "Enable the IKEv1/IKEv2 keying daemon charon"
+ default y
+
+if BR2_PACKAGE_STRONGSWAN_CHARON
+
+config BR2_PACKAGE_STRONGSWAN_EAP
+ bool "Enable EAP protocols"
+ default y
+ help
+ Enable various EAP protocols:
+ - mschapv2
+ - tls
+ - ttls
+ - peap
+ - identity
+ - md5
+
+config BR2_PACKAGE_STRONGSWAN_SQLITE
+ bool "Enable SQLite database support"
+ depends on BR2_PACKAGE_SQLITE
+
+config BR2_PACKAGE_STRONGSWAN_VICI
+ bool "Enable vici/swanctl"
+ default y
+
+endif
+
+endif
Added: branches/1.0/package/strongswan/ipsec.init
===================================================================
--- branches/1.0/package/strongswan/ipsec.init (rev 0)
+++ branches/1.0/package/strongswan/ipsec.init 2016-11-12 01:15:17 UTC (rev 7948)
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+init ()
+{
+ :
+}
+
+start ()
+{
+ :
+}
+
+stop ()
+{
+ :
+}
+
+case $1 in
+
+init)
+ init
+ start
+ ;;
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart" >&2
+ exit 1
+ ;;
+
+esac
Property changes on: branches/1.0/package/strongswan/ipsec.init
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/strongswan/strongswan.mk
===================================================================
--- branches/1.0/package/strongswan/strongswan.mk (rev 0)
+++ branches/1.0/package/strongswan/strongswan.mk 2016-11-12 01:15:17 UTC (rev 7948)
@@ -0,0 +1,76 @@
+################################################################################
+#
+# strongswan
+#
+################################################################################
+
+STRONGSWAN_VERSION = 5.5.1
+STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
+STRONGSWAN_SITE = https://download.strongswan.org
+STRONGSWAN_DEPENDENCIES = openssl host-pkg-config
+STRONGSWAN_CONF_OPT += \
+ --without-lib-prefix \
+ --enable-led=no \
+ --enable-pkcs11=no \
+ --enable-kernel-netlink=yes \
+ --enable-socket-default=yes \
+ --enable-openssl=yes \
+ --enable-gcrypt=no \
+ --enable-gmp=no \
+ --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \
+ --enable-curl=no \
+ --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \
+ --enable-tnccs-11=no \
+ --enable-tnccs-20=no \
+ --enable-tnccs-dynamic=no \
+ --enable-xauth-generic=yes \
+ --enable-xauth-eap=yes \
+ --enable-unity=no \
+ --enable-stroke=no \
+ --enable-sqlite=$(if $(BR2_PACKAGE_STRONGSWAN_SQLITE),yes,no) \
+ --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQLITE),yes,no) \
+ --enable-attr-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQLITE),yes,no) \
+ --enable-pki=no \
+ --enable-scepclient=no \
+ --enable-scripts=no \
+ --enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \
+ --enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \
+ --enable-cmd=yes
+
+ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y)
+STRONGSWAN_CONF_OPT += \
+ --enable-eap-identity \
+ --enable-eap-md5 \
+ --enable-eap-mschapv2 \
+ --enable-eap-tls \
+ --enable-eap-ttls \
+ --enable-eap-peap
+endif
+
+ifeq ($(BR2_PACKAGE_STRONGSWAN_SQLITE),y)
+STRONGSWAN_DEPENDENCIES += \
+ $(if $(BR2_PACKAGE_SQLITE),sqlite)
+endif
+
+define STRONGSWAN_POST_INSTALL
+ $(INSTALL) -m 0755 -D package/strongswan/ipsec.init $(TARGET_DIR)/etc/init.d/ipsec
+ ln -sf ../../init.d/ipsec $(TARGET_DIR)/etc/runlevels/default/S31ipsec
+ ln -sf ../../init.d/ipsec $(TARGET_DIR)/etc/runlevels/default/K20ipsec
+endef
+
+STRONGSWAN_POST_INSTALL_TARGET_HOOKS = STRONGSWAN_POST_INSTALL
+
+STRONGSWAN_UNINSTALL_STAGING_OPT = --version
+
+define STRONGSWAN_UNINSTALL_TARGET_CMDS
+ rm -rf $(TARGET_DIR)/usr/lib/ipsec
+ rm -rf $(TARGET_DIR)/usr/libexec/ipsec
+ rm -rf $(TARGET_DIR)/etc/strongswan.d
+ rm -rf $(TARGET_DIR)/usr/share/strongswan
+ rm -f $(TARGET_DIR)/etc/strongswan.conf
+ rm -f $(TARGET_DIR)/etc/init.d/ipsec
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S31ipsec
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K20ipsec
+endef
+
+$(eval $(call AUTOTARGETS,package,strongswan))
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/runnix-iso.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:16 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:32 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -673,6 +673,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
# BR2_PACKAGE_STUNNEL is not set
# BR2_PACKAGE_TCPDUMP is not set
# BR2_PACKAGE_TCPREPLAY is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/runnix.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:15 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:31 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -674,6 +674,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
# BR2_PACKAGE_STUNNEL is not set
# BR2_PACKAGE_TCPDUMP is not set
# BR2_PACKAGE_TCPREPLAY is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:19 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:33 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -771,6 +771,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:27 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:35 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -771,6 +771,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-11-11 18:22:40 UTC (rev 7947)
+++ branches/1.0/x86_64-configs/initrd.config 2016-11-12 01:15:17 UTC (rev 7948)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7910-dirty Configuration
-# Thu Nov 3 08:17:28 2016
+# Buildroot astlinux-1.x-svn7947-dirty Configuration
+# Fri Nov 11 18:59:36 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -618,6 +618,7 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
+# BR2_PACKAGE_STRONGSWAN is not set
# BR2_PACKAGE_STUNNEL is not set
# BR2_PACKAGE_TCPDUMP is not set
# BR2_PACKAGE_TCPREPLAY is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-15 19:08:46
|
Revision: 7961
http://sourceforge.net/p/astlinux/code/7961
Author: abelbeck
Date: 2016-11-15 19:08:44 +0000 (Tue, 15 Nov 2016)
Log Message:
-----------
strongswan, enable package for default builds
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-15 16:22:54 UTC (rev 7960)
+++ branches/1.0/astlinux-ast11.config 2016-11-15 19:08:44 UTC (rev 7961)
@@ -790,7 +790,12 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
-# BR2_PACKAGE_STRONGSWAN is not set
+BR2_PACKAGE_STRONGSWAN=y
+# BR2_PACKAGE_STRONGSWAN_AF_ALG is not set
+BR2_PACKAGE_STRONGSWAN_CHARON=y
+BR2_PACKAGE_STRONGSWAN_EAP=y
+# BR2_PACKAGE_STRONGSWAN_SQLITE is not set
+BR2_PACKAGE_STRONGSWAN_VICI=y
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-15 16:22:54 UTC (rev 7960)
+++ branches/1.0/astlinux-ast13.config 2016-11-15 19:08:44 UTC (rev 7961)
@@ -790,7 +790,12 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
-# BR2_PACKAGE_STRONGSWAN is not set
+BR2_PACKAGE_STRONGSWAN=y
+# BR2_PACKAGE_STRONGSWAN_AF_ALG is not set
+BR2_PACKAGE_STRONGSWAN_CHARON=y
+BR2_PACKAGE_STRONGSWAN_EAP=y
+# BR2_PACKAGE_STRONGSWAN_SQLITE is not set
+BR2_PACKAGE_STRONGSWAN_VICI=y
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-15 16:22:54 UTC (rev 7960)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-15 19:08:44 UTC (rev 7961)
@@ -771,7 +771,12 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
-# BR2_PACKAGE_STRONGSWAN is not set
+BR2_PACKAGE_STRONGSWAN=y
+# BR2_PACKAGE_STRONGSWAN_AF_ALG is not set
+BR2_PACKAGE_STRONGSWAN_CHARON=y
+BR2_PACKAGE_STRONGSWAN_EAP=y
+# BR2_PACKAGE_STRONGSWAN_SQLITE is not set
+BR2_PACKAGE_STRONGSWAN_VICI=y
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-15 16:22:54 UTC (rev 7960)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-15 19:08:44 UTC (rev 7961)
@@ -771,7 +771,12 @@
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
-# BR2_PACKAGE_STRONGSWAN is not set
+BR2_PACKAGE_STRONGSWAN=y
+# BR2_PACKAGE_STRONGSWAN_AF_ALG is not set
+BR2_PACKAGE_STRONGSWAN_CHARON=y
+BR2_PACKAGE_STRONGSWAN_EAP=y
+# BR2_PACKAGE_STRONGSWAN_SQLITE is not set
+BR2_PACKAGE_STRONGSWAN_VICI=y
BR2_PACKAGE_STUNNEL=y
BR2_PACKAGE_TCPDUMP=y
# BR2_PACKAGE_TCPDUMP_SMB is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-20 18:13:10
|
Revision: 7971
http://sourceforge.net/p/astlinux/code/7971
Author: abelbeck
Date: 2016-11-20 18:13:08 +0000 (Sun, 20 Nov 2016)
Log Message:
-----------
Linux version bump from linux-3.2.80 to linux-3.2.84
fix unionfs patch for kernel change, setattr_prepare (which used to be inode_change_ok)
Ref: https://git.kernel.org/cgit/linux/kernel/git/bwh/linux-stable-queue.git/diff/queue-3.2/fs-give-dentry-to-inode_change_ok-instead-of-inode.patch?id=67c8b46da7f623488620e589a8cb35e095cbfd97
add upstream Buildroot fix: linux, uboot, mxs-bootlets, barebox: avoid double slash in CUSTOM_TARBALL
Ref: https://git.buildroot.net/buildroot/commit/linux/linux.mk?id=579fea227394db02916d7487762c79a8e76e8748
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config
branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
branches/1.0/crosstool-ng-src/get-files.sh
branches/1.0/linux/linux.mk
branches/1.0/project/astlinux/geni586/linux-smp.config
branches/1.0/project/astlinux/geni586/linux.config
branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
branches/1.0/project/astlinux/genx86_64/linux-smp.config
branches/1.0/project/astlinux/kernel-patches/linux-100-unionfs-2.6_for_3.2.62.patch
branches/1.0/project/runnix/geni586/linux.config
branches/1.0/project/runnix-iso/geni586/linux.config
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Removed Paths:
-------------
branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch
branches/1.0/project/astlinux/kernel-patches/linux-810-fix-CVE-2016-5195.patch
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/astlinux-ast11.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -923,7 +923,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.84.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/astlinux-ast13.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -923,7 +923,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.84.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/ct-ng-1.20.0-3.2-x86_64.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2-x86_64.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -219,7 +219,7 @@
# 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.80.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.84.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config
===================================================================
--- branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/crosstool-ng-src/ct-ng-1.20.0-3.2.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -219,7 +219,7 @@
# 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.80.tar.gz"
+CT_KERNEL_LINUX_CUSTOM_LOCATION="${CT_TOP_DIR}/linux-3.2.84.tar.gz"
CT_KERNEL_windows_AVAILABLE=y
#
Modified: branches/1.0/crosstool-ng-src/get-files.sh
===================================================================
--- branches/1.0/crosstool-ng-src/get-files.sh 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/crosstool-ng-src/get-files.sh 2016-11-20 18:13:08 UTC (rev 7971)
@@ -4,7 +4,7 @@
TARBALLS=".build/tarballs"
-LINUX_KERNEL="linux-3.2.80.tar.gz"
+LINUX_KERNEL="linux-3.2.84.tar.gz"
EGLIBC="eglibc-2_18.tar.bz2"
Modified: branches/1.0/linux/linux.mk
===================================================================
--- branches/1.0/linux/linux.mk 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/linux/linux.mk 2016-11-20 18:13:08 UTC (rev 7971)
@@ -8,7 +8,7 @@
# Compute LINUX_SOURCE and LINUX_SITE from the configuration
ifeq ($(LINUX_VERSION),custom)
LINUX_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
-LINUX_SITE = $(dir $(LINUX_TARBALL))
+LINUX_SITE = $(patsubst %/,%,$(dir $(LINUX_TARBALL)))
LINUX_SOURCE = $(notdir $(LINUX_TARBALL))
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
LINUX_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL))
Modified: branches/1.0/project/astlinux/geni586/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux-smp.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/astlinux/geni586/linux-smp.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.80 Kernel Configuration
+# Linux/i386 3.2.84 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/astlinux/geni586/linux.config
===================================================================
--- branches/1.0/project/astlinux/geni586/linux.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/astlinux/geni586/linux.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.80 Kernel Configuration
+# Linux/i386 3.2.84 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp-vm.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.80 Kernel Configuration
+# Linux/x86_64 3.2.84 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
Modified: branches/1.0/project/astlinux/genx86_64/linux-smp.config
===================================================================
--- branches/1.0/project/astlinux/genx86_64/linux-smp.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/astlinux/genx86_64/linux-smp.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.80 Kernel Configuration
+# Linux/x86_64 3.2.84 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
Modified: branches/1.0/project/astlinux/kernel-patches/linux-100-unionfs-2.6_for_3.2.62.patch
===================================================================
--- branches/1.0/project/astlinux/kernel-patches/linux-100-unionfs-2.6_for_3.2.62.patch 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/astlinux/kernel-patches/linux-100-unionfs-2.6_for_3.2.62.patch 2016-11-20 18:13:08 UTC (rev 7971)
@@ -777,7 +777,7 @@
--- /dev/null
+++ b/fs/unionfs/Makefile
@@ -0,0 +1,17 @@
-+UNIONFS_VERSION="2.6 (for 3.2.62)"
++UNIONFS_VERSION="2.6 (for 3.2.84)"
+
+EXTRA_CFLAGS += -DUNIONFS_VERSION=\"$(UNIONFS_VERSION)\"
+
@@ -5852,7 +5852,7 @@
+ struct iattr lower_ia;
+
+ /* check if user has permission to change inode */
-+ err = inode_change_ok(dentry->d_inode, ia);
++ err = setattr_prepare(dentry, ia);
+ if (err)
+ goto out_err;
+
@@ -5889,7 +5889,7 @@
+ lower_inode = lower_dentry->d_inode;
+
+ /* check if user has permission to change lower inode */
-+ err = inode_change_ok(lower_inode, ia);
++ err = setattr_prepare(lower_dentry, ia);
+ if (err)
+ goto out;
+
Deleted: branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch
===================================================================
--- branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/astlinux/kernel-patches/linux-800-tcp-make-challenge-acks-less-predictable.patch 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,76 +0,0 @@
-From: Eric Dumazet <edu...@go...>
-Date: Sun, 10 Jul 2016 10:04:02 +0200
-Subject: tcp: make challenge acks less predictable
-
-commit 75ff39ccc1bd5d3c455b6822ab09e533c551f758 upstream.
-
-Yue Cao claims that current host rate limiting of challenge ACKS
-(RFC 5961) could leak enough information to allow a patient attacker
-to hijack TCP sessions. He will soon provide details in an academic
-paper.
-
-This patch increases the default limit from 100 to 1000, and adds
-some randomization so that the attacker can no longer hijack
-sessions without spending a considerable amount of probes.
-
-Based on initial analysis and patch from Linus.
-
-Note that we also have per socket rate limiting, so it is tempting
-to remove the host limit in the future.
-
-v2: randomize the count of challenge acks per second, not the period.
-
-Fixes: 282f23c6ee34 ("tcp: implement RFC 5961 3.2")
-Reported-by: Yue Cao <yc...@uc...>
-Signed-off-by: Eric Dumazet <edu...@go...>
-Suggested-by: Linus Torvalds <tor...@li...>
-Cc: Yuchung Cheng <yc...@go...>
-Cc: Neal Cardwell <nca...@go...>
-Acked-by: Neal Cardwell <nca...@go...>
-Acked-by: Yuchung Cheng <yc...@go...>
-Signed-off-by: David S. Miller <da...@da...>
-[bwh: Backported to 3.2:
- - Adjust context
- - Use ACCESS_ONCE() instead of {READ,WRITE}_ONCE()
- - Open-code prandom_u32_max()]
-Signed-off-by: Ben Hutchings <be...@de...>
----
- net/ipv4/tcp_input.c | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
---- a/net/ipv4/tcp_input.c
-+++ b/net/ipv4/tcp_input.c
-@@ -87,7 +87,7 @@ int sysctl_tcp_adv_win_scale __read_most
- EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);
-
- /* rfc5961 challenge ack rate limiting */
--int sysctl_tcp_challenge_ack_limit = 100;
-+int sysctl_tcp_challenge_ack_limit = 1000;
-
- int sysctl_tcp_stdurg __read_mostly;
- int sysctl_tcp_rfc1337 __read_mostly;
-@@ -3715,13 +3715,20 @@ static void tcp_send_challenge_ack(struc
- /* unprotected vars, we dont care of overwrites */
- static u32 challenge_timestamp;
- static unsigned int challenge_count;
-- u32 now = jiffies / HZ;
-+ u32 count, now = jiffies / HZ;
-
- if (now != challenge_timestamp) {
-+ u32 half = (sysctl_tcp_challenge_ack_limit + 1) >> 1;
-+
- challenge_timestamp = now;
-- challenge_count = 0;
-- }
-- if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
-+ ACCESS_ONCE(challenge_count) =
-+ half + (u32)(
-+ ((u64) random32() * sysctl_tcp_challenge_ack_limit)
-+ >> 32);
-+ }
-+ count = ACCESS_ONCE(challenge_count);
-+ if (count > 0) {
-+ ACCESS_ONCE(challenge_count) = count - 1;
- NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
- tcp_send_ack(sk);
- }
Deleted: branches/1.0/project/astlinux/kernel-patches/linux-810-fix-CVE-2016-5195.patch
===================================================================
--- branches/1.0/project/astlinux/kernel-patches/linux-810-fix-CVE-2016-5195.patch 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/astlinux/kernel-patches/linux-810-fix-CVE-2016-5195.patch 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,146 +0,0 @@
-From 243f858d7045b710a31c377112578387ead4dde1 Mon Sep 17 00:00:00 2001
-From: Michal Hocko <mh...@su...>
-Date: Sun, 16 Oct 2016 11:55:00 +0200
-Subject: mm, gup: close FOLL MAP_PRIVATE race
-
-commit 19be0eaffa3ac7d8eb6784ad9bdbc7d67ed8e619 upstream.
-
-faultin_page drops FOLL_WRITE after the page fault handler did the CoW
-and then we retry follow_page_mask to get our CoWed page. This is racy,
-however because the page might have been unmapped by that time and so
-we would have to do a page fault again, this time without CoW. This
-would cause the page cache corruption for FOLL_FORCE on MAP_PRIVATE
-read only mappings with obvious consequences.
-
-This is an ancient bug that was actually already fixed once by Linus
-eleven years ago in commit 4ceb5db9757a ("Fix get_user_pages() race
-for write access") but that was then undone due to problems on s390
-by commit f33ea7f404e5 ("fix get_user_pages bug") because s390 didn't
-have proper dirty pte tracking until abf09bed3cce ("s390/mm: implement
-software dirty bits"). This wasn't a problem at the time as pointed out
-by Hugh Dickins because madvise relied on mmap_sem for write up until
-0a27a14a6292 ("mm: madvise avoid exclusive mmap_sem") but since then we
-can race with madvise which can unmap the fresh COWed page or with KSM
-and corrupt the content of the shared page.
-
-This patch is based on the Linus' approach to not clear FOLL_WRITE after
-the CoW page fault (aka VM_FAULT_WRITE) but instead introduces FOLL_COW
-to note this fact. The flag is then rechecked during follow_pfn_pte to
-enforce the page fault again if we do not see the CoWed page. Linus was
-suggesting to check pte_dirty again as s390 is OK now. But that would
-make backporting to some old kernels harder. So instead let's just make
-sure that vm_normal_page sees a pure anonymous page.
-
-This would guarantee we are seeing a real CoW page. Introduce
-can_follow_write_pte which checks both pte_write and falls back to
-PageAnon on forced write faults which passed CoW already. Thanks to Hugh
-to point out that a special care has to be taken for KSM pages because
-our COWed page might have been merged with a KSM one and keep its
-PageAnon flag.
-
-Fixes: 0a27a14a6292 ("mm: madvise avoid exclusive mmap_sem")
-Reported-by: Phil "not Paul" Oester <ke...@li...>
-Disclosed-by: Andy Lutomirski <lu...@ke...>
-Signed-off-by: Linus Torvalds <tor...@li...>
-Signed-off-by: Michal Hocko <mh...@su...>
-[bwh: Backported to 3.2:
- - Adjust filename, context, indentation
- - The 'no_page' exit path in follow_page() is different, so open-code the
- cleanup
- - Delete a now-unused label]
-Signed-off-by: Ben Hutchings <be...@de...>
----
- include/linux/mm.h | 1 +
- mm/memory.c | 39 ++++++++++++++++++++++++++++-----------
- 2 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/include/linux/mm.h b/include/linux/mm.h
-index e5ee683..16394da 100644
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -1527,6 +1527,7 @@ struct page *follow_page(struct vm_area_struct *, unsigned long address,
- #define FOLL_MLOCK 0x40 /* mark page as mlocked */
- #define FOLL_SPLIT 0x80 /* don't return transhuge pages, split them */
- #define FOLL_HWPOISON 0x100 /* check page is hwpoisoned */
-+#define FOLL_COW 0x4000 /* internal GUP flag */
-
- typedef int (*pte_fn_t)(pte_t *pte, pgtable_t token, unsigned long addr,
- void *data);
-diff --git a/mm/memory.c b/mm/memory.c
-index 675b211..2917e9b 100644
---- a/mm/memory.c
-+++ b/mm/memory.c
-@@ -1427,6 +1427,24 @@ int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
- }
- EXPORT_SYMBOL_GPL(zap_vma_ptes);
-
-+static inline bool can_follow_write_pte(pte_t pte, struct page *page,
-+ unsigned int flags)
-+{
-+ if (pte_write(pte))
-+ return true;
-+
-+ /*
-+ * Make sure that we are really following CoWed page. We do not really
-+ * have to care about exclusiveness of the page because we only want
-+ * to ensure that once COWed page hasn't disappeared in the meantime
-+ * or it hasn't been merged to a KSM page.
-+ */
-+ if ((flags & FOLL_FORCE) && (flags & FOLL_COW))
-+ return page && PageAnon(page) && !PageKsm(page);
-+
-+ return false;
-+}
-+
- /**
- * follow_page - look up a page descriptor from a user-virtual address
- * @vma: vm_area_struct mapping @address
-@@ -1509,10 +1527,13 @@ split_fallthrough:
- pte = *ptep;
- if (!pte_present(pte))
- goto no_page;
-- if ((flags & FOLL_WRITE) && !pte_write(pte))
-- goto unlock;
-
- page = vm_normal_page(vma, address, pte);
-+ if ((flags & FOLL_WRITE) && !can_follow_write_pte(pte, page, flags)) {
-+ pte_unmap_unlock(ptep, ptl);
-+ return NULL;
-+ }
-+
- if (unlikely(!page)) {
- if ((flags & FOLL_DUMP) ||
- !is_zero_pfn(pte_pfn(pte)))
-@@ -1555,7 +1576,7 @@ split_fallthrough:
- unlock_page(page);
- }
- }
--unlock:
-+
- pte_unmap_unlock(ptep, ptl);
- out:
- return page;
-@@ -1789,17 +1810,13 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
- * The VM_FAULT_WRITE bit tells us that
- * do_wp_page has broken COW when necessary,
- * even if maybe_mkwrite decided not to set
-- * pte_write. We can thus safely do subsequent
-- * page lookups as if they were reads. But only
-- * do so when looping for pte_write is futile:
-- * in some cases userspace may also be wanting
-- * to write to the gotten user page, which a
-- * read fault here might prevent (a readonly
-- * page might get reCOWed by userspace write).
-+ * pte_write. We cannot simply drop FOLL_WRITE
-+ * here because the COWed page might be gone by
-+ * the time we do the subsequent page lookups.
- */
- if ((ret & VM_FAULT_WRITE) &&
- !(vma->vm_flags & VM_WRITE))
-- foll_flags &= ~FOLL_WRITE;
-+ foll_flags |= FOLL_COW;
-
- cond_resched();
- }
---
-cgit v0.12
Modified: branches/1.0/project/runnix/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix/geni586/linux.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/runnix/geni586/linux.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.80 Kernel Configuration
+# Linux/i386 3.2.84 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/project/runnix-iso/geni586/linux.config
===================================================================
--- branches/1.0/project/runnix-iso/geni586/linux.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/project/runnix-iso/geni586/linux.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.80 Kernel Configuration
+# Linux/i386 3.2.84 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/runnix-iso.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -812,7 +812,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.84.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/runnix.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -813,7 +813,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.84.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH=""
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -904,7 +904,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.84.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/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-19 21:51:06 UTC (rev 7970)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-20 18:13:08 UTC (rev 7971)
@@ -904,7 +904,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="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.80.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.84.tar.gz"
BR2_LINUX_KERNEL_VERSION="custom"
BR2_LINUX_KERNEL_PATCH="project/astlinux/kernel-patches"
# BR2_LINUX_KERNEL_USE_DEFCONFIG is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-11-25 21:19:01
|
Revision: 7984
http://sourceforge.net/p/astlinux/code/7984
Author: abelbeck
Date: 2016-11-25 21:18:59 +0000 (Fri, 25 Nov 2016)
Log Message:
-----------
Enable libcap for standard builds
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-25 19:01:06 UTC (rev 7983)
+++ branches/1.0/astlinux-ast11.config 2016-11-25 21:18:59 UTC (rev 7984)
@@ -622,7 +622,7 @@
# BR2_PACKAGE_LIBARGTABLE2 is not set
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
-# BR2_PACKAGE_LIBCAP is not set
+BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-25 19:01:06 UTC (rev 7983)
+++ branches/1.0/astlinux-ast13.config 2016-11-25 21:18:59 UTC (rev 7984)
@@ -622,7 +622,7 @@
# BR2_PACKAGE_LIBARGTABLE2 is not set
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
-# BR2_PACKAGE_LIBCAP is not set
+BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-25 19:01:06 UTC (rev 7983)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-25 21:18:59 UTC (rev 7984)
@@ -603,7 +603,7 @@
# BR2_PACKAGE_LIBARGTABLE2 is not set
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
-# BR2_PACKAGE_LIBCAP is not set
+BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-25 19:01:06 UTC (rev 7983)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-25 21:18:59 UTC (rev 7984)
@@ -603,7 +603,7 @@
# BR2_PACKAGE_LIBARGTABLE2 is not set
# BR2_PACKAGE_ARGP_STANDALONE is not set
# BR2_PACKAGE_LIBATOMIC_OPS is not set
-# BR2_PACKAGE_LIBCAP is not set
+BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBDAEMON=y
BR2_PACKAGE_LIBELF=y
# BR2_PACKAGE_LIBEVENT is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-12-01 16:09:43
|
Revision: 8003
http://sourceforge.net/p/astlinux/code/8003
Author: abelbeck
Date: 2016-12-01 16:09:41 +0000 (Thu, 01 Dec 2016)
Log Message:
-----------
chrony, new package, replaces 'ntp' as the 'ntpd' service using the chronyd daemon. Web interface tweaks to follow
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/ntp/Config.in
branches/1.0/package/openntpd/Config.in
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/chrony/
branches/1.0/package/chrony/Config.in
branches/1.0/package/chrony/chrony.mk
branches/1.0/package/chrony/ntpd.init
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/astlinux-ast11.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:27 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:30 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -691,6 +691,7 @@
BR2_PACKAGE_BRIDGE=y
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
@@ -749,23 +750,12 @@
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NGREP=y
# BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
BR2_PACKAGE_NUT=y
# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/astlinux-ast13.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:28 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:30 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -691,6 +691,7 @@
BR2_PACKAGE_BRIDGE=y
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
@@ -749,23 +750,12 @@
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NGREP=y
# BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
BR2_PACKAGE_NUT=y
# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/initrd.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:29 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:30 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -569,6 +569,7 @@
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/package/Config.in 2016-12-01 16:09:41 UTC (rev 8003)
@@ -455,6 +455,7 @@
source "package/bridge-utils/Config.in"
source "package/bwm-ng/Config.in"
source "package/can-utils/Config.in"
+source "package/chrony/Config.in"
source "package/ctorrent/Config.in"
source "package/cups/Config.in"
source "package/darkstat/Config.in"
Added: branches/1.0/package/chrony/Config.in
===================================================================
--- branches/1.0/package/chrony/Config.in (rev 0)
+++ branches/1.0/package/chrony/Config.in 2016-12-01 16:09:41 UTC (rev 8003)
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_CHRONY
+ bool "chrony"
+ select BR2_PACKAGE_LIBCAP
+ help
+ An NTP client and server designed to perform well in a wide range
+ of conditions. It can synchronize the system clock with NTP servers,
+ reference clocks, and manual input using wristwatch and keyboard.
+
+ http://chrony.tuxfamily.org/
+
Added: branches/1.0/package/chrony/chrony.mk
===================================================================
--- branches/1.0/package/chrony/chrony.mk (rev 0)
+++ branches/1.0/package/chrony/chrony.mk 2016-12-01 16:09:41 UTC (rev 8003)
@@ -0,0 +1,64 @@
+################################################################################
+#
+# chrony
+#
+################################################################################
+
+CHRONY_VERSION = 2.4.1
+CHRONY_SITE = http://download.tuxfamily.org/chrony
+CHRONY_DEPENDENCIES = libcap
+
+CHRONY_CONF_OPT = \
+ --host-system=Linux \
+ --host-release="" \
+ --host-machine=$(BR2_ARCH) \
+ --prefix=/usr \
+ --with-sendmail=/usr/sbin/sendmail \
+ --with-user=ntp \
+ --disable-ipv6 \
+ --disable-phc \
+ --without-seccomp \
+ --without-tomcrypt
+
+ifeq ($(BR2_PACKAGE_LIBNSS),y)
+CHRONY_DEPENDENCIES += host-pkgconf libnss
+else
+CHRONY_CONF_OPT += --without-nss
+endif
+
+ifeq ($(BR2_PACKAGE_READLINE),y)
+CHRONY_DEPENDENCIES += readline
+else
+CHRONY_CONF_OPT += --disable-readline
+endif
+
+# If pps-tools is available, build it before so the package can use it
+# (HAVE_SYS_TIMEPPS_H).
+ifeq ($(BR2_PACKAGE_PPS_TOOLS),y)
+CHRONY_DEPENDENCIES += pps-tools
+else
+CHRONY_CONF_OPT += --disable-pps
+endif
+
+define CHRONY_CONFIGURE_CMDS
+ cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPT)
+endef
+
+define CHRONY_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define CHRONY_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install
+ $(INSTALL) -D -m 755 package/chrony/ntpd.init $(TARGET_DIR)/etc/init.d/ntpd
+ ln -sf /tmp/etc/chrony.conf $(TARGET_DIR)/etc/chrony.conf
+endef
+
+define CHRONY_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/chronyd
+ rm -f $(TARGET_DIR)/usr/bin/chronyc
+ rm -f $(TARGET_DIR)/etc/init.d/ntpd
+ rm -f $(TARGET_DIR)/etc/chrony.conf
+endef
+
+$(eval $(call GENTARGETS,package,chrony))
Added: branches/1.0/package/chrony/ntpd.init
===================================================================
--- branches/1.0/package/chrony/ntpd.init (rev 0)
+++ branches/1.0/package/chrony/ntpd.init 2016-12-01 16:09:41 UTC (rev 8003)
@@ -0,0 +1,121 @@
+#!/bin/sh
+
+. /etc/rc.conf
+
+PIDFILE="/var/run/chronyd.pid"
+
+DATA_DIR="/var/lib/ntp"
+
+gen_chrony_config()
+{
+ local x IFS
+
+ echo "# Autogenerated. Do not edit.
+
+driftfile $DATA_DIR/chrony.drift
+
+allow
+makestep 1.0 3
+cmdport 0
+rtconutc
+rtcsync"
+
+ if [ -n "$NTPSERVS" ]; then
+ echo "
+# NTP Servers/Pools"
+ unset IFS
+ for x in $NTPSERVS; do
+ if echo "$x" | grep -q '^[a-zA-Z].*\.pool\.'; then
+ echo "pool $x iburst"
+ else
+ echo "server $x iburst"
+ fi
+ done
+ fi
+
+ if [ "$NTPBROADCAST" = "yes" ]; then
+ echo "
+# Broadcast using IPv4 Multicast address
+broadcast 50 224.0.1.1"
+ fi
+
+ echo "
+# Undisciplined Local Clock
+# When no outside source of synchronized time is available
+local stratum 5"
+}
+
+init () {
+
+ if [ ! -d $DATA_DIR ]; then
+ mkdir -m 0700 -p $DATA_DIR
+ chown ntp:ntp $DATA_DIR
+ fi
+
+ if [ -f /mnt/kd/chrony.conf ]; then
+ ln -sf /mnt/kd/chrony.conf /tmp/etc/chrony.conf
+ else
+ if [ -L /tmp/etc/chrony.conf ]; then
+ rm -f /tmp/etc/chrony.conf
+ fi
+ gen_chrony_config > /tmp/etc/chrony.conf
+ fi
+}
+
+start () {
+
+ if [ -f /etc/chrony.conf ]; then
+
+ # Set the clock (large change)
+ echo "Setting local time/date..."
+ if chronyd -q; then
+ if [ -r /dev/rtc ]; then
+ hwclock -wu --noadjfile 2>/dev/null
+ fi
+ fi
+ rm -f $PIDFILE
+ sleep 1
+
+ # Maintain the clock (small changes)
+ echo "Starting NTP Daemon (chronyd)..."
+ chronyd
+ fi
+}
+
+stop () {
+
+ if [ -f $PIDFILE ]; then
+
+ echo "Stopping NTP Daemon (chronyd)..."
+ kill $(cat $PIDFILE) >/dev/null 2>&1
+ rm -f $PIDFILE
+ fi
+}
+
+case $1 in
+
+start)
+ start
+ ;;
+
+stop)
+ stop
+ ;;
+
+init)
+ init
+ start
+ ;;
+
+restart)
+ stop
+ sleep 2
+ start
+ ;;
+
+*)
+ echo "Usage: start|stop|restart"
+ ;;
+
+esac
+
Modified: branches/1.0/package/ntp/Config.in
===================================================================
--- branches/1.0/package/ntp/Config.in 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/package/ntp/Config.in 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_NTP
bool "ntp"
+ depends on !BR2_PACKAGE_CHRONY
select BR2_PACKAGE_LIBCAP
help
Network Time Protocol suite/programs.
Modified: branches/1.0/package/openntpd/Config.in
===================================================================
--- branches/1.0/package/openntpd/Config.in 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/package/openntpd/Config.in 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_OPENNTPD
bool "OpenNTPD"
+ depends on !BR2_PACKAGE_CHRONY
help
OpenNTPD is an easy to use implementation of the Network Time
Protocol. It provides the ability to sync the local clock
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/runnix-iso.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:32 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:31 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -598,6 +598,7 @@
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/runnix.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:31 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:30 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -599,6 +599,7 @@
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:33 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:31 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -672,6 +672,7 @@
BR2_PACKAGE_BRIDGE=y
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
@@ -730,23 +731,12 @@
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NGREP=y
# BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
BR2_PACKAGE_NUT=y
# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:35 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:31 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -672,6 +672,7 @@
BR2_PACKAGE_BRIDGE=y
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+BR2_PACKAGE_CHRONY=y
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
BR2_PACKAGE_DARKSTAT=y
@@ -730,23 +731,12 @@
# BR2_PACKAGE_NGIRCD is not set
BR2_PACKAGE_NGREP=y
# BR2_PACKAGE_NMAP is not set
-BR2_PACKAGE_NTP=y
-BR2_PACKAGE_NTP_SNTP=y
-# BR2_PACKAGE_NTP_NTP_KEYGEN is not set
-# BR2_PACKAGE_NTP_NTP_WAIT is not set
-BR2_PACKAGE_NTP_NTPD=y
-# BR2_PACKAGE_NTP_NTPDATE is not set
-# BR2_PACKAGE_NTP_NTPDC is not set
-BR2_PACKAGE_NTP_NTPQ=y
-# BR2_PACKAGE_NTP_NTPTRACE is not set
-# BR2_PACKAGE_NTP_TICKADJ is not set
BR2_PACKAGE_NUT=y
# BR2_PACKAGE_NUT_SERIAL_DRIVERS is not set
# BR2_PACKAGE_NUTTCP is not set
# BR2_PACKAGE_OLSR is not set
BR2_PACKAGE_OPENLDAP=y
BR2_PACKAGE_OPENLDAP_SERVER=y
-# BR2_PACKAGE_OPENNTPD is not set
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-11-29 23:41:57 UTC (rev 8002)
+++ branches/1.0/x86_64-configs/initrd.config 2016-12-01 16:09:41 UTC (rev 8003)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn7947-dirty Configuration
-# Fri Nov 11 18:59:36 2016
+# Buildroot astlinux-1.x-svn8002-dirty Configuration
+# Thu Dec 1 09:44:31 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -550,6 +550,7 @@
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_BWM_NG is not set
# BR2_PACKAGE_CAN_UTILS is not set
+# BR2_PACKAGE_CHRONY is not set
# BR2_PACKAGE_CTORRENT is not set
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DARKSTAT is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2016-12-05 04:26:21
|
Revision: 8013
http://sourceforge.net/p/astlinux/code/8013
Author: abelbeck
Date: 2016-12-05 04:26:18 +0000 (Mon, 05 Dec 2016)
Log Message:
-----------
libedit, new package replacing the somewhat bloated readline, only used by sqlite CLI tool and chronyc, could be used by Asterisk but does not work with the latest UTF-8 enabled libedit. BR2_PACKAGE_READLINE no longer needs to be enabled with BR2_PACKAGE_LIBEDIT=y
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/package/asterisk/asterisk.mk
branches/1.0/package/chrony/chrony.mk
branches/1.0/package/sqlite/Config.in
branches/1.0/package/sqlite/sqlite.mk
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/libedit/
branches/1.0/package/libedit/Config.in
branches/1.0/package/libedit/libedit.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/astlinux-ast11.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -536,7 +536,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -639,6 +638,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -646,7 +646,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/astlinux-ast13.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -536,7 +536,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -639,6 +638,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -646,7 +646,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/initrd.config
===================================================================
--- branches/1.0/initrd.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/initrd.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -524,6 +524,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
# BR2_PACKAGE_NCURSES is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/Config.in 2016-12-05 04:26:18 UTC (rev 8013)
@@ -405,6 +405,7 @@
menu "Text and terminal handling"
source "package/enchant/Config.in"
source "package/icu/Config.in"
+source "package/libedit/Config.in"
source "package/libiconv/Config.in"
source "package/ncurses/Config.in"
source "package/newt/Config.in"
Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/asterisk/asterisk.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -52,6 +52,10 @@
ASTERISK_CONFIGURE_ARGS+= \
--without-cap
+# Asterisk does not work using system libedit with wide-char/UTF-8 support
+ASTERISK_CONFIGURE_ARGS+= \
+ --without-libedit
+
ifeq ($(strip $(BR2_PACKAGE_LIBXML2)),y)
ASTERISK_EXTRAS+=libxml2
ASTERISK_CONFIGURE_ARGS+= \
Modified: branches/1.0/package/chrony/chrony.mk
===================================================================
--- branches/1.0/package/chrony/chrony.mk 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/chrony/chrony.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -28,8 +28,12 @@
ifeq ($(BR2_PACKAGE_READLINE),y)
CHRONY_DEPENDENCIES += readline
+CHRONY_CONF_OPT += --without-editline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+CHRONY_DEPENDENCIES += libedit
+CHRONY_CONF_OPT += --without-readline
else
-CHRONY_CONF_OPT += --disable-readline
+CHRONY_CONF_OPT += --without-editline --without-readline
endif
# If pps-tools is available, build it before so the package can use it
Added: branches/1.0/package/libedit/Config.in
===================================================================
--- branches/1.0/package/libedit/Config.in (rev 0)
+++ branches/1.0/package/libedit/Config.in 2016-12-05 04:26:18 UTC (rev 8013)
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_LIBEDIT
+ bool "libedit"
+ select BR2_PACKAGE_NCURSES
+ help
+ The editline library (from BSD) provides generic line editing
+ and history functions. It slightly resembles GNU readline.
+
+ Jess Thrysoee maintains an autotoolified package, which we use
+ in Buildroot as it makes it much simpler than using the upstream
+ sources which require pmake.
+
+ http://www.thrysoee.dk/editline
+
Added: branches/1.0/package/libedit/libedit.mk
===================================================================
--- branches/1.0/package/libedit/libedit.mk (rev 0)
+++ branches/1.0/package/libedit/libedit.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -0,0 +1,21 @@
+################################################################################
+#
+# libedit
+#
+################################################################################
+
+LIBEDIT_VERSION = 20160903-3.1
+LIBEDIT_SITE = http://thrysoee.dk/editline
+LIBEDIT_INSTALL_STAGING = YES
+
+LIBEDIT_DEPENDENCIES = ncurses
+
+define LIBEDIT_INSTALL_TARGET_CMDS
+ cp -a $(STAGING_DIR)/usr/lib/libedit.so* $(TARGET_DIR)/usr/lib/
+endef
+
+define LIBEDIT_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/lib/libedit.so*
+endef
+
+$(eval $(call AUTOTARGETS,package,libedit))
Modified: branches/1.0/package/sqlite/Config.in
===================================================================
--- branches/1.0/package/sqlite/Config.in 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/sqlite/Config.in 2016-12-05 04:26:18 UTC (rev 8013)
@@ -6,11 +6,3 @@
http://www.sqlite.org/
-config BR2_PACKAGE_SQLITE_READLINE
- bool "Command-line editing"
- depends on BR2_PACKAGE_SQLITE
- select BR2_PACKAGE_NCURSES
- select BR2_PACKAGE_READLINE
- help
- Enable command-line editing. This requires ncurses and readline.
-
Modified: branches/1.0/package/sqlite/sqlite.mk
===================================================================
--- branches/1.0/package/sqlite/sqlite.mk 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/package/sqlite/sqlite.mk 2016-12-05 04:26:18 UTC (rev 8013)
@@ -18,11 +18,14 @@
--enable-threadsafe \
--localstatedir=/var
-ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
-SQLITE_DEPENDENCIES += ncurses readline
-SQLITE_CONF_OPT += --enable-readline
+ifeq ($(BR2_PACKAGE_READLINE),y)
+SQLITE_DEPENDENCIES += readline
+SQLITE_CONF_OPT += --disable-editline --enable-readline
+else ifeq ($(BR2_PACKAGE_LIBEDIT),y)
+SQLITE_DEPENDENCIES += libedit
+SQLITE_CONF_OPT += --enable-editline --disable-readline
else
-SQLITE_CONF_OPT += --disable-readline
+SQLITE_CONF_OPT += --disable-editline --disable-readline
endif
define SQLITE_UNINSTALL_TARGET_CMDS
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/runnix-iso.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -549,6 +549,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
Modified: branches/1.0/runnix.config
===================================================================
--- branches/1.0/runnix.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/runnix.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:30 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:56 2016
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -550,6 +550,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -517,7 +517,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -620,6 +619,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -627,7 +627,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -517,7 +517,6 @@
# BR2_PACKAGE_BERKELEYDB is not set
# BR2_PACKAGE_MYSQL_CLIENT is not set
BR2_PACKAGE_SQLITE=y
-BR2_PACKAGE_SQLITE_READLINE=y
BR2_PACKAGE_SQLITEODBC=y
BR2_PACKAGE_UNIXODBC=y
@@ -620,6 +619,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
@@ -627,7 +627,7 @@
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
-BR2_PACKAGE_READLINE=y
+# BR2_PACKAGE_READLINE is not set
BR2_PACKAGE_SLANG=y
#
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2016-12-04 16:09:19 UTC (rev 8012)
+++ branches/1.0/x86_64-configs/initrd.config 2016-12-05 04:26:18 UTC (rev 8013)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8002-dirty Configuration
-# Thu Dec 1 09:44:31 2016
+# Buildroot astlinux-1.x-svn8012-dirty Configuration
+# Sun Dec 4 22:03:57 2016
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -505,6 +505,7 @@
#
# BR2_PACKAGE_ENCHANT is not set
# BR2_PACKAGE_ICU is not set
+# BR2_PACKAGE_LIBEDIT is not set
# BR2_PACKAGE_NCURSES is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-02 18:25:25
|
Revision: 8062
http://sourceforge.net/p/astlinux/code/8062
Author: abelbeck
Date: 2017-01-02 18:25:22 +0000 (Mon, 02 Jan 2017)
Log Message:
-----------
openvpn, version bump to 2.4.0, major new features are AEAD (GCM) cipher and Elliptic Curve DH key exchange support. Additionally some cleanup, including removing old deprecated rc.conf variables OVPN_PUSH1-4 and OVPN_OTHER1-2
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/package/openvpn/Config.in
branches/1.0/package/openvpn/openvpn.init
branches/1.0/package/openvpn/openvpn.mk
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/astlinux-ast11.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:56 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:16 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -759,7 +759,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/astlinux-ast13.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:56 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:16 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -759,7 +759,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
Modified: branches/1.0/package/openvpn/Config.in
===================================================================
--- branches/1.0/package/openvpn/Config.in 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/package/openvpn/Config.in 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_OPENVPN
bool "openvpn"
+ select BR2_PACKAGE_OPENSSL
help
OpenVPN is a full-featured SSL VPN solution which can
accomodate a wide range of configurations, including road
@@ -8,20 +9,15 @@
remote access solutions with load balancing, failover, and
fine-grained access-controls.
- http://openvpn.sourceforge.net/
+ http://openvpn.net/
+if BR2_PACKAGE_OPENVPN
+
config BR2_PACKAGE_OPENVPN_LZO
bool "LZO compression"
default y
- depends on BR2_PACKAGE_OPENVPN
select BR2_PACKAGE_LZO
help
Enable LZO compression.
-config BR2_PACKAGE_OPENVPN_OPENSSL
- bool "OpenSSL support"
- default y
- depends on BR2_PACKAGE_OPENVPN
- select BR2_PACKAGE_OPENSSL
- help
- Enable TLS-based key exchange and OpenSSL crypto support.
+endif
Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/package/openvpn/openvpn.init 2017-01-02 18:25:22 UTC (rev 8062)
@@ -63,32 +63,12 @@
server $OVPN_SERVER${OVPN_SERVERV6:+
server-ipv6 $OVPN_SERVERV6}
verb $OVPN_VERBOSITY" > /tmp/etc/openvpn.conf
- # push settings from the server to the client
- if [ -n "$OVPN_PUSH1" ]; then
- echo "push \"$OVPN_PUSH1\"" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_PUSH2" ]; then
- echo "push \"$OVPN_PUSH2\"" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_PUSH3" ]; then
- echo "push \"$OVPN_PUSH3\"" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_PUSH4" ]; then
- echo "push \"$OVPN_PUSH4\"" >> /tmp/etc/openvpn.conf
- fi
- # Deprecate OVPN_PUSH1-4 in favor of OVPN_PUSH
+
IFS=$'\n'
for i in $OVPN_PUSH; do
echo "push \"$i\"" >> /tmp/etc/openvpn.conf
done
- if [ -n "$OVPN_OTHER1" ]; then
- echo "$OVPN_OTHER1" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_OTHER2" ]; then
- echo "$OVPN_OTHER2" >> /tmp/etc/openvpn.conf
- fi
- # Deprecate OVPN_OTHER1-2 in favor of OVPN_OTHER
IFS=$'\n'
for i in $OVPN_OTHER; do
echo "$i" >> /tmp/etc/openvpn.conf
Modified: branches/1.0/package/openvpn/openvpn.mk
===================================================================
--- branches/1.0/package/openvpn/openvpn.mk 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/package/openvpn/openvpn.mk 2017-01-02 18:25:22 UTC (rev 8062)
@@ -4,11 +4,18 @@
#
#############################################################
-OPENVPN_VERSION = 2.3.14
+OPENVPN_VERSION = 2.4.0
OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
-OPENVPN_DEPENDENCIES = host-pkg-config
-OPENVPN_CONF_OPT = --disable-plugins --enable-iproute2
-OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
+OPENVPN_DEPENDENCIES = host-pkg-config openssl
+
+OPENVPN_CONF_OPT = \
+ --disable-debug \
+ --disable-plugins \
+ --enable-iproute2 \
+ --with-crypto-library=openssl
+
+OPENVPN_CONF_ENV = \
+ IFCONFIG=/sbin/ifconfig \
NETSTAT=/bin/netstat \
ROUTE=/sbin/route
@@ -24,11 +31,6 @@
OPENVPN_CONF_OPT += --disable-lzo
endif
-ifeq ($(BR2_PACKAGE_OPENVPN_OPENSSL),y)
- OPENVPN_CONF_OPT += --with-crypto-library=openssl
- OPENVPN_DEPENDENCIES += openssl
-endif
-
define OPENVPN_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 $(@D)/src/openvpn/openvpn $(TARGET_DIR)/usr/sbin/openvpn
$(INSTALL) -m 755 -D package/openvpn/openvpn.init $(TARGET_DIR)/etc/init.d/openvpn
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:57 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:17 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -740,7 +740,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:57 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:17 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -740,7 +740,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-03 21:40:31
|
Revision: 8072
http://sourceforge.net/p/astlinux/code/8072
Author: abelbeck
Date: 2017-01-03 21:40:28 +0000 (Tue, 03 Jan 2017)
Log Message:
-----------
FOP2, version bump to 2.31.06
Modified Paths:
--------------
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2017-01-03 21:10:58 UTC (rev 8071)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2017-01-03 21:40:28 UTC (rev 8072)
@@ -3,7 +3,7 @@
# asterisk-fop2
#
#############################################################
-ASTERISK_FOP2_VERSION = 2.31.05
+ASTERISK_FOP2_VERSION = 2.31.06
ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
ASTERISK_FOP2_SITE = http://download2.fop2.com
# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2017-01-03 21:10:58 UTC (rev 8071)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2017-01-03 21:40:28 UTC (rev 8072)
@@ -248,7 +248,7 @@
if ! RAM_needed_MB 475; then
finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
fi
- SRC_URL="https://files.astlinux-project.org/fop2-2.31.05-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
+ SRC_URL="https://files.astlinux-project.org/fop2-2.31.06-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
;;
show)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-04 21:54:03
|
Revision: 8077
http://sourceforge.net/p/astlinux/code/8077
Author: abelbeck
Date: 2017-01-04 21:54:01 +0000 (Wed, 04 Jan 2017)
Log Message:
-----------
FOP2, version bump to 2.31.07
Modified Paths:
--------------
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2017-01-04 02:23:11 UTC (rev 8076)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2017-01-04 21:54:01 UTC (rev 8077)
@@ -3,7 +3,7 @@
# asterisk-fop2
#
#############################################################
-ASTERISK_FOP2_VERSION = 2.31.06
+ASTERISK_FOP2_VERSION = 2.31.07
ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
ASTERISK_FOP2_SITE = http://download2.fop2.com
# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2017-01-04 02:23:11 UTC (rev 8076)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2017-01-04 21:54:01 UTC (rev 8077)
@@ -248,7 +248,7 @@
if ! RAM_needed_MB 475; then
finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
fi
- SRC_URL="https://files.astlinux-project.org/fop2-2.31.06-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
+ SRC_URL="https://files.astlinux-project.org/fop2-2.31.07-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
;;
show)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-11 18:11:49
|
Revision: 8089
http://sourceforge.net/p/astlinux/code/8089
Author: abelbeck
Date: 2017-01-11 18:11:47 +0000 (Wed, 11 Jan 2017)
Log Message:
-----------
lighttpd, add rc.conf variable HTTPSCHAIN, path to the CA file for support of chained certificates
Modified Paths:
--------------
branches/1.0/package/lighttpd/lighttpd.conf
branches/1.0/package/lighttpd/lighttpd.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Modified: branches/1.0/package/lighttpd/lighttpd.conf
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.conf 2017-01-10 23:46:03 UTC (rev 8088)
+++ branches/1.0/package/lighttpd/lighttpd.conf 2017-01-11 18:11:47 UTC (rev 8089)
@@ -84,6 +84,7 @@
ssl.engine = "enable"
ssl.cipher-list = "aRSA+HIGH !3DES +kEDH +kRSA !kSRP !kPSK"
ssl.pemfile = "@HTTPSCERT@"
+ ssl.ca-file = "@HTTPSCHAIN@"
server.document-root = "/var/www"
accesslog.filename = "@HTTPS_ACCESSLOG@"
url.access-deny = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPSCGI@ )
@@ -101,6 +102,7 @@
@IPV6@ ssl.engine = "enable"
@IPV6@ ssl.cipher-list = "aRSA+HIGH !3DES +kEDH +kRSA !kSRP !kPSK"
@IPV6@ ssl.pemfile = "@HTTPSCERT@"
+@IPV6@ ssl.ca-file = "@HTTPSCHAIN@"
@IPV6@ server.document-root = "/var/www"
@IPV6@ accesslog.filename = "@HTTPS_ACCESSLOG@"
@IPV6@ url.access-deny = ( "~", ".inc", ".htpasswd", ".htaccess"@HTTPSCGI@ )
Modified: branches/1.0/package/lighttpd/lighttpd.init
===================================================================
--- branches/1.0/package/lighttpd/lighttpd.init 2017-01-10 23:46:03 UTC (rev 8088)
+++ branches/1.0/package/lighttpd/lighttpd.init 2017-01-11 18:11:47 UTC (rev 8089)
@@ -55,6 +55,11 @@
httpdir="/dev/null"
fi
httpscert="${HTTPSCERT:-/etc/ssl/default_https.pem}"
+ if [ -n "$HTTPSCHAIN" -a -f "$HTTPSCHAIN" ]; then
+ httpschain="$HTTPSCHAIN"
+ else
+ httpschain=""
+ fi
if [ "$HTTP_LISTING" = "no" ]; then
http_listing="disable"
else
@@ -144,6 +149,7 @@
sed -i -e "s|@HOSTNAME@|${HOSTNAME}|g" \
-e "s|@HTTPDIR@|${httpdir}|g" \
-e "s|@HTTPSCERT@|${httpscert}|g" \
+ -e "s|@HTTPSCHAIN@|${httpschain}|g" \
-e "s|@HTTP_LISTING@|${http_listing}|g" \
-e "s|@HTTPS_LISTING@|${https_listing}|g" \
-e "s|@HTTP_ACCESSLOG@|${http_accesslog}|g" \
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2017-01-10 23:46:03 UTC (rev 8088)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2017-01-11 18:11:47 UTC (rev 8089)
@@ -368,6 +368,7 @@
HTTPS_ACCESSLOG="no" # Enable access logging in /var/log/lighttpd/ssl-access.log
HTTPSCGI="yes" # Define yes|no to enable CGI
HTTPSCERT="/etc/ssl/default_https.pem" # Path to the https certificate
+HTTPSCHAIN="" # Path to the CA file for support of chained certificates
## HTTP Server
## If you set HTTPDIR, serve files from that directory.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-13 20:02:38
|
Revision: 8091
http://sourceforge.net/p/astlinux/code/8091
Author: abelbeck
Date: 2017-01-13 20:02:36 +0000 (Fri, 13 Jan 2017)
Log Message:
-----------
acme, new package, disabled, a work in progress. Thanks to David Kerr
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/package/Config.in
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Added Paths:
-----------
branches/1.0/package/acme/
branches/1.0/package/acme/Config.in
branches/1.0/package/acme/acme-client.sh
branches/1.0/package/acme/acme.mk
branches/1.0/package/acme/astlinux.sh
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2017-01-11 18:14:34 UTC (rev 8090)
+++ branches/1.0/astlinux-ast11.config 2017-01-13 20:02:36 UTC (rev 8091)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8061-dirty Configuration
-# Mon Jan 2 10:45:16 2017
+# Buildroot astlinux-1.x-svn8090-dirty Configuration
+# Fri Jan 13 13:49:22 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -517,6 +517,7 @@
#
# Crypto
#
+# BR2_PACKAGE_ACME is not set
# BR2_PACKAGE_BEECRYPT is not set
BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2017-01-11 18:14:34 UTC (rev 8090)
+++ branches/1.0/astlinux-ast13.config 2017-01-13 20:02:36 UTC (rev 8091)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8061-dirty Configuration
-# Mon Jan 2 10:45:16 2017
+# Buildroot astlinux-1.x-svn8090-dirty Configuration
+# Fri Jan 13 13:49:24 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -517,6 +517,7 @@
#
# Crypto
#
+# BR2_PACKAGE_ACME is not set
# BR2_PACKAGE_BEECRYPT is not set
BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
Modified: branches/1.0/package/Config.in
===================================================================
--- branches/1.0/package/Config.in 2017-01-11 18:14:34 UTC (rev 8090)
+++ branches/1.0/package/Config.in 2017-01-13 20:02:36 UTC (rev 8091)
@@ -286,6 +286,7 @@
endmenu
menu "Crypto"
+source "package/acme/Config.in"
source "package/beecrypt/Config.in"
source "package/ca-certificates/Config.in"
source "package/gnutls/Config.in"
Added: branches/1.0/package/acme/Config.in
===================================================================
--- branches/1.0/package/acme/Config.in (rev 0)
+++ branches/1.0/package/acme/Config.in 2017-01-13 20:02:36 UTC (rev 8091)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_ACME
+ bool "acme"
+ depends on BR2_PACKAGE_OPENSSL
+ help
+ An ACME (Automated Certificate Management Environment) protocol client
+
+ https://github.com/Neilpang/acme.sh
Added: branches/1.0/package/acme/acme-client.sh
===================================================================
--- branches/1.0/package/acme/acme-client.sh (rev 0)
+++ branches/1.0/package/acme/acme-client.sh 2017-01-13 20:02:36 UTC (rev 8091)
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+. /etc/rc.conf
+
+ACME_REPO="/stat/etc/acme"
+
+ACME_PROG="$ACME_REPO/acme.sh"
+
+ACME_WORKING_DIR="/mnt/kd/acme"
+
+export LE_WORKING_DIR="$ACME_WORKING_DIR"
+
+LOCKFILE="/var/lock/acme-client.lock"
+
+if [ ! -x "$ACME_PROG" ]; then
+ echo "acme-client: executable file \"$ACME_PROG\" not found." >&2
+ exit 1
+fi
+
+if [ ! -d "$ACME_WORKING_DIR" ]; then
+ mkdir "$ACME_WORKING_DIR"
+fi
+
+if ! cd "$ACME_WORKING_DIR"; then
+ exit 1
+fi
+
+# Robust 'bash' method of creating/testing for a lockfile
+if ! ( set -o noclobber; echo "$$" > "$LOCKFILE" ) 2>/dev/null; then
+ echo "acme-client: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")." >&2
+ exit 9
+fi
+
+gen_account_conf()
+{
+ if [ -f "$ACME_WORKING_DIR/account.static" ]; then
+ echo "# Autogenerated. Edit $ACME_WORKING_DIR/account.static file.
+"
+ cat "$ACME_WORKING_DIR/account.static"
+ return
+ fi
+
+ echo "# Autogenerated. Do not edit.
+# A manually generated acme.sh config will use $ACME_WORKING_DIR/account.static if it exists.
+"
+ echo "USER_AGENT=\"AstLinux\""
+}
+
+trap 'rm -f "$LOCKFILE"; exit $?' INT TERM EXIT
+
+gen_account_conf > "$ACME_WORKING_DIR/account.conf"
+
+$ACME_PROG "$@"
+rtn=$?
+
+rm -f "$LOCKFILE"
+trap - INT TERM EXIT
+
+exit $rtn
Property changes on: branches/1.0/package/acme/acme-client.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: branches/1.0/package/acme/acme.mk
===================================================================
--- branches/1.0/package/acme/acme.mk (rev 0)
+++ branches/1.0/package/acme/acme.mk 2017-01-13 20:02:36 UTC (rev 8091)
@@ -0,0 +1,32 @@
+################################################################################
+#
+# acme
+#
+################################################################################
+
+ACME_VERSION = 2.6.5-2017-01-13
+ACME_SOURCE = acme.sh-$(ACME_VERSION).tar.gz
+ACME_SITE = http://files.astlinux-project.org
+
+##
+## curl -L -o dl/acme.sh-2.6.5-2017-01-13.tar.gz https://github.com/Neilpang/acme.sh/archive/master.tar.gz
+## ./scripts/upload-dl-pair dl/acme.sh-2.6.5-2017-01-13.tar.gz
+##
+
+define ACME_INSTALL_TARGET_CMDS
+ $(INSTALL) -D -m 0755 package/acme/acme-client.sh $(TARGET_DIR)/usr/sbin/acme-client
+ $(INSTALL) -D -m 0755 package/acme/astlinux.sh $(TARGET_DIR)/stat/etc/acme/deploy/astlinux.sh
+ $(INSTALL) -D -m 0755 $(@D)/acme.sh $(TARGET_DIR)/stat/etc/acme/acme.sh
+ cp -a $(@D)/dnsapi $(TARGET_DIR)/stat/etc/acme/
+ find $(TARGET_DIR)/stat/etc/acme/dnsapi/ -name '*.sh' -print0 | xargs -0 chmod 755
+ # We don't enable BIND, so no nsupdate, and remove sample
+ rm -f $(TARGET_DIR)/stat/etc/acme/dnsapi/dns_nsupdate.sh
+ rm -f $(TARGET_DIR)/stat/etc/acme/dnsapi/dns_myapi.sh
+endef
+
+define ACME_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/usr/sbin/acme-client
+ rm -rf $(TARGET_DIR)/stat/etc/acme
+endef
+
+$(eval $(call GENTARGETS,package,acme))
Added: branches/1.0/package/acme/astlinux.sh
===================================================================
--- branches/1.0/package/acme/astlinux.sh (rev 0)
+++ branches/1.0/package/acme/astlinux.sh 2017-01-13 20:02:36 UTC (rev 8091)
@@ -0,0 +1,57 @@
+#!/usr/bin/env sh
+
+# acme.sh deploy script for AstLinux
+# This file name is "astlinux.sh"
+# So, here must be a method astlinux_deploy()
+# Which will be called by acme.sh to deploy the cert
+# returns 0 means success, otherwise error.
+
+. /etc/rc.conf
+
+######## Public functions #####################
+
+#domain keyfile certfile cafile fullchain
+astlinux_deploy() {
+ _cdomain="$1"
+ _ckey="$2"
+ _ccert="$3"
+ _cca="$4"
+ _cfullchain="$5"
+
+ _debug _cdomain "$_cdomain"
+ _debug _ckey "$_ckey"
+ _debug _ccert "$_ccert"
+ _debug _cca "$_cca"
+ _debug _cfullchain "$_cfullchain"
+
+ if [ -n "$HTTPSCERT" -a "$HTTPS_ACME" = "yes" ]; then
+ service lighttpd stop
+ cat "$_ckey" "$_ccert" > "$HTTPSCERT"
+ chmod 600 "$HTTPSCERT"
+ if [ -n "$HTTPSCHAIN" ]; then
+ if [ -f "$_cfullchain" ]; then
+ cat "$_cfullchain" > "$HTTPSCHAIN"
+ else
+ rm -f "$HTTPSCHAIN"
+ fi
+ fi
+ sleep 1
+ service lighttpd init
+ fi
+
+ if [ "$SIPTLSCERT_ACME" = "yes" ]; then
+# TODO. Not sure what the right files to use are. Need to test.
+# See..
+# https://web.johncook.uk/articles/computing/lets-encrypt-launch
+# https://www.jedwarddurrett.com/20160604162607.php
+
+ mkdir -p /mnt/kd/ssl/sip-tls/keys
+ cat "$_cfullchain" > /mnt/kd/ssl/sip-tls/keys/server.crt
+ cat "$_ckey" > /mnt/kd/ssl/sip-tls/keys/server.key
+ chmod 600 /mnt/kd/ssl/sip-tls/keys/server.key
+# How to tell Asterisk to reload certificate?
+# Hopefully just a reload (of just SIP or PJSIP?) and not a restart
+ fi
+
+ return 0
+}
Property changes on: branches/1.0/package/acme/astlinux.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2017-01-11 18:14:34 UTC (rev 8090)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-01-13 20:02:36 UTC (rev 8091)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8061-dirty Configuration
-# Mon Jan 2 10:45:17 2017
+# Buildroot astlinux-1.x-svn8090-dirty Configuration
+# Fri Jan 13 13:49:27 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -498,6 +498,7 @@
#
# Crypto
#
+# BR2_PACKAGE_ACME is not set
# BR2_PACKAGE_BEECRYPT is not set
BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2017-01-11 18:14:34 UTC (rev 8090)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-01-13 20:02:36 UTC (rev 8091)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8061-dirty Configuration
-# Mon Jan 2 10:45:17 2017
+# Buildroot astlinux-1.x-svn8090-dirty Configuration
+# Fri Jan 13 13:49:29 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -498,6 +498,7 @@
#
# Crypto
#
+# BR2_PACKAGE_ACME is not set
# BR2_PACKAGE_BEECRYPT is not set
BR2_PACKAGE_CA_CERTIFICATES=y
# BR2_PACKAGE_GNUTLS is not set
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-26 14:54:07
|
Revision: 8121
http://sourceforge.net/p/astlinux/code/8121
Author: abelbeck
Date: 2017-01-26 14:54:05 +0000 (Thu, 26 Jan 2017)
Log Message:
-----------
mark release 'astlinux-1.2.9'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2017-01-26 13:56:14 UTC (rev 8120)
+++ branches/1.0/docs/ChangeLog.txt 2017-01-26 14:54:05 UTC (rev 8121)
@@ -8,7 +8,7 @@
Additions for AstLinux 1.2.9:
=============================
-Released @TBD@
+Released 2017-01-26
** IMPORTANT NOTICE
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2017-01-26 13:56:14 UTC (rev 8120)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2017-01-26 14:54:05 UTC (rev 8121)
@@ -1 +1 @@
-svn
+astlinux-1.2.9
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-26 14:54:16
|
Revision: 8123
http://sourceforge.net/p/astlinux/code/8123
Author: abelbeck
Date: 2017-01-26 14:54:13 +0000 (Thu, 26 Jan 2017)
Log Message:
-----------
return to release 'svn'
Modified Paths:
--------------
branches/1.0/docs/ChangeLog.txt
branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
Modified: branches/1.0/docs/ChangeLog.txt
===================================================================
--- branches/1.0/docs/ChangeLog.txt 2017-01-26 14:54:10 UTC (rev 8122)
+++ branches/1.0/docs/ChangeLog.txt 2017-01-26 14:54:13 UTC (rev 8123)
@@ -5,6 +5,12 @@
=== docs/ChangeLog.txt
=========================================================
+Additions for AstLinux 1.2.10:
+=============================
+
+Released @TBD@
+
+
Additions for AstLinux 1.2.9:
=============================
Modified: branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2017-01-26 14:54:10 UTC (rev 8122)
+++ branches/1.0/project/astlinux/target_skeleton/etc/astlinux-release 2017-01-26 14:54:13 UTC (rev 8123)
@@ -1 +1 @@
-astlinux-1.2.9
+svn
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-29 00:14:36
|
Revision: 8131
http://sourceforge.net/p/astlinux/code/8131
Author: abelbeck
Date: 2017-01-29 00:14:33 +0000 (Sun, 29 Jan 2017)
Log Message:
-----------
ddclient, switch to ddclient-curl version 3.8.3-01. Add DDGETIPV6 rc.conf variable
Modified Paths:
--------------
branches/1.0/package/ddclient/Config.in
branches/1.0/package/ddclient/ddclient.conf
branches/1.0/package/ddclient/ddclient.mk
branches/1.0/package/ddclient/dynamicdns.init
branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
Removed Paths:
-------------
branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch
branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch
branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch
branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch
Modified: branches/1.0/package/ddclient/Config.in
===================================================================
--- branches/1.0/package/ddclient/Config.in 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/Config.in 2017-01-29 00:14:33 UTC (rev 8131)
@@ -8,5 +8,5 @@
DDclient is a Perl client used to update dynamic DNS entries for
accounts on a Dynamic DNS Network Service Provider.
- http://sourceforge.net/projects/ddclient/
+ https://github.com/astlinux-project/ddclient-curl
Deleted: branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient-01-bang-perl-cleanup.patch 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,6 +0,0 @@
---- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
-+++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
-@@ -1,3 +1,2 @@
- #!/usr/bin/perl -w
--#!/usr/local/bin/perl -w
- ######################################################################
Deleted: branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient-05-zoneedit-error-result-fix.patch 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,11 +0,0 @@
---- ddclient-3.8.3/ddclient.orig 2014-05-09 18:07:36.000000000 -0500
-+++ ddclient-3.8.3/ddclient 2014-05-09 18:04:23.000000000 -0500
-@@ -3072,7 +3072,7 @@
- $status_text = $var{'TEXT'} if exists $var{'TEXT'};
- $status_ip = $var{'IP'} if exists $var{'IP'};
-
-- if ($status eq 'SUCCESS' || ($status eq 'ERROR' && $var{'CODE'} eq '707')) {
-+ if ($status eq 'SUCCESS' || ($status eq 'ERROR' && ($var{'CODE'} eq '707' || $var{'CODE'} eq '702'))) {
- $config{$h}{'ip'} = $status_ip;
- $config{$h}{'mtime'} = $now;
- $config{$h}{'status'} = 'good';
Deleted: branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient-10-curl-ssl.patch 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,94 +0,0 @@
---- ddclient-3.8.3/ddclient.orig 2015-06-27 16:55:28.055154000 -0400
-+++ ddclient-3.8.3/ddclient 2016-02-17 19:35:16.741410191 -0500
-@@ -1916,7 +1916,7 @@
- if ( $force_ssl || ($globals{'ssl'} and (caller(1))[3] ne 'main::get_ip') ) {
- $use_ssl = 1;
- $default_port = 443;
-- load_ssl_support;
-+# load_ssl_support;
- } else {
- $use_ssl = 0;
- $default_port = 80;
-@@ -1953,58 +1953,32 @@
- debug("skipped network connection");
- verbose("SENDING:", "%s", $request);
- } elsif ($use_ssl) {
-- $sd = IO::Socket::SSL->new(
-- PeerAddr => $peer,
-- PeerPort => $port,
-- Proto => 'tcp',
-- MultiHomed => 1,
-- Timeout => opt('timeout'),
-- );
-- defined $sd or warning("cannot connect to $peer:$port socket: $@ " . IO::Socket::SSL::errstr());
-+ $0 = sprintf("%s - curl (SSL) sending to %s port %s", $program, $peer, $port);
-+ my $timeout = opt('timeout');
-+
-+ $reply = <<`CURL_SSL`;
-+/usr/bin/curl -ksi0 --user '${login}:${password}' --user-agent '${program}/${version}' \\
-+ --connect-timeout $timeout --max-time $timeout \\
-+ --url 'https://${server}/${url}' 2>/dev/null
-+CURL_SSL
-+
-+ if (! $reply) {
-+ warning("curl (SSL) cannot connect to $peer:$port");
-+ }
- } else {
-- $sd = IO::Socket::INET->new(
-- PeerAddr => $peer,
-- PeerPort => $port,
-- Proto => 'tcp',
-- MultiHomed => 1,
-- Timeout => opt('timeout'),
-- );
-- defined $sd or warning("cannot connect to $peer:$port socket: $@");
-- }
-+ $0 = sprintf("%s - curl (non-SSL) sending to %s port %s", $program, $peer, $port);
-+ my $timeout = opt('timeout');
-
-- if (defined $sd) {
-- ## send the request to the http server
-- verbose("CONNECTED: ", $use_ssl ? 'using SSL' : 'using HTTP');
-- verbose("SENDING:", "%s", $request);
--
-- $0 = sprintf("%s - sending to %s port %s", $program, $peer, $port);
-- my $result = syswrite $sd, $rq;
-- if ($result != length($rq)) {
-- warning("cannot send to $peer:$port ($!).");
-- } else {
-- $0 = sprintf("%s - reading from %s port %s", $program, $peer, $port);
-- eval {
-- local $SIG{'ALRM'} = sub { die "timeout";};
-- alarm(opt('timeout')) if opt('timeout') > 0;
-- while ($_ = <$sd>) {
-- $0 = sprintf("%s - read from %s port %s", $program, $peer, $port);
-- verbose("RECEIVE:", "%s", define($_, "<undefined>"));
-- $reply .= $_ if defined $_;
-- }
-- if (opt('timeout') > 0) {
-- alarm(0);
-- }
-- };
-- close($sd);
--
-- if ($@ and $@ =~ /timeout/) {
-- warning("TIMEOUT: %s after %s seconds", $to, opt('timeout'));
-- $reply = '';
-- }
-- $reply = '' if !defined $reply;
-- }
-- }
-- $0 = sprintf("%s - closed %s port %s", $program, $peer, $port);
-+ $reply = <<`CURL`;
-+/usr/bin/curl -si0 --user '${login}:${password}' --user-agent '${program}/${version}' \\
-+ --connect-timeout $timeout --max-time $timeout \\
-+ --url 'http://${server}/${url}' 2>/dev/null
-+CURL
-+
-+ if (! $reply) {
-+ warning("curl (non-SSL) cannot connect to $peer:$port");
-+ }
-+ }
-
- ## during testing simulate reading the URL
- if (opt('test')) {
Deleted: branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient-21-cloudflare-ttl.patch 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,23 +0,0 @@
-diff --git a/ddclient b/ddclient
-index a39fcf0..e1e86e5 100755
---- a/ddclient
-+++ b/ddclient
-@@ -445,6 +445,7 @@ my %variables = (
- 'wildcard' => setv(T_BOOL, 0, 1, 1, 0, undef),
- 'mx' => setv(T_OFQDN, 0, 1, 1, '', undef),
- 'backupmx' => setv(T_BOOL, 0, 1, 1, 0, undef),
-+ 'ttl' => setv(T_NUMBER, 1, 0, 1, 1, undef),
- },
- 'googledomains-common-defaults' => {
- 'server' => setv(T_FQDNP, 1, 0, 1, 'domains.google.com', undef),
-@@ -4083,7 +4084,8 @@ sub nic_cloudflare_update {
- }
-
- # Set domain
-- $url = "https://$config{$key}{'server'}/api_json.html?a=rec_edit&type=A&ttl=1";
-+ $url = "https://$config{$key}{'server'}/api_json.html?a=rec_edit&type=A";
-+ $url .= "&ttl=".$config{$key}{'ttl'};
- $url .= "&name=$hostname";
- $url .= "&z=".$config{$key}{'zone'};
- $url .= "&id=".$id;
-
Deleted: branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient-22-cloudflare-api-v4.patch 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,147 +0,0 @@
---- a/ddclient 2017-01-19 11:36:50.208744563 -0600
-+++ b/ddclient 2017-01-19 11:35:44.265920224 -0600
-@@ -439,7 +439,7 @@
- 'zone' => setv(T_STRING, 1, 1, 1, '', undef),
- },
- 'cloudflare-common-defaults' => {
-- 'server' => setv(T_FQDNP, 1, 0, 1, 'www.cloudflare.com', undef),
-+ 'server' => setv(T_FQDNP, 1, 0, 1, 'api.cloudflare.com/client/v4', undef),
- 'zone' => setv(T_FQDN, 1, 0, 1, '', undef),
- 'static' => setv(T_BOOL, 0, 1, 1, 0, undef),
- 'wildcard' => setv(T_BOOL, 0, 1, 1, 0, undef),
-@@ -613,7 +613,7 @@
- 'update' => \&nic_cloudflare_update,
- 'examples' => \&nic_cloudflare_examples,
- 'variables' => merge(
-- { 'server' => setv(T_FQDNP, 1, 0, 1, 'www.cloudflare.com', undef) },
-+ { 'server' => setv(T_FQDNP, 1, 0, 1, 'api.cloudflare.com/client/v4', undef) },
- { 'min-interval' => setv(T_DELAY, 0, 0, 1, interval('5m'), 0),},
- $variables{'cloudflare-common-defaults'},
- $variables{'service-common-defaults'},
-@@ -1894,6 +1894,9 @@
- my $url = shift || '';
- my $login = shift || '';
- my $password = shift || '';
-+ my $headers = shift || '';
-+ my $method = shift || 'GET';
-+ my $data = shift || '';
- my ($peer, $server, $port, $default_port, $use_ssl);
- my ($sd, $rq, $request, $reply);
-
-@@ -1934,7 +1937,7 @@
- my $to = sprintf "%s%s", $server, $proxy ? " via proxy $peer:$port" : "";
- verbose("CONNECT:", "%s", $to);
-
-- $request = "GET ";
-+ $request = "$method ";
- $request .= "http://$server" if $proxy;
- $request .= "/$url HTTP/1.0\n";
- $request .= "Host: $server\n";
-@@ -1943,7 +1946,10 @@
- $request .= "Authorization: Basic $auth\n" if $login || $password;
- $request .= "User-Agent: ${program}/${version}\n";
- $request .= "Connection: close\n";
-+ $request .= "$headers\n";
-+ $request .= "Content-Length: ".length($data)."\n" if $data;
- $request .= "\n";
-+ $request .= $data;
-
- ## make sure newlines are <cr><lf> for some pedantic proxy servers
- ($rq = $request) =~ s/\n/\r\n/g;
-@@ -4010,7 +4016,7 @@
-
- Configuration variables applicable to the 'cloudflare' protocol are:
- protocol=cloudflare ##
-- server=fqdn.of.service ## defaults to www.cloudflare.com
-+ server=fqdn.of.service ## defaults to api.cloudflare.com/client/v4
- login=service-login ## login name and password registered with the service
- password=service-password ##
- fully.qualified.host ## the host registered with the service.
-@@ -4047,6 +4053,10 @@
- my $key = $hosts[0];
- my $ip = $config{$key}{'wantip'};
-
-+ my $headers = "X-Auth-Email: $config{$key}{'login'}\n";
-+ $headers .= "X-Auth-Key: $config{$key}{'password'}\n";
-+ $headers .= "Content-Type: application/json";
-+
- # FQDNs
- for my $domain (@hosts) {
- (my $hostname = $domain) =~ s/\.$config{$key}{zone}$//;
-@@ -4055,13 +4065,11 @@
- info("setting IP address to %s for %s", $ip, $domain);
- verbose("UPDATE:","updating %s", $domain);
-
-- # Get domain ID
-- my $url = "https://$config{$key}{'server'}/api_json.html?a=rec_load_all";
-- $url .= "&z=".$config{$key}{'zone'};
-- $url .= "&email=".$config{$key}{'login'};
-- $url .= "&tkn=".$config{$key}{'password'};
-+ # Get zone ID
-+ my $url = "https://$config{$key}{'server'}/zones?";
-+ $url .= "name=".$config{$key}{'zone'};
-
-- my $reply = geturl(opt('proxy'), $url);
-+ my $reply = geturl(opt('proxy'), $url, undef, undef, $headers);
- unless ($reply) {
- failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'});
- last;
-@@ -4077,24 +4085,44 @@
- }
-
- # Pull the ID out of the json, messy
-- my ($id) = map { $_->{name} eq $domain ? $_->{rec_id} : () } @{ $response->{response}->{recs}->{objs} };
-- unless($id) {
-- failed("updating %s: No domain ID found.", $domain);
-+ my ($zone_id) = map { $_->{name} eq $config{$key}{'zone'} ? $_->{id} : () } @{ $response->{result} };
-+ unless($zone_id) {
-+ failed("updating %s: No zone ID found.", $config{$key}{'zone'});
- next;
- }
-+ info("zone ID is $zone_id");
-
-- # Set domain
-- $url = "https://$config{$key}{'server'}/api_json.html?a=rec_edit&type=A";
-- $url .= "&ttl=".$config{$key}{'ttl'};
-- $url .= "&name=$hostname";
-- $url .= "&z=".$config{$key}{'zone'};
-- $url .= "&id=".$id;
-- $url .= "&email=".$config{$key}{'login'};
-- $url .= "&tkn=".$config{$key}{'password'};
-- $url .= "&content=";
-- $url .= "$ip" if $ip;
-+ # Get DNS record ID
-+ $url = "https://$config{$key}{'server'}/zones/$zone_id/dns_records?";
-+ $url .= "type=A&name=$domain";
-+
-+ $reply = geturl(opt('proxy'), $url, undef, undef, $headers);
-+ unless ($reply) {
-+ failed("updating %s: Could not connect to %s.", $domain, $config{$key}{'server'});
-+ last;
-+ }
-+ last if !header_ok($domain, $reply);
-+
-+ # Strip header
-+ $reply =~ s/^.*?\n\n//s;
-+ $response = JSON::Any->jsonToObj($reply);
-+ if ($response->{result} eq 'error') {
-+ failed ("%s", $response->{msg});
-+ next;
-+ }
-
-- $reply = geturl(opt('proxy'), $url);
-+ # Pull the ID out of the json, messy
-+ my ($dns_rec_id) = map { $_->{name} eq $domain ? $_->{id} : () } @{ $response->{result} };
-+ unless($dns_rec_id) {
-+ failed("updating %s: No DNS record ID found.", $domain);
-+ next;
-+ }
-+ info("DNS record ID is $dns_rec_id");
-+
-+ # Set domain
-+ $url = "https://$config{$key}{'server'}/zones/$zone_id/dns_records/$dns_rec_id";
-+ my $data = "{\"content\":\"$ip\"}";
-+ $reply = geturl(opt('proxy'), $url, undef, undef, $headers, "PATCH", $data);
- unless ($reply) {
- failed("updating %s: Could not connect to %s.", $domain, $config{$domain}{'server'});
- last;
Deleted: branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient-23-cloudflare-curl-headers.patch 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,29 +0,0 @@
---- a/ddclient
-+++ b/ddclient
-@@ -1959,6 +1959,26 @@
- if (! opt('exec')) {
- debug("skipped network connection");
- verbose("SENDING:", "%s", $request);
-+ } elsif (($headers ne '')) {
-+ $0 = sprintf("%s - curl (SSL w/headers) sending to %s port %s", $program, $peer, $port);
-+ my $timeout = opt('timeout');
-+ my @head_lines = split('\n', $headers);
-+ my $head_args = '';
-+ foreach my $head_line (@head_lines) {
-+ $head_args .= "-H '$head_line' ";
-+ }
-+
-+ $reply = <<`CURL_SSL_HEADERS`;
-+/usr/bin/curl -si0 -X $method --user-agent '${program}/${version}' \\
-+ --connect-timeout $timeout --max-time $timeout \\
-+ ${head_args} \\
-+ --data '${data}' \\
-+ --url 'https://${server}/${url}' 2>/dev/null
-+CURL_SSL_HEADERS
-+
-+ if (! $reply) {
-+ warning("curl (SSL w/headers) cannot connect to $peer:$port");
-+ }
- } elsif ($use_ssl) {
- $0 = sprintf("%s - curl (SSL) sending to %s port %s", $program, $peer, $port);
- my $timeout = opt('timeout');
Deleted: branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch
===================================================================
--- branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient-24-cloudflare-JSON-PP.patch 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,58 +0,0 @@
---- a/ddclient 2017-01-20 09:04:33.026792149 -0600
-+++ b/ddclient 2017-01-20 09:06:01.478773577 -0600
-@@ -1878,13 +1878,13 @@
- ## load_json_support
- ######################################################################
- sub load_json_support {
-- my $json_loaded = eval {require JSON::Any};
-+ my $json_loaded = eval {require JSON::PP};
- unless ($json_loaded) {
- fatal(<<"EOM");
--Error loading the Perl module JSON::Any needed for cloudflare update.
-+Error loading the Perl module JSON::PP needed for cloudflare update.
- EOM
- }
-- import JSON::Any;
-+ import JSON::PP (qw/decode_json/);
- }
- ######################################################################
- ## geturl
-@@ -4098,9 +4098,9 @@
-
- # Strip header
- $reply =~ s/^.*?\n\n//s;
-- my $response = JSON::Any->jsonToObj($reply);
-- if ($response->{result} eq 'error') {
-- failed ("%s", $response->{msg});
-+ my $response = eval {decode_json($reply)};
-+ if (!defined $response || !defined $response->{result}) {
-+ failed ("invalid json or result.");
- next;
- }
-
-@@ -4125,9 +4125,9 @@
-
- # Strip header
- $reply =~ s/^.*?\n\n//s;
-- $response = JSON::Any->jsonToObj($reply);
-- if ($response->{result} eq 'error') {
-- failed ("%s", $response->{msg});
-+ $response = eval {decode_json($reply)};
-+ if (!defined $response || !defined $response->{result}) {
-+ failed ("invalid json or result.");
- next;
- }
-
-@@ -4151,9 +4151,9 @@
-
- # Strip header
- $reply =~ s/^.*?\n\n//s;
-- $response = JSON::Any->jsonToObj($reply);
-- if ($response->{result} eq 'error') {
-- failed ("%s", $response->{msg});
-+ $response = eval {decode_json($reply)};
-+ if (!defined $response || !defined $response->{result}) {
-+ failed ("invalid json or result.");
- } else {
- success ("%s -- Updated Successfully to %s", $domain, $ip);
-
Modified: branches/1.0/package/ddclient/ddclient.conf
===================================================================
--- branches/1.0/package/ddclient/ddclient.conf 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient.conf 2017-01-29 00:14:33 UTC (rev 8131)
@@ -1,6 +1,8 @@
daemon=@DELAY@
@USE_WEB@use=web, web=@WEB_STR@
@USE_IF@use=if, if=@EXTIF@
+@USEV6_WEB@usev6=web, webv6=@WEBV6_STR@
+@USEV6_IF@usev6=if, if=@EXTIF@
#@zoneedit@>
#@zoneedit@>## ZoneEdit
#@zoneedit@>ssl=yes
@@ -121,4 +123,11 @@
#@cloudflare@>login=@DDUSER@
#@cloudflare@>password=@DDPASS@
#@cloudflare@>@DDHOST@
+#@he@>
+#@he@>## Hurricane Electric
+#@he@>ssl=yes
+#@he@>protocol=he
+#@he@>login=@DDUSER@
+#@he@>password=@DDPASS@
+#@he@>@DDHOST@
Modified: branches/1.0/package/ddclient/ddclient.mk
===================================================================
--- branches/1.0/package/ddclient/ddclient.mk 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/ddclient.mk 2017-01-29 00:14:33 UTC (rev 8131)
@@ -3,9 +3,9 @@
# ddclient
#
#############################################################
-DDCLIENT_VERSION = 3.8.3
-DDCLIENT_SOURCE = ddclient-$(DDCLIENT_VERSION).tar.gz
-DDCLIENT_SITE = http://downloads.sourceforge.net/project/ddclient/ddclient/ddclient-$(DDCLIENT_VERSION)
+DDCLIENT_VERSION = 3.8.3-01
+DDCLIENT_SOURCE = ddclient-curl-$(DDCLIENT_VERSION).tar.gz
+DDCLIENT_SITE = https://github.com/astlinux-project/ddclient-curl/releases/download/$(DDCLIENT_VERSION)
define DDCLIENT_INSTALL_TARGET_CMDS
$(INSTALL) -m 0755 -D package/ddclient/dynamicdns.init $(TARGET_DIR)/etc/init.d/dynamicdns
Modified: branches/1.0/package/ddclient/dynamicdns.init
===================================================================
--- branches/1.0/package/ddclient/dynamicdns.init 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/package/ddclient/dynamicdns.init 2017-01-29 00:14:33 UTC (rev 8131)
@@ -4,7 +4,8 @@
gen_ddclient_conf()
{
- local use_web="" use_if="#" web_str delay domain service
+ local use_web="#" use_if="#" web_str delay domain service
+ local usev6_web="#" usev6_if="#" webv6_str
if [ ! -x /usr/sbin/ddclient ]; then
echo "dynamicdns: Script \"/usr/sbin/ddclient\" not found, exiting." >&2
@@ -14,18 +15,38 @@
delay="360"
if [ -z "$DDGETIP" -o "$DDGETIP" = "getip.krisk.org" ]; then
+ use_web=""
web_str="myip.dnsomatic.com/"
elif [ "$DDGETIP" = "interface" ]; then
- use_web="#"
use_if=""
- web_str="$DDGETIP/"
+ web_str=""
delay="120"
elif [ "$DDGETIP" = "checkip.dyndns.org" -o "$DDGETIP" = "checkip.dyndns.com" ]; then
+ use_web=""
web_str="$DDGETIP/, web-skip='IP Address'"
else
- web_str="$DDGETIP/"
+ use_web=""
+ case "$DDGETIP" in
+ dyndns|dnspark|he|whatismyv6|nsupdate.info) # builtinweb entries
+ web_str="$DDGETIP" ;;
+ *) web_str="$DDGETIP/" ;;
+ esac
fi
+ if [ -z "$DDGETIPV6" -o "$DDGETIPV6" = "no" ]; then
+ webv6_str=""
+ elif [ "$DDGETIPV6" = "interface" ]; then
+ usev6_if=""
+ webv6_str=""
+ else
+ usev6_web=""
+ case "$DDGETIPV6" in
+ dyndns|dnspark|he|whatismyv6|nsupdate.info) # builtinweb entries
+ webv6_str="$DDGETIPV6" ;;
+ *) webv6_str="$DDGETIPV6/" ;;
+ esac
+ fi
+
# extract the root domain of DDHOST, used by some providers like Cloudflare
domain="$(echo $DDHOST | sed -n -r -e 's/^(.*\.|)([^.]+)\.([^.]+)$/\2.\3/p')"
@@ -71,6 +92,9 @@
-e "s|@USE_WEB@|${use_web}|g" \
-e "s|@USE_IF@|${use_if}|g" \
-e "s|@WEB_STR@|${web_str}|g" \
+ -e "s|@USEV6_WEB@|${usev6_web}|g" \
+ -e "s|@USEV6_IF@|${usev6_if}|g" \
+ -e "s|@WEBV6_STR@|${webv6_str}|g" \
/tmp/etc/ddclient.conf
chmod 600 /tmp/etc/ddclient.conf
Modified: branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2017-01-28 20:26:14 UTC (rev 8130)
+++ branches/1.0/project/astlinux/target_skeleton/stat/etc/rc.conf 2017-01-29 00:14:33 UTC (rev 8131)
@@ -211,10 +211,15 @@
#DDUSER=
#DDPASS=
#DDHOST=
-## If DDGETIP is not defined, myip.dnsomatic.com is queried to determine the public IP address.
-## If DDGETIP is set to "interface", the IP address of the interface EXTIF will be used.
-## Else, DDGETIP can be set to any web server that returns your public IP address.
+## If DDGETIP is not defined, myip.dnsomatic.com is queried to determine the public IPv4 address.
+## If DDGETIP is set to "interface", the IPv4 address of the interface EXTIF will be used.
+## Else, DDGETIP can be set to any web server that returns your public IPv4 address.
#DDGETIP="interface"
+## If DDGETIPV6="no" or is not defined, IPv6 dynamic DNS will not be enabled.
+## If DDGETIPV6 is set to "interface", the IPv6 address of the interface EXTIF will be used.
+## Else, DDGETIPV6 can be set to any web server that returns your public IPv6 address.
+## Note: Not all DDSERVICE types support both IPv4 and IPv6
+#DDGETIPV6="interface"
## IPv6 Support
## AstLinux supports IPv6 but the kernel autoloader is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-01-29 22:00:22
|
Revision: 8136
http://sourceforge.net/p/astlinux/code/8136
Author: abelbeck
Date: 2017-01-29 22:00:20 +0000 (Sun, 29 Jan 2017)
Log Message:
-----------
sngrep, new package, enabled by default it is so cool
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/initrd.config
branches/1.0/package/Config.in
branches/1.0/runnix-iso.config
branches/1.0/runnix.config
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
branches/1.0/x86_64-configs/initrd.config
Added Paths:
-----------
branches/1.0/package/sngrep/
branches/1.0/package/sngrep/Config.in
branches/1.0/package/sngrep/sngrep.mk
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/astlinux-ast11.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8090-dirty Configuration
-# Fri Jan 13 13:49:22 2017
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:19 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -641,9 +641,9 @@
# BR2_PACKAGE_ICU is not set
BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
+BR2_PACKAGE_NCURSES_TARGET_PANEL=y
+BR2_PACKAGE_NCURSES_TARGET_FORM=y
+BR2_PACKAGE_NCURSES_TARGET_MENU=y
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
@@ -777,6 +777,7 @@
BR2_PACKAGE_SHELLINABOX=y
BR2_PACKAGE_SIPGREP=y
BR2_PACKAGE_SIPSAK=y
+BR2_PACKAGE_SNGREP=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/astlinux-ast13.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8090-dirty Configuration
-# Fri Jan 13 13:49:24 2017
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:21 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -641,9 +641,9 @@
# BR2_PACKAGE_ICU is not set
BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
+BR2_PACKAGE_NCURSES_TARGET_PANEL=y
+BR2_PACKAGE_NCURSES_TARGET_FORM=y
+BR2_PACKAGE_NCURSES_TARGET_MENU=y
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
@@ -777,6 +777,7 @@
BR2_PACKAGE_SHELLINABOX=y
BR2_PACKAGE_SIPGREP=y
BR2_PACKAGE_SIPSAK=y
+BR2_PACKAGE_SNGREP=y
# 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 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/initrd.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:56 2016
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:23 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -636,6 +636,7 @@
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SIPSAK is not set
+# BR2_PACKAGE_SNGREP 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 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/package/Config.in 2017-01-29 22:00:20 UTC (rev 8136)
@@ -534,6 +534,7 @@
source "package/shellinabox/Config.in"
source "package/sipgrep/Config.in"
source "package/sipsak/Config.in"
+source "package/sngrep/Config.in"
source "package/socat/Config.in"
source "package/spawn-fcgi/Config.in"
source "package/squid/Config.in"
Added: branches/1.0/package/sngrep/Config.in
===================================================================
--- branches/1.0/package/sngrep/Config.in (rev 0)
+++ branches/1.0/package/sngrep/Config.in 2017-01-29 22:00:20 UTC (rev 8136)
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_SNGREP
+ bool "sngrep"
+ depends on BR2_TOOLCHAIN_HAS_THREADS
+ select BR2_PACKAGE_NCURSES
+ select BR2_PACKAGE_NCURSES_TARGET_PANEL
+ select BR2_PACKAGE_NCURSES_TARGET_FORM
+ select BR2_PACKAGE_NCURSES_TARGET_MENU
+ select BR2_PACKAGE_LIBPCAP
+ help
+ sngrep is a tool for displaying SIP calls message flows from
+ terminal. It supports live capture to display realtime SIP
+ packets and can also be used as PCAP viewer.
+
+ https://github.com/irontec/sngrep
+
+comment "sngrep needs a toolchain w/ threads"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS
+
Added: branches/1.0/package/sngrep/sngrep.mk
===================================================================
--- branches/1.0/package/sngrep/sngrep.mk (rev 0)
+++ branches/1.0/package/sngrep/sngrep.mk 2017-01-29 22:00:20 UTC (rev 8136)
@@ -0,0 +1,37 @@
+################################################################################
+#
+# sngrep
+#
+################################################################################
+
+SNGREP_VERSION = 1.4.2
+SNGREP_SOURCE = sngrep-$(SNGREP_VERSION).tar.gz
+SNGREP_SITE = http://files.astlinux-project.org
+#SNGREP_SITE = https://github.com/irontec/sngrep/releases
+SNGREP_AUTORECONF = YES
+SNGREP_DEPENDENCIES = libpcap ncurses
+
+SNGREP_CONF_OPT = \
+ --disable-unicode \
+ --enable-ipv6
+
+# openssl and gnutls can't be enabled at the same time.
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+SNGREP_DEPENDENCIES += openssl
+SNGREP_CONF_OPT += --with-openssl --without-gnutls
+# gnutls support also requires libgcrypt
+else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy)
+SNGREP_DEPENDENCIES += gnutls
+SNGREP_CONF_OPT += --with-gnutls --without-openssl
+else
+SNGREP_CONF_OPT += --without-gnutls --without-openssl
+endif
+
+ifeq ($(BR2_PACKAGE_PCRE),y)
+SNGREP_DEPENDENCIES += pcre
+SNGREP_CONF_OPT += --with-pcre
+else
+SNGREP_CONF_OPT += --without-pcre
+endif
+
+$(eval $(call AUTOTARGETS,package,sngrep))
Modified: branches/1.0/runnix-iso.config
===================================================================
--- branches/1.0/runnix-iso.config 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/runnix-iso.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:57 2016
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:25 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -672,6 +672,7 @@
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SIPSAK is not set
+# BR2_PACKAGE_SNGREP 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/runnix.config
===================================================================
--- branches/1.0/runnix.config 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/runnix.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:56 2016
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:24 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -673,6 +673,7 @@
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SIPSAK is not set
+# BR2_PACKAGE_SNGREP 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/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8090-dirty Configuration
-# Fri Jan 13 13:49:27 2017
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:29 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -622,9 +622,9 @@
# BR2_PACKAGE_ICU is not set
BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
+BR2_PACKAGE_NCURSES_TARGET_PANEL=y
+BR2_PACKAGE_NCURSES_TARGET_FORM=y
+BR2_PACKAGE_NCURSES_TARGET_MENU=y
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
@@ -758,6 +758,7 @@
BR2_PACKAGE_SHELLINABOX=y
BR2_PACKAGE_SIPGREP=y
BR2_PACKAGE_SIPSAK=y
+BR2_PACKAGE_SNGREP=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8090-dirty Configuration
-# Fri Jan 13 13:49:29 2017
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:31 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -622,9 +622,9 @@
# BR2_PACKAGE_ICU is not set
BR2_PACKAGE_LIBEDIT=y
BR2_PACKAGE_NCURSES=y
-# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
-# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
-# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
+BR2_PACKAGE_NCURSES_TARGET_PANEL=y
+BR2_PACKAGE_NCURSES_TARGET_FORM=y
+BR2_PACKAGE_NCURSES_TARGET_MENU=y
BR2_PACKAGE_NEWT=y
BR2_PACKAGE_PCRE=y
BR2_PACKAGE_POPT=y
@@ -758,6 +758,7 @@
BR2_PACKAGE_SHELLINABOX=y
BR2_PACKAGE_SIPGREP=y
BR2_PACKAGE_SIPSAK=y
+BR2_PACKAGE_SNGREP=y
# BR2_PACKAGE_SOCAT is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SQUID is not set
Modified: branches/1.0/x86_64-configs/initrd.config
===================================================================
--- branches/1.0/x86_64-configs/initrd.config 2017-01-29 19:55:55 UTC (rev 8135)
+++ branches/1.0/x86_64-configs/initrd.config 2017-01-29 22:00:20 UTC (rev 8136)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:57 2016
+# Buildroot astlinux-1.x-svn8135-dirty Configuration
+# Sun Jan 29 15:52:32 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -617,6 +617,7 @@
# BR2_PACKAGE_SER2NET is not set
# BR2_PACKAGE_SIPGREP is not set
# BR2_PACKAGE_SIPSAK is not set
+# BR2_PACKAGE_SNGREP 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...> - 2017-03-13 15:40:09
|
Revision: 8211
http://sourceforge.net/p/astlinux/code/8211
Author: abelbeck
Date: 2017-03-13 15:40:07 +0000 (Mon, 13 Mar 2017)
Log Message:
-----------
fop2, version bump to 2.31.08
Modified Paths:
--------------
branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
Modified: branches/1.0/package/asterisk-fop2/asterisk-fop2.mk
===================================================================
--- branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2017-03-13 15:05:18 UTC (rev 8210)
+++ branches/1.0/package/asterisk-fop2/asterisk-fop2.mk 2017-03-13 15:40:07 UTC (rev 8211)
@@ -3,7 +3,7 @@
# asterisk-fop2
#
#############################################################
-ASTERISK_FOP2_VERSION = 2.31.07
+ASTERISK_FOP2_VERSION = 2.31.08
ASTERISK_FOP2_SOURCE = fop2-$(ASTERISK_FOP2_VERSION)-debian-i386.tgz
ASTERISK_FOP2_SITE = http://download2.fop2.com
# Note: be sure to edit "project/astlinux/target_skeleton/usr/sbin/upgrade-package" on version change
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2017-03-13 15:05:18 UTC (rev 8210)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/upgrade-package 2017-03-13 15:40:07 UTC (rev 8211)
@@ -248,7 +248,7 @@
if ! RAM_needed_MB 475; then
finish $RED "Not enough RAM installed. Minimum: 512 MB, Recommended: 1024+ MB"
fi
- SRC_URL="https://files.astlinux-project.org/fop2-2.31.07-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
+ SRC_URL="https://files.astlinux-project.org/fop2-2.31.08-debian-$(uname -m | sed -e 's/i.86/i386/').tgz"
;;
show)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <abe...@us...> - 2017-03-15 23:50:21
|
Revision: 8214
http://sourceforge.net/p/astlinux/code/8214
Author: abelbeck
Date: 2017-03-15 23:50:19 +0000 (Wed, 15 Mar 2017)
Log Message:
-----------
background scripts, implement bash loadable 'sleep' builtin from r8213
Modified Paths:
--------------
branches/1.0/package/arnofw/adaptive-ban/adaptive-ban-helper.sh
branches/1.0/package/arnofw/dyndns-host-open/dyndns-host-open-helper.sh
branches/1.0/package/arnofw/dyndns-ipv6-forward/dyndns-ipv6-forward-helper.sh
branches/1.0/package/arnofw/dyndns-ipv6-open/dyndns-ipv6-open-helper.sh
branches/1.0/package/asterisk/asterisk-sip-monitor
branches/1.0/package/msmtp/msmtpqueue.sh
branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
Modified: branches/1.0/package/arnofw/adaptive-ban/adaptive-ban-helper.sh
===================================================================
--- branches/1.0/package/arnofw/adaptive-ban/adaptive-ban-helper.sh 2017-03-15 22:40:18 UTC (rev 8213)
+++ branches/1.0/package/arnofw/adaptive-ban/adaptive-ban-helper.sh 2017-03-15 23:50:19 UTC (rev 8214)
@@ -18,7 +18,12 @@
echo "adaptive-ban-helper: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")."
return 9
fi
-
+
+ # Load 'sleep' builtin if it exists
+ if [ -f /usr/lib/bash/sleep ]; then
+ enable -f /usr/lib/bash/sleep sleep
+ fi
+
trap 'rm -f "$LOCKFILE" "$ARGSFILE" "$TEMPFILE"; exit $?' INT TERM EXIT
echo "$ARGS" > "$ARGSFILE"
Modified: branches/1.0/package/arnofw/dyndns-host-open/dyndns-host-open-helper.sh
===================================================================
--- branches/1.0/package/arnofw/dyndns-host-open/dyndns-host-open-helper.sh 2017-03-15 22:40:18 UTC (rev 8213)
+++ branches/1.0/package/arnofw/dyndns-host-open/dyndns-host-open-helper.sh 2017-03-15 23:50:19 UTC (rev 8214)
@@ -16,7 +16,12 @@
echo "dyndns-host-open-helper: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")."
return 9
fi
-
+
+ # Load 'sleep' builtin if it exists
+ if [ -f /usr/lib/bash/sleep ]; then
+ enable -f /usr/lib/bash/sleep sleep
+ fi
+
trap 'rm -f "$LOCKFILE" "$ARGSFILE"; exit $?' INT TERM EXIT
echo "$ARGS" > "$ARGSFILE"
Modified: branches/1.0/package/arnofw/dyndns-ipv6-forward/dyndns-ipv6-forward-helper.sh
===================================================================
--- branches/1.0/package/arnofw/dyndns-ipv6-forward/dyndns-ipv6-forward-helper.sh 2017-03-15 22:40:18 UTC (rev 8213)
+++ branches/1.0/package/arnofw/dyndns-ipv6-forward/dyndns-ipv6-forward-helper.sh 2017-03-15 23:50:19 UTC (rev 8214)
@@ -16,7 +16,12 @@
echo "dyndns-ipv6-forward-helper: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")."
return 9
fi
-
+
+ # Load 'sleep' builtin if it exists
+ if [ -f /usr/lib/bash/sleep ]; then
+ enable -f /usr/lib/bash/sleep sleep
+ fi
+
trap 'rm -f "$LOCKFILE" "$ARGSFILE"; exit $?' INT TERM EXIT
echo "$ARGS" > "$ARGSFILE"
Modified: branches/1.0/package/arnofw/dyndns-ipv6-open/dyndns-ipv6-open-helper.sh
===================================================================
--- branches/1.0/package/arnofw/dyndns-ipv6-open/dyndns-ipv6-open-helper.sh 2017-03-15 22:40:18 UTC (rev 8213)
+++ branches/1.0/package/arnofw/dyndns-ipv6-open/dyndns-ipv6-open-helper.sh 2017-03-15 23:50:19 UTC (rev 8214)
@@ -16,7 +16,12 @@
echo "dyndns-ipv6-open-helper: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")."
return 9
fi
-
+
+ # Load 'sleep' builtin if it exists
+ if [ -f /usr/lib/bash/sleep ]; then
+ enable -f /usr/lib/bash/sleep sleep
+ fi
+
trap 'rm -f "$LOCKFILE" "$ARGSFILE"; exit $?' INT TERM EXIT
echo "$ARGS" > "$ARGSFILE"
Modified: branches/1.0/package/asterisk/asterisk-sip-monitor
===================================================================
--- branches/1.0/package/asterisk/asterisk-sip-monitor 2017-03-15 22:40:18 UTC (rev 8213)
+++ branches/1.0/package/asterisk/asterisk-sip-monitor 2017-03-15 23:50:19 UTC (rev 8214)
@@ -62,7 +62,12 @@
echo "asterisk-sip-monitor: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")."
return 9
fi
-
+
+ # Load 'sleep' builtin if it exists
+ if [ -f /usr/lib/bash/sleep ]; then
+ enable -f /usr/lib/bash/sleep sleep
+ fi
+
trap 'rm -f "$LOCKFILE" "$PIDFILE"; exit $?' INT TERM EXIT
echo "$BASHPID" > "$PIDFILE"
Modified: branches/1.0/package/msmtp/msmtpqueue.sh
===================================================================
--- branches/1.0/package/msmtp/msmtpqueue.sh 2017-03-15 22:40:18 UTC (rev 8213)
+++ branches/1.0/package/msmtp/msmtpqueue.sh 2017-03-15 23:50:19 UTC (rev 8214)
@@ -25,7 +25,12 @@
echo "msmtpqueue: already running, lockfile \"$LOCKFILE\" exists, process id: $(cat "$LOCKFILE")."
return 9
fi
-
+
+ # Load 'sleep' builtin if it exists
+ if [ -f /usr/lib/bash/sleep ]; then
+ enable -f /usr/lib/bash/sleep sleep
+ fi
+
trap 'rm -f "$LOCKFILE"; exit $?' INT TERM EXIT
while true; do
Modified: branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover 2017-03-15 22:40:18 UTC (rev 8213)
+++ branches/1.0/project/astlinux/target_skeleton/usr/sbin/wan-failover 2017-03-15 23:50:19 UTC (rev 8214)
@@ -331,6 +331,11 @@
return 9
fi
+ # Load 'sleep' builtin if it exists
+ if [ -f /usr/lib/bash/sleep ]; then
+ enable -f /usr/lib/bash/sleep sleep
+ fi
+
trap 'test_switch' HUP
trap 'remove_target_static_routes; rm -f "$LOCKFILE" "$PIDFILE"; exit $?' INT TERM EXIT
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