Merge pull request #1700 from aTanW/master

gammu: bump to mainstream v 1.36.4, full-language version build fix

Merge pull request #1708 from uweber/master

strongswan: dont overwrite ipsec.conf and ipsec.user during upgrade

crelay: Fix link error with BUILD_NLS=y

Signed-off-by: Ted Hess <thess@kitschensync.net>

sqm-scripts: Bump to v1.0.2.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

bash: Update to 4.3.42

Signed-off-by: Marcel Denia <naoir@gmx.net>

mosquitto: fix crash on client disconnect

Patch backported from upstream.  Was only noticed on musl and freebsd
clients.  See https://bugs.eclipse.org/bugs/show_bug.cgi?id=475707

Fixes github issue #1692

Signed-off-by: Karl Palsson <karlp@remake.is>

mosquitto: bump to version 1.4.3

Bugfix release, see http://mosquitto.org/2015/08/version-1-4-3-released/

Signed-off-by: Karl Palsson <karlp@remake.is>

strongswan: dont overwrite ipsec.conf and ipsec.user during upgrade

Signed-off-by: Ulrich Weber <uw@ocedo.com>

dbus: bump to 1.9.20

Signed-off-by: Steven Barth <steven@midlink.org>

libsigc++: bump to 2.5.2

Signed-off-by: Steven Barth <steven@midlink.org>

Merge pull request #1653 from yousong/xl2tpd-fix

Xl2tpd fix

Merge pull request #1702 from the-alien/python-ldap

python-ldap: added python-ldap package

Merge pull request #1705 from commodo/python-setuptools-upgrade

python-setuptools: upgrade to version 18.2

Merge pull request #1706 from commodo/python-pip-upgrade

python-pip: upgrade to version 7.1.2

memcached: fix musl build

 - thx to alpinelinux for the patch
   (http://git.alpinelinux.org/cgit/aports/plain/main/memcached/musl-includes.patch)
 - remove depency to libenvent and replace it libevent2
   should fix issue #1542

Signed-off-by: heil <heil@terminal-consulting.de>

haproxy: fixes for upstream version 1.5.14

 - [PATCH 1/4] BUG/MINOR: log: missing some ARGC_* entries in
 - [PATCH 2/4] DOC: usesrc root privileges requirements
 - [PATCH 3/4] BUILD: ssl: Allow building against libssl without SSLv3.
 - [PATCH 4/4] DOC/MINOR: fix OpenBSD versions where haproxy works

Signed-off-by: heil <heil@terminal-consulting.de>

unixodbc: update to 2.3.3

Signed-off-by: heil <heil@terminal-consulting.de>

acpid: update to 2.0.25
 - remove 001-musl-compat-patch

Signed-off-by: heil <heil@terminal-consulting.de>

python-pip: upgrade to version 7.1.2

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

python-setuptools: upgrade to version 18.2

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

rtklib: bump version to 2.4.2 p11, close #1624

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

Merge pull request #1667 from plntyk/fix_gcc5_netperf

netperf: fix gcc5

python-ldap: added python-ldap package

Signed-off-by: Dimtrij Trefilov <the-alien@live.ru>

Merge pull request #1698 from mstorchak/lsof

lsof: update to 4.89

Merge pull request #1699 from yousong/reaver

reaver: import from oldpackages.

Merge pull request #1701 from thess/hidapi-fix

hidapi: Fix iconv depends

libuv: fix download path

Signed-off-by: John Crispin <blogic@openwrt.org>

python: add dependency to bz2 host build

Signed-off-by: John Crispin <blogic@openwrt.org>

zabbix: update to 2.4.6 (and refresh patches)

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>

mpd: Fix BUILD_NLS=y full language support (regression)

Signed-off-by: Ted Hess <thess@kitschensync.net>

php5: fix the two different maintainer fields into one (fixes #1688)

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

hidapi: Fix iconv depends

Signed-off-by: Ted Hess <thess@kitschensync.net>

crelay: Update to V0.9, add startup config file

Signed-off-by: Ted Hess <thess@kitschensync.net>

gammu: bump to mainstream v 1.36.4, full-language version build fix

Signed-Off-By: Vitaly Protsko <villy@sft.ru>
---
 Makefile |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Merge pull request #1671 from plntyk/fix_musl_dtndht

dtndht: fix musl build

Merge pull request #1694 from jsiverskog/protobuf-maintainer2

protobuf: add myself as maintainer.

lsof: update to 4.89

- build from original tarball
- fix ipv6 support: enable if not completely disabled
- drop useless LSOF_INCLUDE override

Signed-off-by: Maxim Storchak <m.storchak@gmail.com>

reaver: import from oldpackages.

 - Update copyright year.
 - Add PKG_LICENSE:=GPL-2.0 from the Google Code project page.
 - Add autoreconf as the PKG_FIXUP method.
 - Add myself as the package maintainer.
 - Add a patch to fix building with musl-libc.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

Merge pull request #1670 from plntyk/fix_musl_crtmpserver

crtmpserver: fix musl build

Merge pull request #1695 from plntyk/fix_postgresql_various

Fix various postgresql issues

postgresql: fix potential snprintf issue

adopt buildroot commit: 3d3f70b567718ae308b5704ddd7d107c4849309e

spotted while reviewing buildroot changes to postgresql

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

postgresql: fix uclibc locale.h bug

reported in forum:
https://forum.openwrt.org/viewtopic.php?id=59137

issue was discovered and fixed already in buildroot
git commit id: f5e4ca10220e2325d3a34c0a423388e40b27dbdf

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

postgresql: add missing librt dependency

fixes build error with uclibc

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

protobuf: add myself as maintainer.

Signed-off-by: Jacob Siverskog <jacob@teenageengineering.com>

Merge pull request #1691 from commodo/python-pip-maintainer

python-pip: add myself as maintainer

Merge pull request #1690 from commodo/python-setuptools-maintainer

python-setuptools: add myself as maintainer

python-pip: add myself as maintainer

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

python-setuptools: add myself as maintainer

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

alsa-lib: Combine package maintainers

Signed-off-by: Ted Hess <thess@kitschensync.net>

ntfs-3g: Update to latest, add myself as maintainer, cleanup packages content

Signed-off-by: Ted Hess <thess@kitschensync.net>

Merge pull request #1682 from ClaymorePT/master

boost: Boost Makefile Update to Version 1.59

Boost Makefile Update to Version 1.59
This commit updates Boost to version 1.59, released in the 13th of August of 2015 [1].
  - The new version adds two new template libraries, Convert [2] and CoRoutine2 [3].
  - [Warning]-> CoRoutine2 library absolutly requires a C++14 compiler.
  - patch 001-mips-options-fix.patch was removed, since it is already incorporated upstream.

[1] - http://www.boost.org/users/history/version_1_59_0.html
[2] - http://www.boost.org/libs/convert/
[3] - http://www.boost.org/libs/coroutine2/

Signed-off-by: Carlos Ferreira <carlosmf.pt@gmail.com>

znc: update to 1.6.1

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

Merge pull request #1675 from sairon/python-setuptools-revamp-installation

python-setuptools: revamp installation procedure, update to 18.1

Merge pull request #1680 from yousong/strongswan

strongswan: split out libtls.so as a separate package.

strongswan: split out libtls.so as a separate package.

When only strongswan-minimal is selected, libtls.so will not be built
yet package strongswan will still try to copy the file causing build
failure.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

Merge pull request #1677 from luizluca/ruby_update

ruby: bump version to 2.2.3

Merge pull request #1668 from plntyk/fix_gcc5_mocp

mocp: fix build with gcc5

ruby: bump version to 2.2.3

This is a bug and security fix release, including:

- CVE-2015-3900 Request hijacking vulnerability in RubyGems 2.4.6 and earlier

http://svn.ruby-lang.org/repos/ruby/tags/v2_2_3/ChangeLog

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>

Merge pull request #1664 from sairon/python-pip-revamp-installation

python-pip: revamp installation procedure (use setuptools machinery)

lighttpd: backport a fix for running out of filedescriptors

It was breaking uploads of files 4 MiB+. This patch fixes:
https://github.com/openwrt/packages/issues/1658

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

python-setuptools: revamp installation procedure, update to 18.1

It's better to install setuptools-enabled Python packages with a special
flag that makes a flatter structure of the egg and does not create
site.py file. Already done for python-pip recently. Also, version was
bumped to 18.1.

Signed-off-by: Jan Čermák <jan.cermak@nic.cz>

dtndht: fix musl build

add missing headers on musl

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

crtmpserver: fix musl build

MAX values should be defined in stdint.h

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

netperf: fix gcc5

default C standard changed in gcc5 so set old variant

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

mocp: fix build with gcc5

change in default CPP settings lead to build errors
explicitly set flag to enable old behaviour

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

Merge pull request #1666 from hnyman/collectd-simplify

collectd: interface plugin: revert to Linux defaults from BSD-like operations

collectd: interface plugin: revert to Linux defaults from BSD-like operations

Change the interface plugin to operate with collectd's default way for Linux
instead of trying to use BSD functionality with patches.

Openwrt's collectd Makefile has set "enable-getifaddrs" option since r7980
(in 2007, no explanations given for the reasons to add that config option),
causing the addition of 110-net-device-stats.patch in 2010 to fix things,
and then later (with 5.4.1 upgrade in 2014) 150-fix-interface-af-link
to undo BSD-specific changes in collectd code meant for only BSD systems
(as AF_LINK does not exist in Linux).

Revert to collectd's intended way in Linux by removing the config option
and deleting the two corresponding patches.

The same data fieds should be provided, so there is no visbile change to users.

References:
===========

Collectd changes introducing/explaining the option and later breaking things:
http://git.verplant.org/?p=collectd.git;a=commit;h=a05e34a0d4fdb2c15db8226689268a27f6f7163d
http://git.verplant.org/?p=collectd.git;a=commit;h=14740db4b415655abc58307352e406442f9933a0
http://git.verplant.org/?p=collectd.git;a=commitdiff;h=645dadb3fcc466e8880fda4eb23b21ad433631fc

Openwrt:
intro at r7980: https://dev.openwrt.org/changeset/7980
fix1 due to kernel 2.6.36 at r23467: https://dev.openwrt.org/changeset/23467
fix2 due to collectd 5.4.1: https://github.com/openwrt/packages/pull/298

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #1662 from thess/crelay-import

crelay: import usb relay control daemon

python-pip: revamp installation procedure (use setuptools machinery)

PIP's installation procedure was too complicated, requiring obscure
postinstall and prerm scripts to move files created by setup procedure.
But since setuptools is required anyway, it's better to use a special
flag created for the purpose of package creation. Resulting directory
structure is flatter and unnecessary files that had to be moved by
prerm/postinstall scripts are not created anymore.

Signed-off-by: Jan Čermák <jan.cermak@nic.cz>

Merge pull request #1663 from hnyman/vsftpd303

vsftpd: update to 3.0.3

Merge pull request #1596 from danielg4/master

squid: version bump and dependency fixes

vsftpd: update to 3.0.3

Update vsftpd to 3.0.3 released in July 2015.

Changelog: https://security.appspot.com/vsftpd/Changelog.txt
Release blog: http://scarybeastsecurity.blogspot.fi/2015/07/vsftpd-303-released-and-horrors-of-ftp.html

- Increase VSFTP_AS_LIMIT to 200MB; various reports.
- Make the PWD response more RFC compliant; report from Barry Kelly
<barry@modeltwozero.com>.
- Remove the trailing period from EPSV response to work around BT Internet
issues; report from Tim Bishop <tdb@mirrorservice.org>.
- Fix syslog_enable issues vs. seccomp filtering. Report from Michal Vyskocil
<mvyskocil@suse.cz>. At least, syslogging seems to work on my Fedora now.
- Allow gettimeofday() in the seccomp sandbox. I can't repro failures, but I
probably have a different distro / libc / etc. and there are multiple reports.
- Some kernels support PR_SET_NO_NEW_PRIVS but not PR_SET_SECCOMP, so handle
this case gracefully. Report from Vasily Averin <vvs@odin.com>.
- List the TLS1.2 cipher AES128-GCM-SHA256 as first preference by default.
- Make some compile-time SSL defaults (such as correct client shutdown
handling) stricter.
- Disable Nagle algorithm during SSL data connection shutdown, to avoid 200ms
delays. From Tim Kosse <tim.kosse@filezilla-project.org>.
- Kill the FTP session if we see HTTP protocol commands, to avoid
cross-protocol attacks. A report from Jann Horn <jann@thejh.net>.
- Kill the FTP session if we see session re-use failure. A report from
Tim Kosse <tim.kosse@filezilla-project.org>.
(vsftpd-3.0.3pre1)
- Enable ECDHE, Tim Kosse <tim.kosse@filezilla-project.org>.
- Default cipher list is now just ECDHE-RSA-AES256-GCM-SHA384.
- Minor SSL logging improvements.
- Un-default tunable_strict_ssl_write_shutdown again. We still have
tunable_strict_ssl_read_eof defaulted now, which is the important one to prove
upload integrity.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

crelay: import usb relay control daemon

Signed-off-by: Ted Hess <thess@kitschensync.net>

apache: bump to version 2.2.31

Signed-off-by: heil <heil@terminal-consulting.de>

sqm-scripts: Bump to v1.0.1.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

bind: update to version 9.9.7-p2

Signed-off-by: Noah Meyerhans <frodo@morgul.net>

xl2tpd: switch to github devel branch.

Several patches here and pull requests at the upstream github project
page were merged into the devel branch.  Switch to that until the next
stable release.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

xl2tpd: conditionally build with flags for more verbose log output.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

xl2tpd: add new config option checkup_interval.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

xl2tpd: reword the comment on overriding OFLAGS in MAKE_FLAGS.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

xl2tpd: tweak generating pppoptfile.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

xl2tpd: fix aliveness check for xl2tpd process.

This change aims to address the following 2 issues

 - The control file was there yet xl2tpd process was not
 - The control file's existence prevented xl2tpd from start

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

xl2tpd: tweak getting value of mtu config option.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

xl2tpd: remove check for $ERROR.

L2TP with xl2tpd has no proto_task in the context of netifd and because
of this there is no valid $ERROR to check for when doing tearing down.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

sqm-scripts: Fix dependency on tc.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

Merge pull request #1655 from dangowrt/update-postgresql

update postgresql

libinput: update source

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

pcsc-lite: update source

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

ccid: update source

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

gnunet: update source, add iptables dependency

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

gnurl: update source to 7.43.0

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

postgresql: update source to 9.4.4 and refresh scripts

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

postgresql: update to 9.4.1

- supports arm64/aarch64

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>

xl2tpd: transfer maintainership to Yousong Zhou

@openwrt/owners : please invite @yousong to @openwrt/package-maintainers

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

php5-pecl-raphf: update to 1.1.0

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

php5: update to 5.6.12

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Merge pull request #1651 from Wedmer/master

[utils/zoneinfo] Updated to the latest release.

Merge pull request #1650 from sairon/tvheadend-fix-config-install

tvheadend: add missing install of default Uci config file

[utils/zoneinfo] Updated to the latest release.

Signed-off-by: Vladimir Ulrich <admin@evl.su>