09.2015 sync

Author: zyxmon

buildroot/.config

@@ -23,13 +23,3 @@
  	INTL_FULL:=
  endif
 
-@@ -28,7 +28,8 @@
- ICONV_DEPENDS:=+BUILD_NLS:libiconv-full
- ICONV_CFLAGS:=-I$(ICONV_PREFIX)/include
- ICONV_CPPFLAGS:=-I$(ICONV_PREFIX)/include
--ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib
-+ICONV_LDFLAGS:=-L$(ICONV_PREFIX)/lib \
-+	-Wl,-rpath-link=$(ICONV_PREFIX)/lib
- 
- INTL_DEPENDS:=+BUILD_NLS:libintl-full
- INTL_CFLAGS:=-I$(INTL_PREFIX)/include

buildroot/patches/nls.patch

@@ -1,6 +1,6 @@
 --- ../../../downloads/openwrt_trunk-r46338/toolchain/gcc/Config.in	2015-07-15 10:59:19.183750194 +0300
 +++ ../../../openwrt_trunk/toolchain/gcc/Config.in	2015-07-15 14:23:28.855958828 +0300
-@@ -43,7 +43,7 @@
+@@ -42,7 +42,7 @@
  	bool
  	prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
  	depends on !USE_MUSL

buildroot/patches/toolchain-gcc-Config.patch

@@ -5,7 +5,7 @@
 # See /LICENSE for more information.
 #
 
-export OPENWRT_REVISION=46338
+export OPENWRT_REVISION=47008
 
 # Target architecture for repo (now only x86 is supported)
 #export TARGET=x86

config.mk

@@ -1,9 +1,9 @@
---- ../../../downloads/openwrt_trunk-r43718/feeds/packages/libs/alsa-lib/Makefile
-+++ ../../../openwrt_trunk/feeds/packages/libs/alsa-lib/Makefile
+--- ../../../downloads/openwrt_trunk-r46940/feeds/packages/libs/alsa-lib/Makefile	2015-09-15 12:24:40.722451661 +0300
++++ ../../../openwrt_trunk/feeds/packages/libs/alsa-lib/Makefile	2015-09-21 09:36:32.170911966 +0300
 @@ -33,7 +33,7 @@
+   CATEGORY:=Libraries
    TITLE:=ALSA (Advanced Linux Sound Architecture) library
    URL:=http://www.alsa-project.org/
-   MAINTAINER:=Peter Wagner <[email protected]>
 -  DEPENDS:=@AUDIO_SUPPORT +kmod-sound-core +libpthread +librt
 +  DEPENDS:=+libpthread +librt
  endef

packages/alsa-lib/fix-path.patch

@@ -1,14 +1,5 @@
 --- ../../../downloads/openwrt_trunk-r45513/feeds/packages/net/apache/Makefile	2015-04-21 10:37:38.212588033 +0300
 +++ ../../../openwrt_trunk/feeds/packages/net/apache/Makefile	2015-04-22 17:08:02.278600089 +0300
-@@ -9,7 +9,7 @@
- 
- PKG_NAME:=apache
- PKG_VERSION:=2.2.29
--PKG_RELEASE:=1
-+PKG_RELEASE:=1b
- PKG_SOURCE_NAME:=httpd
- PKG_MAINTAINER:=Thomas Heil <[email protected]>
- PKG_LICENSE:=Apache License
 @@ -48,33 +48,23 @@
  $(call Package/apache/Default/description)
   .

packages/apache/fix-path.patch

@@ -1,5 +1,5 @@
---- ../../../downloads/openwrt_trunk-r46338/feeds/telephony/net/asterisk-1.8.x/Makefile	2015-07-14 10:55:19.886308175 +0300
-+++ ../../../openwrt_trunk/feeds/telephony/net/asterisk-1.8.x/Makefile	2015-07-14 17:47:12.742719266 +0300
+--- ../../../downloads/openwrt_trunk-r46940/feeds/telephony/net/asterisk-1.8.x/Makefile	2015-09-15 12:24:40.666451660 +0300
++++ ../../../openwrt_trunk/feeds/telephony/net/asterisk-1.8.x/Makefile	2015-09-21 09:45:17.014920702 +0300
 @@ -25,28 +25,28 @@
  include $(INCLUDE_DIR)/package.mk
 
@@ -94,13 +94,13 @@
 +	rm -f $(1)/opt/lib/asterisk/sounds/conf-*
  endef
 
- #ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),)
- #  CONFIGURE_ARGS+= \
--#	--with-iksemel="$(STAGING_DIR)/usr"
-+#	--with-iksemel="$(STAGING_DIR)/opt"
- #  SITE_VARS+= \
- #	ac_cv_lib_iksemel_iks_start_sasl=yes
- #else
+ ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-chan-gtalk),)
+   CONFIGURE_ARGS+= \
+-	--with-iksemel="$(STAGING_DIR)/usr"
++	--with-iksemel="$(STAGING_DIR)/opt"
+   SITE_VARS+= \
+ 	ac_cv_lib_iksemel_iks_start_sasl=yes
+ else
 @@ -158,7 +157,7 @@
 
  ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-curl),)
@@ -240,12 +240,12 @@
  $(eval $(call BuildAsterisk18Module,func-uri,URI encoding and decoding,Encodes and decodes URI-safe strings,,,,func_uri,))
  $(eval $(call BuildAsterisk18Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,))
  $(eval $(call BuildAsterisk18Module,chan-agent,Agents proxy channel,An implementation of agents proxy channel,,,,chan_agent,))
--#$(eval $(call BuildAsterisk18Module,chan-gtalk,GTalk,An implementation of chan_gtalk and res_jabber for GTalk support,+libiksemel,/etc/asterisk/gtalk.conf /etc/asterisk/jabber.conf,gtalk.conf jabber.conf,chan_gtalk res_jabber,))
+-$(eval $(call BuildAsterisk18Module,chan-gtalk,GTalk,An implementation of chan_gtalk and res_jabber for GTalk support,+libiksemel,/etc/asterisk/gtalk.conf /etc/asterisk/jabber.conf,gtalk.conf jabber.conf,chan_gtalk res_jabber,))
 -$(eval $(call BuildAsterisk18Module,chan-iax2,IAX2 channel,An implementation of IAX2 channel,+asterisk18-res-timing-timerfd,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,))
 -$(eval $(call BuildAsterisk18Module,chan-lantiq,Lantiq TAPI channel,An implementation of Lantiq TAPI channel,@TARGET_lantiq @!TARGET_lantiq_xrx200 +kmod-ltq-vmmc,/etc/asterisk/lantiq.conf,lantiq.conf,chan_lantiq,))
-+#$(eval $(call BuildAsterisk18Module,chan-gtalk,GTalk,An implementation of chan_gtalk and res_jabber for GTalk support,+libiksemel,/opt/etc/asterisk/gtalk.conf /opt/etc/asterisk/jabber.conf,gtalk.conf jabber.conf,chan_gtalk res_jabber,))
++$(eval $(call BuildAsterisk18Module,chan-gtalk,GTalk,An implementation of chan_gtalk and res_jabber for GTalk support,+libiksemel,/opt/etc/asterisk/gtalk.conf /opt/etc/asterisk/jabber.conf,gtalk.conf jabber.conf,chan_gtalk res_jabber,))
 +$(eval $(call BuildAsterisk18Module,chan-iax2,IAX2 channel,An implementation of IAX2 channel,+asterisk18-res-timing-timerfd,/opt/etc/asterisk/iax.conf /opt/etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,))
-+$(eval $(call BuildAsterisk18Module,chan-lantiq,Lantiq TAPI channel,An implementation of Lantiq TAPI channel,@TARGET_lantiq @!TARGET_lantiq_xrx200 +kmod-ltq-vmmc,/opt/etc/asterisk/lantiq.conf,lantiq.conf,chan_lantiq,))
++$(eval $(call BuildAsterisk18Module,chan-lantiq,Lantiq TAPI channel,An implementation of Lantiq TAPI channel,@TARGET_lantiq @!TARGET_lantiq_xrx200,/opt/etc/asterisk/lantiq.conf,lantiq.conf,chan_lantiq,))
  $(eval $(call BuildAsterisk18Module,chan-local,Local proxy channel,An implementation of local proxy channel,,,,chan_local,))
 -$(eval $(call BuildAsterisk18Module,chan-mgcp,MGCP channel,the channel chan_mgcp,,/etc/asterisk/mgcp.conf,mgcp.conf,chan_mgcp,))
 -$(eval $(call BuildAsterisk18Module,chan-ooh323,ooH323 channel,the channel chan_ooh323,,/etc/asterisk/ooh323.conf,ooh323.conf,chan_ooh323,))

packages/asterisk-1.8.x/fix-path.patch

@@ -1,5 +1,5 @@
---- ../../../downloads/openwrt_trunk-r46338/feeds/telephony/net/asterisk-11.x/Makefile	2015-07-14 10:55:19.886308175 +0300
-+++ ../../../openwrt_trunk/feeds/telephony/net/asterisk-11.x/Makefile	2015-07-14 17:40:33.774707869 +0300
+--- ../../../downloads/openwrt_trunk-r46940/feeds/telephony/net/asterisk-11.x/Makefile	2015-09-15 12:24:40.666451660 +0300
++++ ../../../openwrt_trunk/feeds/telephony/net/asterisk-11.x/Makefile	2015-09-21 09:41:54.542917332 +0300
 @@ -26,28 +26,28 @@
  include $(INCLUDE_DIR)/package.mk
 
@@ -163,7 +163,7 @@
  else
    CONFIGURE_ARGS+= \
  	--without-spandsp
-@@ -215,14 +217,14 @@
+@@ -215,7 +217,7 @@
 
  ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-srtp),)
    CONFIGURE_ARGS+= \
@@ -172,6 +172,16 @@
  else
    CONFIGURE_ARGS+= \
  	--without-srtp
+@@ -223,7 +225,7 @@
+ 
+ ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-xmpp),)
+   CONFIGURE_ARGS+= \
+-	--with-iksemel="$(STAGING_DIR)/usr"
++	--with-iksemel="$(STAGING_DIR)/opt"
+   SITE_VARS+= \
+ 	ac_cv_lib_iksemel_iks_start_sasl=yes
+ else
+@@ -232,7 +234,7 @@
  endif
 
  EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
@@ -180,7 +190,7 @@
  CONFIGURE_ARGS+= \
  	--build=$(GNU_HOST_NAME) \
  	--host=$(GNU_TARGET_NAME) \
-@@ -238,28 +240,28 @@
+@@ -247,28 +249,28 @@
  	--without-libxml2 \
  	--without-misdn \
  	--without-nbs \
@@ -214,7 +224,7 @@
  	--with-sounds-cache="$(DL_DIR)" \
  	--disable-xmldoc 
 
-@@ -305,10 +307,10 @@
+@@ -314,10 +316,10 @@
  	ASTCFLAGS="$(EXTRA_CFLAGS) -DLOW_MEMORY"
  	ASTLDFLAGS="$(EXTRA_LDFLAGS)"
  	$(MAKE) -C "$(PKG_BUILD_DIR)" \
@@ -229,7 +239,7 @@
  		NOISY_BUILD="yes" \
  		DEBUG="" \
  		OPTIMIZE="" \
-@@ -317,9 +319,9 @@
+@@ -326,9 +328,9 @@
  endef
 
  define Build/InstallDev
@@ -242,7 +252,7 @@
  endef
 
  $(eval $(call BuildPackage,asterisk11))
-@@ -341,7 +343,7 @@
+@@ -350,7 +352,7 @@
 
  $(eval $(call BuildAsterisk11Module,app-alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID,,,,app_alarmreceiver,))
  $(eval $(call BuildAsterisk11Module,app-authenticate,Authenticate commands,Execute arbitrary authenticate commands,,,,app_authenticate,))
@@ -251,7 +261,7 @@
  $(eval $(call BuildAsterisk11Module,app-dahdiras,Execute an ISDN RAS,support for executing an ISDN RAS using DAHDI,+asterisk11-chan-dahdi,,,app_dahdiras,))
  $(eval $(call BuildAsterisk11Module,app-directory,Provide a directory of extensions,provides a directory of extensions,,,,app_directory,))
  $(eval $(call BuildAsterisk11Module,app-directed_pickup,Directed call pickup,support for directed call pickup,,,,app_directed_pickup,))
-@@ -349,7 +351,7 @@
+@@ -358,7 +360,7 @@
  $(eval $(call BuildAsterisk11Module,app-exec,Exec application,support for application execution,,,,app_exec,))
  $(eval $(call BuildAsterisk11Module,app-chanisavail,Channel availability check,support for checking if a channel is available,,,,app_chanisavail,))
  $(eval $(call BuildAsterisk11Module,app-chanspy,Channel listen in,support for listening in on any channel,,,,app_chanspy,))
@@ -260,7 +270,7 @@
  $(eval $(call BuildAsterisk11Module,app-mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording,,,,app_mixmonitor,))
  $(eval $(call BuildAsterisk11Module,app-originate,Originate a call,originating an outbound call and connecting it to a specified extension or application,,,,app_originate,))
  $(eval $(call BuildAsterisk11Module,app-playtones,Playtones application,play a tone list,,,,app_playtones,))
-@@ -367,7 +369,7 @@
+@@ -376,7 +378,7 @@
  $(eval $(call BuildAsterisk11Module,app-while,While loop,a while loop implementation,,,,app_while,))
  $(eval $(call BuildAsterisk11Module,cdr-csv,Provides CDR CSV,Call Detail Record with CSV support,,,,cdr_csv,))
  $(eval $(call BuildAsterisk11Module,cdr-sqlite3,Provides CDR SQLITE3,Call Detail Record with SQLITE3 support,libsqlite3,,,cdr_sqlite3_custom,))
@@ -269,7 +279,7 @@
  $(eval $(call BuildAsterisk11Module,codec-a-mu,Alaw to ulaw translation,translation between alaw and ulaw codecs,,,,codec_a_mu,))
  $(eval $(call BuildAsterisk11Module,codec-adpcm,ADPCM text,ADPCM text ,,,,codec_adpcm,))
  $(eval $(call BuildAsterisk11Module,codec-alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs,,,,codec_alaw,))
-@@ -394,7 +396,7 @@
+@@ -403,7 +405,7 @@
  $(eval $(call BuildAsterisk11Module,func-cut,CUT function,CUT function,,,,func_cut,))
  $(eval $(call BuildAsterisk11Module,func-db,Database interaction,functions for interaction with the database,,,,func_db app_db,))
  $(eval $(call BuildAsterisk11Module,func-devstate,Blinky lights control,functions for manually controlled blinky lights,,,,func_devstate,))
@@ -278,21 +288,23 @@
  $(eval $(call BuildAsterisk11Module,func-env,Environment functions,Environment dialplan functions,,,,func_env,))
  $(eval $(call BuildAsterisk11Module,func-extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control,,,,func_extstate,))
  $(eval $(call BuildAsterisk11Module,func-global,Global variable,global variable dialplan functions,,,,func_global,))
-@@ -407,35 +409,35 @@
+@@ -416,37 +418,37 @@
  $(eval $(call BuildAsterisk11Module,func-vmcount,vmcount dialplan,a vmcount dialplan function,,,,func_vmcount,))
  $(eval $(call BuildAsterisk11Module,func-realtime,realtime dialplan,the realtime dialplan function,,,,func_realtime,))
  $(eval $(call BuildAsterisk11Module,chan-agent,Agents proxy channel,an implementation of agents proxy channel,,,,chan_agent,))
 -$(eval $(call BuildAsterisk11Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi,/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,))
 -$(eval $(call BuildAsterisk11Module,chan-iax2,IAX2 channel,IAX support,+asterisk11-res-timing-timerfd,/etc/asterisk/iax.conf /etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,))
 -$(eval $(call BuildAsterisk11Module,chan-mgcp,MGCP channel,the channel chan_mgcp,,/etc/asterisk/mgcp.conf,mgcp.conf,chan_mgcp,))
+-$(eval $(call BuildAsterisk11Module,chan-motif,Jingle channel,Motif Jingle Channel Driver,+asterisk11-res-xmpp,/etc/asterisk/motif.conf /etc/asterisk/jingle.conf,motif.conf jingle.conf,chan_motif,))
 -$(eval $(call BuildAsterisk11Module,chan-ooh323,ooH323 channel,the channel chan_ooh323,,/etc/asterisk/ooh323.conf,ooh323.conf,chan_ooh323,))
 -$(eval $(call BuildAsterisk11Module,chan-skinny,Skinny channel,the channel chan_skinny,,/etc/asterisk/skinny.conf,skinny.conf,chan_skinny,))
 -$(eval $(call BuildAsterisk11Module,chan-unistim,Unistim channel,channel driver for the UNISTIM (Unified Networks IP Stimulus) protocol,,/etc/asterisk/unistim.conf,unistim.conf,chan_unistim,))
 -$(eval $(call BuildAsterisk11Module,mysql,MySQL,MySQL support,+libmysqlclient,/etc/asterisk/res_config_mysql.conf,res_config_mysql.conf,res_config_mysql,))
 -$(eval $(call BuildAsterisk11Module,odbc,ODBC,ODBC support,+libpthread +libc +unixodbc,/etc/asterisk/cdr_adaptive_odbc.conf /etc/asterisk/cdr_odbc.conf /etc/asterisk/cel_odbc.conf /etc/asterisk/func_odbc.conf /etc/asterisk/res_odbc.conf,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_odbc,cdr_adaptive_odbc cdr_odbc cel_odbc func_odbc res_config_odbc res_odbc,))
-+$(eval $(call BuildAsterisk11Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone +kmod-dahdi,/opt/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,))
++$(eval $(call BuildAsterisk11Module,chan-dahdi,DAHDI channel,DAHDI channel support,+dahdi-tools-libtonezone,/opt/etc/asterisk/chan_dahdi.conf,chan_dahdi.conf,chan_dahdi,))
 +$(eval $(call BuildAsterisk11Module,chan-iax2,IAX2 channel,IAX support,+asterisk11-res-timing-timerfd,/opt/etc/asterisk/iax.conf /opt/etc/asterisk/iaxprov.conf,iax.conf iaxprov.conf,chan_iax2,))
 +$(eval $(call BuildAsterisk11Module,chan-mgcp,MGCP channel,the channel chan_mgcp,,/opt/etc/asterisk/mgcp.conf,mgcp.conf,chan_mgcp,))
++$(eval $(call BuildAsterisk11Module,chan-motif,Jingle channel,Motif Jingle Channel Driver,+asterisk11-res-xmpp,/opt/etc/asterisk/motif.conf /opt/etc/asterisk/jingle.conf,motif.conf jingle.conf,chan_motif,))
 +$(eval $(call BuildAsterisk11Module,chan-ooh323,ooH323 channel,the channel chan_ooh323,,/opt/etc/asterisk/ooh323.conf,ooh323.conf,chan_ooh323,))
 +$(eval $(call BuildAsterisk11Module,chan-skinny,Skinny channel,the channel chan_skinny,,/opt/etc/asterisk/skinny.conf,skinny.conf,chan_skinny,))
 +$(eval $(call BuildAsterisk11Module,chan-unistim,Unistim channel,channel driver for the UNISTIM (Unified Networks IP Stimulus) protocol,,/opt/etc/asterisk/unistim.conf,unistim.conf,chan_unistim,))
@@ -329,6 +341,8 @@
  $(eval $(call BuildAsterisk11Module,res-timing-dahdi,DAHDI Timing Interface,,+asterisk11-chan-dahdi,,,res_timing_dahdi,))
  $(eval $(call BuildAsterisk11Module,res-timing-pthread,pthread Timing Interface,,,,,res_timing_pthread,))
  $(eval $(call BuildAsterisk11Module,res-timing-timerfd,Timerfd Timing Interface,,,,,res_timing_timerfd,))
+-$(eval $(call BuildAsterisk11Module,res-xmpp,XMPP client and component module,reference module for interfacting Asterisk directly as a client or component with XMPP server,+libiksemel +libopenssl,/etc/asterisk/xmpp.conf,xmpp.conf,res_xmpp,))
++$(eval $(call BuildAsterisk11Module,res-xmpp,XMPP client and component module,reference module for interfacting Asterisk directly as a client or component with XMPP server,+libiksemel +libopenssl,/opt/etc/asterisk/xmpp.conf,xmpp.conf,res_xmpp,))
  $(eval $(call BuildAsterisk11Module,res-realtime,Realtime Interface,,,,,res_realtime,))
 -$(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,+asterisk11-res-adsi +asterisk11-res-smdi,/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail,vm-*)) 
 +$(eval $(call BuildAsterisk11Module,voicemail,Voicemail,voicemail related modules,+asterisk11-res-adsi +asterisk11-res-smdi,/opt/etc/asterisk/voicemail.conf,voicemail.conf,*voicemail,vm-*)) 

packages/asterisk-11.x/fix-path.patch

@@ -9,7 +9,7 @@
  endef
 
  define Package/avrdude/description
-@@ -44,14 +44,14 @@
+@@ -45,14 +45,14 @@
  	-D_GNU_SOURCE \
 
  define Package/avrdude/conffiles

packages/avrdude/fix-path.patch

@@ -1,6 +1,6 @@
---- ../../../downloads/openwrt_trunk-r43708/feeds/packages/net/bind/Makefile	2014-12-15 12:19:58.028388958 +0300
-+++ ../../../openwrt_trunk/feeds/packages/net/bind/Makefile	2014-12-15 12:20:05.552388822 +0300
-@@ -41,7 +41,7 @@
+--- ../../../downloads/openwrt_trunk-r46940/feeds/packages/net/bind/Makefile	2015-09-15 12:24:40.746451661 +0300
++++ ../../../openwrt_trunk/feeds/packages/net/bind/Makefile	2015-09-15 12:24:42.886451697 +0300
+@@ -43,7 +43,7 @@
  define Package/bind-libs
    SECTION:=libs
    CATEGORY:=Libraries
@@ -9,7 +9,7 @@
    TITLE:=bind shared libraries
    URL:=https://www.isc.org/software/bind
  endef
-@@ -86,6 +86,11 @@
+@@ -88,6 +88,11 @@
    TITLE+= DNS excavation tool
  endef
 
@@ -21,7 +21,7 @@
  export BUILD_CC="$(TARGET_CC)"
 
  CONFIGURE_ARGS += \
-@@ -94,9 +99,9 @@
+@@ -96,9 +101,9 @@
  	--with-randomdev="/dev/urandom" \
  	--disable-threads \
  	--disable-linux-caps \
@@ -33,7 +33,7 @@
  	--enable-epoll=yes \
  	--with-gost=no \
  	--with-gssapi=no \
-@@ -117,80 +122,85 @@
+@@ -119,80 +124,85 @@
  endef
 
  define Package/bind-libs/install