Compare commits

...

877 commits

Author SHA1 Message Date
Josef Schlehofer
0171d18e05
libwebsockets: fix recursive dependency
While running `make menuconfig`, it was discovered then there is a
recursive dependency like this:
tmp/.config-package.in:59138:error: recursive dependency detected!
tmp/.config-package.in:59138:	symbol PACKAGE_libwebsockets-openssl is selected by PACKAGE_libwebsockets-mbedtls
tmp/.config-package.in:59122:	symbol PACKAGE_libwebsockets-mbedtls depends on PACKAGE_libwebsockets-openssl

It is not possible with the recently added conflicts that two packages
(OpenSSL and full variant, which uses OpenSSL as well), which are almost the same
provides the same named package libwebsockets as their conflict - Mbed
TLS.

Fixes: 676c5c72b5 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit a4e8cbb89a)
2022-10-27 14:48:35 +02:00
Josef Schlehofer
8542fd3f3c
libwebsockets: OpenSSL and mbedTLS variants should conflict
They provide the same files, but they don't conflict to each other, this
means that users can install them side by side.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 676c5c72b5)
2022-10-25 14:30:05 +02:00
Josef Schlehofer
d257d6660f
libwebsockets: full variant provides OpenSSL
For some time, it is not possible to install ttyd and mosquitto-ssl at the
same time, so let's solve it that libwebsockets-full provides
libwebsockets-openssl. This allows to install ttyd and mosquitto at
the same time.

Also, we need to add conflict, because we should not have installed
libwebsockets-openssl and libwebsockets-full at the same time as they
provides the same files.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 77e682a11c)
2022-10-25 14:30:02 +02:00
Noah Meyerhans
17ab4ed4e4 bind: update to 9.11.37
Fixes security issues:

 * CVE-2021-25220 -- The rules for acceptance of records into the cache
			have been tightened to prevent the possibility of
			poisoning if forwarders send records outside
			the configured bailiwick.

 * CVE-2021-25219 -- The "lame-ttl" option is now forcibly set to 0. This
			effectively disables the lame server cache, as it could
			previously be abused by an attacker to significantly
			degrade resolver performance.

Signed-off-by: Noah Meyerhans <frodo@morgul.net>
2022-03-18 10:57:37 -07:00
Jo-Philipp Wich
ed3e4b711e
htpdate: drop www.freebsd.org from default server list
The FreeBSD project stopped publishing HTTP date headers and seeks to
limit further resource taxing by distributed htpdate clients using the
www.freebsd.org host as default time source.

Fixes: #17924
Reported-by: Allan Jude <allanjude@freebsd.org>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e871318002)
2022-02-23 23:10:19 +01:00
Noah Meyerhans
cce38e78d6 bind: Bump to version 9.11.36
The following security issues are addressed with this change:

CVE-2020-8619
CVE-2020-8622
CVE-2020-8623
CVE-2020-8624
CVE-2020-8625
CVE-2021-25214
CVE-2021-25215
CVE-2021-25216
CVE-2021-25219

A complete description of the changes with this BIND release is
available in the release notes at
https://ftp.isc.org/isc/bind9/9.11.36/RELEASE-NOTES-bind-9.11.36.html

Signed-off-by: Noah Meyerhans <frodo@morgul.net>
2021-10-29 10:28:53 -07:00
Jeffery To
1236ebb505 python3: Update to 3.6.15
Includes fix for CVE-2013-0340 ("Billion Laughs" vulnerability).

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2021-09-08 17:12:03 -04:00
Eneas U de Queiroz
f0b2064caa
perl: perlmod.mk: use 'install' for host binaries
When installing a host perl module, the host perl binary in the staging
dir is replaced by using 'cp'.  However, if the binary is running in a
parallel job, cp will fail with a text file busy error.  Use
$(INSTALL_BIN), which unliks the file first to avoid the error.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit 19c7496648)
(cherry picked from commit 67f403b5e6)
2021-08-15 07:09:24 +02:00
Josef Schlehofer
9344bbab35
Merge pull request #16086 from turris-cz/lxc-update-keyserver
lxc: add patch to switch GPG server
2021-07-11 20:44:01 +02:00
Josef Schlehofer
2f01c25c71
lxc: add patch to switch GPG server
By default, there was used sks-keyservers.net pool, which has invalid
SSL certificate and they also announced that their service is deprecate
and no longer maintained.

Use the same GPG server as LXC is using by default in the newer
releases.

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2021-07-10 16:33:22 +02:00
Josef Schlehofer
53146afb88
Merge pull request #16056 from jefferyto/python3-3.6.14-openwrt-18.06
[openwrt-18.06] python3: Update to 3.6.14
2021-07-07 09:04:46 +02:00
Jeffery To
ea046789ec
python3: Update to 3.6.14
Includes fix for CVE-2021-3426 (Information disclosure via pydoc).

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2021-07-07 00:38:27 +08:00
Luiz Angelo Daros de Luca
005d3b599c
Merge pull request #15415 from luizluca/18.06/ruby-2.5.9
[18.06] ruby: update to 2.5.9
2021-04-13 13:05:03 -03:00
Luiz Angelo Daros de Luca
283d68bf61 ruby: update to 2.5.9
Fixes two CVEs:

CVE-2020-25613: Potential HTTP Request Smuggling Vulnerability in WEBrick
CVE-2021-28965: XML round-trip vulnerability in REXML

After this release, Ruby 2.5 reaches EOL.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2021-04-12 20:04:25 -03:00
Rosen Penev
989f26f541
Merge pull request #15166 from gladiac1337/haproxy-1.8.29-18.06
[openwrt-18.06] haproxy: Update HAProxy to v1.8.29
2021-03-19 15:51:47 -07:00
Christian Lachner
a12efddd43 haproxy: Update HAProxy to v1.8.29
- Update haproxy download URL and hash

Signed-off-by: Christian Lachner <gladiac@gmail.com>
2021-03-19 19:01:37 +01:00
Josef Schlehofer
736493373f
Merge pull request #14843 from jefferyto/python-3.6.13-openwrt-18.06
[openwrt-18.06] python3: Update to 3.6.13
2021-02-22 18:46:55 +01:00
Jeffery To
52ae66045d
python3: Update to 3.6.13
Includes fixes for:
* CVE-2021-3177 - ctypes: Buffer overflow in PyCArg_repr
* CVE-2021-23336 - urllib parse_qsl(): Web cache poisoning - semicolon
  as a query args separator

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2021-02-22 20:28:45 +08:00
Rosen Penev
89b12f5a52
Merge pull request #14502 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: bugfix: high CPU utilization
2021-01-22 17:42:29 -08:00
Stan Grishin
5e06b8d297 https-dns-proxy: bugfix: high CPU utilization
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-01-18 15:28:24 +00:00
Rosen Penev
6ad8033629
Merge pull request #14428 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: update to 2020-11-25: add HTTP auth and DSCP support
2021-01-06 19:58:53 -08:00
Stan Grishin
dd730e831c https-dns-proxy: update to 2020-11-25: add HTTP auth and DSCP codepoint support
Signed-off-by: Stan Grishin <stangri@melmac.net>
2021-01-06 17:53:33 +00:00
Rosen Penev
44f4ea615e
Merge pull request #14272 from stangri/18.06-simple-adblock
[18.06] simple-adblock: config update
2020-12-19 02:29:46 -08:00
Stan Grishin
7d5776befd simple-adblock: config update
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-12-18 22:05:25 -06:00
Rosen Penev
b4e5c5aca0
Merge pull request #14214 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfix - config update
2020-12-14 13:38:00 -08:00
Stan Grishin
8ed11363ad simple-adblock: bugfix - config update
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-12-12 15:58:52 -06:00
Stan Grishin
bf6253d458 https-dns-proxy: update binary to 2020-08-21
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-12-09 23:33:23 -10:00
Rosen Penev
4f4f708542
python3: fix host compilation with clang
Matched rpath parameter with Makefile.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from commit b40c40151c)
2020-12-07 15:50:44 -08:00
Rosen Penev
0d2bc5ae53
Merge pull request #13918 from cartender/pr_stm32flash
stm32flash: Added patch to lock serial device
2020-11-19 17:07:43 -08:00
Giovanni Giacobbi
7f0f22f9a7
stm32flash: Added patch to lock serial device
Patch backported from upstream master

Signed-off-by: Giovanni Giacobbi <giovanni@giacobbi.net>
2020-11-14 16:32:51 +00:00
Christian Lachner
65e9199966 haproxy: Update HAProxy to v1.8.27
- Update haproxy download URL and hash
- Fix ssl compat patch offsets

Signed-off-by: Christian Lachner <gladiac@gmail.com>
2020-11-08 17:47:14 +02:00
Michael Heimpold
3325a3ce01 php7: update to 7.2.34
This fixes:
  - CVE-2020-7069
  - CVE-2020-7070

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 5b3870890d)
2020-11-07 22:06:19 +01:00
Matthias Schiffer
a72e95a2f4
fastd: fix buffer leak when receiving invalid packets
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2020-10-19 22:16:14 +02:00
Rosen Penev
34353f2e8b
Merge pull request #13685 from jefferyto/python-3.6.12-openwrt-18.06
[openwrt-18.06] python3: Update to 3.6.12, remove backported patches
2020-10-16 14:24:08 -07:00
Jeffery To
5d988670ce
python3: Update to 3.6.12, remove backported patches
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-10-17 00:39:17 +08:00
Stan Grishin
46e05d87b9 simple-adblock: config update file fix
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-10-09 17:31:14 -10:00
Hannu Nyman
8579739f2a nano: update to 5.3
Update nano editor to version 5.3.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 4690a1f1c9)
2020-10-07 18:24:51 +03:00
Rosen Penev
0260550777
Merge pull request #13550 from gladiac1337/haproxy-1.8.26-openwrt-18.06
[openwrt-18.06] haproxy: Update HAProxy to v1.8.26
2020-10-02 13:58:28 -07:00
Christian Lachner
16f1b537b3 haproxy: Update HAProxy to v1.8.26
- Update haproxy download URL and hash

Signed-off-by: Christian Lachner <gladiac@gmail.com>
2020-10-02 09:46:05 +02:00
Stan Grishin
dc09a37913 vpnbypass: README update, code cleanup
Signed-off-by: Stan Grishin <stangri@melmac.net>

update

Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-09-21 23:04:09 -10:00
Rosen Penev
82f8333123
Merge pull request #13435 from stangri/18.06-simple-adblock
[18.06] simple-adblock: add config auto-update feature
2020-09-20 04:14:31 -07:00
Stan Grishin
b7c198b3e9 simple-adblock: add config auto-update feature
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-09-20 00:17:04 +00:00
Michael Heimpold
a359b1b3bd php7: update to 7.2.33
This fixes:
  - CVE-2020-7068

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 473ca554f5)
2020-09-10 20:57:21 +02:00
Hannu Nyman
0ad7b4af0a nano: update to 5.2
Update nano editor to version 5.2.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3ce7595136)
2020-08-25 23:06:56 +03:00
Rosen Penev
b2978d83db
Merge pull request #13188 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfix: update config; use command -v
2020-08-21 17:48:40 -07:00
Stan Grishin
b3170384c1 simple-adblock: bugfix: update config; use command -v
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-08-21 23:29:33 +00:00
Robby K
4c1293e3f8
freeradius3: Fix proxy.conf file conflict.
It was provided by both the freeradius3 and freeradius3-mod-realm packages.
Now provided by the freeradius3 package only.

Signed-off-by: Robby K <robbyke@gmail.com>
Fixes: #13149
(cherry picked from commit c81d176e80)
2020-08-17 13:04:36 +02:00
Rosen Penev
f8423ccb09
Merge pull request #13123 from jjm2473/lvm2-fix-mac-sh-for-1806
lvm2: fix CE in mac (backport)
2020-08-15 01:45:13 -07:00
Liangbin Lian
3fd112e4a3 lvm2: fix CE in mac
command-count.h generated by makefile was wrong
when using default shell in mac,
set shell to bash to fix it.

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 9bb0962d6e)
2020-08-14 19:53:59 +08:00
Hannu Nyman
2d1f837934 nano: update to 5.1
Update nano to version 5.1.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 02f9ec4adc)
2020-08-12 22:59:17 +03:00
Hannu Nyman
e6e24738e3 nano: update to 5.0
Update nano editor to version 5.0.
http://git.savannah.gnu.org/cgit/nano.git/tree/NEWS

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 409633f0dd)
2020-08-12 22:59:14 +03:00
Rosen Penev
b2ed091298
Merge pull request #13057 from odmdas/odmdas-freeradius3-Makefile-18.06
[18.06] freeradius3: add missing conffiles to Makefile
2020-08-08 19:47:48 -07:00
Alexey Dobrovolsky
9c86718289 freeradius3: add missing conffiles to Makefile
Config files
/etc/freeradius3/policy.d/accounting
/etc/freeradius3/policy.d/filter
/etc/freeradius3/proxy.conf
/etc/freeradius3/sites-available/default
and link
/etc/freeradius3/sites-enabled/default
are in the freeradius3 package and are mentioned in the main config file
/etc/freeradius3/radiusd.conf
Thus, they must be explicitly specified in the Makefile.

File
/etc/freeradius3/sites/default
is not included in the package, is not created during installation,
is not mentioned in the main config file and should therefore be excluded
from the Makefile.

(backported from commit f6974b8)
Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com>
2020-08-09 00:44:42 +03:00
Rosen Penev
717b781ad7
Merge pull request #13023 from stangri/18.06-simple-adblock
[18.06] simple-adblock: README and config update
2020-08-05 13:16:56 -07:00
Stan Grishin
8dc8d4c207 simple-adblock: README and config update
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-08-04 22:51:00 +00:00
Rosen Penev
f9daa828e0
Merge pull request #12999 from jjm2473/libtasn1-support-host-compile
libtasn1: add host build
2020-08-03 20:03:12 -07:00
Andy Walsh
2d3a84f0fe libtasn1: add host-build
* samba4 complains that it cant find the libasn1 host bins

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 42e9057d41)
2020-08-04 10:38:08 +08:00
Rosen Penev
705d25d5a1
Merge pull request #12989 from jjm2473/netatalk-fix-CE-dtrace
netatalk: fix compile error in mac os
2020-08-03 13:38:18 -07:00
Liangbin Lian
6aeaf7dc92 netatalk: fix compile error in mac os
fix compile error in mac os when dtrace installed.

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
2020-08-03 15:53:59 +08:00
Rosen Penev
a93b93d02b
Merge pull request #12991 from jjm2473/libgpg-error-fix-gawk50-3
libgpg-error: Fix compilation with GAWK 5.0
2020-08-01 16:00:32 -07:00
Liangbin Lian
77587bedae libgpg-error: Fix compilation with GAWK 5.0
Patch from Upstream.

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
2020-08-02 00:11:09 +08:00
Rosen Penev
aa777df6da
Merge pull request #12882 from jefferyto/python3-backport-patches-openwrt-18.06
[openwrt-18.06] python3: Backport security fixes
2020-07-20 03:24:50 -07:00
Jeffery To
e05705fa54
python3: Backport security fixes
This backports fixes for security issues, including:
* CVE-2020-14422: Hash collisions in IPv4Interface and IPv6Interface
* CVE-2019-20907: Infinite loop in the tarfile module

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-07-20 17:43:45 +08:00
Hannu Nyman
c15122fb7a haveged: update to 1.9.13
Update haveged to version 1.9.13.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 28cf201290)
2020-07-18 14:15:45 +03:00
Rosen Penev
546975dffb
Merge pull request #12661 from jefferyto/python-3.6.11-openwrt-18.06
[openwrt-18.06] python3: Update to 3.6.11
2020-06-30 14:33:05 -07:00
Jeffery To
6417457339
python3: Update to 3.6.11
This contains a fix for CVE-2020-8492 (Denial of service in
urllib.request.AbstractBasicAuthHandler)[1].

[1]: https://docs.python.org/release/3.6.11/whatsnew/changelog.html#python-3-6-11-release-candidate-1

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-07-01 00:01:28 +08:00
Rosen Penev
3361313d33
Merge pull request #12615 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: re-add conffiles and add description to Makefile
2020-06-25 22:18:08 -07:00
Stan Grishin
7d36084381 https-dns-proxy: re-add conffiles and add description to Makefile
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-06-26 03:09:53 +00:00
Rosen Penev
f2b54d8261
Merge pull request #12598 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: bugfix: remove eDNS support
2020-06-25 14:22:22 -07:00
Stan Grishin
e97462d3d5 https-dns-proxy: bugfix: remove eDNS support
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-06-25 19:41:07 +00:00
Hannu Nyman
a66ee15de5 haveged: update to 1.9.12
Update haveged to version 1.9.12

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 6392d50c31)
2020-06-21 23:25:18 +03:00
Hannu Nyman
ca1c97a9b5 haveged: update to 1.9.11
Update haveged to version 1.9.11

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ca30b0ff91)
2020-06-14 21:17:24 +03:00
Karel Kočí
ca1082fa14 haveged: move init script from 13 to 01
This is intended as a match with standard urngd. They serve same purpose
and urngd starts as first with 00. Starting haveged later can create
issues if you replace urngd with it. The example problem is if
uci-defaults script decides to generate certificate. Haveged can supply
entropy but it is started later and to mitigate this urngd would still
have to be installed. This means that haveget can't serve as replacement
without moving it to match start order of urngd.

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
(cherry picked from commit 1ef38f45d9)
2020-06-14 21:17:21 +03:00
Etienne Champetier
4176f48148
Merge pull request #12508 from stangri/18.06-simple-adblock
[18.06] simple-adblock: racially-neutral names
2020-06-13 18:11:18 -04:00
Stan Grishin
2ea2b371b3 simple-adblock: racially-neutral names
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-06-13 20:39:21 +00:00
Rosen Penev
45709a6230
Merge pull request #12455 from stangri/18.06-simple-adblock
[18.06] simple-adblock: remove obsolete dshield.org links from config
2020-06-08 13:50:52 -07:00
Stan Grishin
596c55ab24 simple-adblock: remove obsolete dshield.org links from config
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-06-08 17:36:02 +00:00
Hannu Nyman
96718d025b
Merge pull request #12335 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfix: proper error reporting on failed downloads; lists update script
2020-06-03 18:21:58 +03:00
Stan Grishin
971346c385 simple-adblock: bugfix: proper error reporting on failed downloads; lists update script
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-27 00:26:28 +00:00
Hannu Nyman
c3c558f6e3 nano: update to 4.9.3
Update nano version to 4.9.3
Minor bugfix release.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 38be46a7ae)
2020-05-24 20:44:07 +03:00
Josef Schlehofer
58b4399a5c bind: update to version 9.11.19
Fixes:
CVE-2020-8616
CVE-2020-8617

Remove backported patch

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-05-20 11:23:29 -07:00
Rosen Penev
24d14e8b35
Merge pull request #12235 from jefferyto/python-openssl-ca-certs-openwrt-18.06
[openwrt-18.06] python-openssl,python3-openssl: Add dependency on ca-bundle
2020-05-20 09:21:37 -07:00
Jeffery To
76a67189c5 python-openssl,python3-openssl: Add dependency on ca-bundle
The ssl module assumes OpenSSL can load the default trust anchors (root
CA certificates).

From https://github.com/openwrt/packages/issues/12209

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-05-20 17:28:02 +08:00
Jan Kardell
e2aa53d376 Python: Fix compile of host modules
Add -rpath linker option to host build, pointing to staging/hostpkh/lib.
It's needed to find the correct host libs during runtime, without it the
hosts libs may be used instaead, causing failures.

Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
(cherry picked from commit 0311e58bb6)
2020-05-20 17:28:02 +08:00
Jan Kardell
618771c3a3 Python3: Fix host build on OpenSUSE
The linker option -rpath is required to find libs in staging_dir. Now it
is included when building host modules. Without it the import test of
the _ctypes and _uuid modules would fail. The _ctypes module uses
libffi.so.6 from staging, but OpenSUSE LEAP 15 has libffi.so.7.
It will also fail on LEAP 42.x, Fedora28 and 29 and future or old
versions of Ubuntu.

Fix needed in master and 18.06 branches.

Signed-off-by: Jan Kardell <jan.kardell@telliq.com>
(cherry picked from commit 6ade5a1e3a)
2020-05-20 17:28:02 +08:00
Josef Schlehofer
8b23a429bb
unbound: update to version 1.10.1
Fixes:
CVE-2020-12662
CVE-2020-12663

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-05-19 11:50:58 +02:00
Hannu Nyman
8a02981921
Merge pull request #12207 from micmac1/mar-1806-10413
[18.06] mariadb: minor version bump with CVE fixes
2020-05-18 08:49:19 +03:00
Sebastian Kemper
0bf8d57193 mariadb: bump to 10.1.45
Fixes:

  CVE-2020-2752
  CVE-2020-2812
  CVE-2020-2814

This commit also moves mysql_upgrade to the client package and installs
the configuration files readable for all, so that the clients can read
them.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2020-05-18 00:24:31 +02:00
Michael Heimpold
bb636880d8 php7: update to version 7.2.31
This fixes:
  - CVE-2019-11048

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 2e6bd4cb86)
2020-05-16 14:17:24 +02:00
Hannu Nyman
0da88f8eb3
Merge pull request #12142 from EricLuehrsen/unbound_1806_1100
[openwrt-18.06] unbound: update to 1.10.0
2020-05-11 15:09:22 +03:00
Eric Luehrsen
eab86cd2ce unbound: update to 1.10.0
cherry-pick: f779ef48cd
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2020-05-10 23:55:28 -04:00
Hannu Nyman
f245b0e887
Merge pull request #12058 from stangri/18.06-vpnbypass
[18.06] vpnbypass: bugfix: remove non-ASCII from system log; update README
2020-05-03 22:53:02 +03:00
Stan Grishin
1c2ac45a22 vpnbypass: bugfix: remove non-ASCII from system log; update README
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-05-02 22:35:55 +00:00
Josef Schlehofer
a821c3789d
youtube-dl: update to version 2020.3.24
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-05-01 11:47:42 +02:00
Josef Schlehofer
c0ec2dfd55
Merge pull request #11995 from jefferyto/python-2.7.18-openwrt-18.06
[openwrt-18.06] python: Update to 2.7.18, refresh patches
2020-04-29 10:57:13 +02:00
Jeffery To
dd5896c7c4 python: Update to 2.7.18, refresh patches
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-04-29 06:08:03 +08:00
yurtesen
baacda1b4a mwan3: Fix json_load fails with some data
Sometimes the return value of `ubus -S call network.interface.wan status`
cause `json_load` to return `Failed to parse message data` error.

To avoid this, the JSON data always should be quoted with double quotes.

Signed-off-by: Evren Yurtesen <eyurtese@abo.fi>
Removed quoatation marks from commit heading
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 94e0c78826)
2020-04-28 10:21:14 +02:00
Rosen Penev
6f81894d9e
libarchive: update to 3.4.2
Switch to normal tarballs. Remove autoreconf as a result.

Several Makefile cleanups for consistency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit c22dd1bf74)
(cherry picked from commit 2085b990ff)
2020-04-28 09:55:51 +02:00
Jan Pavlinec
5fc2af4385
libarchive: update to version 3.4.1 (security fix)
Fixes CVE-2019-19221

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
(cherry-picked from df634dcc92)
(cherry picked from commit ba43556aed)
2020-04-28 09:55:44 +02:00
Josef Schlehofer
f85dd8b965 php7: update to version 7.2.30
Fixes:
CVE-2020-7066
CVE-2020-7064

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 09738290a3)
2020-04-25 23:31:13 +02:00
Michael Heimpold
ae0e27548f php7: fix dependencies for mysqlnd (fixes #11113)
When during the build the openssl extension is also selected, then
the mysqlnd extension depends on it, too.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 50b1cd3757)
2020-04-25 23:30:29 +02:00
Hannu Nyman
4df97ac0ee
Merge pull request #11926 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfix: start downloads on cold boot/fresh install
2020-04-22 20:57:48 +03:00
Stan Grishin
7ed5c9364b simple-adblock: bugfix: start downloads on cold boot
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-22 17:46:23 +00:00
tripolar
96a2a5cfbc
Merge pull request #11907 from BKPepe/18.06-git
[18.06] git: update to version 2.20.4
2020-04-21 10:04:02 +02:00
Josef Schlehofer
fc93a4f126
git: update to version 2.20.4
Fixes CVE-2020-11008

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-04-21 08:11:54 +02:00
Josef Schlehofer
3b55acda90
Merge pull request #11857 from BKPepe/18.06-git
[18.06] git: update to version 2.20.3
2020-04-21 07:22:14 +02:00
tripolar
48b347e47c
Merge pull request #11883 from yousong/wget1806
[18.06] acme: depends on wget-ssl
2020-04-18 19:55:52 +02:00
Yousong Zhou
a62e54af3e acme: depends on wget-ssl
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit d917d662ae)
2020-04-18 23:46:09 +08:00
Yousong Zhou
7d1f138c23 wget: make the ssl variant provides wget-ssl
This is to address the need for specifying dependency on a wget
implementation with ssl support.

Now we have a game of names for opkg

 1. uclient-fetch: minimal version by openwrt project
 2. wget-nossl: gnu wget w/o ssl support
 3. wget-ssl: for the moment since this commit, gnu wget w/ ssl support
 4. wget: uclient-fetch, wget-nossl, or wget-ssl
 5. gnu-wget: wget-nossl or wget-ssl

By the time we provide some dummy package like uclient-fetch-ssl and
make it also provide wget-ssl, I guess by then we will also need
gnu-wget-ssl...

Ref: https://github.com/openwrt/packages/issues/11534
Ref: https://github.com/openwrt/packages/pull/9941
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 585e4a38fe &
resolved conflict)
2020-04-18 23:45:35 +08:00
Karel Kočí
b075784431 wget: do not provide itself
The package wget should not say that it provides itself.

This also make gnu-wget provide general so it is not written in Makefile
twice.

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 75f2be7d50 &
resolved conflict)
2020-04-18 23:44:20 +08:00
Luiz Angelo Daros de Luca
3066aaa825 ruby: update to 2.5.8
This release includes security fixes, specially:

* CVE-2020-10663: Unsafe Object Creation Vulnerability in JSON (Additional fix)
* CVE-2020-10933: Heap exposure vulnerability in the socket library

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2020-04-15 17:20:17 -03:00
Josef Schlehofer
4a4c793272
git: update to version 2.20.3
Fixes CVE-2020-5260

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-04-15 17:18:25 +02:00
Jo-Philipp Wich
a0fe9eeab1 nlbwmon: update to latest Git HEAD
34a1887 nfnetlink: disable sequence number checking

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 53c48fae15)
2020-04-11 23:24:42 +02:00
Hannu Nyman
c0fffb996f
Merge pull request #11821 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: bugfix: memory leak
2020-04-11 10:48:29 +03:00
Stan Grishin
a0a779faf6 https-dns-proxy: bugfix: memory leak
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-11 00:25:39 +00:00
Jo-Philipp Wich
e8cf2e60ae nlbwmon: update to latest Git HEAD
e757e06 nfnetlink: allow specifying the socket buffer size
33c77cb nfnetlink: properly handle nl_recvmsgs() failures
95cced5 protocol: Include whitespace when reading names

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d81d777a0f)
2020-04-11 00:33:10 +02:00
DENG Qingfang
8696b34992 nlbwmon: bump to latest git
e921ca0a Add further commonly used protocols to the protocol file.

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry picked from commit 5e140462e4)
2020-04-11 00:33:10 +02:00
Richard Yu
c66a3cf7ce nlbwmon: add procd reload trigger for nlbwmon config
Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit d551758310)
2020-04-11 00:33:09 +02:00
Kevin Darbyshire-Bryant
28d6dc944e nlbwmon: receive dhcp interface triggers
Not all interfaces may have been allocated address at nlbwmon startup so
it may not collect statistics as expected/configured.

Add interface triggers to catch dhcp events and restart as required.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 662d3f16d2)
2020-04-11 00:33:09 +02:00
Marc Benoit
6a642a6073 net/nlbwmon: run with lower priority
Even on a powerful platform a nlbwmon process'
activities are sometimes affecting throoughput and
latency. This is a backgroud process, that should not
be running with default priority.
Even if it is a little deplayed, that is not a worry in
this case. The routing should be the main priority,
bandwidth stats collection can wait a bit.

Tested on Netgear R7800
Signed-off-by: Marc Benoit <marcb62185@gmail.com>
(cherry picked from commit 9b3ecbd64a)
2020-04-11 00:33:09 +02:00
Rosen Penev
21f7d16a19
Merge pull request #11803 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfixes: remove escape chars from log, restore from cache on boot
2020-04-07 18:39:35 -07:00
Stan Grishin
6787a9bfd2 simple-adblock: bugfixes: remove escape chars from log, restore from cache on boot
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-04-07 21:55:51 +00:00
Hannu Nyman
876a7418fe nano: update to 4.9.2
Update nano editor to version 4.9.2

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit f11833d46c)
2020-04-07 18:07:20 +03:00
Josef Schlehofer
133f71a2cd
Merge pull request #11773 from BKPepe/msmtp
[18.06] msmtp: update to version 1.8.7
2020-04-06 09:45:41 +02:00
Josef Schlehofer
b0484b0051
msmtp: update to version 1.8.7
- It brings oauthbearer support
- It switches from OpenSSL to GnuTLS, which is fully compatible and
  brings more parameters

Makefile changes:
- Fix SPDX License Identifier
- Add PKG_CPE_ID
- The Project does not use sourceforce anymore.
- Uses GnuTLS instead of OpenSSL, which was discouraged

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-04-06 00:57:02 +02:00
Hannu Nyman
2c4a58a38b nano: update to 4.9.1
Update nano editor to version 4.9.1

 2020.03.31 - GNU nano 4.9.1 "Sapperdeflap"
 Two bugs introduced in version 4.9 are fixed: the cursor
 getting misplaced when undoing line cuts, and filtering
 of the whole buffer to a new buffer not working.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit f5c47a2606)
2020-04-05 19:24:07 +03:00
Hannu Nyman
6effd4b7aa
Merge pull request #11756 from gladiac1337/haproxy-1.8.25-openwrt-18.06
[openwrt-18.06] haproxy: Update HAProxy to v1.8.25
2020-04-03 16:47:09 +03:00
Christian Lachner
0db9f894de haproxy: Update HAProxy to v1.8.25
- Update haproxy download URL and hash
- This fixes CVE-2020-11100 (http://git.haproxy.org/?p=haproxy-1.8.git;a=commit;h=525fbbe388ba033d638ff2a4efb83ae6526db5ab)

Signed-off-by: Christian Lachner <gladiac@gmail.com>
2020-04-03 09:24:53 +02:00
Hannu Nyman
5610642876
Merge pull request #11700 from stangri/18.06-simple-adblock
[18.06] simple-adblock: support multiple dnsmasq instances + internal refactoring
2020-03-29 10:01:04 +03:00
Stan Grishin
2c1a3aaf5a simple-adblock: support multiple dnsmasq instances; rework communication between principal package and luci app
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-03-29 05:13:29 +00:00
Hannu Nyman
e4c60e87d5 nano: update to 4.9
Update nano editor to version 4.9

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 09fd4445b3)
2020-03-26 21:39:49 +02:00
Rosen Penev
24f10e379e
Merge pull request #11626 from nxhack/18_06_icu_fix_CVE-2020-10531
[openwrt-18.06] icu: fix CVE-2020-10531
2020-03-21 18:08:46 -07:00
Hannu Nyman
9bdb25f51f
Merge pull request #11616 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: support for dnsmasq noresolv option
2020-03-21 09:47:15 +02:00
Hirokazu MORIKAWA
c4ddc21bf6 icu: fix CVE-2020-10531
FIX CVE-2020-10531
 An integer overflow, leading to a heap-based buffer overflow, exists in the UnicodeString::doAppend() function in common/unistr.cpp.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
2020-03-21 09:18:49 +09:00
Stan Grishin
6b290744db https-dns-proxy: support for dnsmasq noresolv option
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-03-20 21:22:49 +00:00
Yousong Zhou
f5ae75cf0b openvswitch: fix PIE build against 4.14 kernel
Reported-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Ref: https://github.com/openwrt/packages/pull/11567
(cherry picked from commit e9d6414437)
2020-03-16 15:32:11 +08:00
Michael Heimpold
c05ea69d6d php7: update to 7.2.28
This fixes:
  - CVE-2020-7062
  - CVE-2020-7063

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 95c72d8aba)
2020-02-25 22:39:03 +01:00
Michael Heimpold
31e16f276f php7: update to 7.2.27
This fixes:
  - CVE-2020-7059
  - CVE-2020-7060

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 3cf0c61f2e)
2020-02-25 22:13:58 +01:00
Yousong Zhou
f3df27f6f6 xl2tpd: fix building failure caused by pfc
Fixes openwrt/packages#10270

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 0412c20f1b)
2020-02-25 11:57:26 +08:00
Yousong Zhou
a0f2911918 xl2tpd: bump to version 1.3.15
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Ref: https://github.com/openwrt/packages/issues/11418
(cherry picked from commit 620ba386b4)
2020-02-25 11:57:26 +08:00
Rosen Penev
c95e3b71f3
icu: bump proper variable.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-02-18 18:50:21 -08:00
Rosen Penev
ad7f02d0f1 icu: backport upstream ARC patch
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-02-15 23:01:20 -08:00
Hannu Nyman
d1c6d1d958 nano: update to 4.8
Update nano editor to version 4.8

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 7bc96280d3)
2020-02-08 11:26:38 +02:00
Rosen Penev
b2a29b7a49
Merge pull request #11252 from neheb/i22p
i2pd: fix various issues in 18.06
2020-02-06 19:08:00 -08:00
Rosen Penev
ddfa4cddca
i2pd: move chmod command
Similar change to upstream.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-02-04 18:50:35 -08:00
David Yang
87a7ec7257
i2pd: Move DATADIR to /var/lib/i2pd, fix #5693
Original author: dartraiden <wowemuh@gmail.com>

Signed-off-by: David Yang <mmyangfl@gmail.com>
2020-02-04 18:44:34 -08:00
Hannu Nyman
8235cc43a3
Merge pull request #11227 from micmac1/sqlite3-18.06-2
[18.06] sqlite3: bump to 3.31.1
2020-02-03 22:41:35 +02:00
Sebastian Kemper
e6884e5544 sqlite3: bump to 3.31.1
Upstreamed patch removed.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2020-02-03 20:19:21 +01:00
Rosen Penev
a744482ef5
Merge pull request #11186 from micmac1/18.06-maria-10.1.44
[18.06] mariadb: security bump to 10.1.44
2020-01-30 16:30:19 -08:00
Sebastian Kemper
27d8c1bcc9 mariadb: security bump to 10.1.44
Addresses CVE-2020-2574. Patches refreshed.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2020-01-30 22:21:52 +01:00
Kwonjin Jeong
925068d4f8
ddns-scripts: Change protocols of afraid.org urls to HTTPS.
- Use HTTPS protocol for updating urls for afraid.org to protect the password.
- Bump/align package version number.

Signed-off-by: Kwonjin Jeong <gram25gwh@gmail.com>
(cherry-picked from e25b558999)
2020-01-27 21:44:34 -08:00
Hirokazu MORIKAWA
d905324e49 node-hid: fix i386 build fail
more stability for parallel build

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry-picked from 1aa55f86b5)
2020-01-26 20:44:02 -08:00
Hirokazu MORIKAWA
4ac86244ab node-serialport: fix i386 build fail
more stability for parallel build

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry-picked from 1ce1ca6e06)
2020-01-26 20:38:07 -08:00
Hannu Nyman
1091c431de
Merge pull request #11124 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: fix deleting server items, configurable dnsmasq settings change
2020-01-26 22:39:51 +02:00
Jiri Slachta
7c667ed4ed
Merge pull request #11127 from micmac1/18.06-tiff
[18.06] tiff: update to 4.1.0
2020-01-26 18:27:28 +01:00
Jiri Slachta
33e31a4b3a tiff: update version to 4.1.0
Signed-off-by: Jiri Slachta <jiri@slachta.eu>
2020-01-26 09:20:30 +01:00
Jan Pavlinec
709dc04d2a tiff: patch security issues
Fixes
CVE-2019-7663
CVE-2019-6128

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2020-01-26 09:19:11 +01:00
Stan Grishin
8da1c41104 https-dns-proxy: fix deleting server items, configurable dnsmasq settings change
Signed-off-by: Stan Grishin <stangri@melmac.net>
2020-01-25 21:15:13 -07:00
Rosen Penev
9e1fcfa6eb
Merge pull request #9795 from LoEE/jpc/git-macos-cross
[18.06]git: fix cross compilation on macOS
2020-01-25 15:25:00 -08:00
Ted Hess
3219dbfd8a libsoup: fix intltool host dependency. Cleaup some build args
Signed-off-by: Ted Hess <thess@kitschensync.net>
(cherry-picked from 0daec55ce5)
2020-01-24 23:31:48 -08:00
Rosen Penev
c6e48ff8ed
avrdude: Fix GPIO path building
%ud is a GNU extension. It's not really supported elsewhere.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 536c6b8be7)
2020-01-23 21:33:14 -08:00
Josef Schlehofer
ba934d1fbd
zerotier: add /etc/config/zerotier as configuration file
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-01-22 12:46:54 +01:00
Josef Schlehofer
3d47a69b0c
libseccomp: add seccomp-syscalls.h to InstallDev
In the version 2.4.2, there was introduced a new header file.
Ship it to InstallDev

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-01-17 05:16:45 +01:00
Rosen Penev
c629b44d88
Merge pull request #11023 from jefferyto/golang-goarm-fix-openwrt-18.06
[openwrt-18.06] golang: Fix selection of GOARM value
2020-01-14 12:09:20 -08:00
Jeffery To
4c6ac36d52 golang: Fix selection of GOARM value
This fixes how GOARM is selected for arm platforms, based on support for
VFP/VFPv3 rather than CPU version.

Fixes #10967.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2020-01-15 00:59:28 +08:00
Nikos Mavrogiannopoulos
56e7ce0f9e
Merge pull request #10995 from BKPepe/libseccomp-18.06
[18.06] libseccomp: update to version 2.4.2
2020-01-13 22:57:13 +01:00
Josef Schlehofer
769b3956e8
libseccomp: update to version 2.4.2
Fixes CVE-2019-9893

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-01-12 12:42:48 +01:00
Rosen Penev
36611df05c
transmission: sync with master
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-01-10 18:11:03 -08:00
Josef Schlehofer
b0df5d3365
Merge pull request #10832 from BKPepe/git-18.06
[OpenWrt 18.06] git: Update to version 2.16.6 (security fix)
2020-01-01 13:04:17 +01:00
Josef Schlehofer
7f96b4e2c2
git: Update to version 2.16.6 (security fix)
Fixes CVEs:
CVE-2018-17456
CVE-2019-1348
CVE-2019-1349
CVE-2019-1350
CVE-2019-1351
CVE-2019-1352
CVE-2019-1353
CVE-2019-1354
CVE-2019-1387

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2020-01-01 13:03:34 +01:00
tripolar
8304a768cb
Merge pull request #10858 from BKPepe/wget-18.06
[OpenWrt 18.06] wget: fix CVE-2019-5953
2019-12-30 14:03:47 +01:00
Rosen Penev
3abdfbd14c lcdgrilo: Fix compilation with newer Vala
It seems semantics changed slightly.

Cleaned up Makefile for consistency between packages.

Added PKG_BUILD_PARALLEL for faster compilation.

Fixed license information.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 16fb706641)
2019-12-30 00:15:00 -08:00
Rosen Penev
01ddd6de19 lcdgrilo: Depend on vala/host instead
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 5935670ba1)
2019-12-30 00:12:28 -08:00
Eneas U de Queiroz
a41b4aa0c0 lcdgrilo: remove check dependency
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 2e8b7358c4)
2019-12-29 23:30:38 -08:00
Hannu Nyman
0a00a26911 nano: update to 4.7
Update nano to version 4.7

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c62f8962ba)
2019-12-29 15:21:17 +02:00
Hannu Nyman
1bc3375c57
Merge pull request #10889 from EricLuehrsen/unbound_196_1806
[18.06] unbound: update to 1.9.6
2019-12-28 22:33:00 +02:00
Eric Luehrsen
c791ba8f5b unbound: update to 1.9.6
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2019-12-28 09:22:48 -05:00
Eneas U de Queiroz
998ef11cb4
grilo: copy vapi files to versioned vala dir
The version is obtained via `valac --api-version`

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 8d0c849e56)
2019-12-24 19:17:47 -08:00
Eneas U de Queiroz
8f7b6a2bbc
grilo: update vapi files, copy to unversioned dir
Updates vapigen-generated vapi files to vala-0.34.
Files are now copied to $(STAGING_DIR_HOSTPKG)/share/vala/vapi, without
the vala version being hardcoded.
Removed copyright line, and redundant PKG_BUILD_DEPENDS and
TARGET_LDFLAGS.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 1b794e93e3)
2019-12-24 19:16:26 -08:00
Rosen Penev
b89a2903b2
lcdproc: Fix non x86 platforms on musl
Musl only specifies in/outb for x86/x86. Use the fallback path in case
musl is used.

This should fail compilation during the linking stage but for some reason
does not. Will do if -Werror=implicit-function-declaration is specified.

Fixed up license information.

Other small cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from fa40b85f20)
2019-12-24 19:12:22 -08:00
Rosen Penev
6e079e91ce
Merge pull request #10763 from leonghui/wiki-link-update-18.06
[18.06] treewide: replace old wiki links
2019-12-22 21:44:56 -08:00
Michael Heimpold
3727d98ce2 php7: update to 7.2.26
This fixes:
  - CVE-2019-11046
  - CVE-2019-11044
  - CVE-2019-11045
  - CVE-2019-11050
  - CVE-2019-11047

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit d5c18b1d5e)
2019-12-22 13:36:39 +01:00
Josef Schlehofer
49b5fc001f bind: Update to version 9.11.14
Add patch to fix compile issue:
stats.c: In function 'setcounter':
stats.c:300:29: error: 'val' undeclared (first use in this function); did you mean 'value'?
  stats->counters[counter] = val;
                             ^~~
                             value

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-12-21 15:56:20 -08:00
Josef Schlehofer
8fe26c9855
wget: fix CVE-2019-5953
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-12-21 19:57:41 +01:00
Hannu Nyman
279f4a3386
Merge pull request #10855 from BKPepe/python3-18.06
[OpenWrt 18.06] python3: Updated to version 3.6.10
2019-12-21 20:07:27 +02:00
Josef Schlehofer
29fe5f91d7
python3: Updated to version 3.6.10
Remove backported patches:
025-bpo-34155-Dont-parse-domains-containing-GH-13079-GH-.patch
026-bpo-38243-xmlrpc.server-Escape-the-server_title-GH-1.patch

Fixes CVE-2019-16056

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-12-21 18:12:34 +01:00
Rosen Penev
102c621fc7
Merge pull request #10846 from cshoredaniel/pr-18.06-fix-nut-cgi-initscript
nut: Fix NUT CGI startup script
2019-12-21 07:02:17 -08:00
Daniel F. Dickinson
45c95e8629 nut: Fix NUT CGI startup script
Commit c1aa1f784c which backported
a number of fixes from master, missed one fix for nut-cgi.  If
nut-cgi is installed standalone or nut-cgi starts before nut-server
(the default in 18.04.5) then the configuration file directory does
not get create and therefore there is no CGI configuration file.
This commit fixes that.

Closes: #10687

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-12-21 05:30:40 -05:00
Rosen Penev
d810a30391
Merge pull request #10752 from stangri/18.06-https-dns-proxy
[18.06] https-dns-proxy: switch to https-dns-proxy package name
2019-12-18 16:14:35 -08:00
Josef Schlehofer
97de555425
git: Update to version 2.16.6 (security fix)
Fixes CVEs:
CVE-2018-17456
CVE-2019-1348
CVE-2019-1349
CVE-2019-1350
CVE-2019-1351
CVE-2019-1352
CVE-2019-1353
CVE-2019-1354
CVE-2019-1387

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-12-18 23:21:47 +01:00
Stan Grishin
0369174652 https-dns-proxy: switch to https-dns-proxy package name
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-12-17 14:48:56 -07:00
Leong Hui Wong
0a3b6465f6 treewide: update wiki links
Signed-off-by: Leong Hui Wong <wong.leonghui@gmail.com>
2019-12-14 15:31:54 +08:00
Rosen Penev
44b1f65cc4
Merge pull request #10744 from luizluca/libvpx-fixcve
[18.06] libvpx: backport security fixes
2019-12-10 22:58:11 -08:00
Luiz Angelo Daros de Luca
98ca3621cf libvpx: backport security fixes
Fixes CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433.

From: openwrt/telephony#492

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2019-12-09 23:33:09 -03:00
W. Michael Petullo
cce63a697b
luajit: install libluajit-5.1.so.2
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry-picked from commit 30d5958)
2019-12-06 15:02:32 +01:00
W. Michael Petullo
c1975f5a1f
luajit: add .hpp to InstallDev
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry-picked from commit efb7d0be6d)
2019-12-06 15:01:51 +01:00
Hannu Nyman
6f528c6789 nano: update to 4.6
Update nano editor to version 4.6

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 421dae85a3)
2019-12-01 14:25:17 +02:00
Hannu Nyman
be3ec8baeb
Merge pull request #10678 from gladiac1337/haproxy-1.8.23-openwrt-18.06
[openwrt-18.06] haproxy: Update HAProxy to v1.8.23
2019-11-29 17:30:09 +02:00
Christian Lachner
bc37a31b16 haproxy: Update HAProxy to v1.8.23
- Update haproxy download URL and hash
- This fixes CVE-2019-19330 (See: https://nvd.nist.gov/vuln/detail/CVE-2019-19330)

Signed-off-by: Christian Lachner <gladiac@gmail.com>
2019-11-29 14:01:50 +01:00
Daniel Golle
fff2e26a9b
transmission: sync with master branch
Fixes to init-script were not cherry-picked properly, sync it with
version found in master branch.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry-picked from a79d6df674)
2019-11-28 16:16:21 -08:00
Jan Pavlinec
2986916b81 tor: update to version 4.1.6
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-11-28 22:27:56 +01:00
Rosen Penev
edeac5d3a6
Merge pull request #9836 from cotequeiroz/grilo-plugins_xml
[18.06] grilo plugins: fix build errors
2019-11-27 13:37:07 -08:00
Eneas U de Queiroz
8794f09564
grilo-plugins: adjust CONFIGURE_ARGS
Removed unused flags, and added --enable-compile-warnings=minimum to
avoid a build failure with fortify-headers:
In file included from [staging_dir/target]/usr/include/libxml2/libxml/tree.h:15:0,
                 from [staging_dir/target]/usr/include/libxml2/libxml/parser.h:16,
                 from grl-jamendo.c:32:
[staging_dir/toolchain]/include/fortify/stdio.h: In function 'snprintf':
[staging_dir/toolchain]/include/fortify/stdio.h:99:2: error: format not
a string literal, argument types not checked [-Werror=format-nonliteral]
  return __orig_snprintf(__s, __n, __f, __builtin_va_arg_pack());
  ^~~~~~

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
2019-11-27 10:21:12 -03:00
Eneas U de Queiroz
c3ab7aace8
grilo-plugins: remove XML::Parser build dependency
gnome-common.m4 and gnome-compiler-flags.m4 were taken from version
3.18.0, and match current master branch.

Disable building help and test directories.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit a87108fe40)
2019-11-27 10:21:11 -03:00
Eneas U de Queiroz
86af453021
grilo-plugins: use hostpkg glib-compile-resources
Add GLIB_COMPILE_RESOURCES to MAKE_FLAGS

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit 8e0b7978ec)
2019-11-27 10:21:07 -03:00
Rosen Penev
8ef82e9621
transmission: Disable webseeding
It causes 100% CPU usage in certain situations. Just disable it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 6d9ee2ec86)
2019-11-24 19:15:04 -08:00
Rosen Penev
bd8b4df19d
transmission: Fix tracker issue with some firewalls
Some firewalls mandate a minimum size of 4k for SYN packets, which
transmission does not do by default. Upstream issue here:

https://github.com/transmission/transmission/issues/964

Cleanup:

Fixed license info.

Removed two unnecessary patches.

Ran shell script through shellcheck.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 730a1697fe)
2019-11-24 19:14:28 -08:00
Josef Schlehofer
71969eb041 php7: Update to version 7.2.25
- Fixes CVE-2019-11043

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 9bc48abd2a)
2019-11-24 22:11:39 +01:00
W. Michael Petullo
3d409f615a php7: mark /etc/config/php7-fastcgi as conffile
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit 5bc9bb04c5)
2019-11-24 22:11:31 +01:00
Michael Heimpold
d77c32928d php7-mod-xmlreader: add conditional dependency to php7-mod-dom (fixes #10201)
PHP7 fails to load xmlreader.so (php7-mod-xmlreader) module without
dom.so (php7-mod-dom) module loaded:

-snip-
PHP Warning:  PHP Startup: Unable to load dynamic library 'xmlreader.so'
 (tried: /usr/lib/php/xmlreader.so (Error relocating /usr/lib/php/xmlreader.so:
 dom_node_class_entry: symbol not found), /usr/lib/php/xmlreader.so.so (Error
 loading shared library /usr/lib/php/xmlreader.so.so: No such file or
 directory)) in Unknown on line 0
^C
-snap-

However, this dependency only exists when during build also php7-mod-dom
is selected.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit b8c22fc1ec)
2019-11-24 22:11:24 +01:00
Stefaan Ghysels
8667e35c1e php7: bump to 7.2.23
Signed-off-by: Stefaan Ghysels <stefaang@gmail.com>
(cherry picked from commit dacda44755)
2019-11-24 22:11:04 +01:00
Michael Heimpold
8dc64ea145 php7: update to 7.2.22
While at, update the SPDX license id to most recent format.

Compile and run tested on mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 5805da860e)
2019-11-24 22:09:50 +01:00
Michael Heimpold
882e46916a php7: update to 7.2.21
This fixes CVE-2019-11042 and CVE-2019-11041.

Compile and run tested on mxs platform

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 8e419c6d4c)
2019-11-24 22:09:50 +01:00
Rosen Penev
bbd4ec6cfb
Merge pull request #10609 from ja-pa/bind-update
[OpenWrt 18.06] bind: update to version 9.11.13 (security fix)
2019-11-21 09:34:44 -08:00
Jan Pavlinec
d0726f1f2b
bind: update to version 9.11.13 (security fix)
Fixes CVE-2019-6477

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-11-21 16:14:05 +01:00
Josef Schlehofer
04a8496b7f
unbound: Update to version 1.9.5
Fixes CVE-2019-18934

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-11-20 00:09:04 +01:00
Rosen Penev
70a990ac45
Merge pull request #10520 from Kulipator/libmraa_ramips_fix
[18.06] Libmraa compilation fix
2019-11-13 12:32:14 -08:00
Archil Pirmisashvili
cf4e50ab7b Compilation fix & upgrade to version 0.8.1
Signed-off-by: Archil Pirmisashvili <kulipator@gmail.com>
2019-11-13 22:30:33 +02:00
RF-Networks
1b64cb83d6 Libmraa compilation fix
Signed-off-by: Archil Pirmisashvili <kulipator@gmail.com>
2019-11-10 21:56:28 +02:00
RF-Networks
d029658323 Libmraa compilation fix
Signed-off-by: Archil Pirmisashvili <kulipator@gmail.com>
Signed-off-by: RF-Networks <archil@rf-networks.com>
2019-11-10 21:13:59 +02:00
Jakub Piotr Cłapa
b83b26c33d perl: fixed host compilation of static perl on MacOS
All symbols on MacOS are prefixed with an underscore which
interfered with the filtering mechanism (added in perl 5.28)
for extension libraries to be linked into static perl.

Signed-off-by: Jakub Piotr Cłapa <jpc@loee.pl>
2019-11-10 14:09:56 +01:00
Rosen Penev
f496ed58d3
Merge pull request #9671 from BKPepe/clamav1806
[OpenWrt 18.06] clamav: update to version 0.100.3
2019-11-09 18:52:17 -08:00
Rosen Penev
340d5ce71e protobuf-c: Fix typo on build dependency.
This was fixed in 3bcaa7a4fe

Backported the fix here.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-11-01 20:27:06 -07:00
Rosen Penev
e9c2ba68f7 libgd: Properly disable iconv support
HAVE_ICONV and HAVE_ICONV_H are two different headers that both need to
evaluate to false. Added the extra CONFIGURE_VARS.

This can be verified by passing -Werror=implicit-function-declaration

Added PKG_LICENSE_FILES

Updated homepage URL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from bf2f1a0263)
2019-11-01 20:24:58 -07:00
Yousong Zhou
e312133081 wget: provides gnu-wget
So that packages like acme requiring features from it can depend on it
explicitly, not the more basic "wget" which is also provided by
"uclient-fetch"

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
[port to 18.06 to fix acme package backport]
Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
2019-10-31 10:21:25 +01:00
Toke Høiland-Jørgensen
9f4f78da15 acme: Bring up-to-date with master
There are quite a few bugfixes in the version of the ACME package in
master, and the old version in 18.06 have some issues as seen in #10328.
This commit ports over all changes from the master branch in one go.

Signed-off-by: Toke Høiland-Jørgensen <toke@redhat.com>
2019-10-29 09:48:37 +01:00
Luiz Angelo Daros de Luca
938818ec41 ruby: bump to 2.5.7
2.5.7 fixes:
* CVE-2019-16255: A code injection vulnerability of Shell#[] and Shell#test
* CVE-2019-16254: HTTP response splitting in WEBrick (Additional fix)
* CVE-2019-15845: A NUL injection vulnerability of File.fnmatch and File.fnmatch?
* CVE-2019-16201: Regular Expression Denial of Service vulnerability of WEBrick’s Digest access authentication

2.5.6 fixes:
* Multiple jQuery vulnerabilities in RDoc
* About 40 bugs

Changelog: https://github.com/ruby/ruby/compare/v2_5_5...v2_5_7

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2019-10-27 11:40:26 -03:00
Josef Schlehofer
0f0c062d3c
python-cryptography: fix CVE-2018-10903
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-10-25 01:30:27 +02:00
Josef Schlehofer
5a9d222e5c
python-cryptography: Add support for LibreSSL 2.7.x
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-10-25 01:30:27 +02:00
Hannu Nyman
5edcc9f30e
Merge pull request #10324 from jefferyto/python-2.7.17-openwrt-18.06
[openwrt-18.06] python: Update to 2.7.17, refresh patches
2019-10-21 21:54:57 +03:00
Jeffery To
f184eb5f0e python: Update to 2.7.17, refresh patches
Patches already merged and so removed:
* 019-bpo-36216-Add-check-for-characters-in-netloc-that-normalize-to-separators-GH-12216.patch
* 020-bpo-36216-Only-print-test-messages-when-verbose-GH-12291.patch
* 021-2.7-bpo-35121-prefix-dot-in-domain-for-proper-subdom.patch
* 027-bpo-38243-Escape-the-server-title-of-DocXMLRPCServer.patch
* 028-bpo-34155-Dont-parse-domains-containing-GH-13079.patch

Patches no longer necessary and so removed:
* 017_lib2to3_fix_pyc_search.patch

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from 83b300aa83)
2019-10-22 01:04:43 +08:00
Rosen Penev
4d9282a4d6
Merge pull request #10312 from stangri/18.06-vpnbypass
[18.06] vpnbypass: bugfix: PROCD command not found on stop
2019-10-21 09:14:14 -07:00
Stan Grishin
7001d4748d vpnbypass: bugfix: PROCD command not found on stop
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-20 21:21:30 -07:00
Rosen Penev
7dbad81f8d
Merge pull request #10279 from BKPepe/sudo-18.06
[OpenWrt 18.06] sudo: Update to version 1.8.28p1
2019-10-20 10:16:28 -07:00
Josef Schlehofer
4c72f8dd66
sudo: Update to version 1.8.28p1
- Use HTTPS for downloading tarball and for their website
- Add PKG_CPE_ID
- Remove inactive maintainer
- Refreshed patches
Fixes: CVE-2019-14287

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-10-20 09:06:42 +02:00
Jan Pavlinec
b504ac5532
irssi: update to version 1.2.2 (security fix)
Fixes CVE-2019-15717

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
(cherry-picked from commit b42159dea3)
2019-10-20 00:23:44 +02:00
Noah Meyerhans
e98bc6874d Merge branch 'pr/10215' into openwrt-18.06
https://github.com/openwrt/packages/pull/10215
2019-10-16 08:38:11 -07:00
Josef Schlehofer
f2812716fd
Merge pull request #9997 from flyn-org/openldap-18.06
openldap: update to 2.4.48
2019-10-14 21:21:03 +02:00
Rosen Penev
22a272ccf9
Merge pull request #10237 from jefferyto/gammu-fix-lib-symlinks-openwrt-18.06
[openwrt-18.06] gammu: Fix lib symlinks
2019-10-14 09:29:16 -07:00
Jeffery To
6e2b8c2da6 gammu: Fix lib symlinks
This fixes the symlinks for libGammu.so and libgsmsd.so. Previously, the
symlinks were overwritten by $(INSTALL_BIN) with copies of their
sources.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-10-14 17:12:41 +08:00
Josef Schlehofer
9c7cf98805
bind: Update to version 9.11.11
Change License to MPL-2.0 and add PKG_LICENSE_FILES.
For more details look at https://www.isc.org/blogs/bind9-adopts-the-mpl-2-0-license-with-bind-9-11-0/

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-10-13 11:04:51 +02:00
Rosen Penev
728edfbdcd
Merge pull request #10108 from BKPepe/expat-1806
[OpenWrt 18.06] expat: Update to version 2.2.9
2019-10-11 12:49:51 -07:00
Rosen Penev
a8ca566840
Merge pull request #10167 from BKPepe/unbound18.06
[OpenWrt 18.06] unbound: Update to version 1.9.4
2019-10-08 13:58:14 -07:00
Alexandru Ardelean
e84deea057
python3-pip: fix install rule
This seems to have slipped for some time. No idea if it ever worked.
It could be that this worked at some point.

In any case, the shebang is properly updated now.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry-picked from commit 1b96dc0171)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(bump PKG_RELEASE for python3-pip)
2019-10-08 09:48:19 +02:00
Hannu Nyman
c4710f7805 nano: update to 4.5
Update nano editor to version 4.5.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit bfd66f2d23)
(fix also license tag and add CVE)
2019-10-07 18:24:57 +03:00
Hannu Nyman
cae699fc44
Merge pull request #10164 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfix: proper dnsmasq reload on stop, rework start/stop logic
2019-10-07 18:08:58 +03:00
Josef Schlehofer
c674fa684d
unbound: Update to version 1.9.4
Fixes CVE-2019-16866

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-10-07 01:45:38 +02:00
Eric Luehrsen
0b8eee5fbd
unbound: update to 1.9.3
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2019-10-07 01:45:24 +02:00
Stan Grishin
dba87ee0cc simple-adblock: bugfix: proper dnsmasq reload on stop, rework start/stop logic
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-06 09:33:48 -07:00
Hannu Nyman
5452bb8332
Merge pull request #10156 from gladiac1337/haproxy-1.8.21-openwrt-18.06
[openwrt-18.06] haproxy: Update HAProxy to v1.8.21
2019-10-05 17:17:46 +03:00
Christian Lachner
1bb725133e haproxy: Update HAProxy to v1.8.21
- Update haproxy download URL and hash
- Add new patches (see https://www.haproxy.org/bugs/bugs-1.8.21.html)

Signed-off-by: Christian Lachner <gladiac@gmail.com>
2019-10-05 13:26:02 +02:00
Hannu Nyman
da5a8e5962
Merge pull request #10155 from jefferyto/python-bpo-38243-34155-openwrt-18.06
[openwrt-18.06] python: Fix CVE-2019-16056, CVE-2019-16935
2019-10-05 11:27:49 +03:00
Hannu Nyman
ad7b3c6184
Merge pull request #10143 from stangri/18.06-simple-adblock
[18.06] simple-adblock: bugfix and improvements (check description)
2019-10-05 11:26:08 +03:00
Jeffery To
dad9a1a2a4 python: Fix CVE-2019-16056, CVE-2019-16935
These patches address issues:
CVE-2019-16056: email.utils.parseaddr mistakenly parse an email
CVE-2019-16935: A reflected XSS in python/Lib/DocXMLRPCServer.py

Links to Python issues:
https://bugs.python.org/issue34155
https://bugs.python.org/issue38243

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-10-05 00:58:08 +08:00
Stan Grishin
b677e3eee3 simple-adblock: bugfix and improvements (check description)
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-10-03 18:42:02 -07:00
Rosen Penev
7a8808940c
clamav: Remove build hacks
Simplified the Makefile and fixes compilation with uClibc-ng. Also added
IPv6 support.

Took the time to clean up the Makefile with other useful options.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from commit 012e4c1)
2019-10-03 23:03:21 +02:00
Josef Schlehofer
eef89800eb
clamav: update to version 0.100.3
Fixes CVEs:
0.100.1
- CVE-2017-16932
- CVE-2018-0360
- CVE-2018-0361
0.100.2
- CVE-2018-15378
- CVE-2018-14680
- CVE-2018-14681
- CVE-2018-14682
0.100.3
- CVE-2019-1787
- CVE-2019-1788
- CVE-2019-1789

Use HTTPS in URL

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-10-03 22:27:21 +02:00
Rosen Penev
b60caa4940
Merge pull request #10120 from BKPepe/youtubedl-1806
[OpenWrt 18.06] youtube-dl: Update to version 2019.9.28
2019-10-02 12:05:53 -07:00
Hannu Nyman
2d822fb624 haveged: convert to procd
Convert haveged init script to use procd

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 4f717a6f65)
2019-10-01 23:18:46 +03:00
Hannu Nyman
4fe703393b haveged: update to 1.9.8
Update haveged to 1.9.8

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e5b308308b)
2019-10-01 22:11:11 +03:00
Josef Schlehofer
36919e51f4
youtube-dl: Update to version 2019.9.28
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-30 23:23:16 +02:00
Rosen Penev
00133e1e07
Merge pull request #10118 from BKPepe/libgcrypt-1806
[OpenWrt 18.06] libgcrypt: backport fix for CVE-2019-13627
2019-09-30 13:30:46 -07:00
Josef Schlehofer
126cdd7c6b
python3: fix CVE-2019-16056 and delete two patches
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-30 17:23:40 +02:00
Josef Schlehofer
0d9eeca453
python3: backport three security patches
Fixes: CVE-2019-16935

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry-picked from commit 80def9e)
2019-09-30 10:03:35 +02:00
Josef Schlehofer
f19f9ffc9f
expat: Update to version 2.2.9
Fixes CVE-2019-15903

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-29 11:30:20 +02:00
Jan Pavlinec
c0dea72f92
expat: update to version 2.2.7 (security fix)
Fixes:
CVE-2018-20843

Changes:
add PKG_CPE_ID
switch to xz
remove maintainer

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-09-29 11:29:57 +02:00
Michael Heimpold
deae9b348a
expat: fix host build issue with docbook
Additionally to the fix issued for #6923, we need to disable the docbook
usage also for the host build. This prevents the following error:

checking for docbook2man... docbook2man
configure: error: Your local docbook2man was found to work with SGML rather
  than XML. Please install docbook2X and use variable DOCBOOK_TO_MAN to point
  configure to command docbook2x-man of docbook2X.
  Or use DOCBOOK_TO_MAN="xmlto man --skip-validation" if you have xmlto around.
  You can also configure using --without-docbook if you can do without a man
  page for xmlwf.

Signed-off-by: Michael Heimpold <michael.heimpold@i2se.com>
2019-09-29 11:29:52 +02:00
Andy Walsh
fec2709d78
expat: disable docbook
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
2019-09-29 11:29:47 +02:00
Daniel Engberg
fefe8e1f79
lib/expat: Update to 2.2.6
Update (lib)expat to 2.2.6

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
2019-09-29 11:29:31 +02:00
Josef Schlehofer
c64a4e86c3
Merge pull request #9893 from BKPepe/bind-18.06
[OpenWrt 18.06] bind: update to version 9.11.10
2019-09-28 11:52:27 +02:00
Rosen Penev
d98310a3fb
Merge pull request #9798 from ja-pa/zmq-security-fix-18.06
[OpenWrt 18.06] zeromq: update to version 4.1.7 (security fix)
2019-09-27 12:24:47 -07:00
Karl Palsson
03fb174ec7 net/mosquitto: bump to 1.5.9 for CVE
Fixes CVE-2019-11779
Release notes at https://mosquitto.org/blog/2019/09/version-1-6-6-released/

Signed-off-by: Karl Palsson <karlp@etactica.com>
2019-09-27 13:31:27 +00:00
Rosen Penev
8eca9c9164
python-crypto: Fix two CVEs
CVE-2013-7459 and CVE-2018-6594. Both patches taken from Fedora.

Also took the liberty to update the PKG_SOURCE_URL to a standard one.

Updated the home URL as well.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 32b23e28ad)
2019-09-26 19:42:54 -07:00
Josef Schlehofer
7ec22baf1e
libgcrypt: backport fix for CVE-2019-13627
Refresh patches due to offsets

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-26 20:27:57 +02:00
Hannu Nyman
6305d09b1a
Merge pull request #10063 from stangri/18.06-simple-adblock
[18.06] simple-adblock: dnsmasq.ipset option support, better handling of IDNs, updated README
2019-09-25 19:13:10 +03:00
Stan Grishin
fb43709a64 simple-adblock: dnsmasq.ipset option support, better handling of IDNs, updated README
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-09-24 09:11:57 -07:00
Josef Schlehofer
9265be5448
zmq: fix CVE-2019-13132
- Use HTTPS in their website
- Remove unnecessary space between PKG_SOURCE_URL

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-09-24 14:18:05 +02:00
Rosen Penev
29cd578d62
Merge pull request #10041 from neheb/djj
[18.06]django: Update to 1.8.19
2019-09-20 13:07:47 -07:00
Rosen Penev
f292062517
django: Update to 1.8.19
Fixes:

CVE-2018-7536
CVE-2018-7537

Switches to pypi, as in upstream. Updated maintainer as well.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-09-20 11:45:45 -07:00
W. Michael Petullo
3772cdb3d1 openldap: update to 2.4.48
Fixes CVE-2019-13565.

Signed-off-by: W. Michael Petullo <mike@flyn.org>
2019-09-15 13:28:11 -04:00
Rosen Penev
bbc22a721a openldap: Add static function declaration
Fixes compilation with -Werror=implicit-function-declaration .

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2019-09-15 13:27:32 -04:00
Val Kulkov
c272beb439 openldap: version update and new build parameters
This patch updates OpenLDAP to 2.4.47, introduces new build
parameters and places openldap-server, openldap-utils and
libopenldap under a separate menu item in Network.

OpenLDAP is difficult to find in menuconfig at present. Making
a separate menu item for OpenLDAP for selection of packages and
enabling or disabling build parameters makes better sense.

To have access to the loglevel directive, OpenLDAP must be built
with debugging information. Having access to the loglevel directive
is essential during the initial configuration of OpenLDAP server.

International users may want to enable ICU support to have access
to international characters.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2019-09-15 13:26:13 -04:00
Daniel Engberg
ec029b9ae0 openldap: Switch tarball sources to https and http
Switch from ftp which can be broken on corp firewalls to https and http.
Mirrors taken from https://www.openldap.org/software/download/ and
https://www.openldap.org/software/download/OpenLDAP/MIRRORS
Place master site as last resort.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: W. Michael Petullo <mike@flyn.org>
2019-09-15 13:25:22 -04:00
W. Michael Petullo
f587f31ad5
lighttpd: mark module configuration files
Signed-off-by: W. Michael Petullo <mike@flyn.org>
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry-picked from 9cf412c0cb)
2019-09-11 10:50:45 +02:00
Josef Schlehofer
19879284af
dovecot: Update to version 2.2.36.4
- Fix CVE-2019-11500
- Download tarball from HTTPS instead of HTTP

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-09 08:10:47 +02:00
Josef Schlehofer
8f42d4b714 wget: fix CVE-2018-20483
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-06 19:58:33 +02:00
Matthias Schiffer
f6e7b56a58
fastd: fix init script for multiple VPN instances
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit b7ff8b8087)
2019-09-04 22:51:10 +02:00
Hannu Nyman
06cc48c49b haveged: update to 1.9.6
Update haveged to 1.9.6

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit c933ac5dcb)
2019-09-02 21:02:17 +03:00
Florian Eckert
6014389c55
Merge pull request #9894 from BKPepe/keepalived-18.06
[OpenWrt 18.06] keepalived: Update to version 1.4.5
2019-09-02 09:27:24 +02:00
Rosen Penev
7a7820fb15
Merge pull request #9904 from RussellSenior/my-18.06
patch: cherry pick CVE fixes to 18.06 branch
2019-09-02 00:13:59 -07:00
Russell Senior
18f9e437ce patch: rename CVE-2019-13638 patch to mollify uscan
Signed-off-by: Russell Senior <russell@personaltelco.net>
2019-09-01 23:39:22 -07:00
Russell Senior
abe523c579 patch: apply upstream patch for CVE-2019-13638
GNU patch through 2.7.6 is vulnerable to OS shell command injection that
can be exploited by opening a crafted patch file that contains an ed style
diff payload with shell metacharacters. The ed editor does not need to be
present on the vulnerable system. This is different from CVE-2018-1000156.

https://nvd.nist.gov/vuln/detail/CVE-2019-13638

Signed-off-by: Russell Senior <russell@personaltelco.net>
2019-09-01 23:39:22 -07:00
Russell Senior
a3d8698e35 tools/patch: apply upstream patch for CVE-2019-13636
In GNU patch through 2.7.6, the following of symlinks is mishandled in
certain cases other than input files. This affects inp.c and util.c.

https://nvd.nist.gov/vuln/detail/CVE-2019-13636

Signed-off-by: Russell Senior <russell@personaltelco.net>
2019-09-01 23:39:22 -07:00
DENG Qingfang
ebb9b3f172 exfat-nofuse: drop BUILD_PATENTED
Microsoft has published technical specification for exFAT [1]
and the driver has been added to Linux staging tree [2].

It's now safe to drop BUILD_PATENTED label.

[1] https://docs.microsoft.com/windows/win32/fileio/exfat-specification
[2] http://lkml.iu.edu/hypermail/linux/kernel/1908.3/04254.html

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit 4c9d0c7b56)
2019-09-02 01:49:54 +00:00
Josef Schlehofer
2d9a3eff47
keepalived: add patch for CVE-2018-19115
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-01 17:42:25 +02:00
Josef Schlehofer
e4508a3518
keepalived: Update to version 1.4.5
- Use HTTPS for PKG_SOURCE_URL and as well for URL in description

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-01 17:42:25 +02:00
Josef Schlehofer
e0af45ff79
bind: Update to version 9.11.10
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-01 17:01:50 +02:00
Josef Schlehofer
6d8293801e
lighttpd: fix CVE-2018-19052
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-09-01 13:15:34 +02:00
Rosen Penev
55dcffd7fd
Merge pull request #9841 from cshoredaniel/pr-18.06-nut-targetted
[18.06] Targeted fixes based on 19.07/master
2019-08-30 10:13:47 -07:00
Josef Schlehofer
bdddb2127f
Merge pull request #9703 from BKPepe/squid-18.06
[OpenWrt 18.06] squid: update to version 3.5.28
2019-08-29 23:40:33 +02:00
Hannu Nyman
e45c2f206c
Merge pull request #9814 from guidosarducci/speedtest-18.06
[18.06] speedtest-netperf: backport stable package from 19.07 and master
2019-08-29 20:41:04 +03:00
Rosen Penev
f01e4171db
Merge pull request #9777 from BKPepe/tar_1806
[OpenWrt 18.06] tar: update to version 1.3.2
2019-08-27 18:55:27 -07:00
Rosen Penev
85b1ca7fb1
Merge pull request #9821 from cotequeiroz/vim_host
[18.06] vim: Add host build to install xxd
2019-08-27 11:31:22 -07:00
Daniel F. Dickinson
c1aa1f784c nut: Bump PKG_RELEASE
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-27 01:22:41 -04:00
Daniel F. Dickinson
361e6aaaab nut: Handle FSD properly
Make sure we force shutdown of UPS only when we should, and when
we should that shutdown happens.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-27 00:56:42 -04:00
Daniel F. Dickinson
a2ab989c12 nut: Fix init actions (server/driver)
The server and driver were not starting/restarting reliably. In
addition on interface changes NUT got very confused.  So we fix
handling of restarts and add a reload trigger for interface
changes.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-27 00:53:42 -04:00
Daniel F. Dickinson
ef0bd01409 nut: Fix extra diver params config
Extra parameters for the UPS driver were not being handled correctly.
Fix that (was wrong variable name).

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-27 00:49:46 -04:00
Daniel F. Dickinson
77519cd204 nut: Fix permissions with runas
Fix directory and conf file creation and owner/mode setting
for when running as non-root.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-27 00:47:16 -04:00
Daniel F. Dickinson
e976846521 nut: Fix statepath handling
The statepath was getting the wrong permission and/or not created
at the right time.  This commit includes fixes for handling the
statepath (typically /var/run/nut).

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-27 00:47:16 -04:00
Daniel F. Dickinson
5f69f9a065 nut: Fix unset of runas user (ups server)
Running as non-root was failing due to misplace local keyword
causing runas to be unset from calling value.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-27 00:46:51 -04:00
Daniel F. Dickinson
ccdec71b5c nut: Fix bad check for conf exists
We were `cat`ing the file instead of just checking for non-empty
existance.  Fix that.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-26 23:48:49 -04:00
Daniel F. Dickinson
c963f0c297 nut: Fix upsmon init actions
1) For upsmon start and stop were at wrong position in rc.d
2) Stop needs more than just killing the procd instead but rather
needs a  stop command to be issued.
3) Interface up/down was causing not to enter a crashloop (we fix this
with procd trigger on interface changes).

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-26 23:43:16 -04:00
Daniel F. Dickinson
d06bd2d7e3 nut: Fix unset of runas user (upsmon)
Running as non-root was failing due to misplace local keyword
causing runas to be unset from calling value.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-26 23:38:10 -04:00
Daniel F. Dickinson
020dfd4541 nut: Remove unecessary libwrap dependency
CONFIG_ARGS has --without-wrap so libwrap as a dependency is
extraneous as it is not actually used.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2019-08-26 23:18:05 -04:00
Hannu Nyman
7fe013ce7b nano: update to 4.4
Update nano editor to 4.4

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit d9347059a8)
2019-08-25 20:42:42 +03:00
Rosen Penev
f50edf52d3
ttyd: Add dependency for vim
Needed to avoid error in case xxd is not installed:

[ 16%] Generating html.h from index.html
/bin/sh: 1: CMAKE_XXD-NOTFOUND: not found
CMakeFiles/ttyd.dir/build.make:61: recipe for target 'html.h' failed
make[6]: *** [html.h] Error 127

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 773c19afad)
2019-08-24 15:51:36 -03:00
Rosen Penev
d9b29fe5e6
vim: Add host build to install xxd
Packages such as ttyd and device-observatory need this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 8e93386b80)
2019-08-24 15:48:59 -03:00
Tony Ambardar
5640d6e68b speedtest-netperf: new package to measure network performance
The speedtest-netperf.sh script measures the network throughput while
monitoring latency under load and capturing key CPU usage and frequency
statistics. The script can emulate a web-based speed test by downloading
and then uploading from an internet server, or perform simultaneous
download and upload to mimic the stress of the FLENT test program.

It simplifies tasks such as validating ISP provisioned speeds or setting
up and fine-tuning SQM, directly on the router. The CPU usage details
can also help determine if the demands of SQM, routing and other tasks
such as the test itself are exhausting the device's CPUs.

This script leverages earlier scripts from the CeroWrt project used for
bufferbloat mitigation, betterspeedtest.sh and netperfrunner.sh. They are
used with the permission of the author, Rich Brown.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
(cherry-picked from 463590e2bc)
2019-08-23 13:32:08 -07:00
Rosen Penev
fded0497e4
Merge pull request #9789 from ja-pa/libarchive-security-fix-18.06
[OpenWrt 18.06] libarchive: update to version 3.4.0 (security fix)
2019-08-22 18:18:46 -07:00
Jakub Piotr Cłapa
51025867b3 git: Override uname result for cross-compilation.
Based on: http://lists.busybox.net/pipermail/buildroot/2016-May/161696.html

Signed-off-by: Mauro Condarelli <mc5686@mclink.it>
Signed-off-by: Jakub Piotr Cłapa <jpc@loee.pl>
2019-08-22 12:42:18 +02:00
Rosen Penev
43f49bdbca
apinger: Update to latest git revision
This project seems abandoned. Updated to latest version.

Also cleaned up the Makefile quite a bit.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from dff6d2639e)
2019-08-21 19:38:44 -07:00
Hirokazu MORIKAWA
45e38f116c
node-serialport: fix i386 build fail
more stability for parallel build

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry-picked from 1ce1ca6e06)
2019-08-21 19:35:50 -07:00
Hirokazu MORIKAWA
19ee25df60
node-hid: fix i386 build fail
more stability for parallel build

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry-picked from 1aa55f86b5)
2019-08-21 19:33:12 -07:00
Jan Pavlinec
232df28216
libarchive: update to version 3.4.0 (security fix)
Fixes:
CVE-2019-1000019
CVE-2019-1000020
CVE-2018-1000880
CVE-2018-1000879
CVE-2018-1000878
CVE-2018-1000877

Changes:
add bsdtar libopenssl variant
switch to github codeload
polish tab/spaces

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-08-21 17:49:29 +02:00
Noah Meyerhans
3bdadf4d77 Merge branch 'pr/9778' into openwrt-18.06
PR #9778

Signed-off-by: Noah Meyerhans <frodo@morgul.net>
2019-08-21 07:44:18 -07:00
Matthias Schiffer
14219822ec
fastd: update URL and PKG_SOURCE_URL
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2019-08-21 16:18:18 +02:00
Matthias Schiffer
41a85be714
libuecc: update URL and PKG_SOURCE_URL
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2019-08-21 16:18:18 +02:00
Etienne Champetier
51462b3df9
Merge pull request #9754 from champtar/openwrt-18.06
[18.06] prometheus-node-exporter-lua: update to 2019.08.14
2019-08-20 16:07:32 -07:00
DENG Qingfang
23eeeeadc8
bind: update to 9.11.9
Fixes CVEs:
CVE-2018-5738
CVE-2018-5740
CVE-2018-5743
CVE-2018-5744
CVE-2018-5745
CVE-2019-6465
CVE-2019-6471

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[mention fixed CVEs;patches: refreshed and removed those which are in
upstream now]
2019-08-19 23:24:56 +02:00
Daniel Golle
0d7a234181
tar: update to version 1.32
Fixes CVE-2019-9923

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[mention CVE in commit message]
2019-08-19 22:07:31 +02:00
Rosen Penev
70e3f5d170
tar: Update to 1.31
Fixes CVE-2018-20482

Added PKG_BUILD_PARALLEL for faster compilation.

Added PKG_CPE_ID for proper CVE tracking.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-08-19 22:07:31 +02:00
Rosen Penev
01466e76e9
lcdringer: Remove libcheck dependency to fix compilation
libcheck is some kind of testing framework. it is not only unnecessary, it
is not even used in the code.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-08-18 11:41:48 -07:00
Hannu Nyman
502ccc496b
Merge pull request #9765 from stangri/18.06-simple-adblock
[18.06] simple-adblock: support for varios DNS resolvers/options
2019-08-18 21:08:10 +03:00
Josef Schlehofer
ddcbf080aa
dovecot: update to version 2.2.36.3
- Fixes CVE-2019-7524
- Refresh patch

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-08-18 09:50:52 +02:00
Stan Grishin
8e8087706d [18.06] simple-adblock: support for varios DNS resolvers/options
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-08-17 06:09:43 -07:00
Rosen Penev
a4314b868c
linknx: Fix compilation with libiconv
Based on ee94a1e912

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-08-16 13:02:54 -07:00
Eneas U de Queiroz
ca99a333e5
rp-pppoe: redo glibc patch
Previous fix broke compilation with kernel < 4.8

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from e40d67a48f)
2019-08-16 12:56:26 -07:00
Eneas U de Queiroz
5327a95d66
rp-pppoe: Fixed compilation with glibc
Do not inlcude <netinet/in.h> when using glibc to avoid various
redefinitions.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 0c995cabe7)
2019-08-16 12:55:48 -07:00
Rosen Penev
19d101bd22
ldbus: Add zip/host build dependency
Needed when zip is missing on the host (very rare).

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-08-16 12:51:27 -07:00
Rosen Penev
db85d6ec98
gcc: Do not build on ARC
Not supported until GCC8.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-08-16 12:46:22 -07:00
Etienne Champetier
80742d0da2 prometheus-node-exporter-lua: add target & system to OpenWrt collector
Before:
node_openwrt_info{revision="r10756+1-7546be6007",model="GL.iNet GL-AR150",id="OpenWrt",board_name="glinet,gl-ar150",release="SNAPSHOT"} 1

After:
node_openwrt_info{revision="r10756+1-7546be6007",target="ath79/generic",board_name="glinet,gl-ar150",id="OpenWrt",model="GL.iNet GL-AR150",release="SNAPSHOT",system="Atheros AR9330 rev 1"} 1

Fixes #9730, replace #9735

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit a14bed1bc9)
2019-08-15 23:12:17 -07:00
Kirill Lukonin
06e513ba3e prometheus-node-exporter-lua: Add more wifi_station metrics and fix naming according to original wifi_linux.go node exporter
Signed-off-by: Kirill Lukonin <klukonin@gmail.com>
(cherry picked from commit 5eb8e47df2)
2019-08-15 23:12:10 -07:00
Alex Tomlins
60002eb621 prometheus-node-exporter-lua: Bump PKG_RELEASE
Signed-off-by: Alex Tomlins <alex@tomlins.org.uk>
(cherry picked from commit 4b6f76bfac)
2019-08-15 23:11:55 -07:00
Alex Tomlins
1014b09871 prometheus-node-exporter-lua: Add wifi_station_count
To return the number of connected clients.

At present this can be partially inferred by using a count() over one of
the existing metrics, however this doesn't handle the case when there
are no connected clients. When that happens, the count() will return no
data instead of 0.

Signed-off-by: Alex Tomlins <alex@tomlins.org.uk>
(cherry picked from commit 1237e196b4)
2019-08-15 23:11:48 -07:00
Alex Tomlins
0d224bdfa1 prometheus-node-exporter-lua: wifi packets should be a counter
These output a count of the number of packets transmitted/received, so
should be tracked as a counter. As it stands, promtool is warning that
these shouldn't be named ending _total if they're a gauge.

Signed-off-by: Alex Tomlins <alex@tomlins.org.uk>
(cherry picked from commit a45c702baa)
2019-08-15 23:11:41 -07:00
Alex Tomlins
a08f5e17f6 prometheus-node-exporter-lua: Bump PKG_RELEASE
Signed-off-by: Alex Tomlins <alex@tomlins.org.uk>
(cherry picked from commit deab22044b)
2019-08-15 23:11:31 -07:00
Alex Tomlins
b03545e0bc prometheus-node-exporter-lua: fix missing conntrack values
If the /proc/sys/net/netfilter/nc_conntrack_* files are not present,
this exporter was outputting a blank value, which is invalid. These
files will not be present when using an image that doesn't include the
iptables and firewall packages (eg a minimal access-point type image).

This updates the collector to only output the metrics if the
corresponding /proc files are present.

Signed-off-by: Alex Tomlins <alex@tomlins.org.uk>
(cherry picked from commit 0100a2cb26)
2019-08-15 23:11:23 -07:00
Piotr Machała
70bd5a36cd prometheus-node-exporter-lua: change network metric type to counter
Signed-off-by: Piotr Machała <pm7gt@933x.net>
(cherry picked from commit 626b197cc1)
2019-08-15 23:08:19 -07:00
Rene Treffer
ad34675dfb prometheus-node-exporter-lua: add lantiq dsl modem collector
a.heider: Address PR comments and clean up.

Signed-off-by: Rene Treffer <treffer+github@measite.de>
Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit c751af8616)
2019-08-15 23:08:09 -07:00
Guo Li
d921407d42 openssh: fix pthread functions redefine with pam module
we should pass -DUNSUPPORTED_POSIX_THREADS_HACK to CFLAGS to openssh
to prevent function redefine, I don't know why pam module use
micro UNSUPPORTED_POSIX_THREADS_HACK to detect whether define
pthread functions, but not detect whether define
UNSUPPORTED_POSIX_THREADS_HACK.

Signed-off-by: Guo Li <uxgood.org@gmail.com>
2019-08-15 11:54:09 +02:00
Josef Schlehofer
df3d2312c6
Merge pull request #9403 from BKPepe/yt-18.06
[18.06] youtube-dl: update to version 2019.8.2
2019-08-14 21:20:07 +02:00
Josef Schlehofer
6d55ff558b
Merge pull request #9513 from BKPepe/openwrt-18.06_python_shebang
[OpenWrt 18.06] python,python3: move shebang handle in install script
2019-08-14 21:19:50 +02:00
Rosen Penev
b29ecaa111 libinput: Add missing header to fix compilation
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 671f0363a4)
2019-08-13 22:22:27 -07:00
Eneas U de Queiroz
3414ca250e libglog: fix removing libunwind dependency
ac_cv_header_libunwind_h needs to be set to 0, as ac_cv_have_libunwind_h
overwritten based on the former's value.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from ec317934b2)
2019-08-13 22:21:06 -07:00
Eneas U de Queiroz
e41a914bf2
libseccomp: workaround a recursive dependency
DEPENDS:=@!arc is causing a recursive dependency because of the optional
selection of libseccomp by util/lxc.  The workaround hides the package
in Package/libseccomp/config instead.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from e29483d7e2)
2019-08-13 15:21:46 -07:00
Rosen Penev
a1eccf2237
lxc: Backport uClibc patch
Fixes compilation

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 189a170038)
2019-08-13 15:18:17 -07:00
Eneas U de Queiroz
08c0b2949c
lxc: hide seccomp support for arc
libseccomp does not compile for arc, so we can't show that option for
arc.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 57b4d94d98)
2019-08-13 15:17:54 -07:00
Daniel F. Dickinson
d3e54adcdb
lxc: Disable use of unwanted libraries explicity
Otherwise one gets a failure if the libraries (e.g. Python
header file) exist in the build system.  Worse in some cases
is host headers being found if one doesn't specifically
disable a library search in autotools.  It is especially
important that Python is disabled by default.

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
(cherry-picked from cc039d801e)
2019-08-13 15:17:30 -07:00
Rosen Penev
bb1882d294
boost: Fix compilation with uClibc-ng
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 053faa31e5)
2019-08-13 15:09:52 -07:00
Rosen Penev
ad26261e18
iodine: Fix compilation with uClibc-ng
daemon is supported now.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 3226673a48)
2019-08-13 15:03:23 -07:00
Sebastian Kemper
e42f8da512
mariadb: add dependency on libaio for arc as well
Now that libaio compiles on arc targets we need to add the dependency to
libaio on these targets as well.

resolves #9298

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry-picked from c571c37e5c)
2019-08-13 15:01:28 -07:00
Daniel Golle
29e7e06191
libudev-fbsd: update to git source as of 2017-12-16
Remove patches 001-fix-unused.patch and 002-replace-nitems.patch,
similar fixes to make libudev-fbsd compile were applied upstream.
Refresh remaining patches.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry-picked from 58f1de60f8)
2019-08-13 14:56:53 -07:00
Rosen Penev
a0e1a77006
Merge pull request #9710 from BKPepe/icu_fix
[OpenWrt 18.06] icu: fix patch, which adds big endian ARM support
2019-08-13 08:54:36 -07:00
Josef Schlehofer
4bda1ca542
icu: fix patch, which adds big endian ARM support
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-08-13 13:25:52 +02:00
Josef Schlehofer
78bf09b084
golang: update to version 1.10.8
Fixes CVEs

1.10.6
CVE-2018-16873
CVE-2018-16874
CVE-2018-16875

1.10.8
CVE-2019-6486

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-08-13 09:02:17 +02:00
Eneas U de Queiroz
fa384e518f
libgee: copy vapi files to versioned vala dir
The version is obtained via `valac --api-version`

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from fb4b5c5701)
2019-08-12 17:09:55 -07:00
Eneas U de Queiroz
2d59ec88d8
libgee: use unversioned vala dir, misc fixes
Copy vapi files to unversioned vala dir.
Added vala/host to PKG_BUILD_DEPENDS.
Removed TARGET_LDFLAGS
Removed copyright lines

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 2cf76d5278)
2019-08-12 17:09:27 -07:00
Rosen Penev
d7a071f4ae
icu: Fix patch from faulty backport
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-08-12 16:05:04 -07:00
Josef Schlehofer
1607a5bd8b
squid: update to version 3.5.28
Fixes CVEs:
CVE-2018-1000024
CVE-2018-1000027
CVE-2018-1172

Add patches from Squid Proxy Cache Security Update Advisory:
http://www.squid-cache.org/Advisories/SQUID-2018_4.txt
http://www.squid-cache.org/Advisories/SQUID-2018_5.txt
http://www.squid-cache.org/Advisories/SQUID-2019_3.txt
http://www.squid-cache.org/Advisories/SQUID-2019_6.txt

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-08-12 23:16:59 +02:00
Mislav Novakovic
983bd03703
protobuf-c: add build time dependency protobuf
Signed-off-by: Mislav Novakovic <mislav.novakovic@sartura.hr>
(cherry-picked from a35581902c)
2019-08-11 13:01:57 -07:00
Yousong Zhou
87b6ed6b93
jamvm: depends on supported architectures
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from 11f0544744)
2019-08-11 12:59:34 -07:00
Rosen Penev
ca0e429e25
icu: Backport ARMEB support patch
This should fix php compilation on PPC.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from a958f49bd0)
2019-08-11 12:56:03 -07:00
Rosen Penev
ad43d622e9
gammu: Really fix compilation under 64-bit
The InstallDev section needed the same treatment as the Install one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 5fbc6c873e)
2019-08-11 12:51:01 -07:00
Rosen Penev
1ad4f3a9bd
gammu: Fix build under 64-bit targets.
There's a faulty suffix variable that points to the wrong place.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from bf42426e4a)
2019-08-11 12:49:28 -07:00
Josef Schlehofer
cdbc724641
youtube-dl: update to version 2019.8.2
Backport the Makefile from branches 'master' and 'openwrt-19.07'
- It means that now it will be created as Python package
with one difference that this one uses Python2

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-08-08 19:16:18 +02:00
Jeffery To
af975f0f30
python,python3: Fix overridden usr/bin symlinks
Currently, all files in usr/bin (presumably all Python scripts) are run
through sed to replace the shebang; sed will overwrite the file whether
or not a match is found. This causes symlinks to be overridden and made
into copies of their targets. python[3]-base and python[3]-dev are
affected by this.

This adds the --follow-symlinks flag to sed, in addition to using
$(SED), so that symlinks are not overridden.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-08-08 13:38:37 +02:00
Alexandru Ardelean
421c58a946
python,python3: move shebang handle in install script
This extends the Python[3] shebang fixup to all packages.
Only Python scripts in `/usr/bin` will be handled at the moment. Later it
may make sense to also cover executables in `/bin`, though typically Python
executables shouldn't be placed there.

Previously the shebang handling was only done for python[3]-pip &
python[3]-setuptools.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-08-08 13:38:36 +02:00
Josef Schlehofer
243f921ae1 subversion: update to version 1.10.6
Most interesting changes:
- Fixes CVEs
1.10.6
- CVE-2018-11782
- CVE-2019-0203
1.10.4
- CVE-2018-11803

Other misc changes:
- Fixes indentation in Makefile
- Reorder some things in Makefile to be sync with other packages
- Use HTTPS in URL

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-08-06 11:19:41 +08:00
W. Michael Petullo
70a1ffdf0f
jq: compile with _GNU_SOURCE (fixes #7785)
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry-picked from 4bb18b04b6)
2019-08-04 08:55:47 -07:00
Yousong Zhou
fb0566686d
libsoc: fix compilation error caused by multiple goals on make
Error of the following kind can happen when parallel build with goals "all" and
"install" both specified on the command line.  Seems like make can parallelly
build for both targets causing race conditions

	make[3]: Entering directory `/tmp/tmp.HIR3tEIqBb/build_dir/target-mips_24kc_musl/libsoc-2016-12-22-5b788d4d'
	Making all in lib
	Making install in lib
	make[4]: Entering directory `/tmp/tmp.HIR3tEIqBb/build_dir/target-mips_24kc_musl/libsoc-2016-12-22-5b788d4d/lib'
	  CC       libsoc_la-gpio.lo
	make[4]: Entering directory `/tmp/tmp.HIR3tEIqBb/build_dir/target-mips_24kc_musl/libsoc-2016-12-22-5b788d4d/lib'
	  CC       libsoc_la-spi.lo
	  CC       libsoc_la-gpio.lo
	  CC       libsoc_la-file.lo
	  CC       libsoc_la-i2c.lo
	  CC       libsoc_la-spi.lo
	  CC       libsoc_la-pwm.lo
	  CC       libsoc_la-board.lo
	  CC       libsoc_la-file.lo
	  CC       libsoc_la-conffile.lo
	  CC       libsoc_la-debug.lo
	  CC       libsoc_la-pwm.lo
	  CC       libsoc_la-conffile.lo
	  CCLD     libsoc.la
	OpenWrt-libtool: link: `libsoc_la-pwm.lo' is not a valid libtool object
	make[4]: *** [libsoc.la] Error 1

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from 19bde8da68)
2019-08-03 12:23:33 -07:00
Rosen Penev
1fec7ea23b
rtl-ais: Fix compilation on i386
The code from 1996 is using pre-c99 inline semantics that cause compilation
failures on i386. Added std-gnu89 to fix this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 16f623b387)
2019-08-03 12:19:20 -07:00
Rosen Penev
de750bba0c
libdouble-conversion: Update to 3.1.4
Added patch to fix compilation on big endian ARM.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 4252d20f6a)
2019-08-03 12:13:32 -07:00
Rosen Penev
49a6444ab4
libdouble-conversion: Update to 3.1.1
Switched to codeload and updated the Makefile to standards.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 9da161b8ae)
2019-08-03 12:13:00 -07:00
Rosen Penev
056cad1e0e
libaio: Update to 0.3.112
Replace inactive maintainer with myself.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 7cd204e99e)
2019-08-03 12:10:23 -07:00
Rosen Penev
b4e4e5a002
libaio: Backport DESTDIR patch to simplify the Makefile
Fixes issue where OpenWrt CFLAGS like relro were not being passed.

Updated license information.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 5e34f4a32b)
2019-08-03 12:09:57 -07:00
Rosen Penev
7ccc104c96
libaio: Update to 0.3.111
Switched to new upstream at pagure.io.

Refreshed debian patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 9428e4cbd2)
2019-08-03 12:09:32 -07:00
Rosen Penev
d6145ce0c6
quassel-irssi: Fix compilation with GCC8
It throws new warnings which triggers -Werror. Remove it.

Added support for full NLS.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
)cherry picked from 623d25a86b)
2019-08-03 12:06:33 -07:00
Rosen Penev
47e4537fd9
quasselc: Fix compilation with uClibc-ng
nls.mk is needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 54e6f29df1)
2019-08-03 12:05:15 -07:00
Rosen Penev
b26ffad37e
Merge pull request #9625 from micmac1/18.06-mariadb10141
mariadb (18.06): security bump to 10.1.41
2019-08-01 17:22:14 -07:00
Sebastian Kemper
e5cc721c74 mariadb: security bump to 10.1.41
New upstream release. Addresses:

  CVE-2019-2805
  CVE-2019-2740
  CVE-2019-2739
  CVE-2019-2737

Package updates:

  - refreshes patches

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2019-08-02 00:07:48 +02:00
Rosen Penev
1eeea30fda
softethervpn: Fix compilation under 64-bit targets
-m64 is not compatible with OpenWrt's compilers.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 23134b07de)
2019-07-28 20:32:37 -07:00
Josef Schlehofer
276b7d9b06
Merge pull request #9542 from jefferyto/python-musl-find_library-openwrt-18.06
[openwrt-18.06] python,python3: Fix ctypes.util.find_library()
2019-07-24 09:11:35 +02:00
Rosen Penev
e1cb7f98d8
opendkim: Fix compilation with uClibc-ng
res_nsend and res_send are both not available in uClibc-ng as configured
in OpenWrt. Having this function return an error is the only sensible way
to fix.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from b5b776fc9a)
2019-07-23 20:36:35 -07:00
Rosen Penev
bc8fc4fb76
tvheadend: Fix compilation on GCC8
New string warnings were introduced. Adding -Wno-error to TARGET_CFLAGS
does not work so patch it out.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 9eea417e92)
2019-07-22 20:30:31 -07:00
Rosen Penev
4c1252e9de
tvheadend: Fix compilation without deprecated OpenSSL 1.0.2 APIs
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from c59e53619e)
2019-07-22 20:30:05 -07:00
Rosen Penev
bd96e95e3f
tvheadend: Fix compilation without OpenSSL deprecated APIs
Also switched to codeload for Makefile simplicity.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 5033e594cc)
2019-07-22 20:29:43 -07:00
Rosen Penev
59f7eb5e1f
libartnet: Fix compilation with GCC8
Previous GCC7 fix was incorrect and GCC8 correctly complains about it.
Fix it properly.

Also cleaned up the Makefile for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from fac6f0e0a5)
2019-07-22 20:27:56 -07:00
Rosen Penev
e00521bc76
poco: Do not build on ARC
Not supported.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(ported from ec2f632603)
2019-07-22 20:26:26 -07:00
Rosen Penev
0662e833ec
flent-tools: Fix compilation with uClibc-ng
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(ported from 9cd01fd1c5)
2019-07-22 20:22:41 -07:00
Rosen Penev
131c9436c4
oath-toolkit: Fix compilation with uClibc-ng
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from c201e58145)
2019-07-22 20:19:30 -07:00
Rosen Penev
0524f21edf
flashrom: Add ARC support
Mainly endian definitions are needed.

Removed sys/io.h patch. It's a GNU header unsupported by uClibc-ng.

Cleaned up Makefile slightly.

Added HTTPS everywhere.

Added PKG_BUILD_PARALLEL for faster compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 12378cd4d3)
2019-07-22 20:18:25 -07:00
Rosen Penev
8923eecd3b
elektra: Fix compilation with uClibc-ng
Add patch that checks for libiconv instead of iconv. nls.mk handles this.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-07-22 20:17:21 -07:00
Rosen Penev
24ad87702f
elektra: Fix compilation without deprecated OpenSSL APIs
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-07-22 20:17:14 -07:00
Rosen Penev
f30898d3e3
hfsprogs: Fix compilation with uClibc-ng
Replaced deprecated and unsupported valloc with posix_memalign.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 4639e208b3)
2019-07-22 20:15:11 -07:00
Rosen Penev
02d64a9222
dosfsutils: Properly fix iconv linking
Necessary when using libiconv.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from fbfe49d7ff)
2019-07-22 20:13:32 -07:00
Rosen Penev
f273581e12
dosfstools: Fix compilation with full NLS
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 28a18b8ecc)
2019-07-22 20:13:05 -07:00
Rosen Penev
4870eab081
loudmouth: Fix compilation with uClibc-ng
nls.mk must be included.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from e69d5dc1d5)
2019-07-22 20:11:23 -07:00
Rosen Penev
b1adbbe5b1
loudmouth: Disable debug and fix no deprecated API compilation
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 788fda356e)
2019-07-22 20:10:52 -07:00
Rosen Penev
30ddc8a151
transmission: Fix compilation under uClibc-ng
Upstream has a patch for this dated 2016.

Also ran the init script through shellcheck.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from f4f665c7db)
2019-07-22 20:08:39 -07:00
Richard Yu
0cac0b3ebc
transmission: add PKGARCH:=all for transmission-web
Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry-picked from eaeadff317)
2019-07-22 20:08:01 -07:00
Rosen Penev
c2860ce2cf
transmission: Add LTO support to shave off 35KB off of the ipk
Minor Makefile cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 70c34ef472)
2019-07-22 20:07:25 -07:00
Andrii Korzh
b5957aed64
transmission: Allow user to configure web ui home directory
Signed-off-by: Andrii Korzh <andrii.korzh@gmail.com>
(cherry-picked from 582f697afd)
2019-07-22 20:06:57 -07:00
Rosen Penev
cdc0017367
open2300: Switch to GitHub fork
It applies the single patch here as well as adding some fixes.

The upstream project is dead.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from d2af82a6f5)
2019-07-22 20:04:33 -07:00
Rosen Penev
dddcd5d909
softethervpn: Add openssl to host build deps
Some hosts might be missing OpenSSL.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-07-22 20:04:33 -07:00
Rosen Penev
0a4f88e567
softethervpn: Really fix iconv support
softethervpn overrides nls.mk by defining its iconv functions. This only
works if the libc has iconv. In addition, it does not allow external
libiconv usage. TARGET_LDFLAGS is also the wrong place to add -liconv.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from fb480e297c)
2019-07-22 20:04:33 -07:00
Eneas U de Queiroz
e05f50c128
softethervpn: add package name to build dir
Current build dir is set at just v$(PKG_VERSION).

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 80b61c3e57)
2019-07-22 20:04:33 -07:00
Eneas U de Queiroz
8358aa6906
softethervpn: cleanup host/build, pass HOST_*FLAGS
Remove hack to avoid readline host dependency, now that readline is
being host/built.
Pass on HOST_CFLAGS, HOST_CPPFLAGS, & HOST_LDFLAGS, to fix buildbots
host-compile errors about not finding openssl headers.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from e3c6fcb796)
2019-07-22 20:04:32 -07:00
Jeffery To
5cb4c348a7 python,python3: Fix ctypes.util.find_library()
Python's ctypes.util.find_library() function currently doesn't work for
musl libraries/systems[1].

This adds a patch to fix this function, based on a patch from Alpine
Linux[2].

Fixes #9448.

[1]: https://bugs.python.org/issue21622
[2]: https://git.alpinelinux.org/aports/tree/main/python2/musl-find_library.patch

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-07-22 21:38:08 +08:00
Josef Schlehofer
d16a931db4
python: add patch for CVE-2018-20852
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-07-22 15:22:56 +02:00
Alexandru Ardelean
2402c223df
python: bump to version 2.7.16
This change updates Python to version 2.7.16, which is a bugfix release
in the Python 2.7 series.
This also removes patches back-ported from upstream.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-07-22 15:22:55 +02:00
Josef Schlehofer
ae21f4990d
python3: update to version 3.6.9
3.6.9 is the latest security fix release of Python 3.6.

- Fixes: CVE-2018-20852, CVE-2019-9948, CVE-2019-9740, CVE-2019-5010
- Refreshed patches
- Removed a few backports patches

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-07-22 10:17:35 +02:00
Yousong Zhou
12c96eaad6 diffutils: provide diff, cmp as alternatives
Resolves openwrt/packages#6361

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(Backported from commit b02e4eafd1)
2019-07-20 07:37:35 +00:00
Rosen Penev
04c9e6708f
Merge pull request #9463 from ps790/patch-4
softethervpn: Update to rtm version 4.29-9680
2019-07-16 13:09:39 -07:00
Rosen Penev
4265311c14
Merge pull request #9461 from ps790/patch-2
softethervpn: Pass FLAGS to CC for hamcorebuilder
2019-07-16 13:09:19 -07:00
Yousong Zhou
93e7b09827 coreutils: add alternatives support
Fixes openwrt/packages#9290

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit 9282044851)
2019-07-13 11:09:09 +00:00
Konstantin Demin
ef44ef6980 bridge-utils: fix conflict with busybox brctl
Busybox brctl applet conflicts with the version from bridge-utils.
Fix this by using ALTERNATIVE support for brctl in bridge-utils.

Fixes openwrt/packages#8812

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
[PKG_RELEASE bump]
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit fabd9efdea)
2019-07-12 09:11:12 +00:00
Philipp Schuster
4e93f455a3
softethervpn: Update to rtm version 4.29-9680
Update SoftEther VPN to the latest rtm version 4.29-9680

Compile tested: Atheros AR7xxx/AR9xxx, TP-LINK Archer C7 v2, 18.06.4

Signed-off-by: Philipp Schuster <philippschuster@gmx.com>
2019-07-12 04:13:03 +02:00
Philipp Schuster
4682d17416
softethervpn: Pass FLAGS to CC for hamcorebuilder
CFLAGS, CPPFLAGS & LDFLAGS need to be passed with CC because they are being ingored.
This is already contained in the master branch but was missing in 18.06. Without these flags the compilation fails.

Compile tested: Atheros AR7xxx/AR9xxx, TP-LINK Archer C7 v2, 18.06.4

Signed-off-by: Philipp Schuster <philippschuster@gmx.com>
2019-07-12 03:33:45 +02:00
Eneas U de Queiroz
f424f7dfae wifidog: fix getting ip from interface, cleanup
Patch taken from upstream fixes an Invalid argument error while trying
to get the IP address of an interface.
Makefile was updated to current style.
(cherry-picked from 5ab9f3e357)

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
2019-07-11 11:40:20 -03:00
Jan Pavlinec
bba8e2c44e irssi: update to version 1.2.1 (security fix)
Fixes CVE-2019-13045

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-07-10 22:12:59 +02:00
Hannu Nyman
d10ac7c295
Merge pull request #9396 from stangri/openwrt-18.06-simple-adblock
[18.06] simple-adblock: options to filter non-ASCII domains, local compressed storage
2019-07-06 10:01:23 +03:00
Stan Grishin
78b0da4691 simple-adblock: options to filter non-ASCII domains, local compressed storage
Signed-off-by: Stan Grishin <stangri@melmac.net>
2019-07-04 15:42:34 -07:00
Nikos Mavrogiannopoulos
1e398bbcb8 ocserv: updated to 0.12.4
Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
2019-07-03 21:38:35 +02:00
Rosen Penev
43bfa6fe4c
Merge pull request #9292 from BKPepe/18.06-youtube
[OpenWrt 18.06] youtube-dl: update to version 2019.06.21
2019-07-01 18:09:55 -07:00
Michael Heimpold
68461c4c54 php7: update to 7.2.19
Compile and run tested on mxs platform

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 134ebb7a9d)
2019-06-26 22:36:43 +02:00
Michael Heimpold
f9b20e9ddb php7: update to 7.2.18
Compile and run tested on mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 59e48a68ba)
2019-06-26 22:33:52 +02:00
Jonas Gorski
5779614d26 znc: backport fix for CVE-2019-12816
Backport the fix for CVE-2019-12816 from 1.7.4 to 1.6.x.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
2019-06-24 14:46:56 +02:00
Josef Schlehofer
63c532a712
youtube-dl: update to version 2019.06.21
Small Makefile polishing
- removed PKG_BUILD_DIR
- PKG_MAINTAINER is above PKG_LICENSE
- URL should be under TITLE

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-06-22 19:05:43 +02:00
Michael Heimpold
7879bbdb4b Revert "php7: Fix compilation without deprecated OpenSSL APIs"
This reverts commit a176ffa0a1.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2019-06-21 10:29:21 +02:00
Michael Heimpold
115f72fc48 Revert "php7: update to 7.2.18"
This reverts commit 8e9429f3e9.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2019-06-21 10:28:48 +02:00
Michael Heimpold
70e4af4416 Revert "php7: update to 7.2.19"
This reverts commit 8abaf8a308.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2019-06-21 10:27:01 +02:00
Michael Heimpold
d90a035c1f libxml2: update to 2.9.9
Also drop the CVE patches which are already covered by this new release.

Compile tested for and run tested on mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit d5f0331c91)
2019-06-21 07:03:05 +02:00
Rosen Penev
5aa670ed36 libxml2: Fix CVE-2018-14404
Embarrasingly, I missed this one last time.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit b7870ea711)
2019-06-21 07:01:55 +02:00
Michael Heimpold
8abaf8a308 php7: update to 7.2.19
Compile and run tested on mxs platform

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 134ebb7a9d)
2019-06-21 06:54:05 +02:00
Michael Heimpold
8e9429f3e9 php7: update to 7.2.18
Compile and run tested on mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 59e48a68ba)
2019-06-21 06:53:48 +02:00
Rosen Penev
a176ffa0a1 php7: Fix compilation without deprecated OpenSSL APIs
Refreshed patches.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit b81a2bd384)
2019-06-21 06:53:27 +02:00
Michael Heimpold
53742f130c php7: update to 7.2.17
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 71d3f6aa8c)
2019-06-21 06:52:30 +02:00
Hannu Nyman
81a8e59042 nano: update to 4.3
Update nano to 4.3

Release notes at https://nano-editor.org/news.php

2019.06.18 - GNU nano 4.3
* The ability to read from and write to a FIFO has been regained.
* Startup time is reduced by fully parsing a syntax only when needed.
* Asking for help (^G) when using --operatingdir does not crash.
* The reading of a huge or slow file can be stopped with ^C.
* Cut, zap, and copy operations are undone separately when intermixed.
* M-D reports the correct number of lines (zero for an empty buffer).

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2bdd3856fd)
2019-06-20 14:54:54 +03:00
Hannu Nyman
dd927adcec
Merge pull request #9272 from gladiac1337/openwrt-18.06
[openwrt-18.06] haproxy: Update HAProxy to v1.8.20
2019-06-20 13:14:23 +03:00
Hannu Nyman
28007a8bde
Merge pull request #9268 from EricLuehrsen/unbound_192_1806
[openwrt-18.06] unbound: update to 1.9.2 with package bug fixes
2019-06-20 13:14:08 +03:00
Christian Lachner
1784615d36 haproxy: Update HAProxy to v1.8.20
- Update haproxy download URL and hash
- Add new patches (see https://www.haproxy.org/bugs/bugs-1.8.20.html)
- Make halog use our CFLAGS
- Update statically linked LUA to v5.3.5

Signed-off-by: Christian Lachner <gladiac@gmail.com>
2019-06-19 14:34:29 +02:00
Eric Luehrsen
88a7f98bd2 unbound: update to 1.9.2 with package bug fixes
- fix package makefile resulted in resolved symlink and copied
double file contents of libunbound.so during install
- treat RFC6762 'local.' as nxdomain because avahi and other services
will disable if SOA or NS records appear in central DNS
- NLNetLabs has moved download and documentation sites

cherry-pick and squash from openwrt-19.07
add3e6c699
936a71739c
4618c74150

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2019-06-19 01:15:09 -04:00
Rosen Penev
7290c123d8
Merge pull request #9232 from neheb/13
[18.06]haproxy: Remove unnecessary OpenSSL depends
2019-06-15 15:46:06 -07:00
Rosen Penev
356bb11623 haproxy: Remove unnecessary OpenSSL depends
All of these are either not needed or not valid.

Added a patch to remove the OPENSSL_WITH_DEPRECATED dependency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 430906bd78)
(refreshed patches)
2019-06-15 15:03:36 -07:00
Deng Qingfang
3afd619828 lm-sensors: install libsensors using CP instead of INSTALL_DATA
INSTALL_DATA turns all of the symlinks to files, increasing size.

Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry-picked from 3417ee0122)
2019-06-14 11:44:37 -07:00
Carlos Miguel Ferreira
d8ecf9cb7c boost: Release update with minor fix
This commit fixes the bug described in issue #8146 [1], where the
package fails to build if the boost package is selected without
selecting any of the internal non-header-only libraries.

[1]: https://github.com/openwrt/packages/issues/8146

Signed-off-by: Carlos Miguel Ferreira <carlosmf.pt@gmail.com>
(cherry-picked from 92c93ca0f4)
2019-06-14 11:34:45 -07:00
Jonas Gorski
efa0b885ad znc: update my email address
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
2019-06-11 14:27:52 +02:00
Rosen Penev
45e1b91aeb
Merge pull request #9193 from ryzhovau/getdns_lib-18.06
getdns: fix library double packing (18.06 branch)
2019-06-08 11:41:35 -07:00
Alexander Ryzhov
55e357b66e getdns: fix library double packing
Signed-off-by: Alexander Ryzhov <github@ryzhov-al.ru>
2019-06-08 20:29:58 +03:00
Jo-Philipp Wich
810f22da8f nlbwmon: update to latest Git HEAD
4574e6e nfnetlink: prevent tight retry loops
163a211 client: fix commit error information
21290db nlbwmon: merge existing data
abe701d database: do not overwrite unexpectedly preexisting databases
ef3fa58 socket: handle EAGAIN on send()

Ref: https://github.com/jow-/nlbwmon/issues/23
Ref: https://github.com/jow-/nlbwmon/issues/26
Ref: https://github.com/jow-/nlbwmon/issues/30
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c528e01f4c)
2019-06-06 09:31:24 +02:00
Rosen Penev
5d3cb594e4
Merge pull request #9058 from micmac1/sqlite3-arm-endian-owrt18
(18.06) sqlite3: fix arm endian issue
2019-05-23 23:43:06 -07:00
Sebastian Kemper
d13f831ba8 sqlite3: fix arm endian issue
Forum user portuquesa raised a topic (see [1]) about being unable to use
Asterisk on his armeb xscale device. We narrowed it down to sqlite3.
Asterisk was unable to insert a simple table into its db.

In short, sqlite3 assumes little endian for every ARM device. This worked OK
for 4 Byte (unaligned) access. But once upstream (back in 2015) added a
function which accesses 2 Bytes (see [2]) this failed for some (if not all) ARM
big endian devices. ARM CPUs are bi-endian for 4 Byte reads but not for 2 Byte
reads.

This patch fixes the problem by setting the endianness adequately for
ARM targets, for both 32 bit and 64 bit varieties. The patch was applied
upstream (see [3]).

[1] https://forum.openwrt.org/t/solved-asterisk13-or-15-sqlite3-database-problem/36856
[2] 329428e208
[3] https://www.sqlite.org/src/info/b7aad929619f7043

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2019-05-23 20:37:27 +02:00
Rosen Penev
48687a5819
Merge pull request #8966 from BKPepe/18.06-ytdl
[OpenWrt 18.06] youtube-dl: update to version 2019.05.11
2019-05-13 13:33:44 -07:00
Josef Schlehofer
5387239ad1
youtube-dl: update to version 2019.05.11
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-05-12 11:41:04 +02:00
Josef Schlehofer
76ebe2be00
Merge pull request #8765 from BKPepe/1806-urllib3
[OpenWrt 18.06] python-urllib3: update to 1.24.3
2019-05-12 11:09:35 +02:00
Rosen Penev
ec5e894ce7
Merge pull request #8954 from jonathanunderwood/openwrt-18.06-getdns-stubby-from-master
[18.06] stubby and getdns: cherry pick commits from master
2019-05-11 12:14:15 -07:00
Peter Wagner
54928eb69d nfs-kernel-server: use portmap, drop rpcbind 2019-05-11 18:03:06 +02:00
Jonathan G. Underwood
09e18eef72 stubby: set PKG_SOURCE_VERSION using PKG_VERSION
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-05-11 10:30:23 +01:00
Jonathan G. Underwood
f8c8b96e78 stubby: remove PKG_SOURCE from Makefile
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-05-11 10:30:23 +01:00
Jonathan G. Underwood
28c328d666 stubby: add support for TLS configuration options
- tls_cipher_list
  - tls_ciphersuites
  - tls_min_version
  - tls_max_version

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-05-11 10:30:23 +01:00
Jonathan G. Underwood
eec23a91b3 stubby: add support for tls_port resolver config option (#8889)
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-05-11 10:30:23 +01:00
Jonathan G. Underwood
5415cc7b29 stubby: update to 0.2.6
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-05-11 10:30:23 +01:00
Jonathan G. Underwood
b1cc26adf2 getdns: update to version 1.5.2
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-05-11 10:27:56 +01:00
Rosen Penev
813d49c69f stubby: Update PKG_RELEASE
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-05-11 10:26:26 +01:00
Jonathan G. Underwood
3b498844ac stubby: fix handling of pkis in config (#8888)
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-05-11 10:26:09 +01:00
Jannik Vieten
95daecd815 stubby: fixed duplicate IPv6 address in stubby.yml; fixed typo in README.md
Signed-off-by: Jannik Vieten <me@exploide.net>
2019-05-11 10:25:52 +01:00
Rosen Penev
eca82ce3db
Merge pull request #8938 from lucize/doveup18
dovecot: [18.06] update to 2.2.36.1
2019-05-09 17:05:30 -07:00
Lucian Cristian
2c87aeba17 dovecot: update to 2.2.36.1
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
2019-05-09 22:31:47 +03:00
Josef Schlehofer
8459433eb8
python-urllib3: update to 1.24.3
- Fixes CVE-2019-9740, CVE-2019-11324
- RFC 3986 compliant
- Fix TITLE, which was too long for make menuconfig
- Add PKG_LICENSE_FILES
- Remove current maintainer

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-05-08 19:23:10 +02:00
Rosen Penev
0141067413
Merge pull request #8781 from neheb/pros
[18.06] Prosody: backport changes from master
2019-05-07 10:38:12 -07:00
Rosen Penev
41c85f8ef5
Merge pull request #8767 from neheb/cr2
[18.06] crtmpserver: Update to official git repo
2019-05-07 10:35:45 -07:00
Rosen Penev
9e4966bd30
Merge pull request #8816 from neheb/lo
[18.06] loudmouth: Disable debug and fix compilation
2019-05-03 11:43:10 -07:00
Rosen Penev
55b505f821
Merge pull request #8815 from neheb/gr
[18.06] grilo: Remove build dependency on perl-xml-parser
2019-05-03 09:40:29 -07:00
Rosen Penev
1663a01863
Merge pull request #8881 from micmac1/maria_10.1.39
(18.06) mariadb: bump to 10.1.39
2019-05-03 09:39:07 -07:00
Jiri Slachta
78328ebe34 libxslt: add PKG_CPE_ID for proper CVE tracking
Signed-off-by: Jiri Slachta <jiri@slachta.eu>
2019-05-03 08:38:07 +02:00
Jiri Slachta
816c7aed67
Merge pull request #8882 from micmac1/xslt-cve-18
(18.06) libxslt: backport patch for CVE-2019-11068
2019-05-03 08:36:35 +02:00
Sebastian Kemper
2eb2a94da4 mariadb: bump to 10.1.39
Fixes CVE-2019-2614 and CVE-2019-2627.

Added PKG_CPE_ID.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2019-05-02 22:09:25 +02:00
Sebastian Kemper
d03db02bcc libxslt: backport patch for CVE-2019-11068
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2019-05-02 21:21:04 +02:00
Rosen Penev
d3c324d8bc
Merge pull request #8871 from neheb/ad
[18.06] addrwatch: Add -std=gnu89 to fix compilation
2019-05-02 00:15:33 -07:00
Rosen Penev
fb9238b61d
addrwatch: Add -std=gnu89 to fix compilation
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-05-01 14:24:37 -07:00
Nikos Mavrogiannopoulos
5fae371ab6
Merge pull request #8779 from neheb/libsec
[18.06] libseccomp: Update to 2.3.3
2019-05-01 20:15:16 +02:00
Rosen Penev
3ca88ff6df
Merge pull request #8780 from neheb/apc
[18.06] apcupsd: preset shutdown binary
2019-04-30 11:53:23 -07:00
Rosen Penev
1d44e408f4
Merge pull request #8770 from neheb/es
[18.06] espeak: Fix build issues. Cleanup patches
2019-04-30 11:50:48 -07:00
Rosen Penev
759e836746
Merge pull request #8772 from neheb/oa
[18.06] oath-toolkit: Add patch from Fedora to fix compilation
2019-04-30 11:49:37 -07:00
Rosen Penev
ea1429f690
Merge pull request #8778 from neheb/liba
[18.06] libartnet: Fix compile with GCC7
2019-04-30 11:49:10 -07:00
Rosen Penev
46d30c2215
Merge pull request #8850 from EricLuehrsen/unbound_dhcp_1806
[18.06] unbound: fix local dns synthesis corner cases
2019-04-30 11:47:36 -07:00
Peter Wagner
7f7fda67bd add rpcbind
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-04-30 19:19:55 +02:00
Eric Luehrsen
80429e0a5b unbound: fix local dns synthesis corner cases
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2019-04-29 22:51:55 -04:00
Rosen Penev
1f77a05825
Merge pull request #8777 from neheb/sendm
[18.06] sendmail: link with gcc instead of ld
2019-04-28 13:53:08 -07:00
Rosen Penev
071a926dd3
Merge pull request #8817 from neheb/bonnnnn
bonnie++: Remove wrongly added patch during cherry-pick
2019-04-27 17:41:53 -07:00
Rosen Penev
ddc48c3d5a
bonnie++: Remove wrongly added patch during cherry-pick
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-27 17:40:18 -07:00
Rosen Penev
21de3c1acf
loudmouth: Disable debug and fix compilation
Reduces size and and eliminates -Werror

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 788fda356e)
2019-04-27 17:37:28 -07:00
Rosen Penev
79e69bf412
grilo: Remove build dependency on perl-xml-parser
Given that we don't enable a bunch of stuff, we can patch this out.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from e7dacf3cd3)
2019-04-27 17:30:45 -07:00
Guo Li
c3f6660b8b nfs-kernel-server: fix missing libbsd dependency
libbsd may compile before nfs-kernel-server, it  will make
nfs-kernel-server depends libbsd.so.0, that is not we want to see. so
gave option to 'configure' to disable libbsd detect and tell it we have
no libbsd

Signed-off-by: Guo Li <uxgood.org@gmail.com>
(cherry picked from commit 3fc7f7b8cc)
2019-04-27 19:53:33 +02:00
Peter Wagner
d2f254a729 nfs-kernel-server: update to 2.3.3
Signed-off-by: Peter Wagner <tripolar@gmx.at>
(cherry picked from commit e5216bb0d5)
2019-04-27 19:53:33 +02:00
Daniel Engberg
dac119d492 nfs-kernel-server: Switch to xz tarball
Switch to smaller xz tarball

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit cfba4f0874)
2019-04-27 19:53:33 +02:00
Andy Walsh
f1ab32ab62 nfs-kernel-server: switch to libtirpc, enable ipv6
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 22ebb5a8d6)
2019-04-27 19:53:33 +02:00
Andy Walsh
5ab569a069 nfs-kernel-server: fix missing host symbol res_querydomain/missing-include-dir
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 19dfe3b173)
2019-04-27 19:53:33 +02:00
Peter Wagner
20809ba6a7 nfs-kernel-server: add -Wno-error=format-security to TARGET_CFLAGS to a fix compily error
Signed-off-by: Peter Wagner <tripolar@gmx.at>
(cherry picked from commit b1be3f9c06)
2019-04-27 19:53:33 +02:00
Peter Wagner
2c137a7a5a nfs-kernel-server: update to 2.3.2
Signed-off-by: Peter Wagner <tripolar@gmx.at>
(cherry picked from commit 0d1f48893c)
2019-04-27 19:53:33 +02:00
Andy Walsh
765ae27989 libtirpc: enable host build
* include /etc/netconfig
* cleanup old patches
* update via patch to 1.0.4-rc2

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 4896e9c36e)
2019-04-27 19:53:33 +02:00
Rosen Penev
9b3414fd11 znc: Clean up Makefile and fix compilation on PPC
Some of these hacks were needed when uClibc++ was used. Now that it is not
we can remove them.

Remove libpthread dependency. Not only is it unneeded, package-defaults
already specifies it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[jonas.gorski: cherry-pick from master]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
(cherry picked from commit 9cb7cc71e7da9d06194b813d6263c0b8427eb1c3)
2019-04-26 13:56:20 +02:00
Hannu Nyman
a8316a5c6c nano: update to 4.2
* update nano to 4.2

Release notes at https://nano-editor.org/news.php

2019.04.24 - GNU nano 4.2
* The integrated spell checker does not crash when 'spell' is missing.
* Option --breaklonglines works also when --ignorercfiles is used.
* Automatic hard-wrapping is more persistent in pushing words to the
  same overflow line.

Tested with ipq806x/R7800 and mvebu/WRT3200ACM

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit aee8628696)
2019-04-25 19:26:11 +03:00
Josef Schlehofer
f69a00efba
Merge pull request #8764 from BKPepe/1806-youtubedl
[OpenWrt 18.06] youtube-dl: update to version 2019.04.24
2019-04-25 11:45:43 +02:00
Rosen Penev
024543fb1e
Merge pull request #8766 from neheb/qu
[18.06] quasselc: Update to latest version
2019-04-25 01:01:06 -07:00
Rosen Penev
c69c1aea43
Merge pull request #8768 from neheb/cmd
[18.06] cmdpad: Fix compile
2019-04-24 19:30:49 -07:00
Rosen Penev
d018e0946e
Merge pull request #8776 from neheb/luas
[18.06] luasec: backport build fixes
2019-04-24 16:38:58 -07:00
Eneas U de Queiroz
9f74ef0f89
luasec: cleanup Makefile
The LIBDIR and INCDIR assignments are duplicate of the original
Makefile, changing LIB_PATH and INC_PATH to LDFLAGS and CPPFLAGS.

Setting LIB_PATH and INC_PATH to empty strings will do the same
without duplicating the flags.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-04-24 11:13:48 -07:00
Eneas U de Queiroz
bbfd71a598
luasec: use gcc to link instead of ld
Linking with ld is not portable and was causing problems for some
targets, e.g. i386_pentium4:
i486-openwrt-linux-musl-ld: x509.o: in function `push_asn1_objname':
x509.c:(.text+0x61): undefined reference to `__stack_chk_fail_local'
...

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from e3f1532297)
2019-04-24 11:13:48 -07:00
Rosen Penev
7059f94769
luasec: Replace -fPIC with $(FPIC)
Currently i386 and the PPC targets have issues linking issues.

https://github.com/openwrt/packages/issues/3319

says that replacing -fPIC with -fpic works.

Patch added to avoid package overriding settings set by toolchain and make
compilation less noisy

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from cf23dd2eb0)
2019-04-24 11:13:48 -07:00
Josef Schlehofer
a3d99ad905
youtube-dl: update to version 2019.04.24
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-04-24 20:11:18 +02:00
Rosen Penev
9e532f2254
Merge pull request #8773 from neheb/cla
[18.06] clamsmtp: Really fix compilation
2019-04-24 09:54:27 -07:00
Ted Hess
bcf889b362 intltool: Add patch to fix regular expressions and avoid warnings in perl 5.22 and later.
Signed-off-by: Ted Hess <thess@kitschensync.net>
(backported from commit 5c823596dd)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2019-04-24 07:35:52 +02:00
Rosen Penev
2653eabd4d
prosody: Change linker from LD to CC
This is causing linking errors on i3486 and maybe other platforms. Linking
with LD does not seem to be very portable.

Also cleaned up the Makefile by getting rid of whitespace, HTTPS,
duplicated entries, etc...

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 20:16:00 -07:00
Luís Felipe Safady
c15b779b81
prosody: Update prosody to 0.11.2 Update
Fixes CVE-2018-10847

Added PKG_CPE_ID for proper CVE tracking.

Signed-off-by: Luís Felipe Safady <lagonauta@gmail.com>
2019-04-23 20:15:54 -07:00
Othmar Truniger
9104a1f140
apcupsd: preset shutdown binary
Signed-off-by: Othmar Truniger <github@truniger.ch>
2019-04-23 20:12:32 -07:00
Rosen Penev
e484057d03
libseccomp: Update to 2.3.3
Added PKG_BUILD_PARALLEL for faster compilation.

Removed PKG_FORMAT_SECURITY as it's not needed to be disabled anymore.

Removed patch as musl has been updated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 20:07:55 -07:00
Rosen Penev
f61ee11d00
libartnet: Fix compile with GCC7
error: memset' used with length equal to number of elements without
multiplication by element size

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 20:04:47 -07:00
Eneas U de Queiroz
9d2bf88ec4
sendmail: link with gcc instead of ld
If ld is used directly to link libmilter.so, linking is not done
correctly with glibc, and produces a library that can't be used.
Linking with the bad library produces a strange error:
ld: conftest: hidden symbol `stat' in [...]libc_nonshared.a(stat.oS)
is referenced by DSO

Using ld with musl works fine, but using gcc is a more portable way of
linking the shared library anyway.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-04-23 20:00:22 -07:00
Rosen Penev
dd2c1e03e6
Merge pull request #8769 from neheb/da
[18.06] darkstat: Remove libbsd dependency
2019-04-23 18:05:52 -07:00
Daniel Golle
3a478756fc
Merge pull request #8774 from neheb/psq
[18.06] psqlodbc: bump to 10.03.0000, fix --with-unixodbc
2019-04-24 00:40:25 +02:00
Rosen Penev
cf45375748
psqlodbc: Update to 11.00.0000
[ Upstream commit 5ec4eb76c3 ]

Rearranged Makefile for consistency between packages.

Added PKG_BUILD_PARALLEL to speed up compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 14:48:55 -07:00
Eneas U de Queiroz
8ca29a4f3f
psqlodbc: bump to 10.03.0000, fix --with-unixodbc
[ Upstream commit 2bc28eb40c ]

Update to 10.03.0000.

--with-unixodbc should point to the odbc_config binary, not to the top
of the install directory $(STAGING_DIR)/usr.

Acked-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-04-23 14:47:31 -07:00
Ted Hess
81a6687a66
Merge pull request #8771 from neheb/pia
[18.06] pianod: Update to 174.09 release (removes BSD dependencies)
2019-04-23 17:16:33 -04:00
Rosen Penev
fa060f40ee
clamsmtp: Really fix compilation
It seems Linux headers are broken/incompatible with musl for some reason.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 11:46:45 -07:00
Rosen Penev
850126c0de
oath-toolkit: Add patch from Fedora to fix compilation
Probably a result of GCC7 that it fails now.

Added PKG_CPE_ID for proper CVE tracking.

Added PKG_BUILD_PARALLEL for faster compilation.

Reorganized Makefile slightly for consistency with other packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 11:41:11 -07:00
Ted Hess
fd52a3df01
pianod: Update to 174.09 release (removes BSD dependencies)
Signed-off-by: Ted Hess <thess@kitschensync.net>
2019-04-23 11:39:17 -07:00
Ted Hess
a0ca3e308a
espeak: Fix build issues. Cleanup patches
Signed-off-by: Ted Hess <thess@kitschensync.net>
2019-04-23 11:37:07 -07:00
Rosen Penev
d02a17b35b
darkstat: Remove libbsd dependency
darkstat includes its own strlcat and strlcpy, making the dependency
somewhat pointless.

Fixes compilation ever since glibc dependency on libbsd was removed.

Also removed std=gnu99 as it's not needed with GCC7.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 11:32:53 -07:00
Rosen Penev
0a4f26f3c5
cmdpad: Fix compile
Since the switch to GCC7, this has not compiled as it assumes gnu89 behavior.

-fgnu89-inlining is not enough so use std=gnu89.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 11:29:03 -07:00
Rosen Penev
27af84f57b
crtmpserver: Update to official git repo
The previous source location was an SVN mirror from long ago. This one is
from the author himself.

Reduced overall patch count. A lot of them are no longer necessary.

Switched back to libstdcpp as the necessary uclibc++ changes are not being
merged.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 11:23:25 -07:00
Rosen Penev
1a7d79d981
quassel-irc: Update to latest version
Now that the library has been updated, we can also update this.

Switched to codeload as we don't need the submodule anymore.

Various other Makefile consistency updates.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 11:12:31 -07:00
Rosen Penev
873762ce2c
quasselc: Update to latest commit
Switched to codeload for simpler Makefile.

Several adjustments for consistency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-23 11:12:31 -07:00
Rosen Penev
c8c8c1a4a7
Merge pull request #8759 from neheb/bon2
[18.06] bonnie++: Update to 1.98
2019-04-23 11:05:36 -07:00
Rosen Penev
76132b0443 bonnie++: Update to 1.98
This version contains NVME fixes.

Edited the patches to modify the package Makefile directly so as to reduce
hacks in the OpenWrt Makefile.

Added LTO support to lower filesize by ~4KB.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-22 23:05:30 -07:00
Rosen Penev
df7f21bcdc
Merge pull request #8718 from neheb/lcd
[18.06] lcd4linux: Update to 1204
2019-04-22 22:59:55 -07:00
Rosen Penev
588f971f09
Merge pull request #8716 from neheb/wifi
[18.06] wifidog: Change to use TLS above 1.0
2019-04-22 22:54:18 -07:00
Rosen Penev
4e0a836c5d
Merge pull request #8717 from neheb/setser
[18.06] setserial: Don't build docs to remove nroff dependency
2019-04-22 22:53:49 -07:00
Rosen Penev
403d40d913
Merge pull request #8720 from neheb/iio
[18.06] libiio: add missing dependency to zlib
2019-04-22 22:53:26 -07:00
Rosen Penev
03a4afe5f8
Merge pull request #8719 from neheb/unix
[18.06] unixodbc: Fix compilation
2019-04-22 12:18:34 -07:00
Rosen Penev
d42547cd3f
Merge pull request #8733 from jefferyto/openwrt-18.06-python-cve-2019-9636
[openwrt-18.06] python,python3: Fix CVE-2019-9636 - urlsplit missing NFKC normalization
2019-04-22 09:27:56 -07:00
Jeffery To
fbcac2d532 python,python3: Fix CVE-2019-9636 - urlsplit missing NFKC normalization
These patches address issue:
CVE-2019-9636: urlsplit does not handle NFKC normalization

Link to Python issue:
https://bugs.python.org/issue36216

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-04-21 00:52:30 +08:00
Rosen Penev
01f90caa14
Merge pull request #8706 from nxhack/18_06_icu_support_reiwa
[openwrt-18.06] icu: support for new Japanese era Reiwa
2019-04-18 18:29:02 -07:00
Martin Schiller
e0bee26f42
libiio: add missing dependency to zlib
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
2019-04-18 11:21:38 -07:00
Eneas U de Queiroz
7220dab755
unixodbc: save unixodbc_conf.h for host build
Save a copy of unixodbc_conf.h in STAGING_DIR to be used by host build.
Use STAGING_DIR/tmp/unixodbc instead of include.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-04-18 11:16:12 -07:00
Eneas U de Queiroz
01a2f4353e
unixodbc: fix clean-build compilation
For host compilation, the configure-generated config.h from the target
compilation is used in place of the host-generated file.  When the
target package is compiled with clean-build, that file is gone.  This
saves the file under $(STAGING_DIR), and fetch it from there.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-04-18 11:16:04 -07:00
Eneas U de Queiroz
bd380a3c71
unixodbc: Fix LIB_PREFIX in host build
When copying config.h from PKG_BUILD_DIR to HOST_BUILD_DIR, LIB_PREFIX
is set to /usr/lib.  Then when odbc_config is run, it reports /usr/lib
as the --lib-dir, and in --libs as well, and dependent packages may
fail.  Set it to $(STAGING_DIR)/usr/lib to make it right.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-04-18 11:15:57 -07:00
Rosen Penev
9b5b23f442
lcd4linux: Update to 1204
Very minor bugfix.

Also adjusted standard to gnu89 to fix compilation issues (lot of missing
prototypes).

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-18 11:08:09 -07:00
Rosen Penev
c26a03a1d6
setserial: Don't build docs to remove nroff dependency
Buildbots are failing as they lack nroff.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-18 11:02:37 -07:00
Rosen Penev
2a85006ab4
wifidog: Change to use TLS above 1.0
This should fix compilation as wolfSSL currently does not define
wolfTLSv1_client_method. And as the comment suggests, this is only TLS 1,
not 1.0 and above.

SSLv23 is TLS 1.1 and above as currently configured in the wolfssl package

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-04-18 10:57:25 -07:00
Hirokazu MORIKAWA
94b07876ea icu: [openwrt-18.06] support for new Japanese era Reiwa
support for new Japanese era Reiwa
change source url

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
2019-04-18 14:03:13 +09:00
Hannu Nyman
c9aedd9a56 nano: update to 4.1
* update nano to 4.1
* implement Makefile style changes proposed in #8483

Release notes at https://nano-editor.org/news.php

2019.04.15 - GNU nano 4.1
* By default, a newline character is again automatically added at the
  end of a buffer, to produce valid POSIX text files by default, but
  also to get back the easy adding of text at the bottom.
* The now unneeded option --finalnewline (-f) has been removed.
* Syntax files are read in alphabetical order when globbing, so that
  the precedence of syntaxes becomes predictable.
* In the C syntax, preprocessor directives are highlighted differently.
* M-S now toggles soft wrapping, and M-N toggles line numbers.
* The jumpy-scrolling toggle has been removed.
* The legacy keystrokes ^W^Y and ^W^V are recognized again.
* Executing an external command is disallowed when in view mode.
* Problems with resizing during external or speller commands were fixed.

Tested with ipq806x R7800

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 5c212b1a13)
2019-04-17 19:34:56 +03:00
Rosen Penev
49e759b28b
Merge pull request #8638 from mwarning/zerotier
zerotier: update version
2019-04-11 09:47:35 -07:00
Rosen Penev
890993d406
Merge pull request #8477 from BKPepe/openwrt-18.06_perl
[OpenWrt 18.06] perlmod: fix ability to build module out-of-feed
2019-04-11 09:42:51 -07:00
Karl Palsson
d6ed5c22b4 net/mosquitto: correct config file option name
Correct option is "password_file" not "passwd_file"

Originally reported as: https://github.com/openwrt/packages/pull/8642
Added the package bump.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2019-04-11 12:08:30 +00:00
Moritz Warning
05e16dd223 zerotier: fix multiple instance handling and port setting
Signed-off-by: Moritz Warning <moritzwarning@web.de>
2019-04-10 14:16:52 +02:00
Moritz Warning
59c6457ec8 zerotier: update to version 1.2.12
Signed-off-by: Moritz Warning <moritzwarning@web.de>
2019-04-10 14:16:45 +02:00
Hannu Nyman
4db1027556
Merge pull request #8595 from EricLuehrsen/openwrt-18.06
[openwrt-18.06] unbound: correct forward of root domain
2019-04-06 18:16:48 +03:00
Eric Luehrsen
43c1d6c2af unbound: correct forward of root domain
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2019-04-05 00:14:50 -04:00
Jonas Gorski
b7bcf24a00 znc: backport CVE fixes to 1.6
Backport fixes for CVEs CVE-2018-14055 and CVE-2018-14056.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
2019-04-01 11:28:30 +02:00
Rosen Penev
f91539e92f
Merge pull request #7807 from D-Albers/openwrt-18.06
jool: Backport two fixes for newer kernels.
2019-03-29 22:56:13 -07:00
Jiri Slachta
550de23319
Merge pull request #8449 from micmac1/ssh2-1806-181
libssh2 (18.06): version bump/CVE fixes
2019-03-28 09:41:06 +01:00
Karl Palsson
16fcd6d383 mosquitto: bump to v1.5.8
Full changelog available at:
https://github.com/eclipse/mosquitto/blob/v1.5.8/ChangeLog.txt

This is a bugfix release.  Of likely note to OpenWrt is a bug affecting
missing messages on bridges since 1.5.4:
https://github.com/eclipse/mosquitto/issues/1174

Signed-off-by: Karl Palsson <karlp@etactica.com>
2019-03-27 11:18:21 +00:00
Jan Pavlinec
1a23db5b23 php7: Add PKG_CPE_ID for proper CVE tracking
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 0465f6fb46)
2019-03-26 20:21:10 +01:00
Michael Heimpold
7aacf24236 php7: update to 7.2.16
Also refresh patch which does not apply cleanly anymore.

Run tested on Duckbill for mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 80cdd53134)
2019-03-26 20:21:04 +01:00
Michael Heimpold
27433fc3eb php7: fix cross compiling patch (fixes #8166)
Fixes: e148924a4 ("php7: update to 7.2.15")

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 1d4081dd4c)
2019-03-26 20:20:57 +01:00
Michael Heimpold
00f6119bd2 php7: update to 7.2.15
Also refresh patch which does not apply cleanly anymore.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit e148924a4c)
2019-03-26 20:20:51 +01:00
Michael Heimpold
ef57201aa9 php7: update to 7.2.14
While at, add --with-pic to configure arguments. This prevents the following
build errors spotted by the build bots for i386 targets:

-snip-
...
ext/openssl/.libs/openssl.o: direct GOT relocation R_386_GOT32X against
`X509_REQ_free' without base register can not be used when making a shared object
...
-snap-

This parameter seems to make no difference on other targets, nor
improve or make worse the package size.

Run tested for i386 in VirtualBox VM and on Duckbill for mxs platform.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 963c841463)
2019-03-26 20:20:43 +01:00
Michael Heimpold
e9271cf276 php7: update to 7.2.13
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 794f8f8e94)
2019-03-26 20:20:36 +01:00
Michael Heimpold
1308ba92ce php7: update to 7.2.12
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 2186fe821d)
2019-03-26 20:20:31 +01:00
Michael Heimpold
9e330d6e9d php7: update to 7.2.11
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 797776a3b3)
2019-03-26 20:20:24 +01:00
Michael Heimpold
5e25be5353 php7: update to 7.2.10
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit c69af6717c)
2019-03-26 20:20:18 +01:00
Michael Heimpold
85c616557f php7: adjust load priority for openssl (fixes #6893)
This orders loading of openssl extension before extensions
which require openssl functions.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 5afeb3f9c8)
2019-03-26 20:20:05 +01:00
Hannu Nyman
31d279c963 nano: update to 4.0
Update nano editor to version 4.0.

Release notes at
http://git.savannah.gnu.org/cgit/nano.git/plain/NEWS?h=v4.0

 2019.03.24 - GNU nano 4.0 "Thy Rope of Sands"
 * An overlong line is no longer automatically hard-wrapped.
 * Smooth scrolling (one line at a time) has become the default.
 * A newline character is no longer automatically added at end of buffer.
 * The line below the title bar is by default part of the editing space.
 * Option --breaklonglines (-b) turns automatic hard-wrapping back on.
 * Option --jumpyscrolling (-j) gives the chunky, half-screen scrolling.
 * Option --finalnewline (-f) brings back the automatic newline at EOF.
 * Option --emptyline (-e) leaves the line below the title bar unused.
 * <Alt+Up> and <Alt+Down> now do a linewise scroll instead of a findnext.
 * Any number of justifications can be undone (like all other operations).
 * When marked text is justified, it becomes a single, separate paragraph.
 * Option --guidestripe=<number> draws a vertical bar at the given column.
 * Option --fill=<number> no longer turns on automatic hard-wrapping.
 * When a line continues offscreen, it now ends with a highlighted ">".
 * The halfs of a split two-column character are shown as "[" and "]".
 * A line now scrolls horizontally one column earlier.
 * The bindable functions 'cutwordleft' and 'cutwordright' were renamed
   to 'chopwordleft' and 'chopwordright' as they don't use the cutbuffer.
 * The paragraph-jumping functions were moved from Search to Go-to-Line.
 * Option --rebinddelete is able to compensate for more misbindings.
 * Options --morespace and --smooth are obsolete and thus ignored.
 * The --disable-wrapping-as-root configure option was removed.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit f1d51dbf76)
2019-03-24 19:32:58 +02:00
Philip Prindeville
b8970833bf
perlmod: fix ability to build module out-of-feed
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2019-03-23 13:06:13 +01:00
Sebastian Kemper
59aa52ccdb libssh2: version bump/CVE fixes
- CVE-2019-3855
  Possible integer overflow in transport read allows out-of-bounds write

- CVE-2019-3856
  Possible integer overflow in keyboard interactive handling allows
  out-of-bounds write

- CVE-2019-3857
  Possible integer overflow leading to zero-byte allocation and out-of-bounds
  write

- CVE-2019-3858
  Possible zero-byte allocation leading to an out-of-bounds read

- CVE-2019-3859
  Out-of-bounds reads with specially crafted payloads due to unchecked use of
  `_libssh2_packet_require` and `_libssh2_packet_requirev`

- CVE-2019-3860
  Out-of-bounds reads with specially crafted SFTP packets

- CVE-2019-3861
  Out-of-bounds reads with specially crafted SSH packets

- CVE-2019-3862
  Out-of-bounds memory comparison

- CVE-2019-3863
  Integer overflow in user authenicate keyboard interactive allows
  out-of-bounds writes

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2019-03-19 08:48:58 +01:00
Rosen Penev
e47fe43ea5 Jinja2: Update to 2.10
Switch URL to a deterministic one.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-03-19 00:19:46 +01:00
Luiz Angelo Daros de Luca
8d7e62d952 ruby: update to 2.5.5
2.5.5: Bug fix for a deadlock in multi-thread/multi-process (using Process.fork) applications, like for example Puma

2.5.4: Fixes multiple vulnerabilities:

CVE-2019-8320: Delete directory using symlink when decompressing tar
CVE-2019-8321: Escape sequence injection vulnerability in verbose
CVE-2019-8322: Escape sequence injection vulnerability in gem owner
CVE-2019-8323: Escape sequence injection vulnerability in API response handling
CVE-2019-8324: Installing a malicious gem may lead to arbitrary code execution
CVE-2019-8325: Escape sequence injection vulnerability in errors

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
2019-03-18 14:39:28 -03:00
Luiz Angelo Daros de Luca
17a0279dd1 ruby: fix build for uclibc
Backporting upstream fix. Closes #8051.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(cherry picked from commit f9b16dea51)
2019-03-18 14:39:21 -03:00
Daniel Gimpelevich
017b74d359 vpnc: fix IPv6-triggered inoperability
When the server hostname resolved to both IPv4 and IPv6 addresses,
connecting would fail with nothing in syslog. This corrects that oversight.

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>

(cherry picked from ca56324 and PKG_MIRROR_HASH removal from 494ce71)
2019-03-17 16:39:07 +02:00
Hannu Nyman
563aafceec postgresql: Revert adding build dependency to zlib/host
Revert the addition of build dependency in commit 2d1694ff7
to a non-existent host build of zlib.

The host build of zlib was removed already in April 2018 by
8dcd941d8b (diff-1ed408c61d79f9c6c5d197333e94ce8d)
which made zlib a build tool defined in /tools

The newly introduced build dependency causes always a warning like:
   WARNING: Makefile 'package/feeds/packages/postgresql/Makefile'
   has a build dependency on 'zlib/host', which does not exist

Not sure what was the error that 2d1694ff7 tried to fix,
but reference to a non-existent host build is not the solution.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit d8e61d49da)
2019-03-17 10:44:13 +02:00
Hannu Nyman
3323ebddfe
Merge pull request #8403 from BKPepe/transmission_openwrt-18.06
[OpenWrt 18.06] Transmission: update to version 2.94
2019-03-16 08:01:50 +02:00
Hannu Nyman
c0293cd999
Merge pull request #8402 from BKPepe/netdata_openwrt-18.06
[OpenWrt 18.06] Netdata: update to version 1.12.2
2019-03-16 08:00:39 +02:00
Hannu Nyman
9bb4bcc9b4
Merge pull request #8395 from EricLuehrsen/unbound_191_1806
[openwrt-18.06] unbound: update to 1.9.1
2019-03-13 17:24:28 +02:00
Rosen Penev
d444a910fe
transmission: update to version 2.94
Add LTO support

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-03-13 15:38:29 +01:00
Josef Schlehofer
99c3670bb1
Netdata: update to version 1.12.2
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-03-13 14:49:38 +01:00
Ted Hess
1e347beb3c libtalloc: Merge 2.1.14 from master (remove libbsd dependency)
Signed-off-by: Ted Hess <thess@kitschensync.net>
2019-03-13 08:39:17 -04:00
Eric Luehrsen
a476bf8d00 unbound: update to 1.9.1
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2019-03-12 21:26:53 -04:00
Hannu Nyman
060e59a285
Merge pull request #8386 from wvdakker/openwrt-18.06
Openwrt 18.06: Shorewall Bump to 5.2.0.5 (issue #8382)
2019-03-12 17:49:32 +02:00
W. van den Akker
86efe678a2
Shorewall6: Bump to 5.2.0.5.
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2019-03-11 20:47:54 +01:00
W. van den Akker
9cdc22eefe
Shorewall: Bump to 5.2.0.5.
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2019-03-11 20:47:54 +01:00
W. van den Akker
3669215b21
Shorewall6-lite: Bump to 5.2.0.5.
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2019-03-11 20:47:54 +01:00
W. van den Akker
762093fe72
Shorewall-lite: Bump to 5.2.0.5.
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2019-03-11 20:47:54 +01:00
W. van den Akker
1a97a8444f
Shorewall-core: Bump to 5.2.0.5.
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2019-03-11 20:47:21 +01:00
Daniel Golle
121072523c postgresql: add HOST_BUILD_DEPENDS:=zlib/host
spotted on buildbot trying postgresql/host build:
configure: error: zlib library not found

Fix this by adding zlib/host to HOST_BUILD_DEPENDS.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry-picked from commit 2d1694ff7c)
2019-03-11 02:27:24 +01:00
Daniel Golle
daef6665b4 gnurl: update to version 7.64.0
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry-picked from commit 78adac5930)
2019-03-11 02:26:09 +01:00
Daniel Golle
5fff804725 libgabe: add package
cherry-pick and squash commits from master for GNUnet
 04eb431cb libgabe: add package
 7831fb63b libgabe: update to shared library version

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-07 03:21:21 +01:00
Daniel Golle
cb253649a0 libpbc: add new package
cherry-pick commit 4c5d25458 libpbc: add new package
from master as GNUnet started to depend on libgabe which depends on
libpbc.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-07 01:39:24 +01:00
Daniel Golle
f03acaa391
Merge pull request #8346 from Cynerd/jinja2-missing-dep-18.06
Jinja2: add missing dependency on markupsafe
2019-03-05 19:05:35 +01:00
Karel Kočí
2324d341ea
Jinja2: add missing dependency on markupsafe
Signed-off-by: Karel Kočí <karel.koci@nic.cz>
2019-03-05 17:20:36 +01:00
Daniel Golle
0ba0e0d1b5 gnunet: revert accidentally applied libmicrohttpd changes
revert 7b2bf511c gnunet: Specify libmicrohttpd-ssl dependency
which was accidentally merged from master while the rename of the
libmicrohttpd* packages has happened only on master.
Revert it for openwrt-18.06.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-05 02:02:36 +01:00
Daniel Golle
799c409d37 gnunet-secushare: add package (replacing gnunet-social package)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-03 03:02:19 +01:00
Daniel Golle
d70e35ba10 gnunet: GNUnet v0.11.0 release
Backport and squash the following commits from master:
 4dcd1d4d0 gnunet: update to 0.12 pre-release snapshot
 acc59d3a0 gnunet: fix uclibc build issue
 f546ac9b8 gnunet: remove iconv hack
 b5b271a39 gnunet: update to gnunet 0.11 release candidate source as of 20180929
 1459c3513 gnunet: update source
 0b548cb73 gnunet: adapt uci-defaults to renamed namestore-flat -> -heap
 effc8b5bf gnunet: update to source to 20190128
 7b2bf511c gnunet: Specify libmicrohttpd-ssl dependency
 1d5af8f9e gnunet: fix PKG_MIRROR_HASH
 77191eddb gnunet: GNUnet v0.11 release
 1c658e5f3 gnunet-secushare: auto-configure database backend

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-03 03:02:12 +01:00
Daniel Golle
799f553b2a postgresql: update to version 9.6.12
Backport and squash the following commits from master:
 43ec390bd postgresql: security bump to 9.6.10
 845aab78a postgresql: Update to 9.6.11
 fe6597dd7 postgresql: update to version 9.6.12

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-03 03:02:07 +01:00
Daniel Golle
257dfbb55b libextractor: update to version 1.9
Backport and squash the following commits from master:
 853e9d1c3 libextractor: Update to 1.7
 1a23de5db libextractor: update to version 1.8
 a50f26941 libextractor: fix PKG_HASH
 6709d9b82 libextractor: update to version 1.9
2019-03-03 03:02:01 +01:00
Daniel Golle
6c2266acff gnurl: update to version 7.63.0
Backport and squash the following commits from master:
 af06f6fd5 gnurl: update to version 7.61.1
 7cdbb7569 gnurl: build without libpsl
 d34eda733 gnurl: update to version 7.63.0

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2019-03-03 03:01:48 +01:00
Yousong Zhou
3e6d392e02 openvswitch: bump to version 2.8.5
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2019-02-27 10:31:44 +00:00
Stijn Tintel
5de163d67c vallumd: bump to 0.1.4
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit d89cd30a79)
2019-02-17 18:28:56 +02:00
Hannu Nyman
383019fdff
Merge pull request #8207 from commodo/18.06-CVE-2018-20406
[18.06] python3: fix [CVE-2018-20406]
2019-02-14 18:25:51 +02:00
Karl Palsson
b8c2c2b1bb mosquitto: update to 1.5.7
This is a minor bugfix release. Full changelog available at:
https://mosquitto.org/blog/2019/02/version-1-5-7-released/

Most relevant to OpenWrt are probably:
* fixing persistent store bloat
* fix sorting of included config files
* fix errors related to per_listener_settings

Signed-off-by: Karl Palsson <karlp@etactica.com>
2019-02-14 11:14:13 +00:00
Peter Wagner
8a2d566849 irssi: update to 1.2.0
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-02-13 23:05:54 +01:00
Alexandru Ardelean
d0f5ae180c [18.06] python3: fix [CVE-2018-20406]
Link to Python bug:
  https://bugs.python.org/issue34656

Upstream commit:
  71a9c65e74

OpenWrt 18.06 contains version Python 3.6.5, which doesn't contain this
fix.
Python 2.7 is not affected.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2019-02-13 10:27:22 +02:00
Yousong Zhou
dad217d34c shadowsocks-libev: flush ss rules on entry
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2019-02-11 13:30:43 +00:00
Karl Palsson
bbc2e68ede mosquitto: bump to 1.5.6
This is a bugfix and security release.

CVE-2018-12551: If Mosquitto is configured to use a password file for
authentication, any malformed data in the password file will be
treated as valid. This typically means that the malformed data becomes
a username and no password. If this occurs, clients can circumvent
authentication and get access to the broker by using the malformed
username. In particular, a blank line will be treated as a valid empty
username. Other security measures are unaffected.

=> Users who have only used the mosquitto_passwd utility to create and
modify their password files are unaffected by this vulnerability.

CVE-2018-12550: If an ACL file is empty, or has only blank lines or
comments, then mosquitto treats the ACL file as not being defined,
which means that no topic access is denied. Although denying access to
all topics is not a useful configuration, this behaviour is unexpected
and could lead to access being incorrectly granted in some
circumstances.

CVE-2018-12546. If a client publishes a retained message to a topic
that they have access to, and then their access to that topic is
revoked, the retained message will still be delivered to future
subscribers. This behaviour may be undesirable in some applications,
so a configuration option `check_retain_source` has been introduced to
enforce checking of the retained message source on publish.

Plus the following bugfixes:
* wills not sent to websocket clients
* spaces now allowed in bridge usernames
* durable clients not receiving offline messages with
per_listener_settings==true
* compilation with openssl without deprecated apis
* TLS working over SOCKS
* better comment handling in config files

Full changelog available at: https://github.com/eclipse/mosquitto/blob/fixes/ChangeLog.txt#L1

Signed-off-by: Karl Palsson <karlp@etactica.com>
2019-02-08 11:55:04 +00:00
Hannu Nyman
1127ef99b7
Merge pull request #8143 from micmac1/18.06-bump-maria38
mariadb: security bump to 10.1.38
2019-02-07 20:49:29 +02:00
Sebastian Kemper
9ffcfea198 mariadb: bump to 10.1.38
Upstream Release Notes:

- MDEV-17475: Maximum value of table_definition_cache is now 2097152
- MDEV-13671: InnoDB should use case-insensitive column name comparisons
  like the rest of the server
- ALTER TABLE fixes: MDEV-17230, MDEV-16499, MDEV-17904, MDEV-17833,
  MDEV-17470, MDEV-18237, MDEV-18016
- Improvements to InnoDB page checksum, recovery, and Mariabackup:
  MDEV-17957, MDEV-12112, MDEV-18025, MDEV-18279, MDEV-18183
- Galera
  - MDEV-15740: Galera durability fix
  - New configuration variable wsrep_certification_rules, used for
    controlling whether to use new/optimized
    (--wsrep_certification_rules=optimized) certification rules or the
    old/classic ones (--wsrep_certification_rules=strict). Setting the
    variable to strict can cause more certification failures.

- Fixes for the following security vulnerabilities:
  - CVE-2019-2537
  - CVE-2019-2529

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2019-02-06 23:36:27 +01:00
Hannu Nyman
a4111bcf0d
Merge pull request #8098 from jonathanunderwood/openwrt-18.06-getdns-stubby-from-master
[18.06] Cherry pick getdns and stubby commits from master
2019-02-01 16:37:58 +02:00
Jonathan G. Underwood
09b794eccc stubby: update to version 0.2.4
This upstream release adds support for trust_anchors_backoff_time
configuration parameter. UCI support has been added for this.

This commit also includes a number of clean-ups:
    o change START=50 to START=30 in init file
      Starting earlier in the boot means less chance of missing interface
      trigger events. See: https://github.com/openwrt/packages/pull/4675
    o remove unused variables from init file
    o separate local declarations and assignments in init file
    o add defensive quoting in init file
    o use default values for procd respawn in init file
    o make use of {} in variables consistent in init file
    o remove unused variable from init file

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-01-31 23:41:52 +00:00
David Mora
41c4f82f8d stubby: Remove iamperson347 from maintainer
I am no longer able to support maintaining the stubby daemon for openwrt. I suggest Jonathan Underwood <jonathan.underwood@gmail.com> as a replacement.
2019-01-31 23:41:52 +00:00
jonathanunderwood
2cf2210d83 stubby: add Jonathan Underwood as co-maintainer (#7307)
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-01-31 23:41:52 +00:00
Jonathan G. Underwood
709a736043 stubby: add reload_config to documentation
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-01-31 23:41:52 +00:00
Jonathan G. Underwood
aa8380721b stubby: fix loading of config file
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-01-31 23:41:52 +00:00
Jonathan G. Underwood
6e2451dd00 stubby: add uci support to init file
This commit brings UCI support to the stubby package.

    o All options are documented in the README.md file.
    o The README.md file has been re-written to include a short usage
      manual.
    o The default configuration now includes more Cloudflare addresses.
    o The stubby service is (re)started using procd triggers from a
      specified interface with a configurable time delay.
    o Round robin use of upstream resolvers is now activated by
      default.
    o Client privacy is now activated by default.
    o Options are added for specifying the log level of the daemon and
      command line options passed to the stubby command.

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
7a2b9df89b stubby: bump PKG_RELEASE
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
304596d21c stubby: remove unnecessary core limit
Remove the limit setting core="unlimited", since this shouldn't be needed
in production use (i.e. non-debug) and on an embedded platform, which is
why it's rarely used by any existing packages.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
fd8505f760 stubby: add SPKI pin set for Cloudflare cert
Add an SPKI pin for Cloudflare to help prevent MITM and downgrade attacks,
as described in RFC7858 (DNS over TLS). The setup of SPKI and the specific
SHA256 certificate hash are taken from Cloudflare's DoT configuration guide
published at https://developers.cloudflare.com/1.1.1.1/dns-over-tls/.

Note that the certificate is valid to March 25th 2020, 13:00 CET, which
provides ample time for issuance of a backup pin to support future key
rollover.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
b77053d350 stubby: add Cloudflare 1.0.0.1 and ::1001 servers
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
3f17c54f26 stubby: use EDNS client-subnet privacy by default
Retain the upstream value since privacy is usually the key user motivation
for using DNS-over-TLS, and simply note that those encountering sub-optimal
routing may consider disabling the setting.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
9351266328 stubby: fix config file definition
The config file /etc/stubby/stubby.yml is not registered properly and any
local changes are being overwritten on upgrade or reinstall.

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
d3b090a311 stubby: rearrange Makefile for clarity
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Tony Ambardar
a3a73ef7bc stubby: add missing dependency on ca-certificates
Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
2019-01-31 23:41:51 +00:00
Jonathan G. Underwood
ccf0c71ace getdns: update to version 1.5.0
Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
2019-01-31 23:41:45 +00:00
David Mora
07e6476454 getdns: Remove iamperson347 from maintainer
I am no longer able to support maintaining the getdns lib for openwrt. I suggest Jonathan Underwood <jonathan.underwood@gmail.com> as a replacement.
2019-01-31 23:41:38 +00:00
Hannu Nyman
6e7207c94e
Merge pull request #8094 from candrews/patch-2
getdns: fix missing libbsd dependency
2019-01-31 20:12:48 +02:00
Craig Andrews
ca7555e52d
getdns: fix missing libbsd dependency
Backport these commits from master to the 18.06 branch:
8365744b80
035b22b208
d0766135ad

Fixes https://github.com/openwrt/packages/issues/8093

Signed-off-by: Craig Andrews <candrews@integralblue.com>
2019-01-31 13:06:08 -05:00
Adrien DAURIAT
cc8439566f acme: Fix loading credentials
Move loading credential function before cert renewal call as credentials might be needed for some renewal operations ( ex: DNS )

Signed-off-by: Adrien DAURIAT <16813527+dauriata@users.noreply.github.com>
2019-01-31 15:16:33 +01:00
Hannu Nyman
fc42664a18
Merge pull request #8077 from BKPepe/openwrt-18.06
[openwrt-18.06] youtube-dl: update to version 2019.01.30.1
2019-01-30 23:09:39 +02:00
Josef Schlehofer
fb3dd71efd
youtube-dl: update to version 2019.01.30.1
Add Josef Schlehofer as Co-maintainer to be able to track issues

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2019-01-30 14:29:53 +01:00
Hannu Nyman
911bbd6bb4
Merge pull request #8048 from jefferyto/openwrt-18.06-python-idna
[openwrt-18.06] python-idna: Add missing dependency on python(3)-codecs
2019-01-27 23:05:41 +02:00
Jeffery To
4368783e97 python-idna: Add missing dependency on python(3)-codecs
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-01-27 20:26:48 +08:00
Hannu Nyman
88cdd51d30
Merge pull request #7945 from jefferyto/openwrt-18.06-python-lib2to3-pyc-fix
[openwrt-18.06] python/python3: Fix lib2to3 fixes search
2019-01-27 11:58:13 +02:00
Jeffery To
480e4d7e88 python/python3: Fix lib2to3 fixes search
This is the patch from c98b12d9a9 (#7931),
applied for both python 2 and 3.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-01-13 06:14:36 +08:00
Hannu Nyman
6f84d68c94
Merge pull request #7799 from cshoredaniel/pr-nut-runas-backport
[18.06] nut: Default to run as root but fix alt runas
2019-01-02 18:02:23 +02:00
Peter Wagner
02dd97d148 libsndfile: update to 42132c543358cee9f7c3e9e9b15bb6c1063a608e
Fixes CVE-2018-19758
2019-01-02 01:06:23 +01:00
Hannu Nyman
85bfefb561
Merge pull request #7757 from jefferyto/openwrt-18.06-python-dist-info
[openwrt-18.06] python/python3: fix .dist-info missing for setuptools and pip
2019-01-01 21:55:43 +02:00
Hannu Nyman
94b3e50e04
Merge pull request #7820 from commodo/18-06-python3-CVE-2018-14647
[18.06] python3: backport CVE-2018-14647 patch from upstream
2018-12-31 22:33:38 +02:00
Hannu Nyman
8f988efb92
Merge pull request #7819 from commodo/18-06-python-CVE-2018-14647
[18.06] python: backport CVE-2018-14647 patches from upstream
2018-12-31 22:32:58 +02:00
Alexandru Ardelean
34dec81901 python3: backport CVE-2018-14647 patch from upstream [18.06]
These patches are backports from Python 3.6 upstream.
The security issue is described here:
  https://nvd.nist.gov/vuln/detail/CVE-2018-14647

The Python bug report:
  https://bugs.python.org/issue34623

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2018-12-31 19:20:27 +02:00
Alexandru Ardelean
3785db429f python: backport CVE-2018-14647 patches from upstream [18.06]
These patches are backports from Python 2.7 upstream.
The security issue is described here:
  https://nvd.nist.gov/vuln/detail/CVE-2018-14647

The Python bug report:
  https://bugs.python.org/issue34623

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
2018-12-31 18:58:19 +02:00
Rosen Penev
931070c26d jool: Backport two fixes for newer kernels.
The first is needed for 4.14 (maybe the relevant parts got packported and
the second is for when OpenWrt migrates to 4.19.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 4f28139a3c)

Signed-off-by: Daniel Albers <Daniel.Albers@public-files.de>
2018-12-30 16:16:36 +01:00
Daniel F. Dickinson
8f41fa7f82 nut: Default to run as root but fix alt runas
Since the new hotplug script in master was not backport (new feature),
for 18.06 branch revert the old behavior of running NUT daemons and
drivers as root by default to avoid permisions problems, but backport
fix the support for running as another user for those who can set the
appropriate permissions on the USB (or other) device.

Closes: #7742

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-12-28 16:18:26 -05:00
Peter Wagner
f7048b725d libsndfile: update to 8ddc442d539ca775d80cdbc7af17a718634a743f
a/ulaw: fix multiple buffer overflows

Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-12-25 04:04:46 +01:00
Jeffery To
e3f32b75b3 python/python3: fix .dist-info missing for setuptools and pip
Without .dist-info (similar to .egg-info), setuptools and pip are not
discoverable by pkg_resources.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-12-23 03:28:02 +08:00
champtar
d05b98c6c8
Merge pull request #7733 from micmac1/openwrt-18.06-sqlite-fpic
(18.06) sqlite3: remove fpic, change maintainer
2018-12-20 19:08:45 +01:00
Sebastian Kemper
e814c888d0 sqlite3: change maintainer
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-12-20 18:44:48 +01:00
Sebastian Kemper
578762f4fc sqlite3: remove $(FPIC)
Defaulting to -fPIC is a bad idea, especially for executables (here:
sqlite3-cli). In short, there are certain security implications as well
as overhead/performance penalties. Details see:

https://wiki.gentoo.org/wiki/Project:Hardened/Position_Independent_Code_internals

The configure script is able to detect the need for PIC and adds the
flag when needed anyway (when compiling the library).

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-12-19 20:24:17 +01:00
champtar
8b4118cd7b
Merge pull request #7726 from micmac1/openwrt-18.06-sqlite3
(18.06) sqlite3 security bump
2018-12-18 22:46:08 +01:00
Sebastian Kemper
68694dddb1 sqlite3: security bump
A remote code execution vuln has been found in sqlite. Infos available
here:

https://blade.tencent.com/magellan/index_en.html

sqlite 3.26.0 contains the fix.

This commit also changes source URL to https.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-12-18 21:12:47 +01:00
Karl Palsson
13a4dcd614 net/mosquitto: bump to 1.5.5
Security and bug fix.  Full changelog available at: https://mosquitto.org/ChangeLog.txt

Signed-off-by: Karl Palsson <karlp@etactica.com>
2018-12-17 10:55:34 +00:00
Ted Hess
3e4fae2465 CircleCI: [18.06] branch specific version.
Add package checks and HASH verify from Travis. Fix build log generation.

Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-12-11 15:56:29 -05:00
Hannu Nyman
c95a1d3da8
Merge pull request #7638 from cshoredaniel/pr-nut-backport
[18.06] nut: Backport fixes from master
2018-12-11 18:42:14 +02:00
Daniel F. Dickinson
bb1b12733e nut: Backport fixes from master
Backport and squash the following commits from master:

  5790053eb nut: Add missing conffiles
  ceff68837 nut: Reorganize nut-server to clarify nut-driver
  f6a2a97d2 nut: Use 'real' procd init for nut-monitor
  918a62f91 nut: Make FSD really work
  a2f64b3ba nut: Reduce user error with POWERDOWNFLAG
  461393810 nut: Use quotes around filenames
  1b6dbe7a7 nut: Remove duplicate/extraneous lines
  0a49d0ffb nut: Fix checking for path before it exists
  3b5a8eee8 nut: Various startup fixes for monitor and server
  44e57d4bd nut: Fix variables for NUT drivers
  36fd59dc7 nut: Fix extraneous config_get
  192b0f164 nut: Fix a typo in setting a driver parameter
  f48b060fa nut: Fix upsd runs as root

And bump PKG_RELEASE

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
2018-12-11 07:19:15 -05:00
Rosen Penev
e6769fc7ef libsndfile: Fix MIRROR_HASH
Signed-off-by: Rosen Penev <rosenp@gmail.com>
2018-12-07 06:18:21 +01:00
Hannu Nyman
19ca64fc81
Merge pull request #7554 from micmac1/tiff-4010-18.06
(openwrt-18.06) tiff: security bump to 4.0.10
2018-12-06 10:36:21 +02:00
Peter Wagner
f432140863 libsndfile: add PKG_SOURCE_DATE
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-12-03 23:10:36 +01:00
Peter Wagner
18c3166385 libsndfile: switch to cmake
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-12-03 20:40:11 +01:00
Peter Wagner
6124b001e9 libsndfile: switch to git
Fixes CVEs:
CVE-2017-6892
CVE-2017-8361
CVE-2017-8362
CVE-2017-8363
CVE-2017-8365
CVE-2017-12562
CVE-2017-14245
CVE-2017-14246
CVE-2017-14634
CVE-2018-13139
CVE-2018-13419

Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-12-03 20:39:59 +01:00
Sebastian Kemper
e802a0c008 tiff: security bump to 4.0.10
This bumps libtiff's minor version from 9 to 10. In addition to the CVE
fixes that we already included this fixes:

CVE-2017-17095
CVE-2018-17101
CVE-2018-18557

The update is 100% backwards compatible, no symbol changes.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-12-02 11:31:19 +01:00
Rosen Penev
b9b3445cc0 tree: Update to 1.8.0
Signed-off-by: Rosen Penev <rosenp@gmail.com>

(cherry picked from commit dbe1c48c53)
2018-12-01 13:29:16 +02:00
Karl Palsson
890c302e1a net/mosquitto: support more acl plugin options
Adds support for acl_plugin, and acl_opt_* options.
acl_opt_* requires some care as it relies on the internal behaviour of
cfg_load setting environment variables in a certain form.  However,
given that _all_ of the cfg_load infrastructure relies on that, we can
be pretty sure that it won't change in a way that will hurt us.

Originally reported as: https://github.com/openwrt/packages/pull/7434

Signed-off-by: Karl Palsson <karlp@etactica.com>
2018-11-27 16:54:37 +00:00
champtar
469bcb5ea1
Merge pull request #7481 from padre-lacroix/darkstat-18.06
darkstat: [18.06] procd init script and enabling additional parameters
2018-11-26 19:57:01 -05:00
Jean-Michel Lacroix
8643915bbd darkstat: [18.06] procd init script and enabling additional parameters
This is the same change as the one on master
This is to change the init script to a procd init script
This also enable some additional parameters in the binary that
were present but not enabled:
The export file (option export_file)
The import file (option import_file)
The daylog (option daylog_file)
These are disabled by default.  Also, the option to run as a daemon
is removed, as not compatible with procd.

There is no change in the binary.

Signed-off-by: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
2018-11-26 18:12:14 -05:00
Leonid Evdokimov
8ccfae065f prometheus-node-exporter-lua: close io.popen files to reap zombies
Signed-off-by: Leonid Evdokimov <leon@darkk.net.ru>
2018-11-25 16:56:38 -05:00
Ted Hess
430f6c0164 build,circleci: Updates with additional checks from travis scripts.
Checking:
- Pull request does not contain unwanted merges
- signed-off-by tag exists and matches author
- Subject line has package name
- Author name has 'firstname lastname' (no nicknames)

Signed-off-by: Ted Hess <thess@kitschensync.net>
[Use git instead of CircleCI variables]
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-11-24 22:23:34 -05:00
Etienne Champetier
677eb7ec2b build,circleci: add curl & wget to base image
curl was present in latest image but seems to have been remove from latest debian:9

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-11-24 22:23:06 -05:00
Hannu Nyman
7370760f5d nano: update to 3.2
Update nano to version 3.2

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ea656e25a2)
2018-11-24 16:49:45 +02:00
Hannu Nyman
1f2f177d3c collectd: update to 5.8.1
Update collectd to version 5.8.1

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 29eac13d8f)
2018-11-24 16:49:45 +02:00
Hannu Nyman
44458746f2 collectd: remove obsolete references to avr32
Backport the collectd portion of the treewide changes
made by e38c10061 in master

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
2018-11-24 16:49:45 +02:00
Sebastian Kemper
635d96ca45 collectd: include nls.mk for mysql plugin
libmariadb 10.2 needs to be linked in together with iconv.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit b695c1150a)
2018-11-24 16:49:45 +02:00
Marc Benoit
86c3ea10ec utils/collectd: run with low priority
Even on a powerful platform a collectd process'
activities are sometimes affecting throoughput and
latency. This is a backgroud process, that should not
be running with default priority.
Even if it is a little deplayed, that is not a worry in
this case. The routing should be the main priority,
stats collection can wait a bit.

Tested on Netgear R7800
Signed-off-by: Marc Benoit <marcb62185@gmail.com>
Make niceness more moderate, bump version.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit b33ec70c95)
2018-11-24 16:49:45 +02:00
Hannu Nyman
e5983c1863
Merge pull request #7484 from luizluca/mwan3-backports
[18.06] net/mwan3: fix NDP on ipv6 for ra services
2018-11-21 19:20:53 +02:00
Florian Eckert
f1209a6eb8 net/mwan3: fix NDP on ipv6 for ra services
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit b6249f1781)
2018-11-20 14:07:05 -02:00
Magnus Kroken
b6f6df1d77 strongswan: backport upstream fixes for CVEs in gmp plugin
This fixes:
* CVE-2018-16151
* CVE-2018-16152
* CVE-2018-17540

Details:
https://strongswan.org/blog/2018/09/24/strongswan-vulnerability-(cve-2018-16151,-cve-2018-16152).html
https://strongswan.org/blog/2018/10/01/strongswan-vulnerability-(cve-2018-17540).html

Signed-off-by: Magnus Kroken <mkroken@gmail.com>
2018-11-19 21:58:23 +01:00
Ted Hess
c6a9b01a62 CircleCI: Fix URL references and add BRANCH refs
Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-11-13 12:12:07 -05:00
Ted Hess
bbbb47b7a8
Merge pull request #7366 from thess/ffmpeg-18.06
[18.06] ffmpeg: work around hard/soft float configs for libffmpeg-full
2018-11-12 14:35:50 -05:00
Ted Hess
4e8dd36499 ffmpeg: work around hard/soft float configs for libffmpeg-full
Hard float includes: mp3lame
Soft float includes: shine (mp3 encoder)

libx264 is included when selected iff BUILD_PATENTED is true.

fdk-aac will not be available in libffmpeg-full due to incompatible license with libx264.
Custom builds can override licensing restrictions but results may not be re-distributable.

Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-11-11 15:27:00 -05:00
Hannu Nyman
f09f0f1c5b
Merge pull request #6932 from chris5560/radicale_18.06
radicale: [18.06] add extra command "export_storage" to init script
2018-11-11 10:52:53 +02:00
Dirk Brenken
74fc2449e4
adblock: fix adguard source
* fix regex for adguard blocklist source

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit ff139131a7)
2018-11-10 17:50:19 +01:00
Karl Palsson
1ec36271be net/mosquitto: bump to 1.5.4
Security and bugfix release.  Full release notes available at:
https://mosquitto.org/blog/2018/11/version-154-released/

Security:
* client certificates not validated for websockets listeners.

Bugfixes:
* wills with disconnected clients better handled
* bridge restart_timeout properly observed

Signed-off-by: Karl Palsson <karlp@etactica.com>
2018-11-09 10:26:02 +00:00
Hannu Nyman
5552214d82 haveged: update to 1.9.4
Version bump to 1.9.4

Development has moved to github.
 * old site: http://www.issihosts.com/haveged
 * new site: https://github.com/jirka-h/haveged

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit f316aaeab6)
2018-11-04 21:35:17 +02:00
Rosen Penev
57b1bbb9a2 ccrypt: Update to 1.11
Signed-off-by: Rosen Penev <rosenp@gmail.com>

(cherry picked from commit 2074901f33)
2018-11-04 21:34:53 +02:00
champtar
335bd7cbab
Merge pull request #7301 from micmac1/maria37
(18.06) mariadb: security bump to 10.1.37
2018-11-03 13:35:02 -04:00
champtar
c646c1841b
Merge pull request #7231 from padre-lacroix/bandwidthd-18.06
Bandwidthd 18.06: fix undefined references to inline functions
2018-11-03 13:32:12 -04:00
Sebastian Kemper
377f886246 mariadb: security bump to 10.1.37
Notable Changes (copied from release notes):

  Various fixes from MySQL 5.6.42: MDEV-17533, MDEV-17532, MDEV-17531
  MDEV-16465: fixed a bug with DDL and FOREIGN KEY
  Fulltext index fixes:
    MDEV-12547: extended the range of innodb_ft_result_cache_limit on 64-bit systems
    MDEV-16865: InnoDB fts_query() ignores KILL
  Fixes for the following security vulnerabilities:
    CVE-2018-3282
    CVE-2016-9843
    CVE-2018-3174
    CVE-2018-3143
    CVE-2018-3156
    CVE-2018-3251

OpenWrt changes:
  - dropped obsolete ucontext patch (issue fixed upstream)
  - refreshed 130-c11_atomics.patch

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-11-03 18:06:12 +01:00
Jean-Michel Lacroix
104ce78af8 bandwidthd: [18.06] fix undefined references to inline functions
This is basically same commit that took place in master 3 weeks ago.
gcc-7 with -Os makes inline functions disappeard. It is caused by
the new C11 inline semantics. pass option -fgnu89-inline to gcc let
it use gnu inline semantics.
see https://wiki.debian.org/GCC7#Porting_help

Compile tested on 18.06.  Run tested on OpenWrt 18.06.1 r7258-5eb055306f
QEMU Virtual CPU version (cpu64-rhel6)

Signed-off-by: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
2018-11-03 11:07:08 -04:00
Etienne Champetier
db5d46f28d build,circleci: fix container digest
I used podman/buildah to build this image, and the local sha256 is not the same than
the docker hub sha256. The layers are the same, so maybe just docker hub changing the manifest

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-11-03 08:54:25 -04:00
Etienne Champetier
da45630922 build,circleci: add 'time' to container build image
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-11-03 00:05:16 -04:00
Philip Prindeville
7b85f3c376 isc-dhcp: drop .conf suffix on dhcrelay config file
Resolves issue #7235

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit b0e73634f7)
2018-10-31 09:35:21 -06:00
Etienne Champetier
ca30e06544 build,circleci: copy and adjust config from master
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-10-29 21:03:06 -04:00
Peter Wagner
fc212923d5 glib2: update to 2.58.1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-10-28 16:56:11 +01:00
Luiz Angelo Daros de Luca
06579f632e
ruby: bump to 2.5.3
Fix only release, including:
* CVE-2018-16396: Tainted flags are not propagated in Array#pack
  and String#unpack with some directives
* CVE-2018-16395: OpenSSL::X509::Name equality check does not work
  correctly

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(cherry picked from commit 74216a55e1)
2018-10-22 14:14:12 -03:00
Kevin Darbyshire-Bryant
99208fcfe8 libssh: mark as BROKEN due to CVE-2018-10933
The only known user of this library is currently unable to get their
application to work with with the fixed 0.7.6 release of this library.

To prevent accidental use by unknown parties of a flawed library, mark
it as BROKEN.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 14ad4cb976)
2018-10-19 13:08:01 +01:00
Rosen Penev
7bd9d69140 patch: Add missing CVE-2018-6951 patch
The last commit added PKG_CPE_ID and now uscan detects a CVE that I missed

Reordered patches by date

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[tweaked commit message]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 394ff73e53)
2018-10-18 08:48:41 +01:00
Rosen Penev
bfa879cdf2 patch: Fix CVE-2018-6952 and CVE-2018-1000156
Patches taken from official git repository.

Added PKG_CPE_ID for proper CVE tracking.

Added PKG_BUILD_PARALLEL for faster compilation.

Also adjusted Makefile to be more similar to other projects.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 6f0ff25503)
2018-10-18 08:48:30 +01:00
Hannu Nyman
971efb45af
Merge pull request #7160 from EricLuehrsen/o1806_ub_181
[openwrt-18.06] unbound: update to 1.8.1
2018-10-10 20:29:22 +03:00
Hannu Nyman
c346de9b4e
Merge pull request #7164 from pacien/181009-1806-pkg-tinc
tinc: update to 1.0.35 (security update) [openwrt-18.06]
2018-10-10 20:28:12 +03:00
Nuno Goncalves
9f5ea1c289 watchcat: make compatible with updated busybox ash array handling (fixes #7148)
Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>
2018-10-10 07:21:08 +01:00
Pacien TRAN-GIRARD
58dbd3fda4 tinc: update to 1.0.35
Critical security update for:
* CVE-2018-16737,
* CVE-2018-16738,
* CVE-2018-16758

Announcement:
https://www.tinc-vpn.org/pipermail/tinc/2018-October/005311.html

Signed-off-by: Pacien TRAN-GIRARD <pacien.trangirard@pacien.net>
2018-10-09 23:45:35 +02:00
Eric Luehrsen
f3bc02155e unbound: update to 1.8.1
bug fixes for memory leaks
bug fixes for DNS over TLS

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2018-10-08 21:21:13 -04:00
Ted Hess
482d94bf47 iotivity, i2pd, domoticz: Bump PKG_RELEASE to force re-build with Boost upgrade to 1.68
Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-10-04 15:59:43 -04:00
Nikos Mavrogiannopoulos
15cf061d5a gnutls: updated to 3.5.19
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
2018-09-29 10:13:58 +02:00
Karl Palsson
d7980aceb2 mosquitto: bump to 1.5.3
Full changelog at https://github.com/eclipse/mosquitto/blob/v1.5.3/ChangeLog.txt

Primary change:
CVE fix for CVE-2018-12543 - prevent crash on topics that begin with $
but are not $SYS

Selected other fixes relevant to OpenWrt since 1.5.1:
- Fix retained messages not sent by bridges on outgoing topics at the first
  connection. Closes #701.
- Fix duplicate clients being added to by_id hash before the old client was
  removed. Closes #645.
- Fix excessive CPU usage when the number of sockets exceeds the system limit.
  Closes #948.
- Fix for bridge connections when using WITH_ADNS=yes.
- Fix round_robin false behaviour. Closes #481.
- Fix segfault on HUP when bridges and security options are configured.
  Closes #965.

Signed-off-by: Karl Palsson <karlp@etactica.com>
2018-09-27 11:48:36 +00:00
Guo Li
fae92edd7a sendmail: fix confLIBSEARCHPATH to $(STAGING_DIR)
This fix issue 'cannot find -lnsl' on build server which has libnsl.so in
/usr/lib

Signed-off-by: Guo Li <uxgood.org@gmail.com>
2018-09-27 03:25:13 +00:00
Guo Li
21b69c23a2 jamvm: Use <fenv.h> instead of <fpu_control.h>
musl libc (http://musl-libc.org lack the non-standard <fpu_control.h>
header, which is used in src/os/linux/{i386,x86_64}/init.c files to
setup the floating point precision. This patch makes it use the
standard C <fenv.h> header instead.

Original patch at Felix Janda at
https://sourceforge.net/p/jamvm/patches/6/

Signed-off-by: Guo Li <uxgood.org@gmail.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-09-27 03:24:43 +00:00
Ted Hess
218a7a6868 fdm: Merge latest version and build fixes from master
Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-09-26 10:08:59 -04:00
Ted Hess
11c25f58fb boost: Merge updates (1.68.0) and build fixes from master
Makefile and package changes to support builds with both Python 2.x and Python 3.x versions.

Python versioning is automatically configured from lang/python repository xxx-version.mk files.

Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-09-26 09:43:52 -04:00
Jo-Philipp Wich
cea8bebc6f
Merge pull request #7084 from brianjmurrell/add-foolsm-to-18.06
foolsm: Add package foolsm
2018-09-25 16:25:16 +02:00
Rob Mosher
c58367d4ff cshark: update to latest git HEAD
This fixes GCC8 compile due to buffer overrun

Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>
(cherry picked from commit e3144f00a3)
2018-09-24 08:57:08 +02:00
Hans Dedecker
e70b4775d3 strongswan: refresh patches
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 3bc3949e28)
2018-09-24 08:49:41 +02:00
Hans Dedecker
88715598b1 strongswan: fix OpenWrt hotplug script handling
Commit 6cd8fcabe added ipsec hotplug script support by calling "exec
/sbin/hotplug-call ipsec".
Using the exec call breaks the insertion of iptables rules by the _updown.in
script as hotplug-call just replaces the current shell meaning the commands
following exec do not run since the shell is replaced and as a result lead to
connectivity issues.
Fix this by removing the exec command in front of /sbin/hotplug-call.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit d0ac611bf0)
2018-09-24 08:49:40 +02:00
Florian Eckert
1f4c93972e strongswan: add openwrt hotplug script handling
Ipsec user script (/etc/ipsec.user) now get called indirectly by openwrt
"/sbin/hotplug-call". So other packages could also install their scripts
in "/etc/hotplug.d/ipsec".

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6cd8fcabe6)
2018-09-24 08:49:40 +02:00
Sebastian Kemper
c340159a92 strongswan: include nls.mk for mysql plugin
ibmariadb 10.2 needs to be linked in together with iconv.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit 7a0aebbff2)
2018-09-24 08:49:40 +02:00
Hans Dedecker
474d9a0a15 net-snmp: fix inbound firewall rule support
Commit ae5ee6ba6c added support for inbound
firewall rule support but some corner cases were not covered.

In case net-snmp is started and the network interface is already up
the procd firewall rule is created but not applied by fw3 as
service_started calling procd_set_config_changed firewall was missing.

When stopping net-snmp clean up the net-snmp inbound firewall rules in
iptables by calling procd_set_config_changed firewall in stop_service
which will trigger fw3 to remove the inbound firewall rules.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 0bd19db049)
2018-09-24 08:47:43 +02:00
Rosen Penev
fddaa085f2 tdb: Remove libbsd dependency
libbsd gets picked up since it's no longer limited to glibc.

Patch identical to libtalloc one. Same codebase.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 33dc529e00)
2018-09-24 08:46:29 +02:00
BangLang Huang
aa58b6bfba tdb: bump to latest version
Signed-off-by: BangLang Huang <banglang.huang@foxmail.com>
(cherry picked from commit d1804d38d4)
2018-09-24 08:46:29 +02:00
Eneas U de Queiroz
da27b31346 tdb: avoid installing duplicate files
Use $(CP) instead of $(INSTALL) so that libtdb.so.1 is installed as
symlink, and not duplicated.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit 75d9ab331d)
2018-09-24 08:46:29 +02:00
Hirokazu MORIKAWA
93587e54e6 node: Fix incorrect detection of arm_version and arm_fpu
Automatic detection of the arm architecture does not work well.

http://downloads.lede-project.org/snapshots/faillogs/arm_arm1176jzf-s_vfp/packages/node/compile.txt

```
../deps/v8/src/arm/assembler-arm.cc:176:2: error: #error "CAN_USE_ARMV7_INSTRUCTIONS should match CAN_USE_VFP3_INSTRUCTIONS"
 #error "CAN_USE_ARMV7_INSTRUCTIONS should match CAN_USE_VFP3_INSTRUCTIONS"
   ^~~~~
```

https://github.com/openwrt/packages/issues/5728

Explicitly set cpu arch optimization flag to the compiler option so that "configure" script correctly identifies "arm version".

(Raspberry Pi Zero W)
Raspbian:
```
raspberrypi:~ $ echo | gcc -dM -E - | grep ARM_ARCH
```
OpenWrt (cross-env):
```
ubuntu:~ $ echo | ./arm-openwrt-linux-muslgnueabi-gcc -dM -E - | grep ARM_ARCH
```
```
ubuntu:~ $ echo | ./arm-openwrt-linux-muslgnueabi-gcc -mcpu=arm1176jzf-s -dM -E - | grep ARM_ARCH
```

Also specifying an option lines compactly.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 3482320c2a)
2018-09-24 08:45:42 +02:00
Hirokazu MORIKAWA
c999832881 node: fix host build fail
modify patch.
 https://github.com/nodejs/node/pull/19196

made not to use libressl headers
 fix to include path not to use "host/include"

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 818770d273)
2018-09-24 08:45:42 +02:00
Hannu Nyman
0a2078bf14 nano: update to 3.1
* Update nano editor to 3.1
* Apply a post-release upstream patch to fix compilation

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit af86b17064)
2018-09-23 18:48:52 +03:00
Jonathan Bennett
791933dd56 Nano: Update to 3.0
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>

(cherry picked from commit 0ceaa4e32c)
2018-09-23 18:48:38 +03:00
Brian J. Murrell
1bdddaefcd foolsm: Add package foolsm
Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
(cherry picked from commit 5cff94399d)
2018-09-21 07:52:47 -04:00
Hannu Nyman
df8b221e00
Merge pull request #7053 from mlichvar/chrony-fix-ipv6-allow-18.06
chrony: fix configuration of IPv6 client access (18.06)
2018-09-17 20:32:23 +03:00
Miroslav Lichvar
1377bc60f0 chrony: fix configuration of IPv6 client access
Fix the init script to allow access from IPv6 subnets of the interface
specified in allow section in /etc/config/chrony.

Fixes issue #7039.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
2018-09-17 17:44:18 +02:00
Dirk Brenken
23bb744ff3
adblock: bugfix 3.5.5v2
* fix uci wrapper calls
* fix link in readme

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit cd3f925210)
2018-09-05 17:54:26 +02:00
Dirk Brenken
e8813bb561
adblock: update 3.5.5
* accept only ascii aka punycode chars in blocklists to prevent possible
dns backend warnings
* fix cornercase issues in json parsing (backend & frontend)
* slightly optimize tld compression performance
* refine logging
* use uci wrapper where possible
* change indentation from spaces to tabs (saves 8kb)
* add experimental youtube blocklist source

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 4987f066f9)
2018-09-04 21:41:09 +02:00
Christian Schoenebeck
c7e97bf2b0 radicale[18.06]: add extra command "export_storage" to init script
add extra command "export_storage" to export data for use with Radicale 2.x.x
remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2018-09-02 16:59:20 +02:00
Ted Hess
6680ce8650 socat: Fix CRDLY, TABDLY and CSIZE shifts for PowerPC
Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-08-30 15:07:20 -04:00
Toke Høiland-Jørgensen
09f9947f83 sqm-scripts: Bump to v1.2.4
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2018-08-28 12:14:41 +02:00
Michael Heimpold
88db40cd26 php7: update to 7.2.9
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-08-23 22:14:42 +02:00
Michael Heimpold
853f87a5f6 php7: add dependency to hash for mysqlnd
The following error shows that mysqlnd depends on functions
provided by hash:

root@OpenWrt:/etc/php7# php-cli -m
PHP Warning:  PHP Startup: Unable to load dynamic library
'mysqlnd.so' (tried: /usr/lib/php/mysqlnd.so (Error
relocating /usr/lib/php/mysqlnd.so: PHP_SHA256Final: symbol
not found), /usr/lib/php/mysqlnd.so.so (Error loading shared
library /usr/lib/php/mysqlnd.so.so: No such file or
directory)) in Unknown on line 0

So let's model this dep in package metadata.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-08-23 22:14:35 +02:00
Michael Heimpold
b2eda63396 libxml2: add cpe id for CVE tracking
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-08-21 21:19:01 +02:00
Michael Heimpold
6a768c8e38
Merge pull request #6834 from micmac1/xml2-cve-18.06
libxml2: fix CVE-2018-9251 and CVE-2018-14567
2018-08-21 21:07:48 +02:00
Sebastian Kemper
8476750886 libxml2: fix CVE-2018-9251 and CVE-2018-14567
Backport from master.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-08-21 20:29:19 +02:00
Karl Palsson
c696cc4600 net/mosquitto: update to 1.5.1
Bugfix release.  Full changelog at:
https://mosquitto.org/blog/2018/08/version-151-released/

Of most interest to OpenWrt:
* Remove use of AI_ADDRCONFIG, which means the broker can be used on systems where only the loopback interface is defined.
* Fix IPv6 addresses not being able to be used as bridge addresses.
* Fix problem opening listeners on Pi caused by unsigned char being default.
* Fix segfault on startup if bridge CA certificates could not be read.
* Fix possible endian issue when reading the memory_limit option.
* library and client bugfixes including: https://github.com/openwrt/packages/issues/6765

Signed-off-by: Karl Palsson <karlp@etactica.com>
2018-08-20 09:30:12 +00:00
Jiri Slachta
2c8e700442
Merge pull request #6805 from micmac1/tiff-18.06
tiff: fix remaining CVEs
2018-08-19 19:12:28 +02:00
Sebastian Kemper
19e0097978 tiff: fix remaining CVEs
Backport Rosen's commit in master to 18.06 to address open CVEs. This
fixes:

CVE-2017-11613
CVE-2018-5784
CVE-2018-7456
CVE-2018-8905
CVE-2018-10963

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-08-19 10:40:18 +02:00
Dirk Brenken
0f75ae32b8
Merge pull request #6782 from EricLuehrsen/unbound_odhcpd_fix
[openwrt-18.06] unbound: drop odhcpd leases with wrong field count
2018-08-18 19:53:04 +02:00
Eric Luehrsen
45ffcb3d6a unbound: drop odhcpd leases with wrong field count
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
(cherry pick commit: 59617f076d)
2018-08-17 23:24:16 -04:00
Ted Hess
251640ac95 ffmpeg: Add build overrides for some specific CPUs: Octeon, X86 and 24kf.
Octeon: Rename octeonplus to oction+
MIPS 24kf: Inline ASM fails to build (unknown reason)
X86: Configure finds NASM and assumes YASM if name explictly set (wrong switches)

Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-08-16 14:00:23 -04:00
Ted Hess
a64352cae0 ffmpeg: Add cpu_type to configure opts. Upgrade to 3.2.12
Fixes certain combinations of architecture/cpu_type failing builds

Signed-off-by: Ted Hess <thess@kitschensync.net>
2018-08-16 13:45:38 -04:00
Daniel Golle
35e0b737ab
Merge pull request #6759 from micmac1/postgresql-18.06
postgresql: security bump to 9.6.10 for 18.06
2018-08-15 20:07:49 +02:00
Sebastian Kemper
2db46d289c postgresql: security bump to 9.6.10
This update includes fixes for the following CVEs:

- CVE-2018-1115
- CVE-2018-10925
- CVE-2018-10915

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-08-15 17:00:21 +02:00
Philip Prindeville
4f3f81b64f perl: version modules and non-base packages
Currently external modules and non-base packages are numbered
from their own internal number space, and even though the Perl
ABI number is embedded into them this isn't externally visible.

For example, perl-html-parser-3.72.1 could be built for ABI
5.26 or for 5.28, we can't easily tell.  This changes all of
that by embedding the ABI number into the filename.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 0d9584724f)
2018-08-14 13:28:53 -06:00
Dirk Brenken
5041d2f331
Merge pull request #6736 from micmac1/maria-1806-10.1.35-cve
mariadb[18.06]: security bump to 10.1.35
2018-08-12 08:53:49 +02:00
Sebastian Kemper
bc6753832d mariadb: security bump to 10.1.35
Bump minor version. Bugfix release. 100% backward compatible.

Includes fixes for:

CVE-2018-3064
CVE-2018-3063
CVE-2018-3058
CVE-2018-3066

Also includes CPPFLAGS fix from master (to get fortify-source headers
etc.).

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-08-11 22:59:24 +02:00
Dirk Brenken
1e5416bbd1
travelmate: update 1.2.2
* fix restart behaviour after successful connection
* fix labeling of faulty stations
* optimize re-connect behaviour at locations where multiple uplinks with
the same SSID are in range
* use procd pidfile handling
* refine logging
* small fixes

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit bc78ad8200)
2018-08-11 07:49:33 +02:00
Jo-Philipp Wich
d7bea561dc usbip: remove nonshared flag (#6681)
Since https://git.openwrt.org/d0e0b7049f88774e67c3d5ad6b573f7070e5f900,
OpenWrt SDKs ship the appropriate sources for building usbip userspace
packages, so special nonshared handling is not required anymore.

Sucessfully tested by compiling usbip utilities for various architectures
using self built SDKs after applying the change linked above.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit eded6ed7cf)
2018-08-05 12:39:45 +02:00
Philip Prindeville
c875de62b3 perl: update to 5.28
Refresh patches 900 and 910.

Add fix (920) for improperly gated variable.

Add workaround (020) for Storable's run-time check for stacksize.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit b94744496f)
2018-08-02 22:39:16 -06:00
Philip Prindeville
53597cf64e travis: don't need git cloning progress
Since Travis runs as a batch job and logs are typically looked at
after-the-fact (if at all), there's not any point to seeing progress
when cloning git repos.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit fc3beffeff)
2018-08-02 22:38:05 -06:00
Philip Prindeville
bae476afe5 isc-dhcp: write resolv.conf per network & dhcp settings
The internal nameservers and the DHCP default domain should be
squirted into /tmp/resolv.conf.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit db6adb616d)
2018-08-02 22:38:05 -06:00
Philip Prindeville
e9854d09f3 perl: build with -fno-strict-liasing and -fwrapv
Looking at Configure and Porting/config.sh, it seems that Perl
requires both of these options to build correctly.

Should fix FS #1464.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2018-08-02 22:28:03 -06:00
Daniel F. Dickinson
af0ad2ce0d nut: Fix for nut-upsmon without nut-server
nut-monitor failed to create required dir /var/etc/nut, as
well as failing to set appropriate user on the directory and
conf files.  Fixing this closes
https://github.com/openwrt/packages/issues/6644

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
(cherry picked from commit 98fdf16ecb)
2018-08-02 19:27:33 +03:00
Daniel F. Dickinson
6a5a257fc0 nut: Update my email
Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
(cherry picked from commit b4fe49d2b2)
2018-08-02 19:27:33 +03:00
Eneas U de Queiroz
41a9bf21f0 nut: Add PKG_FIXUP:=autoreconf
We need to force this since a *.m4 file is patched.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit 6543859dab)
2018-08-02 19:27:33 +03:00
Eneas U de Queiroz
6576f7be92 nut: added compatibility with openssl-1.1
Also added a fix in a check for empty string.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit 1a9a7cc280)
2018-08-02 19:27:33 +03:00
Hannu Nyman
323fbdbb51
Merge pull request #6638 from chris5560/ddns-18.06
ddns-scripts[18.06]: bump to version 2.7.8-1
2018-08-01 19:06:46 +03:00
Christian Schoenebeck
edf11aaaee ddns-scripts[18.06]: bump to version 2.7.8-1
- synchronize with "master" incl. add service FreeDNS.42.pl
- remove Cloudflare v1 protocol support #6084 #6519
- fix goip.de update url #6448 #6519
- change Cloudflare v4 to read "Proxied" from current setting at Cloudflare Dashboard #5097 #6364 #6505
- fix replace of password inside logfile #6568
- remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>
2018-08-01 09:59:02 +02:00
Jo-Philipp Wich
cb54af8d0d privoxy: fix uci configuration parsing after upstream OpenWrt changes
OpenWrt changed the way the uci shell parsing functions deal with list
configuration items.

This change broke the generation of the privoxy runtime configuration
because no callbacks were emitted anymore.

Fix the problem by defining a list_cb() that simply calls the existing
option_cb() to deal with list item values.

Ref: c9c0fc28a9 ("base-files: fix UCI config parsing and callback handling")
Ref: https://forum.lede-project.org/t/openwrt-snapshot-privoxy-error/15919
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3113d62393)
2018-08-01 09:29:55 +02:00
Eneas U de Queiroz
327a03e8f0 usbip: adapt package to new kernel/libudev
The sources for usbip are within the kernel.  A patch that was included
with the package, which changed the old signal name SIGCLD to the new
one, SIGCHLD, was merged upstream.  However, different targets use
different kernel versions.  Current version 4.14 and 4.9 are fine, but
older versions do not have the patch applied.  So, I used
-DSIGCLD=SIGCHLD to please both worlds.

libudev-fbsd currently used by openwrt does not implement the
udev_device_get_devpath function.  eudev's implementation of libudev
sets it as (src/libudev/libudev-device.c):
udev_device->devpath = udev_device->syspath + strlen("/sys");
I used a command-line define to use the same logic, as it works with
new and old versions of the kernel--the use of ..devpath is quite
recent.

I also linked with libbsd, when using glibc.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit 633fe0dbdf)
2018-07-31 21:29:55 +02:00
Eneas U de Queiroz
8f6157048f usbip: Remove obsolete patches
These patches are obsolete and are never applied.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry picked from commit 0baaabb640)
2018-07-31 21:29:55 +02:00
Hannu Nyman
64ccbc88fb
Merge pull request #6617 from dibdot/travelmate-18.06
travelmate[18.06]: backport release 1.2.1 to 18.06 branch
2018-07-30 23:07:09 +03:00
Hannu Nyman
4554f1c37c
Merge pull request #6616 from dibdot/adblock-18.06
adblock[18.06]: backport release 3.5.4 to 18.06 branch
2018-07-30 23:06:58 +03:00
W. Michael Petullo
8bf5fc17db krb5: update to 1.16.1
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit 8256b96743)
2018-07-30 16:11:35 +02:00
W. Michael Petullo
59199e2534 krb5: set replay cache directory to /tmp
Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit 536d555456)
2018-07-30 16:11:34 +02:00
Andy Walsh
14340062e3 krb5: update depends, adapt FS#1310
Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit ebc41d5759)
2018-07-30 16:11:34 +02:00
Dirk Brenken
8a19a18c45 travelmate[18.06]: backport release 1.2.1 to 18.06 branch
Tested with latest 18.06 branch (OpenWrt 18.06-SNAPSHOT,
r7175+5-ca0c649a38)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-30 13:58:40 +02:00
Dirk Brenken
5e41db3de3 adblock[18.06]: backport release 3.5.4 to 18.06 branch
Tested with latest 18.06 branch (OpenWrt 18.06-SNAPSHOT,
r7175+5-ca0c649a38)

Signed-off-by: Dirk Brenken <dev@brenken.org>
2018-07-30 13:51:06 +02:00
Rafał Miłecki
87b3ea5c85 lxc: nl: avoid NULL pointer dereference
This backports upstream fix from the master branch.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 13d57a5e9f)
(cherry picked from commit 6e1104cc6d)
2018-07-29 21:19:56 +02:00
Etienne Champetier
98822cd11d prometheus-node-exporter-lua: add conntrack collector
Also fix missing dependency of openwrt collector

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-07-25 23:27:39 +02:00
Etienne Champetier
605acbbebe prometheus-node-exporter-lua: set myself as maintainer
This was OKed sometimes ago by @simonswine
https://github.com/openwrt/packages/pull/5128

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
2018-07-25 23:27:34 +02:00
Dirk Brenken
5f68dd0a6d
Merge pull request #6572 from EricLuehrsen/unbound_1806_doc
[openwrt-18.06] unbound: fix TLS override documentation
2018-07-25 06:31:41 +02:00
Eric Luehrsen
44790e43cb unbound: fix TLS override documentation
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2018-07-24 22:58:44 -04:00
Michael Heimpold
c7bad61e2e
Merge pull request #6537 from mhei/openwrt-18.06-php7
[openwrt-18.06] php7: update to latest version and include bugfixes
2018-07-22 00:15:24 +02:00
Michael Heimpold
522800696d php7: update to 7.2.8
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:42:23 +02:00
Michael Heimpold
98edb6e210 php7: fix load order of mysqli extension
This problem was reported by Teun Lubberhuizen, thanks!

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:42:15 +02:00
Michael Heimpold
cdf150d0ca php7: update to 7.2.7
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:42:08 +02:00
Rafał Miłecki
81332c4765 php7: add package dependency on zoneinfo-core
Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
when using "opkg install" (during runtime or when building images with
CONFIG_TARGET_PER_DEVICE_ROOTFS).

Missing zoneinfo results in PHP fatal errors, e.g.:
Fatal error: DateTime::createFromFormat(): Timezone database is corrupt - this should *never* happen!

For years users were told to manually install zoneinfo-core package.
This problem was hidden for some time (including 17.01 release) due to
disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
for --with-system-tzdata was enabled again.

The proper solution is to simply make php7 package depend on
zoneinfo-core when PHP7_SYSTEMTZDATA is used.

Fixes: 84e5012e88 ("php7: re-enable system timezone data usage")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2018-07-21 23:41:56 +02:00
Sebastian Kemper
b65a759e80 php7: use mysqlnd
This is in anticipation of the MariaDB upgrade from mariadb 10.1.x to
10.2.x. With the latter the PHP MySQL plugins fail to compile, e.g.:

In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:63:0,
                 from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:
/home/equeiroz/src/openwrt-asus/staging_dir/target-mipsel_74kc_musl/usr/include/mysql/my_global.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp]
 #warning This file should not be included by clients, include only <mysql.h>
  ^~~~~~~
In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:79:0,
                 from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:
/home/equeiroz/src/openwrt-asus/staging_dir/target-mipsel_74kc_musl/usr/include/mysql/my_sys.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp]
 #warning This file should not be included by clients, include only <mysql.h>
  ^~~~~~~
In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:0:
/home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:82:10: fatal error: my_list.h: No such file or directory
 #include <my_list.h>

Upstream seems unlikely to fix this, see
https://bugs.php.net/bug.php?id=75612. In the bug report it is suggested
to not use libmysqlclient/libmariadbclient and instead utilize mysqlnd
(MySQL Native Driver) provided by PHP. This is the default anyway.

So add the mysqlnd module and remove the libmariadbclient depends.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-07-21 23:41:47 +02:00
Michael Heimpold
7e33126dc0 php7: update to 7.2.6
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:41:32 +02:00
Michael Heimpold
ac5ee1ffb1 php7: replace libmysqlclient dependencies with libmariadbclient
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
2018-07-21 23:41:22 +02:00
Hannu Nyman
fd57c8cfeb irqbalance: fix AARCH64 compilation
AARCH64 compilation fails due to upstream bug in 1.2.0
that has been later fixed. Backport the fix commit.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 0cb6e15f01)
2018-07-19 21:40:14 +03:00
Stan Grishin
45f6a81fb2 simple-adblock: better download processing, luci-app integration, lists optimization, firewall integration
Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit ac34bf910e)
2018-07-17 22:08:00 +03:00
Hannu Nyman
d3b43be6c9
Merge pull request #6509 from jefferyto/slide-switch-0.9.2-openwrt-18.06
[openwrt-18.06] slide-switch: update to latest version
2018-07-17 21:49:25 +03:00
Jeffery To
1fb64b107d slide-switch: update to latest version
This also changes PKG_SOURCE to use .tar.xz, and changes the copyright
line. (I believe this is more accurate, as I haven't done a copyright
assignment.)

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-07-18 02:14:04 +08:00
Eneas U de Queiroz
787a5f9c55 gcc: enable compilation with gcc 7.x
Defining _GLIBCXX_INCLUDE_NEXT_C_HEADERS instructs gcc 7.x libstdc++ to
include the system's stdlib.h and math.h, and not their own.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>

(cherry picked from commit 054d5273cb)
2018-07-16 16:46:06 +03:00
Dirk Brenken
05b9aceb00
Merge pull request #6444 from EricLuehrsen/unbound_1806_doc
[openwrt-18.06] unbound: add README recipe for DNS/TLS outside of UCI
2018-07-09 07:49:33 +02:00
Eric Luehrsen
bd4cfc3d63 unbound: add README recipe for DNS/TLS outside of UCI
Unbound UCI in OpenWrt 18.06 has limited forward configuration lacking
DNS over TLS connection setup tools. User override files
'unbound_srv.conf' and 'unbound_ext.conf' can implement this.

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2018-07-09 01:26:54 -04:00
Hannu Nyman
4fa0437fd5
Merge pull request #6399 from EricLuehrsen/unbound_1806rc1
[openwrt-18.06] unbound: update README.md to be consistent OpenWrt Wiki
2018-07-05 09:58:10 +03:00
Eric Luehrsen
4e4534f1fb unbound: update README.md to be consistent with OpenWrt Wiki
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2018-07-04 15:21:54 -04:00
Hannu Nyman
3175b77b6d
Merge pull request #6384 from micmac1/1806-mariadb
[18.06] mariadb: bump to 10.1.34 + procd init
2018-07-03 19:29:03 +03:00
Sebastian Kemper
a4df7b1db3 mariadb: convert init script to procd
- also adds mariadb user to run the server as
- tweaks the default configuration a bit

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-06-30 20:05:26 +02:00
Sebastian Kemper
a26540d61c mariadb: bump to 10.1.34
- bump version (100% backward compatible)
- add modules
- small misc improvements

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-06-30 20:01:11 +02:00
Hannu Nyman
38a224d3fb
Merge pull request #6373 from jefferyto/golang-compile-arguments-openwrt-18.06
[openwrt-18.06] golang: Makefile improvements
2018-06-29 18:11:13 +03:00
David Woodhouse
4618427deb rtl-sdr: fix build when GCC decides not to emit inlines
Maybe we should use something other than -Os for this code anyway; it's
generally quite CPU-intensive.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2018-06-29 14:31:23 +00:00
champtar
8fbe9d9578
Merge pull request #6380 from aparcar/prom-0161806
[openwrt-18.06] prometheus-node-exporter-lua: adapt 0.16 metrics
2018-06-29 11:42:10 +02:00
Paul Spooren
fcaf255d0f prometheus-node-exporter-lua: adapt 0.16 metrics
Prometheus introduced some new conventions on how to name metrics.
Read here https://prometheus.io/docs/practices/naming/

This PR breaks compatibility with past versions, just like the officials
node exporter! 💥

Signed-off-by: Paul Spooren <mail@aparcar.org>
2018-06-29 18:21:03 +09:00
Jeffery To
5d289ccd6a golang: Download bootstrap source directly, use golang-specific mirrors
These changes are a result of this conversation:
1929265024 (r29531922)

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-29 15:04:26 +08:00
Jeffery To
665f3d2bbc golang: Allow additional arguments when compiling Go packages
This updates GoPackage/Build/Compile in golang-package.mk to accept
additional arguments that are passed to the go command line.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-28 03:11:56 +08:00
Stijn Tintel
8b76a11e67 strongswan: bump to 5.6.3
Fixes the following CVEs:
- CVE-2018-5388
- CVE-2018-10811

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit 7bb68c74e2)
2018-06-27 16:33:58 +03:00
Hannu Nyman
6dbfae07f5
Merge pull request #6351 from EricLuehrsen/unbound_20180625_1806
[openwrt-18.06] unbound: limit outside script source to init funciton scope
2018-06-27 07:17:07 +03:00
Jeffery To
7789257342 golang: update to 1.10.3, add mirrors
This also changes the bootstrap source URL to the official GitHub
mirror, to make building easier for places where Google sites aren't
accessible. Fixes #6326.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-27 11:39:26 +08:00
Stijn Tintel
d48cf92735
Merge pull request #6363 from dwmw2/domoticz-18.06
Domoticz update for 18.06
2018-06-27 00:15:29 +02:00
Hannu Nyman
d471ad56c2
Merge pull request #6349 from jefferyto/python-package-updates-openwrt-18.06
[openwrt-18.06] Python package updates
2018-06-26 21:54:05 +03:00
Eric Luehrsen
eb80360e57 unbound: limit outside script source to init funciton scope
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
2018-06-25 20:45:35 -04:00
Jeffery To
9250b7283a twisted: update to 18.4.0, refresh patches
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:58:14 +08:00
Jeffery To
d25196bc28 python-zope-interface: update to 4.5.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:57:35 +08:00
Jeffery To
e7af1e992d python-pyasn1: update to 0.4.3
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:57:25 +08:00
Jeffery To
8c545ae8dd python-ply: update to 3.11
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:57:16 +08:00
Jeffery To
dcdc8807a0 python-ipaddress: update to 1.0.22
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:57:04 +08:00
Jeffery To
4d225bb519 python-hyperlink: update to 18.0.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:56:53 +08:00
Jeffery To
c5a5b3c74c python-automat: update to 0.7.0, refresh patches
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:56:38 +08:00
Jeffery To
2a7c48c7fa python-attrs: update to 18.1.0
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2018-06-26 04:56:11 +08:00
David Woodhouse
9b390cb468 domoticz: update to 4.9700 stable release, enable Python, fix compression
The files in ozwcp/ shouldn't be compressed as there's no gzip handling
for those.

Also enable Python support — since it can dynamically link with
libpython optionally, it's harmless to enable it. Those who want Python
plugins can use it. I still want lua-based hardware plugins though.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2018-06-25 16:56:19 +01:00
David Woodhouse
7785d2a444 domoticz: fix Onkyo custom command handling from dzVents
https://github.com/domoticz/domoticz/pull/2386

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2018-06-25 15:26:25 +01:00
David Woodhouse
394e676d27 domoticz: update to 3.9571 and clean up FHS handling
Upstream has merged a simplified version of the FHS patch, with a few
changes...

Scripts are actually configuration. There are examples, but the point is
that you write your own.

So they should live in the data directory (e.g. /var/lib/domoticz) not
in /usr/share/domoticz. The only exception is the dzVents runtime.

So.... the upstream patch handles the dzVents runtime bit. Drop the part
of our patch which added -scripts, because it can just be based in the
userdata directory and we don't need to change that.

Ship the default scripts/ directory in /etc/domoticz/scripts, and on
startup make a *symlink* to it from /var/lib/domoticz/scripts.

Symlink from /etc/domoticz/scripts/dzVents{data,generated_scripts} to
temporary directories under /var/lib/domoticz/dzVents so that those
directories (which are written to by Domoticz) don't land on the root
file system. Anyone with a writeable file system who *wants* the data/
directory to be persistent, can change that. Just as they can change
the userdata config option to point to a real file system somewhere.

Also drop the renaming of the OpenZWave Config/ directory. It's purely
cosmetric so there's no need for us to carry that change. It can go
upstream first, if it really offends anyone.

Drop the patches which are now merged upstream, and turn off the newly
added USE_OPENSSL_STATIC. Add -noupdates to the command line.

Finally, gzip the static www files to save space. In the common case,
clients will use "Accept-Encodiong: gzip" and Domoticz will serve them
as-is. It can also decompress on the fly if it really has to, but now we
aren't asking it to *compress* on the fly, which is probably a losing
proposition on an OpenWRT box.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2018-06-25 15:26:25 +01:00
David Woodhouse
1298bf851a domoticz: build with -flto
This makes quite a significant difference to the executable size:

   text    data     bss     dec     hex filename
7921421   87804   31692 8040917  7ab1d5 domoticz
5862321	  86180	  31212	5979713	 5b3e41	domoticz-lto

As an added bonus, it still seems to work.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2018-06-25 15:26:25 +01:00
David Woodhouse
d4853c5644 domoticz: support -ssldhparam config/command line option
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2018-06-25 15:26:25 +01:00
David Woodhouse
fa714dc793 domoticz: use 'ln -sf' in serial hotplug script
Otherwise, stale symlinks don't get replaced

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2018-06-25 15:26:25 +01:00
Hannu Nyman
38077f8db4
Merge pull request #6338 from EricLuehrsen/unbound_173_1806
[openwrt-18.06] unbound: update to 1.7.3
2018-06-24 21:41:40 +03:00
Eric Luehrsen
3f00ecb725 unbound: update to 1.7.3
Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2018-06-23 12:47:43 -04:00
Daniel Golle
b94f4f8dce ola: enable and ship web stuff
Make OLA more useful for untrained users which depend on the built-in
webserver. We may split the ola package into smaller parts to allow
not having web-stuff in case this breaks the space-constraints for some
users.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-06-23 11:12:22 +02:00
Daniel Golle
e4142dee1b ola: implement Host/Install for ola_protoc_plugin
Should fix build with SDK on buildbots.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-06-23 11:12:22 +02:00
Daniel Golle
5268d788f5 ola: update to 0.10.6, fix build with recent protobuf
Recent protobuf requires C++11 while OLA was forcing C++98 in order
to keep using auto_ptr without getting warnings... Use gnu++11 to make
everyone happy and live with the warnings about auto_ptr being
deprecated.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2018-06-23 11:12:22 +02:00
champtar
d83dc7cfb8
Merge pull request #6327 from aparcar/fancy_backport
prometheus-node-exporter-lua: handle fancy release backport to 18.06
2018-06-21 14:29:54 +02:00
Paul Spooren
9e1fcd153b prometheus-node-exporter-lua: handle fancy release
Some releases may have non letters in it's name currently resulting in
an empty ("") output which is then discarded, resulting in *missing*
labels in the metric.

Now it uses `.-` to catch as little as possible, but anything.

Signed-off-by: Paul Spooren <mail@aparcar.org>
2018-06-21 20:34:24 +09:00
Jo-Philipp Wich
adb6c1e129
Merge pull request #6314 from aparcar/golang-18.06
golang: add package to 18.06
2018-06-20 15:34:10 +02:00
Alif M. Ahmad
5025648074 gptfdisk: add a new package
gptfdisk is a gpt-aware disk partitioning tool. It can be used to
convert mbr partitioned disk to gpt and vice versa.

It supports reading GPT, MBR, and BSD disklabels.

Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
(cherry picked from commit eac2e12a6b)
2018-06-18 21:54:25 +02:00
Jeffery To
e077dc6a90 golang: new packages
From golang.org:
The Go programming language is an open source project to make
programmers more productive.

This commit consists of two "parts":

* golang/host: Main Go compiler for host (installed to
  STAGING_DIR_HOST/lib/go-cross), used to cross-compile Go programs to
  be packaged.

* golang (and golang-src/golang-doc): Main Go compiler for on-target
  development. These packages are quite large, but I would expect only
  developers to install these.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Signed-off-by: Paul Spooren <mail@aparcar.org>
2018-06-18 22:50:37 +09:00
Saverio Proto
cb7048e427 tinc: version bump 1.0.34
Signed-off-by: Saverio Proto <zioproto@gmail.com>
2018-06-15 17:03:47 +02:00
Hannu Nyman
656a56fee7
Merge pull request #6281 from wvdakker/openwrt-18.06
Shorewall: Bump to 5.2.0.4 (cherry-pick from master)
2018-06-12 16:29:48 +03:00
W. van den Akker
3d38c59976
Shorewall6: Bump to version 5.2.0.4
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:05:50 +02:00
W. van den Akker
0daf02f3a3
Shorewall: Bump to version 5.2.0.4
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:05:29 +02:00
W. van den Akker
979ea451a3
Shorewall6-lite: Bump to version 5.2.0.4
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:05:09 +02:00
W. van den Akker
61f78cd51b
Shorewall-lite: Bump to version 5.2.0.4
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:04:50 +02:00
W. van den Akker
decc2f979f
Shorewall-core: Bump to version 5.2.0.4
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:04:30 +02:00
W. van den Akker
25f8ef2a46
Shorewall6: Bump to 5.2.0.3
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:04:04 +02:00
W. van den Akker
4a024eaf3b
Shorewall: Bump to 5.2.0.3
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:03:41 +02:00
W. van den Akker
6f14c89fb0
Shorewall6-lite: Bump to 5.2.0.3
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:03:08 +02:00
W. van den Akker
e0166df3dd
Shorewall-lite: Bump to 5.2.0.3
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:02:49 +02:00
W. van den Akker
12e3fe7743
Shorewall-core: Bump to 5.2.0.3
Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>
2018-06-12 12:02:28 +02:00
Rafał Miłecki
4cc0c88713 lighttpd: backport fix for plain auth from 1.4.49 release
Update commit 3d59ce6f50 ("lighttpd: update to 1.4.48") resulted in
plain auth regression: it simply stopped working with:
(mod_auth.c.525) password doesn't match for (...)
appearing on every authentication try.

This regression was fixed in 1.4.49 release. Backport the fix instead of
updating to the 1.4.49 to avoid risking more/other regressions.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
2018-06-09 22:21:44 +02:00
Toke Høiland-Jørgensen
b6e7720aff sqm-scripts: Bump to v1.2.3
Fixes an issue with sqm-scripts not being reloaded on ifup/down.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
2018-06-05 23:39:02 +02:00
Hannu Nyman
f754df5e4b nano: update to 2.9.8
Update nano to version 2.9.8

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 33f1f6e940)
2018-06-04 18:12:19 +03:00
Michael Heimpold
178926dc19
Merge pull request #6154 from micmac1/18.06-bump-libxml2
libxml2: revision bump to force clean build
2018-05-30 21:53:13 +02:00
Sebastian Kemper
30d5e97fea libxml2: revision bump to force clean build
Commit dcd68100c23f980a7bbd1d7d9567a315ee584bdf fixed the zlib pkgconfig
file. But libxml2/host is stuck in the compile phase on the build bots.
Bumping the revision will force a clean build.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
2018-05-30 20:27:59 +02:00
Florian Eckert
cd5fd3883e net/mwan3: update version to 2.6.17
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit acf7278fb8)
2018-05-30 17:38:36 +03:00
Florian Eckert
4bb6f8fff3 net/mwan3: fix update on connected ip networks
If an interface is not tracked by mwan3 or enabled and this interface is
setup by netifd, then the connected ipset is not update by mwan3.
To fix this also call connected ipset update code even if the interface
is not tracked or enabled by mwan3.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7ea690ea3c)
2018-05-30 17:38:28 +03:00
Hannu Nyman
619474a15e
Merge pull request #6147 from EricLuehrsen/openwrt-18.06
[openwrt-18.06] unbound: provide transparent defaults with documentation
2018-05-29 08:06:11 +03:00
Eric Luehrsen
1c6b0f97cd unbound: provide transparent defaults with documentation
Some resource options bundled many Unbound.conf options and
made customizing on top of UCI difficult. Make it easier to
use Unbound built defaults (blank conf sections).

Signed-off-by: Eric Luehrsen <ericluehrsen@hotmail.com>
2018-05-28 23:22:06 -04:00
Yousong Zhou
240e767bba xl2tpd: bump to version 1.3.12
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-05-25 09:39:59 +08:00
Jo-Philipp Wich
e27fa6782a flashrom: update to v1.0
Update to flashrom version 1.0 and cherry-pick an upstream fix for deprecated
libusb api usage.

Fixes the following error spotted by the buildbots:

    ch341a_spi.c: In function 'ch341a_spi_init':
    ch341a_spi.c:447:2: error: 'libusb_set_debug' is deprecated: [...]
      libusb_set_debug(NULL, 3); // Enable information, warning and [...]
      ^~~~~~~~~~~~~~~~
    In file included from ch341a_spi.c:25:0:
    .../libusb-1.0/libusb.h:1300:18: note: declared here
     void LIBUSB_CALL libusb_set_debug(libusb_context *ctx, int level);
                      ^~~~~~~~~~~~~~~~
    cc1: all warnings being treated as errors
    Makefile:1030: recipe for target 'ch341a_spi.o' failed

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit cb6e98ba44)
2018-05-23 10:04:36 +02:00
Rosen Penev
4f462c67d2 xz: Update to 5.2.4 + misc
The second source is just a redirect to SourceForge. Removed.
Also change URL to HTTPS as the website now supports it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

(cherry picked from commit 54a35e465f)
2018-05-17 08:34:25 +03:00
Hannu Nyman
40e02f6984 nano: update to 2.9.7
nano 2.9.7 was released on 2018 May 15.

Release notes:

GNU nano 2.9.7 "Hvide Sande" adds the option '--afterends'
for making Ctrl+Right (the nextword function) stop at word
ends instead of beginnings, accepts multibyte letters for
the Yes/No/All answers, does emergency saves of changed
buffers in the unlikely event that nano crashes, adds the
until-now missing bindable function 'linenumbers', and
renames the toggles 'constupdate' to 'constantshow' and
'cuttoend' to 'cutfromcursor', for consistency with the
corresponding options -- adjust your nanorc files soon.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit d9e9b59159)
2018-05-16 18:46:59 +03:00
Florian Eckert
cf04f87e8d net/mwan3: update version to 2.6.16
Signed-off-by: Florian Eckert <fe@dev.tdt.de>

(cherry picked from commit 18022993d9)
2018-05-16 16:56:52 +03:00
Florian Eckert
c1374f1ace net/mwan3: execute only ifup event if l3_device is found
Only execute an ifup event with the command "mwan3 ifup <iface>" if the
l3_device is found in the ubus "network.interface.<iface>".

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit ab4e62b885)
2018-05-16 16:56:13 +03:00
Florian Eckert
32931c324b net/mwan3: remove logging mwan3track pid is not found
Remove unnecessary logging if mwan3track pid is not found

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 215708a415)
2018-05-16 16:56:02 +03:00
Florian Eckert
7d1344d95e net/mwan3: add/remove src_ip from routing table
Add or remove local_source ip also if mwan3 is stopped or started

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 2d9dfa3b1b)
2018-05-16 16:55:52 +03:00
615 changed files with 19821 additions and 23142 deletions

141
.circleci/config.yml Normal file
View file

@ -0,0 +1,141 @@
version: 2.0
jobs:
build:
docker:
- image: docker.io/openwrtorg/packages-cci:v1.0.1
environment:
- SDK_BASE_URL: "https://downloads.openwrt.org/releases/18.06.1/targets/ar71xx/generic"
- SDK_FILE: "openwrt-sdk-18.06.1-ar71xx-generic_gcc-7.3.0_musl.Linux-x86_64.tar.xz"
- BRANCH: "openwrt-18.06"
steps:
- checkout:
path: ~/openwrt_packages
- run:
name: Check changes / verify commits
working_directory: ~/openwrt_packages
command: |
cat >> $BASH_ENV <<EOF
echo_red() { printf "\033[1;31m\$*\033[m\n"; }
echo_green() { printf "\033[1;32m\$*\033[m\n"; }
echo_blue() { printf "\033[1;34m\$*\033[m\n"; }
EOF
source $BASH_ENV
RET=0
for commit in $(git rev-list HEAD ^origin/$BRANCH); do
echo_blue "=== Checking commit '$commit'"
if git show --format='%P' -s $commit | grep -qF ' '; then
echo_red "Pull request should not include merge commits"
RET=1
fi
author="$(git show -s --format=%aN $commit)"
if echo $author | grep -q '\S\+\s\+\S\+'; then
echo_green "Author name ($author) seems ok"
else
echo_red "Author name ($author) need to be your real name 'firstname lastname'"
RET=1
fi
subject="$(git show -s --format=%s $commit)"
if echo "$subject" | grep -q -e '^[0-9A-Za-z,/_-]\+: ' -e '^Revert '; then
echo_green "Commit subject line seems ok ($subject)"
else
echo_red "Commit subject line MUST start with '<package name>: ' ($subject)"
RET=1
fi
body="$(git show -s --format=%b $commit)"
sob="$(git show -s --format='Signed-off-by: %aN <%aE>' $commit)"
if echo "$body" | grep -qF "$sob"; then
echo_green "Signed-off-by match author"
else
echo_red "Signed-off-by is missing or doesn't match author (should be '$sob')"
RET=1
fi
done
exit $RET
- run:
name: Download the SDK
working_directory: ~/sdk
command: |
curl "$SDK_BASE_URL/sha256sums" -sS -o sha256sums
curl "$SDK_BASE_URL/sha256sums.asc" -sS -o sha256sums.asc
gpg --with-fingerprint --verify sha256sums.asc sha256sums
curl "$SDK_BASE_URL/$SDK_FILE" -sS -o "$SDK_FILE"
sha256sum -c --ignore-missing sha256sums
- run:
name: Prepare work_dir
working_directory: ~/work_dir
command: |
tar Jxf ~/sdk/$SDK_FILE --strip=1
cat > feeds.conf <<EOF
src-git base https://github.com/openwrt/openwrt.git;$BRANCH
src-link packages $HOME/openwrt_packages
src-git luci https://github.com/openwrt/luci.git;$BRANCH
EOF
cat feeds.conf
./scripts/feeds update -a > /dev/null
./scripts/feeds install -a > /dev/null
make defconfig > /dev/null
# enable BUILD_LOG
sed -i 's/# CONFIG_BUILD_LOG is not set/CONFIG_BUILD_LOG=y/' .config
- run:
name: Download source, check package, compile
working_directory: ~/work_dir
command: |
set +o pipefail
PKGS=$(cd ~/openwrt_packages; git diff --diff-filter=d --name-only "origin/$BRANCH..." | grep 'Makefile$' | grep -v '/files/' | awk -F/ '{ print $(NF-1) }')
if [ -z "$PKGS" ] ; then
echo_blue "WARNING: No new or modified packages found!"
exit 0
fi
echo_blue "=== Found new/modified packages: $PKGS"
for PKG in $PKGS ; do
echo_blue "===+ Download: $PKG"
make "package/$PKG/download" V=s
echo_blue "===+ Check package: $PKG"
make "package/$PKG/check" V=s 2>&1 | tee logtmp
RET=${PIPESTATUS[0]}
if [ $RET -ne 0 ]; then
echo_red "=> Package check failed: $RET)"
exit $RET
fi
badhash_msg="HASH does not match "
badhash_msg+="|HASH uses deprecated hash,"
badhash_msg+="|HASH is missing,"
if grep -qE "$badhash_msg" logtmp; then
echo_red "=> Package HASH check failed"
exit 1
fi
echo_green "=> Package check OK"
done
for PKG in $PKGS ; do
echo_blue "===+ Building: $PKG"
make "package/$PKG/compile" -j3 V=s
done
- store_artifacts:
path: ~/work_dir/logs
- store_artifacts:
path: ~/work_dir/bin
workflows:
version: 2
buildpr:
jobs:
- build:
filters:
branches:
ignore: master

View file

@ -1,5 +1,7 @@
git:
depth: 10
quiet: true
language: c
dist: trusty
sudo: false

View file

@ -1,5 +1,5 @@
# Contributing Guidelines
(See <http://wiki.openwrt.org/doc/devel/packages> for overall format and construction)
(See <https://openwrt.org/docs/guide-developer/packages> for overall format and construction)
### Basic guidelines
@ -29,7 +29,7 @@ All packages you commit or submit by pull-request should follow these simple gui
* Have a useful description prefixed with the package name
(E.g.: "foopkg: Add libzot dependency")
* Include Signed-off-by in the comment
(See <https://dev.openwrt.org/wiki/SubmittingPatches#a10.Signyourwork>)
(See <https://openwrt.org/submitting-patches#sign_your_work>)
### Advice on pull requests:

View file

@ -4,11 +4,11 @@
This is the OpenWrt "packages"-feed containing community-maintained build scripts, options and patches for applications, modules and libraries used within OpenWrt.
Installation of pre-built packages is handled directly by the **opkg** utility within your running OpenWrt system or by using the [OpenWrt SDK](http://wiki.openwrt.org/doc/howto/obtain.firmware.sdk) on a build system.
Installation of pre-built packages is handled directly by the **opkg** utility within your running OpenWrt system or by using the [OpenWrt SDK](https://openwrt.org/docs/guide-developer/using_the_sdk) on a build system.
## Usage
This repository is intended to be layered on-top of an OpenWrt buildroot. If you do not have an OpenWrt buildroot installed, see the documentation at: [OpenWrt Buildroot Installation](http://wiki.openwrt.org/doc/howto/buildroot.exigence) on the OpenWrt support site.
This repository is intended to be layered on-top of an OpenWrt buildroot. If you do not have an OpenWrt buildroot installed, see the documentation at: [OpenWrt Buildroot Installation](https://openwrt.org/docs/guide-developer/build-system/install-buildsystem) on the OpenWrt support site.
This feed is enabled by default. To install all its package definitions, run:
```

View file

@ -8,18 +8,20 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netdata
PKG_VERSION:=1.10.0
PKG_VERSION:=1.12.2
PKG_RELEASE:=1
PKG_MAINTAINER:=
PKG_LICENSE:=GPL-3.0
PKG_LICENSE:=GPL-3.0+
PKG_LICENSE_FILES:=COPYING
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/firehol/netdata/releases/download/v$(PKG_VERSION)
PKG_HASH:=0514fc002c5c5fb730156b3fe928965b22327833c6c17e22b7097eda657e77a2
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/netdata/netdata/releases/download/v$(PKG_VERSION)
PKG_HASH:=f8cd689ec1ab262903b5a54c8df2fd0fe6e5e7b0ab4a2c60fde4e88f37aa72b5
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
PKG_INSTALL:=1
PKG_FIXUP:=autoreconf
PKG_USE_MIPS16:=0
include $(INCLUDE_DIR)/package.mk
@ -34,38 +36,52 @@ endef
define Package/netdata/description
netdata is a highly optimized Linux daemon providing real-time performance
monitoring for Linux systems, applications and SNMP devices over the web.
If you want to use Python plugins install python3, python3-yaml and
python3-urllib3
endef
TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS))
TARGET_CFLAGS += -ffunction-sections -fdata-sections -O3
TARGET_LDFLAGS += -Wl,--gc-sections
CONFIGURE_ARGS += --with-zlib --with-math --disable-x86-sse --disable-lto
CONFIGURE_ARGS += \
--with-zlib \
--with-math \
--disable-x86-sse \
--enable-lto \
--without-libcap \
--disable-plugin-nfacct
define Package/netdata/conffiles
/etc/netdata/
endef
define Package/netdata/install
mkdir -p $(1)/etc/netdata
$(INSTALL_DIR) $(1)/etc/netdata/custom-plugins.d
$(CP) $(PKG_INSTALL_DIR)/etc/netdata $(1)/etc
$(CP) ./files/netdata.conf $(1)/etc/netdata
mkdir -p $(1)/usr/share/netdata
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/netdata $(1)/usr/lib
$(CP) $(1)/usr/lib/netdata/conf.d/fping.conf $(1)/etc
$(CP) $(1)/usr/lib/netdata/conf.d/health_alarm_notify.conf $(1)/etc
rm -rf $(1)/usr/lib/netdata/python.d/python_modules/pyyaml2
rm -rf $(1)/usr/lib/netdata/python.d/python_modules/pyyaml3
rm -rf $(1)/usr/lib/netdata/python.d/python_modules/urllib3
$(CP) $(1)/usr/lib/netdata/plugins.d/tc-qos-helper.sh $(1)/etc
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdata $(1)/usr/sbin
$(INSTALL_DIR) $(1)/usr/share/netdata
$(CP) $(PKG_INSTALL_DIR)/usr/share/netdata $(1)/usr/share
rm -rf $(1)/usr/share/netdata/web/images
rm -rf $(1)/usr/share/netdata/web/old
rm $(1)/usr/share/netdata/web/demo*html
rm $(1)/usr/share/netdata/web/fonts/*.svg
rm $(1)/usr/share/netdata/web/fonts/*.ttf
rm $(1)/usr/share/netdata/web/fonts/*.woff
mkdir -p $(1)/usr/lib/netdata
$(CP) $(PKG_INSTALL_DIR)/usr/lib/netdata $(1)/usr/lib
rm $(1)/usr/lib/netdata/python.d/python-modules-installer.sh
chmod 4755 $(1)/usr/lib/netdata/plugins.d/apps.plugin
mkdir -p $(1)/etc/init.d
rm $(1)/usr/share/netdata/web/images/*.png
rm $(1)/usr/share/netdata/web/images/*.gif
rm $(1)/usr/share/netdata/web/images/*.ico
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/netdata.init $(1)/etc/init.d/netdata
mkdir -p $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/netdata $(1)/usr/sbin
endef
$(eval $(call BuildPackage,netdata))

View file

@ -1,83 +1,24 @@
# netdata configuration
# Full configuration can be retrieved from the running
# server at http://localhost:19999/netdata.conf
#
# You can download the latest version of this file, using:
#
# wget -O /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
# or
# Example:
# curl -o /etc/netdata/netdata.conf http://localhost:19999/netdata.conf
#
# You can uncomment and change any of the options below.
# The value shown in the commented settings, is the default value.
#
# global netdata configuration
[global]
# glibc malloc arena max for plugins = 1
# hostname = LEDE
# history = 4036
update every = 2
# config directory = /etc/netdata
# log directory = /var/log/netdata
# web files directory = /usr/share/netdata/web
# cache directory = /var/cache/netdata
# lib directory = /var/lib/netdata
# home directory = /var/cache/netdata
# plugins directory = "/usr/lib/netdata/plugins.d" "/etc/netdata/custom-plugins.d"
# memory mode = save
# host access prefix =
memory deduplication (ksm) = no
# TZ environment variable = :/etc/localtime
# timezone = UTC
# debug flags = 0x0000000000000000
debug log = syslog
error log = syslog
access log = none
# errors flood protection period = 1200
# errors to trigger flood protection = 200
run as user = root
# OOM score = 1000
# process scheduling policy = idle
# process nice level = 19
# pthread stack size = 81920
# cleanup obsolete charts after seconds = 3600
# gap when lost iterations above = 1
# cleanup orphan hosts after seconds = 3600
# delete obsolete charts files = yes
# delete orphan hosts files = yes
[web]
# mode = static-threaded
# listen backlog = 4096
# default port = 19999
# bind to = *
# web files owner = nobody
# web files group = nogroup
# disconnect idle clients after seconds = 60
# timeout for first request = 60
# respect do not track policy = no
# x-frame-options response header =
allow connections from = localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
allow dashboard from = localhost 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
# allow badges from = *
# allow streaming from = *
# allow netdata.conf from = localhost fd* 10.* 192.168.* 172.16.* 172.17.* 172.18.* 172.19.* 172.20.* 172.21.* 172.22.* 172.23.* 172.24.* 172.25.* 172.26.* 172.27.* 172.28.* 172.29.* 172.30.* 172.31.*
# enable gzip compression = yes
# gzip compression strategy = default
# gzip compression level = 3
# web server threads = 2
# web server max sockets = 512
[plugins]
# PATH environment variable = /usr/sbin:/usr/bin:/sbin:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
# PYTHONPATH environment variable =
# proc = yes
# diskspace = yes
# cgroups = yes
# tc = yes
# idlejitter = yes
# enable running new plugins = yes
# check for new plugins every = 60
cgroups = no
apps = no
charts.d = no
fping = no
@ -86,36 +27,3 @@
[health]
enabled = no
# in memory max health log entries = 1000
# script to execute on alarm = /usr/lib/netdata/plugins.d/alarm-notify.sh
# health configuration directory = /etc/netdata/health.d
# run at least every seconds = 10
# postpone alarms during hibernation for seconds = 60
# rotate log every lines = 2000
[statsd]
enabled = no
# update every (flushInterval) = 1
# udp messages to process at once = 10
# create private charts for metrics matching = *
# max private charts allowed = 200
# max private charts hard limit = 1000
# private charts memory mode = save
# private charts history = 4036
# decimal detail = 1000
# disconnect idle tcp clients after seconds = 600
# private charts hidden = no
# histograms and timers percentile (percentThreshold) = 95.00000
# add dimension for number of events received = yes
# gaps on gauges (deleteGauges) = no
# gaps on counters (deleteCounters) = no
# gaps on meters (deleteMeters) = no
# gaps on sets (deleteSets) = no
# gaps on histograms (deleteHistograms) = no
# gaps on timers (deleteTimers) = no
# statsd server max TCP sockets = 256
# listen backlog = 4096
# default port = 8125
# bind to = udp:localhost tcp:localhost

View file

@ -1,5 +1,5 @@
--- a/conf.d/charts.d.conf
+++ b/conf.d/charts.d.conf
--- a/collectors/charts.d.plugin/charts.d.conf
+++ b/collectors/charts.d.plugin/charts.d.conf
@@ -30,7 +30,7 @@
# the default enable/disable for all charts.d collectors
@ -9,8 +9,8 @@
# BY DEFAULT ENABLED MODULES
# ap=yes
--- a/conf.d/python.d.conf
+++ b/conf.d/python.d.conf
--- a/collectors/python.d.plugin/python.d.conf
+++ b/collectors/python.d.plugin/python.d.conf
@@ -7,7 +7,7 @@
#
@ -18,5 +18,5 @@
-enabled: yes
+enabled: no
# Prevent log flood
# Define how many log messages can be written to log file in one log_interval
# ----------------------------------------------------------------------
# Enable / Disable python.d.plugin modules

View file

@ -0,0 +1,10 @@
--- a/collectors/python.d.plugin/python.d.plugin.in
+++ b/collectors/python.d.plugin/python.d.plugin.in
@@ -1,6 +1,4 @@
-#!/usr/bin/env bash
-'''':; exec "$(command -v python || command -v python3 || command -v python2 ||
-echo "ERROR python IS NOT AVAILABLE IN THIS SYSTEM")" "$0" "$@" # '''
+#!/usr/bin/python3
# -*- coding: utf-8 -*-
# Description:

View file

@ -8,14 +8,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=sudo
PKG_VERSION:=1.8.21p2
PKG_VERSION:=1.8.28p1
PKG_RELEASE:=1
PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=doc/LICENSE
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.sudo.ws/dist
PKG_HASH:=74c5746cd33a814e2431c39faf0d76f7f8a697379bd073862e3b156cf0d76368
PKG_SOURCE_URL:=https://www.sudo.ws/dist/
PKG_HASH:=23ba5a84af31e3b5ded58d4be6d3f6939a495a55561fba92c6941b79a6e8b027
PKG_MAINTAINER:=
PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=doc/LICENSE
PKG_CPE_ID:=cpe:/a:todd_miller:sudo
PKG_INSTALL:=1
@ -27,8 +30,7 @@ define Package/sudo
SECTION:=admin
CATEGORY:=Administration
TITLE:=Delegate authority to run commands
URL:=http://www.sudo.ws/
MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
URL:=https://www.sudo.ws/
endef
define Package/sudo/description

View file

@ -1,7 +1,6 @@
diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefile.in
--- sudo-1.8.11p2.orig/lib/util/Makefile.in 2014-10-07 22:26:20.000000000 +0200
+++ sudo-1.8.11p2/lib/util/Makefile.in 2014-12-09 21:44:35.610041162 +0100
@@ -142,10 +142,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -188,10 +188,10 @@ libsudo_util.la: $(LTOBJS) @LT_LDDEP@
esac
siglist.c: mksiglist
@ -13,4 +12,4 @@ diff -rupN sudo-1.8.11p2.orig/lib/util/Makefile.in sudo-1.8.11p2/lib/util/Makefi
+ mksigname > $@
mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/sudo_compat.h $(top_builddir)/config.h
$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
$(CC) $(CPPFLAGS) $(CFLAGS) $(srcdir)/mksiglist.c -o $@

View file

@ -1,7 +1,6 @@
diff -rupN sudo-1.8.11p2.orig/Makefile.in sudo-1.8.11p2/Makefile.in
--- sudo-1.8.11p2.orig/Makefile.in 2014-10-07 22:26:20.000000000 +0200
+++ sudo-1.8.11p2/Makefile.in 2014-12-09 22:00:27.256934143 +0100
@@ -62,7 +62,7 @@ SHELL = @SHELL@
--- a/Makefile.in
+++ b/Makefile.in
@@ -64,7 +64,7 @@ SHELL = @SHELL@
SED = @SED@
INSTALL = $(SHELL) $(top_srcdir)/install-sh -c

View file

@ -1,9 +1,8 @@
diff -rupN sudo-1.8.14p3.orig/include/sudo_util.h sudo-1.8.14p3/include/sudo_util.h
--- sudo-1.8.14p3.orig/include/sudo_util.h 2015-07-22 14:22:49.000000000 +0200
+++ sudo-1.8.14p3/include/sudo_util.h 2015-08-30 18:41:24.509814946 +0200
@@ -23,6 +23,8 @@
# include "compat/stdbool.h"
#endif /* HAVE_STDBOOL_H */
--- a/include/sudo_util.h
+++ b/include/sudo_util.h
@@ -33,6 +33,8 @@
# endif
#endif
+#include <sys/types.h>
+

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=zabbix
PKG_VERSION:=3.2.7
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=3ea0c299bd69bc728177128740f0476bc1a2c1de438330df5bbd8f5fc6090712
@ -84,19 +84,19 @@ endef
define Package/zabbix-extra-mac80211/description
An extra package for zabbix-agentd that adds a discovery rule for mac80211 wifi phy and many userparameters.
It contains an suid helper to allow zabbix-agentd to still run as zabbix user and not as root.
See http://wiki.openwrt.org/doc/howto/zabbix for ready to use zabbix templates.
See https://openwrt.org/docs/guide-user/services/network_monitoring/zabbix for ready to use zabbix templates.
endef
define Package/zabbix-extra-network/description
An extra package for zabbix-agentd that adds a discovery rule for openwrt network interfaces.
The idea here is to discover only interfaces listed in /etc/config/network (discover br-lan and not eth0.1 and wlan0)
See http://wiki.openwrt.org/doc/howto/zabbix for ready to use zabbix templates.
See https://openwrt.org/docs/guide-user/services/network_monitoring/zabbix for ready to use zabbix templates.
endef
define Package/zabbix-extra-wifi/description
An extra package for zabbix-agentd that adds a discovery rule for wifi interfaces and many userparameters.
As it uses libiwinfo, it works with all wifi devices supported by openwrt.
See http://wiki.openwrt.org/doc/howto/zabbix for ready to use zabbix templates.
See https://openwrt.org/docs/guide-user/services/network_monitoring/zabbix for ready to use zabbix templates.
endef
CONFIGURE_ARGS+= \

View file

@ -1,7 +1,7 @@
#see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates
#see https://openwrt.org/docs/guide-user/services/network_monitoring/zabbix for ready to use templates
# If you want to know the exact meaning of an UserParameter, you can search in the ieee80211 standard:
# http://standards.ieee.org/getieee802/download/802.11-2012.pdf
# https://standards.ieee.org/standard/802_11-2016.html
# example: for mac80211.ACKFailureCount search for dot11ACKFailureCount (page 2145)
# mac80211 phy discovery (like 'phy0')

View file

@ -1,4 +1,4 @@
#see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates
#see https://openwrt.org/docs/guide-user/services/network_monitoring/zabbix for ready to use templates
# network interface discovery
# example: {"data":[{"{#IF}":"lo", "{#NET}":"loopback"},{"{#IF}":"br-lan", "{#NET}":"lan"},{"{#IF}":"eth0.1", "{#NET}":"wan"}]}

View file

@ -1,4 +1,4 @@
#see http://wiki.openwrt.org/doc/howto/zabbix for ready to use templates
#see https://openwrt.org/docs/guide-user/services/network_monitoring/zabbix for ready to use templates
# wifi interface discovery
# example: {"data":[{"{#IF}":"wlan0", "{#MODE}":"ap", "{#SSID}":"Openwrt", "{#NET}":"lan", "{#DEV}":"radio0", "{#ENC}":"psk2+ccmp", "{#TYPE}":"mac80211", "{#HWMODE}":"11ng", "{#CHANNEL}":"11", "{#BSSID}":"xx:xx:xx:xx:xx:xx"}]}

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=diffutils
PKG_VERSION:=3.6
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/diffutils
@ -27,6 +27,10 @@ define Package/diffutils
DEPENDS:=+USE_GLIBC:librt
TITLE:=diffutils
URL:=http://www.gnu.org/software/diffutils/
ALTERNATIVES:=\
200:/usr/bin/cmp:/usr/bin/gnu-cmp \
200:/usr/bin/diff:/usr/bin/gnu-diff \
endef
define Package/diffutils/description
@ -40,23 +44,9 @@ TARGET_CFLAGS += --std=gnu99
define Package/diffutils/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3,diff,cmp} $(1)/usr/bin/
endef
define Package/diffutils/preinst
#!/bin/sh
for x in sdiff diff3 diff cmp; do
[ -L "$${IPKG_INSTROOT}/usr/bin/$$x" ] && rm -f "$${IPKG_INSTROOT}/usr/bin/$$x"
done
exit 0
endef
define Package/diffutils/postrm
#!/bin/sh
for x in sdiff diff3 diff cmp; do
/bin/busybox $$x -h 2>&1 | grep -q BusyBox && ln -sf ../../bin/busybox /usr/bin/$$x
done
exit 0
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{sdiff,diff3} $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/diff $(1)/usr/bin/gnu-diff
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cmp $(1)/usr/bin/gnu-cmp
endef
$(eval $(call BuildPackage,diffutils))

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gcc
PKG_VERSION:=5.4.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE_URL:=@GNU/gcc/gcc-$(PKG_VERSION)
PKG_HASH:=608df76dec2d34de6558249d8af4cbee21eceddbcb580d666f7a5a583ca3303a
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@ -22,6 +22,7 @@ include $(INCLUDE_DIR)/package.mk
TARGET_LANGUAGES:="c,c++"
BUGURL=https://dev.openwrt.org/
PKGVERSION=OpenWrt GCC $(PKG_VERSION)
TARGET_CPPFLAGS += -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
# not using sstrip here as this fucks up the .so's somehow
STRIP:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)strip
@ -42,7 +43,7 @@ define Package/gcc
CATEGORY:=Development
TITLE:=gcc
MAINTAINER:=Noble Pepper <gccmaintain@noblepepper.com>
DEPENDS:= +binutils +libstdcpp
DEPENDS:= +binutils +libstdcpp @!arc
endef
define Package/gcc/description
@ -92,6 +93,8 @@ define Build/Prepare
cp $(PKG_BUILD_DIR)/config.sub $(PKG_BUILD_DIR)/mpc/
endef
TARGET_CXX += -std=gnu++03
CONFIGURE_ARGS += CXX_FOR_TARGET="$(TARGET_CXX)" CXXFLAGS_FOR_TARGET="-g -O2 -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS"
define Build/Configure
(cd $(PKG_BUILD_DIR); rm -f config.cache; \

View file

@ -9,13 +9,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=patch
PKG_VERSION:=2.7.6
PKG_RELEASE:=1
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNU/patch
PKG_HASH:=ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd
PKG_LICENSE:=GPL-3.0+
PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:gnu:patch
PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk
@ -23,7 +27,7 @@ define Package/patch
SECTION:=devel
CATEGORY:=Development
TITLE:=patch
URL:=http://www.gnu.org/
URL:=https://savannah.gnu.org/projects/patch/
MAINTAINER:=Russell Senior <russell@personaltelco.net>
endef

View file

@ -0,0 +1,29 @@
From 9bf998b5fcbcde1dea0e472dc1538abb97e9012e Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@gnu.org>
Date: Mon, 12 Feb 2018 16:48:24 +0100
Subject: [PATCH] Fix segfault with mangled rename patch
http://savannah.gnu.org/bugs/?53132
* src/pch.c (intuit_diff_type): Ensure that two filenames are specified
for renames and copies (fix the existing check).
---
src/pch.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/pch.c b/src/pch.c
index ff9ed2c..bc6278c 100644
--- a/src/pch.c
+++ b/src/pch.c
@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
if ((pch_rename () || pch_copy ())
&& ! inname
&& ! ((i == OLD || i == NEW) &&
- p_name[! reverse] &&
+ p_name[reverse] && p_name[! reverse] &&
+ name_is_valid (p_name[reverse]) &&
name_is_valid (p_name[! reverse])))
{
say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
--
2.19.1

View file

@ -0,0 +1,209 @@
From b56779aed483f0036a32a65e62ab7b5e461b07cc Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@gnu.org>
Date: Fri, 6 Apr 2018 12:14:49 +0200
Subject: [PATCH] Fix arbitrary command execution in ed-style patches
(CVE-2018-1000156)
* src/pch.c (do_ed_script): Write ed script to a temporary file instead
of piping it to ed: this will cause ed to abort on invalid commands
instead of rejecting them and carrying on.
* tests/ed-style: New test case.
* tests/Makefile.am (TESTS): Add test case.
---
src/pch.c | 89 +++++++++++++++++++++++++++++++++++------------
tests/Makefile.am | 1 +
tests/ed-style | 41 ++++++++++++++++++++++
3 files changed, 108 insertions(+), 23 deletions(-)
create mode 100644 tests/ed-style
diff --git a/src/pch.c b/src/pch.c
index bc6278c..4fd5a05 100644
--- a/src/pch.c
+++ b/src/pch.c
@@ -33,6 +33,7 @@
# include <io.h>
#endif
#include <safe.h>
+#include <sys/wait.h>
#define INITHUNKMAX 125 /* initial dynamic allocation size */
@@ -2389,22 +2390,28 @@ do_ed_script (char const *inname, char const *outname,
static char const editor_program[] = EDITOR_PROGRAM;
file_offset beginning_of_this_line;
- FILE *pipefp = 0;
size_t chars_read;
+ FILE *tmpfp = 0;
+ char const *tmpname;
+ int tmpfd;
+ pid_t pid;
+
+ if (! dry_run && ! skip_rest_of_patch)
+ {
+ /* Write ed script to a temporary file. This causes ed to abort on
+ invalid commands such as when line numbers or ranges exceed the
+ number of available lines. When ed reads from a pipe, it rejects
+ invalid commands and treats the next line as a new command, which
+ can lead to arbitrary command execution. */
+
+ tmpfd = make_tempfile (&tmpname, 'e', NULL, O_RDWR | O_BINARY, 0);
+ if (tmpfd == -1)
+ pfatal ("Can't create temporary file %s", quotearg (tmpname));
+ tmpfp = fdopen (tmpfd, "w+b");
+ if (! tmpfp)
+ pfatal ("Can't open stream for file %s", quotearg (tmpname));
+ }
- if (! dry_run && ! skip_rest_of_patch) {
- int exclusive = *outname_needs_removal ? 0 : O_EXCL;
- assert (! inerrno);
- *outname_needs_removal = true;
- copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
- sprintf (buf, "%s %s%s", editor_program,
- verbosity == VERBOSE ? "" : "- ",
- outname);
- fflush (stdout);
- pipefp = popen(buf, binary_transput ? "wb" : "w");
- if (!pipefp)
- pfatal ("Can't open pipe to %s", quotearg (buf));
- }
for (;;) {
char ed_command_letter;
beginning_of_this_line = file_tell (pfp);
@@ -2415,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname,
}
ed_command_letter = get_ed_command_letter (buf);
if (ed_command_letter) {
- if (pipefp)
- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
+ if (tmpfp)
+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
write_fatal ();
if (ed_command_letter != 'd' && ed_command_letter != 's') {
p_pass_comments_through = true;
while ((chars_read = get_line ()) != 0) {
- if (pipefp)
- if (! fwrite (buf, sizeof *buf, chars_read, pipefp))
+ if (tmpfp)
+ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp))
write_fatal ();
if (chars_read == 2 && strEQ (buf, ".\n"))
break;
@@ -2435,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname,
break;
}
}
- if (!pipefp)
+ if (!tmpfp)
return;
- if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0
- || fflush (pipefp) != 0)
+ if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, tmpfp) == 0
+ || fflush (tmpfp) != 0)
write_fatal ();
- if (pclose (pipefp) != 0)
- fatal ("%s FAILED", editor_program);
+
+ if (lseek (tmpfd, 0, SEEK_SET) == -1)
+ pfatal ("Can't rewind to the beginning of file %s", quotearg (tmpname));
+
+ if (! dry_run && ! skip_rest_of_patch) {
+ int exclusive = *outname_needs_removal ? 0 : O_EXCL;
+ *outname_needs_removal = true;
+ if (inerrno != ENOENT)
+ {
+ *outname_needs_removal = true;
+ copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
+ }
+ sprintf (buf, "%s %s%s", editor_program,
+ verbosity == VERBOSE ? "" : "- ",
+ outname);
+ fflush (stdout);
+
+ pid = fork();
+ if (pid == -1)
+ pfatal ("Can't fork");
+ else if (pid == 0)
+ {
+ dup2 (tmpfd, 0);
+ execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
+ _exit (2);
+ }
+ else
+ {
+ int wstatus;
+ if (waitpid (pid, &wstatus, 0) == -1
+ || ! WIFEXITED (wstatus)
+ || WEXITSTATUS (wstatus) != 0)
+ fatal ("%s FAILED", editor_program);
+ }
+ }
+
+ fclose (tmpfp);
+ safe_unlink (tmpname);
if (ofp)
{
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6b6df63..16f8693 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,6 +32,7 @@ TESTS = \
crlf-handling \
dash-o-append \
deep-directories \
+ ed-style \
empty-files \
false-match \
fifo \
diff --git a/tests/ed-style b/tests/ed-style
new file mode 100644
index 0000000..d8c0689
--- /dev/null
+++ b/tests/ed-style
@@ -0,0 +1,41 @@
+# Copyright (C) 2018 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# in any medium, are permitted without royalty provided the copyright
+# notice and this notice are preserved.
+
+. $srcdir/test-lib.sh
+
+require cat
+use_local_patch
+use_tmpdir
+
+# ==============================================================
+
+cat > ed1.diff <<EOF
+0a
+foo
+.
+EOF
+
+check 'patch -e foo -i ed1.diff' <<EOF
+EOF
+
+check 'cat foo' <<EOF
+foo
+EOF
+
+cat > ed2.diff <<EOF
+1337a
+r !echo bar
+,p
+EOF
+
+check 'patch -e foo -i ed2.diff 2> /dev/null || echo "Status: $?"' <<EOF
+?
+Status: 2
+EOF
+
+check 'cat foo' <<EOF
+foo
+EOF
--
2.19.1

View file

@ -0,0 +1,30 @@
From 71607715f11c9875a5aaaf3240885c45f79138e9 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@gnu.org>
Date: Fri, 17 Aug 2018 13:35:40 +0200
Subject: [PATCH] Fix swapping fake lines in pch_swap
* src/pch.c (pch_swap): Fix swapping p_bfake and p_efake when there is a
blank line in the middle of a context-diff hunk: that empty line stays
in the middle of the hunk and isn't swapped.
Fixes: https://savannah.gnu.org/bugs/index.php?53133
---
src/pch.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pch.c b/src/pch.c
index 4fd5a05..b0dd14d 100644
--- a/src/pch.c
+++ b/src/pch.c
@@ -2115,7 +2115,7 @@ pch_swap (void)
}
if (p_efake >= 0) { /* fix non-freeable ptr range */
if (p_efake <= i)
- n = p_end - i + 1;
+ n = p_end - p_ptrn_lines;
else
n = -i;
p_efake += n;
--
2.19.1

View file

@ -0,0 +1,108 @@
From dce4683cbbe107a95f1f0d45fabc304acfb5d71a Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@gnu.org>
Date: Mon, 15 Jul 2019 16:21:48 +0200
Subject: Don't follow symlinks unless --follow-symlinks is given
* src/inp.c (plan_a, plan_b), src/util.c (copy_to_fd, copy_file,
append_to_file): Unless the --follow-symlinks option is given, open files with
the O_NOFOLLOW flag to avoid following symlinks. So far, we were only doing
that consistently for input files.
* src/util.c (create_backup): When creating empty backup files, (re)create them
with O_CREAT | O_EXCL to avoid following symlinks in that case as well.
---
src/inp.c | 12 ++++++++++--
src/util.c | 14 +++++++++++---
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/src/inp.c b/src/inp.c
index 32d0919..22d7473 100644
--- a/src/inp.c
+++ b/src/inp.c
@@ -238,8 +238,13 @@ plan_a (char const *filename)
{
if (S_ISREG (instat.st_mode))
{
- int ifd = safe_open (filename, O_RDONLY|binary_transput, 0);
+ int flags = O_RDONLY | binary_transput;
size_t buffered = 0, n;
+ int ifd;
+
+ if (! follow_symlinks)
+ flags |= O_NOFOLLOW;
+ ifd = safe_open (filename, flags, 0);
if (ifd < 0)
pfatal ("can't open file %s", quotearg (filename));
@@ -340,6 +345,7 @@ plan_a (char const *filename)
static void
plan_b (char const *filename)
{
+ int flags = O_RDONLY | binary_transput;
int ifd;
FILE *ifp;
int c;
@@ -353,7 +359,9 @@ plan_b (char const *filename)
if (instat.st_size == 0)
filename = NULL_DEVICE;
- if ((ifd = safe_open (filename, O_RDONLY | binary_transput, 0)) < 0
+ if (! follow_symlinks)
+ flags |= O_NOFOLLOW;
+ if ((ifd = safe_open (filename, flags, 0)) < 0
|| ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r")))
pfatal ("Can't open file %s", quotearg (filename));
if (TMPINNAME_needs_removal)
diff --git a/src/util.c b/src/util.c
index 1cc08ba..fb38307 100644
--- a/src/util.c
+++ b/src/util.c
@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original)
try_makedirs_errno = ENOENT;
safe_unlink (bakname);
- while ((fd = safe_open (bakname, O_CREAT | O_WRONLY | O_TRUNC, 0666)) < 0)
+ while ((fd = safe_open (bakname, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, 0666)) < 0)
{
if (errno != try_makedirs_errno)
pfatal ("Can't create file %s", quotearg (bakname));
@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode,
static void
copy_to_fd (const char *from, int tofd)
{
+ int from_flags = O_RDONLY | O_BINARY;
int fromfd;
ssize_t i;
- if ((fromfd = safe_open (from, O_RDONLY | O_BINARY, 0)) < 0)
+ if (! follow_symlinks)
+ from_flags |= O_NOFOLLOW;
+ if ((fromfd = safe_open (from, from_flags, 0)) < 0)
pfatal ("Can't reopen file %s", quotearg (from));
while ((i = read (fromfd, buf, bufsize)) != 0)
{
@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost,
else
{
assert (S_ISREG (mode));
+ if (! follow_symlinks)
+ to_flags |= O_NOFOLLOW;
tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode,
to_dir_known_to_exist);
copy_to_fd (from, tofd);
@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost,
void
append_to_file (char const *from, char const *to)
{
+ int to_flags = O_WRONLY | O_APPEND | O_BINARY;
int tofd;
- if ((tofd = safe_open (to, O_WRONLY | O_BINARY | O_APPEND, 0)) < 0)
+ if (! follow_symlinks)
+ to_flags |= O_NOFOLLOW;
+ if ((tofd = safe_open (to, to_flags, 0)) < 0)
pfatal ("Can't reopen file %s", quotearg (to));
copy_to_fd (from, tofd);
if (close (tofd) != 0)
--
cgit v1.0-41-gc330

View file

@ -0,0 +1,38 @@
From 3fcd042d26d70856e826a42b5f93dc4854d80bf0 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@gnu.org>
Date: Fri, 6 Apr 2018 19:36:15 +0200
Subject: Invoke ed directly instead of using the shell
* src/pch.c (do_ed_script): Invoke ed directly instead of using a shell
command to avoid quoting vulnerabilities.
---
src/pch.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/pch.c b/src/pch.c
index 4fd5a05..16e001a 100644
--- a/src/pch.c
+++ b/src/pch.c
@@ -2459,9 +2459,6 @@ do_ed_script (char const *inname, char const *outname,
*outname_needs_removal = true;
copy_file (inname, outname, 0, exclusive, instat.st_mode, true);
}
- sprintf (buf, "%s %s%s", editor_program,
- verbosity == VERBOSE ? "" : "- ",
- outname);
fflush (stdout);
pid = fork();
@@ -2470,7 +2467,8 @@ do_ed_script (char const *inname, char const *outname,
else if (pid == 0)
{
dup2 (tmpfd, 0);
- execl ("/bin/sh", "sh", "-c", buf, (char *) 0);
+ assert (outname[0] != '!' && outname[0] != '-');
+ execlp (editor_program, editor_program, "-", outname, (char *) NULL);
_exit (2);
}
else
--
cgit v1.0-41-gc330

View file

@ -28,7 +28,7 @@ define KernelPackage/fs-exfat
TITLE:=ExFAT Kernel driver
FILES:=$(PKG_BUILD_DIR)/exfat.ko
AUTOLOAD:=$(call AutoLoad,30,exfat,1)
DEPENDS:=+kmod-nls-base @BUILD_PATENTED
DEPENDS:=+kmod-nls-base
endef
define KernelPackage/fs-exfat/description

View file

@ -0,0 +1,186 @@
#
# Copyright (C) 2018 Jeffery To
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
ifeq ($(origin GO_INCLUDE_DIR),undefined)
GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
endif
include $(GO_INCLUDE_DIR)/golang-values.mk
# $(1) valid GOOS_GOARCH combinations
# $(2) go version id
define GoCompiler/Default/CheckHost
$(if $(filter $(GO_HOST_OS_ARCH),$(1)),,$(error go-$(2) cannot be installed on $(GO_HOST_OS)/$(GO_HOST_ARCH)))
endef
# $(1) source go root
# $(2) destination prefix
# $(3) go version id
# $(4) additional environment variables (optional)
define GoCompiler/Default/Make
( \
cd $(1)/src ; \
$(if $(2),GOROOT_FINAL=$(2)/lib/go-$(3)) \
$(4) \
$(BASH) make.bash --no-banner ; \
)
endef
# $(1) destination prefix
# $(2) go version id
define GoCompiler/Default/Install/make-dirs
$(INSTALL_DIR) $(1)/lib/go-$(2)
$(INSTALL_DIR) $(1)/share/go-$(2)
endef
# $(1) source go root
# $(2) destination prefix
# $(3) go version id
# $(4) file/directory name
define GoCompiler/Default/Install/install-share-data
$(CP) $(1)/$(4) $(2)/share/go-$(3)/
$(LN) ../../share/go-$(3)/$(4) $(2)/lib/go-$(3)/
endef
# $(1) source go root
# $(2) destination prefix
# $(3) go version id
# $(4) GOOS_GOARCH
define GoCompiler/Default/Install/Bin
$(call GoCompiler/Default/Install/make-dirs,$(2),$(3))
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),api)
$(INSTALL_DATA) -p $(1)/VERSION $(2)/lib/go-$(3)/
for file in AUTHORS CONTRIBUTING.md CONTRIBUTORS LICENSE PATENTS README README.md; do \
if [ -f $(1)/$$$$file ]; then \
$(INSTALL_DATA) -p $(1)/$$$$file $(2)/share/go-$(3)/ ; \
fi ; \
done
$(INSTALL_DIR) $(2)/lib/go-$(3)/bin
ifeq ($(4),$(GO_HOST_OS_ARCH))
$(INSTALL_BIN) -p $(1)/bin/* $(2)/lib/go-$(3)/bin/
else
$(INSTALL_BIN) -p $(1)/bin/$(4)/* $(2)/lib/go-$(3)/bin/
endif
$(INSTALL_DIR) $(2)/lib/go-$(3)/pkg
$(CP) $(1)/pkg/$(4) $(2)/lib/go-$(3)/pkg/
$(INSTALL_DIR) $(2)/lib/go-$(3)/pkg/tool/$(4)
$(INSTALL_BIN) -p $(1)/pkg/tool/$(4)/* $(2)/lib/go-$(3)/pkg/tool/$(4)/
endef
# $(1) destination prefix
# $(2) go version id
define GoCompiler/Default/Install/BinLinks
$(INSTALL_DIR) $(1)/bin
$(LN) ../lib/go-$(2)/bin/go $(1)/bin/go
$(LN) ../lib/go-$(2)/bin/gofmt $(1)/bin/gofmt
endef
# $(1) source go root
# $(2) destination prefix
# $(3) go version id
define GoCompiler/Default/Install/Doc
$(call GoCompiler/Default/Install/make-dirs,$(2),$(3))
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),doc)
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),favicon.ico)
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),robots.txt)
endef
# $(1) source go root
# $(2) destination prefix
# $(3) go version id
define GoCompiler/Default/Install/Src
$(call GoCompiler/Default/Install/make-dirs,$(2),$(3))
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),lib)
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),misc)
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),src)
$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),test)
$(FIND) \
$(2)/share/go-$(3)/src/ \
\! -type d -a \( -name '*.bat' -o -name '*.rc' \) \
-delete
if [ -d $(1)/pkg/include ]; then \
$(INSTALL_DIR) $(2)/lib/go-$(3)/pkg ; \
$(INSTALL_DIR) $(2)/share/go-$(3)/pkg ; \
$(CP) $(1)/pkg/include $(2)/share/go-$(3)/pkg/ ; \
$(LN) ../../../share/go-$(3)/pkg/include $(2)/lib/go-$(3)/pkg/ ; \
fi
endef
# $(1) destination prefix
# $(2) go version id
define GoCompiler/Default/Uninstall
rm -rf $(1)/lib/go-$(2)
rm -rf $(1)/share/go-$(2)
endef
# $(1) destination prefix
define GoCompiler/Default/Uninstall/BinLinks
rm -f $(1)/bin/go
rm -f $(1)/bin/gofmt
endef
# $(1) profile name
# $(2) source go root
# $(3) destination prefix
# $(4) go version id
# $(5) GOOS_GOARCH
define GoCompiler/AddProfile
# $$(1) valid GOOS_GOARCH combinations
define GoCompiler/$(1)/CheckHost
$$(call GoCompiler/Default/CheckHost,$$(1),$(4))
endef
# $$(1) additional environment variables (optional)
define GoCompiler/$(1)/Make
$$(call GoCompiler/Default/Make,$(2),$(3),$(4),$$(1))
endef
# $$(1) override install prefix (optional)
define GoCompiler/$(1)/Install/Bin
$$(call GoCompiler/Default/Install/Bin,$(2),$$(or $$(1),$(3)),$(4),$(5))
endef
# $$(1) override install prefix (optional)
define GoCompiler/$(1)/Install/BinLinks
$$(call GoCompiler/Default/Install/BinLinks,$$(or $$(1),$(3)),$(4))
endef
# $$(1) override install prefix (optional)
define GoCompiler/$(1)/Install/Doc
$$(call GoCompiler/Default/Install/Doc,$(2),$$(or $$(1),$(3)),$(4))
endef
# $$(1) override install prefix (optional)
define GoCompiler/$(1)/Install/Src
$$(call GoCompiler/Default/Install/Src,$(2),$$(or $$(1),$(3)),$(4))
endef
# $$(1) override install prefix (optional)
define GoCompiler/$(1)/Uninstall
$$(call GoCompiler/Default/Uninstall,$$(or $$(1),$(3)),$(4))
endef
# $$(1) override install prefix (optional)
define GoCompiler/$(1)/Uninstall/BinLinks
$$(call GoCompiler/Default/Uninstall/BinLinks,$$(or $$(1),$(3)))
endef
endef

View file

@ -0,0 +1,305 @@
#
# Copyright (C) 2018 Jeffery To
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
ifeq ($(origin GO_INCLUDE_DIR),undefined)
GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
endif
include $(GO_INCLUDE_DIR)/golang-values.mk
# Variables (all optional, except GO_PKG) to be set in package
# Makefiles:
#
# GO_PKG (required) - name of Go package
#
# Go name of the package.
#
# e.g. GO_PKG:=golang.org/x/text
#
#
# GO_PKG_INSTALL_EXTRA - list of regular expressions, default empty
#
# Additional files/directories to install. By default, only these
# files are installed:
#
# * Files with one of these extensions:
# .go, .c, .cc, .h, .hh, .proto, .s
#
# * Files in any 'testdata' directory
#
# e.g. GO_PKG_INSTALL_EXTRA:=example.toml marshal_test.toml
#
#
# GO_PKG_INSTALL_ALL - boolean (0 or 1), default false
#
# If true, install all files regardless of extension or directory.
#
# e.g. GO_PKG_INSTALL_ALL:=1
#
#
# GO_PKG_SOURCE_ONLY - boolean (0 or 1), default false
#
# If true, 'go install' will not be called. If the package does not
# (or should not) build any binaries, then specifying this option will
# save build time.
#
# e.g. GO_PKG_SOURCE_ONLY:=1
#
#
# GO_PKG_BUILD_PKG - list of build targets, default GO_PKG/...
#
# Build targets for compiling this Go package, i.e. arguments passed
# to 'go install'
#
# e.g. GO_PKG_BUILD_PKG:=github.com/debian/ratt/cmd/...
#
#
# GO_PKG_EXCLUDES - list of regular expressions, default empty
#
# Patterns to exclude from the build targets expanded from
# GO_PKG_BUILD_PKG.
#
# e.g. GO_PKG_EXCLUDES:=examples/
#
#
# GO_PKG_GO_GENERATE - boolean (0 or 1), default false
#
# If true, 'go generate' will be called on all build targets (as
# determined by GO_PKG_BUILD_PKG and GO_PKG_EXCLUDES). This is usually
# not necessary.
#
# e.g. GO_PKG_GO_GENERATE:=1
# Credit for this package build process (GoPackage/Build/Configure and
# GoPackage/Build/Compile) belong to Debian's dh-golang completely.
# https://anonscm.debian.org/cgit/pkg-go/packages/dh-golang.git
# for building packages, not user code
GO_PKG_PATH:=/usr/share/gocode
GO_PKG_BUILD_PKG?=$(GO_PKG)/...
GO_PKG_WORK_DIR_NAME:=.go_work
GO_PKG_WORK_DIR:=$(PKG_BUILD_DIR)/$(GO_PKG_WORK_DIR_NAME)
GO_PKG_BUILD_DIR:=$(GO_PKG_WORK_DIR)/build
GO_PKG_CACHE_DIR:=$(GO_PKG_WORK_DIR)/cache
GO_PKG_TMP_DIR:=$(GO_PKG_WORK_DIR)/tmp
GO_PKG_BUILD_BIN_DIR:=$(GO_PKG_BUILD_DIR)/bin$(if \
$(GO_HOST_TARGET_DIFFERENT),/$(GO_OS)_$(GO_ARCH))
GO_PKG_BUILD_DEPENDS_SRC:=$(STAGING_DIR)$(GO_PKG_PATH)/src
# sstrip causes corrupted section header size
ifneq ($(CONFIG_USE_SSTRIP),)
ifneq ($(CONFIG_DEBUG),)
GO_PKG_STRIP_ARGS:=--strip-unneeded --remove-section=.comment --remove-section=.note
else
GO_PKG_STRIP_ARGS:=--strip-all
endif
STRIP:=$(TARGET_CROSS)strip $(GO_PKG_STRIP_ARGS)
RSTRIP= \
export CROSS="$(TARGET_CROSS)" \
$(if $(PKG_BUILD_ID),KEEP_BUILD_ID=1) \
$(if $(CONFIG_KERNEL_KALLSYMS),NO_RENAME=1) \
$(if $(CONFIG_KERNEL_PROFILING),KEEP_SYMBOLS=1); \
NM="$(TARGET_CROSS)nm" \
STRIP="$(STRIP)" \
STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \
PATCHELF="$(STAGING_DIR_HOST)/bin/patchelf" \
$(SCRIPT_DIR)/rstrip.sh
endif
define GoPackage/GoSubMenu
SUBMENU:=Go
SECTION:=lang
CATEGORY:=Languages
endef
define GoPackage/Environment
GOOS=$(GO_OS) \
GOARCH=$(GO_ARCH) \
GO386=$(GO_386) \
GOARM=$(GO_ARM) \
GOMIPS=$(GO_MIPS) \
CGO_ENABLED=1 \
CGO_CFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CFLAGS))" \
CGO_CPPFLAGS="$(TARGET_CPPFLAGS)" \
CGO_CXXFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CXXFLAGS))"
endef
# false if directory does not exist
GoPackage/is_dir_not_empty=$$$$($(FIND) $(1) -maxdepth 0 -type d \! -empty 2>/dev/null)
GoPackage/has_binaries=$(call GoPackage/is_dir_not_empty,$(GO_PKG_BUILD_BIN_DIR))
define GoPackage/Build/Configure
( \
cd $(PKG_BUILD_DIR) ; \
mkdir -p $(GO_PKG_BUILD_DIR)/bin $(GO_PKG_BUILD_DIR)/src \
$(GO_PKG_CACHE_DIR) $(GO_PKG_TMP_DIR) ; \
\
files=$$$$($(FIND) ./ \
-type d -a \( -path './.git' -o -path './$(GO_PKG_WORK_DIR_NAME)' \) -prune -o \
\! -type d -print | \
sed 's|^\./||') ; \
\
if [ "$(GO_PKG_INSTALL_ALL)" != 1 ]; then \
code=$$$$(echo "$$$$files" | grep '\.\(c\|cc\|go\|h\|hh\|proto\|s\)$$$$') ; \
testdata=$$$$(echo "$$$$files" | grep '\(^\|/\)testdata/') ; \
\
for pattern in $(GO_PKG_INSTALL_EXTRA); do \
extra=$$$$(echo "$$$$extra"; echo "$$$$files" | grep "$$$$pattern") ; \
done ; \
\
files=$$$$(echo "$$$$code"; echo "$$$$testdata"; echo "$$$$extra") ; \
files=$$$$(echo "$$$$files" | grep -v '^[[:space:]]*$$$$' | sort -u) ; \
fi ; \
\
echo "Copying files from $(PKG_BUILD_DIR) into $(GO_PKG_BUILD_DIR)/src/$(GO_PKG)" ; \
for file in $$$$files; do \
echo $$$$file ; \
dest=$(GO_PKG_BUILD_DIR)/src/$(GO_PKG)/$$$$file ; \
mkdir -p $$$$(dirname $$$$dest) ; \
$(CP) $$$$file $$$$dest ; \
done ; \
\
link_contents() { \
local src=$$$$1 ; \
local dest=$$$$2 ; \
local dirs dir base ; \
\
if [ -n "$$$$($(FIND) $$$$src -mindepth 1 -maxdepth 1 -name '*.go' \! -type d)" ]; then \
echo "$$$$src is already a Go library" ; \
return 1 ; \
fi ; \
\
dirs=$$$$($(FIND) $$$$src -mindepth 1 -maxdepth 1 -type d) ; \
for dir in $$$$dirs; do \
base=$$$$(basename $$$$dir) ; \
if [ -d $$$$dest/$$$$base ]; then \
case $$$$dir in \
*$(GO_PKG_PATH)/src/$(GO_PKG)) \
echo "$(GO_PKG) is already installed. Please check for circular dependencies." ;; \
*) \
link_contents $$$$src/$$$$base $$$$dest/$$$$base ;; \
esac ; \
else \
echo "...$$$${src#$(GO_PKG_BUILD_DEPENDS_SRC)}/$$$$base" ; \
$(LN) $$$$src/$$$$base $$$$dest/$$$$base ; \
fi ; \
done ; \
} ; \
\
if [ "$(GO_PKG_SOURCE_ONLY)" != 1 ]; then \
if [ -d $(GO_PKG_BUILD_DEPENDS_SRC) ]; then \
echo "Symlinking directories from $(GO_PKG_BUILD_DEPENDS_SRC) into $(GO_PKG_BUILD_DIR)/src" ; \
link_contents $(GO_PKG_BUILD_DEPENDS_SRC) $(GO_PKG_BUILD_DIR)/src ; \
else \
echo "$(GO_PKG_BUILD_DEPENDS_SRC) does not exist, skipping symlinks" ; \
fi ; \
else \
echo "Not building binaries, skipping symlinks" ; \
fi ; \
)
endef
# $(1) additional arguments for go command line (optional)
define GoPackage/Build/Compile
( \
cd $(GO_PKG_BUILD_DIR) ; \
export GOPATH=$(GO_PKG_BUILD_DIR) \
GOCACHE=$(GO_PKG_CACHE_DIR) \
GOTMPDIR=$(GO_PKG_TMP_DIR) \
GOROOT_FINAL=$(GO_TARGET_ROOT) \
CC=$(TARGET_CC) \
CXX=$(TARGET_CXX) \
$(call GoPackage/Environment) ; \
\
targets=$$$$(go list $(GO_PKG_BUILD_PKG)) ; \
for pattern in $(GO_PKG_EXCLUDES); do \
targets=$$$$(echo "$$$$targets" | grep -v "$$$$pattern") ; \
done ; \
\
if [ "$(GO_PKG_GO_GENERATE)" = 1 ]; then \
go generate -v $(1) $$$$targets ; \
fi ; \
\
if [ "$(GO_PKG_SOURCE_ONLY)" != 1 ]; then \
case $(GO_ARCH) in \
arm) installsuffix="-installsuffix v$(GO_ARM)" ;; \
mips|mipsle) installsuffix="-installsuffix $(GO_MIPS)" ;; \
esac ; \
trimpath="all=-trimpath=$(GO_PKG_BUILD_DIR)" ; \
ldflags="all=-linkmode external -extldflags '$(TARGET_LDFLAGS)'" ; \
go install \
$$$$installsuffix \
-gcflags "$$$$trimpath" \
-asmflags "$$$$trimpath" \
-ldflags "$$$$ldflags" \
-v \
$(1) \
$$$$targets ; \
retval=$$$$? ; \
\
if [ "$$$$retval" -eq 0 ] && [ -z "$(call GoPackage/has_binaries)" ]; then \
echo "No binaries were generated, consider adding GO_PKG_SOURCE_ONLY:=1 to Makefile" ; \
fi ; \
fi ; \
exit $$$$retval ; \
)
endef
define GoPackage/Build/InstallDev
$(call GoPackage/Package/Install/Src,$(1))
endef
define GoPackage/Package/Install/Bin
if [ -n "$(call GoPackage/has_binaries)" ]; then \
$(INSTALL_DIR) $(1)/usr/bin ; \
$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/* $(1)/usr/bin/ ; \
fi
endef
define GoPackage/Package/Install/Src
dir=$$$$(dirname $(GO_PKG)) ; \
$(INSTALL_DIR) $(1)$(GO_PKG_PATH)/src/$$$$dir ; \
$(CP) $(GO_PKG_BUILD_DIR)/src/$(GO_PKG) $(1)$(GO_PKG_PATH)/src/$$$$dir/
endef
define GoPackage/Package/Install
$(call GoPackage/Package/Install/Bin,$(1))
$(call GoPackage/Package/Install/Src,$(1))
endef
ifneq ($(GO_PKG),)
Build/Configure=$(call GoPackage/Build/Configure)
Build/Compile=$(call GoPackage/Build/Compile)
Build/InstallDev=$(call GoPackage/Build/InstallDev,$(1))
endif
define GoPackage
ifndef Package/$(1)/install
Package/$(1)/install=$$(call GoPackage/Package/Install,$$(1))
endif
endef
define GoBinPackage
ifndef Package/$(1)/install
Package/$(1)/install=$$(call GoPackage/Package/Install/Bin,$$(1))
endif
endef
define GoSrcPackage
ifndef Package/$(1)/install
Package/$(1)/install=$$(call GoPackage/Package/Install/Src,$$(1))
endif
endef

View file

@ -0,0 +1,102 @@
#
# Copyright (C) 2018 Jeffery To
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
ifeq ($(origin GO_INCLUDE_DIR),undefined)
GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
endif
include $(GO_INCLUDE_DIR)/golang-version.mk
unexport \
GOARCH GOBIN GOCACHE GODEBUG GOHOSTARCH GOOS GOPATH GORACE GOROOT GOTMPDIR GCCGO \
CGO_ENABLED \
CGO_CFLAGS CGO_CFLAGS_ALLOW CGO_CFLAGS_DISALLOW \
CGO_CPPFLAGS CGO_CPPFLAGS_ALLOW CGO_CPPFLAGS_DISALLOW \
CGO_CXXFLAGS CGO_CXXFLAGS_ALLOW CGO_CXXFLAGS_DISALLOW \
CGO_FFLAGS CGO_FFLAGS_ALLOW CGO_FFLAGS_DISALLOW \
CGO_LDFLAGS CGO_LDFLAGS_ALLOW CGO_LDFLAGS_DISALLOW \
GOARM GO386 GOMIPS \
GOROOT_FINAL GO_EXTLINK_ENABLED GIT_ALLOW_PROTOCOL \
CC_FOR_TARGET CXX_FOR_TARGET GO_DISTFLAGS GO_GCFLAGS GO_LDFLAGS GOBUILDTIMELOGFILE GOROOT_BOOTSTRAP \
BOOT_GO_GCFLAGS GOEXPERIMENT GOBOOTSTRAP_TOOLEXEC
# there are more magic environment variables to track down, but ain't nobody got time for that
go_arch=$(subst \
aarch64,arm64,$(subst \
i386,386,$(subst \
mipsel,mipsle,$(subst \
mips64el,mips64le,$(subst \
powerpc64,ppc64,$(subst \
x86_64,amd64,$(1)))))))
GO_OS:=linux
GO_ARCH:=$(call go_arch,$(ARCH))
GO_OS_ARCH:=$(GO_OS)_$(GO_ARCH)
GO_HOST_OS:=$(call tolower,$(HOST_OS))
GO_HOST_ARCH:=$(call go_arch,$(subst \
armv6l,arm,$(subst \
armv7l,arm,$(subst \
i486,i386,$(subst \
i586,i386,$(subst \
i686,i386,$(HOST_ARCH)))))))
GO_HOST_OS_ARCH:=$(GO_HOST_OS)_$(GO_HOST_ARCH)
GO_HOST_TARGET_SAME:=$(if $(and $(findstring $(GO_OS_ARCH),$(GO_HOST_OS_ARCH)),$(findstring $(GO_HOST_OS_ARCH),$(GO_OS_ARCH))),1)
GO_HOST_TARGET_DIFFERENT:=$(if $(GO_HOST_TARGET_SAME),,1)
# ensure binaries can run on older CPUs
GO_386:=387
ifeq ($(GO_ARCH),arm)
GO_TARGET_FPU:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
# FPU names from https://gcc.gnu.org/onlinedocs/gcc-8.3.0/gcc/ARM-Options.html#index-mfpu-1
# see also https://github.com/gcc-mirror/gcc/blob/gcc-8_3_0-release/gcc/config/arm/arm-cpus.in
#
# Assumptions:
#
# * -d16 variants (16 instead of 32 double-precision registers) acceptable
# Go doesn't appear to check the HWCAP_VFPv3D16 flag in
# https://github.com/golang/go/blob/release-branch.go1.13/src/runtime/os_linux_arm.go
#
# * Double-precision required
# Based on no evidence(!)
# Excludes vfpv3xd, vfpv3xd-fp16, fpv4-sp-d16, fpv5-sp-d16
GO_ARM_7_FPUS:= \
vfpv3 vfpv3-fp16 vfpv3-d16 vfpv3-d16-fp16 neon neon-vfpv3 neon-fp16 \
vfpv4 vfpv4-d16 neon-vfpv4 \
fpv5-d16 fp-armv8 neon-fp-armv8 crypto-neon-fp-armv8
GO_ARM_6_FPUS:=vfp vfpv2
ifneq ($(filter $(GO_TARGET_FPU),$(GO_ARM_7_FPUS)),)
GO_ARM:=7
else ifneq ($(filter $(GO_TARGET_FPU),$(GO_ARM_6_FPUS)),)
GO_ARM:=6
else
GO_ARM:=5
endif
endif
GO_MIPS:=$(if $(filter $(GO_ARCH),mips mipsle),$(if $(CONFIG_HAS_FPU),hardfloat,softfloat),)
# -fno-plt: causes "unexpected GOT reloc for non-dynamic symbol" errors
# -mips32r2: conflicts with -march=mips32 set by go
GO_CFLAGS_TO_REMOVE:=$(if \
$(filter $(GO_ARCH),386),-fno-plt,$(if \
$(filter $(GO_ARCH),mips mipsle),-mips32r2,))
# mips64 / mips64el doesn't have softfloat support yet
# https://github.com/golang/go/issues/14635
GO_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||mips||mipsel||powerpc64||x86_64)
GO_TARGET_PREFIX:=/usr
GO_TARGET_VERSION_ID:=$(GO_VERSION_MAJOR_MINOR)
GO_TARGET_ROOT:=$(GO_TARGET_PREFIX)/lib/go-$(GO_TARGET_VERSION_ID)

View file

@ -0,0 +1,14 @@
#
# Copyright (C) 2018 Jeffery To
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
ifeq ($(origin GO_INCLUDE_DIR),undefined)
GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
endif
GO_VERSION_MAJOR_MINOR:=1.10
GO_VERSION_PATCH:=8

272
lang/golang/golang/Makefile Normal file
View file

@ -0,0 +1,272 @@
#
# Copyright (C) 2018 Jeffery To
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
include ../golang-version.mk
PKG_NAME:=golang
PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
PKG_RELEASE:=1
GO_SOURCE_URLS:=https://dl.google.com/go/ \
https://mirrors.ustc.edu.cn/golang/ \
https://mirrors.nju.edu.cn/golang/
PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
PKG_HASH:=6faf74046b5e24c2c0b46e78571cca4d65e1b89819da1089e53ea57539c63491
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
PKG_BUILD_DEPENDS:=golang/host
PKG_BUILD_DIR:=$(BUILD_DIR)/go-$(PKG_VERSION)
PKG_BUILD_PARALLEL:=1
PKG_USE_MIPS16:=0
PKG_GO_WORK_DIR:=$(PKG_BUILD_DIR)/.go_work
PKG_GO_HOST_CACHE_DIR:=$(PKG_GO_WORK_DIR)/host_cache
PKG_GO_TARGET_CACHE_DIR:=$(PKG_GO_WORK_DIR)/target_cache
PKG_GO_TMP_DIR:=$(PKG_GO_WORK_DIR)/tmp
HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/go-$(PKG_VERSION)
HOST_BUILD_PARALLEL:=1
HOST_GO_PREFIX:=$(STAGING_DIR_HOSTPKG)
HOST_GO_VERSION_ID:=cross
HOST_GO_ROOT:=$(HOST_GO_PREFIX)/lib/go-$(HOST_GO_VERSION_ID)
HOST_GO_VALID_OS_ARCH:= \
android_arm \
darwin_386 darwin_amd64 darwin_arm darwin_arm64 \
dragonfly_amd64 \
freebsd_386 freebsd_amd64 freebsd_arm \
linux_386 linux_amd64 linux_arm linux_arm64 \
netbsd_386 netbsd_amd64 netbsd_arm \
openbsd_386 openbsd_amd64 openbsd_arm \
plan9_386 plan9_amd64 \
solaris_amd64 \
windows_386 windows_amd64 \
\
linux_ppc64 linux_ppc64le linux_mips linux_mipsle linux_mips64 linux_mips64le
BOOTSTRAP_SOURCE:=go1.4-bootstrap-20171003.tar.gz
BOOTSTRAP_SOURCE_URL:=$(GO_SOURCE_URLS)
BOOTSTRAP_HASH:=f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52
BOOTSTRAP_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap
BOOTSTRAP_GO_VALID_OS_ARCH:= \
darwin_386 darwin_amd64 \
dragonfly_386 dragonfly_amd64 \
freebsd_386 freebsd_amd64 freebsd_arm \
linux_386 linux_amd64 linux_arm \
netbsd_386 netbsd_amd64 netbsd_arm \
openbsd_386 openbsd_amd64 \
plan9_386 plan9_amd64 \
solaris_amd64 \
windows_386 windows_amd64
include $(INCLUDE_DIR)/host-build.mk
include $(INCLUDE_DIR)/package.mk
include ../golang-compiler.mk
include ../golang-package.mk
PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
HOST_UNPACK:=$(HOST_TAR) -C $(HOST_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(PKG_SOURCE)
BOOTSTRAP_UNPACK:=$(HOST_TAR) -C $(BOOTSTRAP_BUILD_DIR) --strip-components=1 -xzf $(DL_DIR)/$(BOOTSTRAP_SOURCE)
# don't strip ELF executables in test data (and go itself)
RSTRIP:=:
STRIP:=:
define Package/golang/Default
$(call GoPackage/GoSubMenu)
TITLE:=Go programming language
URL:=https://golang.org/
DEPENDS:=$(GO_ARCH_DEPENDS)
endef
define Package/golang/Default/description
The Go programming language is an open source project to make
programmers more productive.
Go is expressive, concise, clean, and efficient. Its concurrency
mechanisms make it easy to write programs that get the most out of
multicore and networked machines, while its novel type system enables
flexible and modular program construction. Go compiles quickly to
machine code yet has the convenience of garbage collection and the power
of run-time reflection. It's a fast, statically typed, compiled language
that feels like a dynamically typed, interpreted language.
endef
# go tool requires source present:
# https://github.com/golang/go/issues/4635
define Package/golang
$(call Package/golang/Default)
TITLE+= (compiler)
DEPENDS+= +golang-src
endef
define Package/golang/description
$(call Package/golang/Default/description)
This package provides an assembler, compiler, linker, and compiled
libraries for the Go programming language.
endef
define Package/golang-doc
$(call Package/golang/Default)
TITLE+= (documentation)
endef
define Package/golang-doc/description
$(call Package/golang/Default/description)
This package provides the documentation for the Go programming language.
endef
define Package/golang-src
$(call Package/golang/Default)
TITLE+= (source files)
endef
define Package/golang-src/description
$(call Package/golang/Default/description)
This package provides the Go programming language source files needed
for cross-compilation.
endef
define Download/golang-bootstrap
FILE:=$(BOOTSTRAP_SOURCE)
URL:=$(BOOTSTRAP_SOURCE_URL)
HASH:=$(BOOTSTRAP_HASH)
endef
$(eval $(call Download,golang-bootstrap))
$(eval $(call GoCompiler/AddProfile,Bootstrap,$(BOOTSTRAP_BUILD_DIR),,bootstrap,$(GO_HOST_OS_ARCH)))
$(eval $(call GoCompiler/AddProfile,Host,$(HOST_BUILD_DIR),$(HOST_GO_PREFIX),$(HOST_GO_VERSION_ID),$(GO_HOST_OS_ARCH)))
$(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(GO_TARGET_PREFIX),$(GO_TARGET_VERSION_ID),$(GO_OS_ARCH)))
define Host/Prepare
$(call Host/Prepare/Default)
mkdir -p $(BOOTSTRAP_BUILD_DIR)
$(BOOTSTRAP_UNPACK)
endef
define Host/Compile
$(call GoCompiler/Bootstrap/CheckHost,$(BOOTSTRAP_GO_VALID_OS_ARCH))
$(call GoCompiler/Host/CheckHost,$(HOST_GO_VALID_OS_ARCH))
$(call GoCompiler/Bootstrap/Make, \
CC=$(HOSTCC_NOCACHE) \
CXX=$(HOSTCXX_NOCACHE) \
)
$(call GoCompiler/Host/Make, \
GOROOT_BOOTSTRAP=$(BOOTSTRAP_BUILD_DIR) \
CC=$(HOSTCC_NOCACHE) \
CXX=$(HOSTCXX_NOCACHE) \
)
endef
# if host and target os/arch are the same,
# when go compiles a program, it will use the host std lib
# so remove it now and force go to rebuild std for target later
define Host/Install
$(call GoCompiler/Host/Install/Bin,)
$(call GoCompiler/Host/Install/Src,)
$(call GoCompiler/Host/Install/BinLinks,)
rm -rf $(HOST_GO_ROOT)/pkg/$(GO_HOST_OS_ARCH)
$(INSTALL_DIR) $(HOST_GO_ROOT)/openwrt
$(INSTALL_BIN) ./files/go-gcc-helper $(HOST_GO_ROOT)/openwrt/
$(LN) go-gcc-helper $(HOST_GO_ROOT)/openwrt/gcc
$(LN) go-gcc-helper $(HOST_GO_ROOT)/openwrt/g++
endef
define Host/Uninstall
rm -rf $(HOST_GO_ROOT)/openwrt
$(call GoCompiler/Host/Uninstall/BinLinks,)
$(call GoCompiler/Host/Uninstall,)
endef
define Build/Compile
mkdir -p \
$(PKG_GO_HOST_CACHE_DIR) \
$(PKG_GO_TARGET_CACHE_DIR) \
$(PKG_GO_TMP_DIR)
@echo "Building target Go first stage"
$(call GoCompiler/Package/Make, \
GOROOT_BOOTSTRAP=$(HOST_GO_ROOT) \
GOCACHE=$(PKG_GO_HOST_CACHE_DIR) \
GOTMPDIR=$(PKG_GO_TMP_DIR) \
GO_GCC_HELPER_CC="$(HOSTCC)" \
GO_GCC_HELPER_CXX="$(HOSTCXX)" \
GO_GCC_HELPER_PATH=$$$$PATH \
CC=gcc \
CXX=g++ \
PKG_CONFIG=pkg-config \
PATH=$(HOST_GO_ROOT)/openwrt:$$$$PATH \
)
@echo "Building target Go second stage"
( \
cd $(PKG_BUILD_DIR)/bin ; \
$(CP) go go-host ; \
GOROOT_FINAL=$(GO_TARGET_ROOT) \
GOCACHE=$(PKG_GO_TARGET_CACHE_DIR) \
GOTMPDIR=$(PKG_GO_TMP_DIR) \
GO_GCC_HELPER_CC="$(TARGET_CC)" \
GO_GCC_HELPER_CXX="$(TARGET_CXX)" \
GO_GCC_HELPER_PATH=$$$$PATH \
CC=gcc \
CXX=g++ \
PKG_CONFIG=pkg-config \
PATH=$(HOST_GO_ROOT)/openwrt:$$$$PATH \
$(call GoPackage/Environment) \
./go-host install -a -v std cmd ; \
retval=$$$$? ; \
rm -f go-host ; \
exit $$$$retval ; \
)
endef
define Package/golang/install
$(call GoCompiler/Package/Install/Bin,$(1)$(GO_TARGET_PREFIX))
$(call GoCompiler/Package/Install/BinLinks,$(1)$(GO_TARGET_PREFIX))
endef
define Package/golang-doc/install
$(call GoCompiler/Package/Install/Doc,$(1)$(GO_TARGET_PREFIX))
endef
define Package/golang-src/install
$(call GoCompiler/Package/Install/Src,$(1)$(GO_TARGET_PREFIX))
endef
# src/debug contains ELF executables as test data
# and they reference these libraries
# we need to call this in Package/$(1)/extra_provides
# to pass CheckDependencies in include/package-ipkg.mk
define Package/golang-src/extra_provides
echo 'libc.so.6'
endef
$(eval $(call HostBuild))
$(eval $(call BuildPackage,golang))
$(eval $(call BuildPackage,golang-doc))
$(eval $(call BuildPackage,golang-src))

View file

@ -0,0 +1,23 @@
#!/bin/sh
me=go-gcc-helper
name=$(basename $0)
case $name in
gcc)
cmd=$GO_GCC_HELPER_CC
;;
g++)
cmd=$GO_GCC_HELPER_CXX
;;
*)
echo "$me: unknown command \"$name\""
exit 1
;;
esac
export PATH="$GO_GCC_HELPER_PATH"
echo "$me: running $cmd $@"
$cmd "$@"

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=jamvm
PKG_VERSION:=2.0.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0+
PKG_MAINTAINER:=Dana H. Myers <k6jq@comcast.net>
@ -30,7 +30,8 @@ define Package/jamvm
CATEGORY:=Languages
TITLE:=A compact Java Virtual Machine
URL:=http://sourceforge.net/projects/jamvm
DEPENDS:=+zlib +libpthread +librt +classpath @!avr32
DEPENDS:=+zlib +libpthread +librt +classpath \
@(i386||i686||x86_64||arm||armeb||mips||mipsel||powerpc||powerpc64) +CONFIG_powerpc64:libffi
endef
define Package/jamvm/description

View file

@ -0,0 +1,86 @@
From 7152ded5219453c9ff1cd062cecbeaf4d77e4cab Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 26 May 2016 15:05:48 +0200
Subject: [PATCH] Use <fenv.h> instead of <fpu_control.h>
musl libc (http://musl-libc.org lack the non-standard <fpu_control.h>
header, which is used in src/os/linux/{i386,x86_64}/init.c files to
setup the floating point precision. This patch makes it use the
standard C <fenv.h> header instead.
Original patch at Felix Janda at
https://sourceforge.net/p/jamvm/patches/6/.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
src/os/linux/i386/init.c | 12 ++++++------
src/os/linux/x86_64/init.c | 16 ++++++----------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/os/linux/i386/init.c b/src/os/linux/i386/init.c
index d9c6648..94a733e 100644
--- a/src/os/linux/i386/init.c
+++ b/src/os/linux/i386/init.c
@@ -19,18 +19,18 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <fpu_control.h>
+#include <fenv.h>
/* Change floating point precision to double (64-bit) from
* the extended (80-bit) Linux default. */
void setDoublePrecision() {
- fpu_control_t cw;
+ fenv_t fenv;
- _FPU_GETCW(cw);
- cw &= ~_FPU_EXTENDED;
- cw |= _FPU_DOUBLE;
- _FPU_SETCW(cw);
+ fegetenv(&fenv);
+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */
+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */
+ fesetenv(&fenv);
}
void initialisePlatform() {
diff --git a/src/os/linux/x86_64/init.c b/src/os/linux/x86_64/init.c
index 9d55229..a76a923 100644
--- a/src/os/linux/x86_64/init.c
+++ b/src/os/linux/x86_64/init.c
@@ -19,9 +19,7 @@
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#ifdef __linux__
-#include <fpu_control.h>
-#endif
+#include <fenv.h>
/* Change the x87 FPU precision to double (64-bit) from the extended
(80-bit) Linux default. Note, unlike on i386, my testcases pass
@@ -30,14 +28,12 @@
*/
void setDoublePrecision() {
-#ifdef __linux__
- fpu_control_t cw;
+ fenv_t fenv;
- _FPU_GETCW(cw);
- cw &= ~_FPU_EXTENDED;
- cw |= _FPU_DOUBLE;
- _FPU_SETCW(cw);
-#endif
+ fegetenv(&fenv);
+ fenv.__control_word &= ~0x300; /*_FPU_EXTENDED */
+ fenv.__control_word |= 0x200; /*_FPU_DOUBLE */
+ fesetenv(&fenv);
}
void initialisePlatform() {
--
2.7.4

View file

@ -17,7 +17,7 @@ PKG_SOURCE_URL=https://github.com/daurnimator/ldbus
PKG_MAINTAINER:=Enrico Mioso <mrkiko.rs@gmail.com>
PKG_LICENSE:=MIT
PKG_BUILD_DEPENDS:=luarocks/host
PKG_BUILD_DEPENDS:=luarocks/host zip/host
include $(INCLUDE_DIR)/package.mk

View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luajit
PKG_VERSION:=2017-01-17-71ff7ef
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_MAINTAINER:=Morteza Milani <milani@pichak.co>
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=COPYRIGHT
@ -59,7 +59,7 @@ endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include/luajit-2.1
$(CP) $(PKG_INSTALL_DIR)/usr/include/luajit-2.1/*.h $(1)/usr/include/luajit-2.1
$(CP) $(PKG_INSTALL_DIR)/usr/include/luajit-2.1/*.{h,hpp} $(1)/usr/include/luajit-2.1
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so*} $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
@ -69,7 +69,7 @@ endef
define Package/luajit/install
$(INSTALL_DIR) $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/luajit-2.1.0-beta2 $(1)/usr/bin/$(PKG_NAME)
endef

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luasec
PKG_VERSION:=0.6
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/brunoos/luasec/archive/
@ -40,9 +40,13 @@ endef
define Build/Configure
endef
TARGET_CFLAGS += $(FPIC)
TARGET_LDFLAGS += $(FPIC)
MAKE_FLAGS += \
INCDIR="$(TARGET_CPPFLAGS) -I." \
LIBDIR="$(TARGET_LDFLAGS) -L./luasocket" \
LD="$(TARGET_CC)" \
INC_PATH="" \
LIB_PATH="" \
LUACPATH="$(PKG_INSTALL_DIR)/usr/lib/lua" \
LUAPATH="$(PKG_INSTALL_DIR)/usr/lib/lua"

View file

@ -0,0 +1,13 @@
--- a/src/Makefile
+++ b/src/Makefile
@@ -13,8 +13,8 @@ WARN=-Wall -pedantic
BSD_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
BSD_LDFLAGS=-O -fPIC -shared $(LIBDIR)
-LNX_CFLAGS=-O2 -fPIC $(WARN) $(INCDIR) $(DEFS)
-LNX_LDFLAGS=-O -fPIC -shared $(LIBDIR)
+LNX_CFLAGS=$(INCDIR) $(DEFS)
+LNX_LDFLAGS=-shared $(LIBDIR)
MAC_ENV=env MACOSX_DEPLOYMENT_TARGET='$(MACVER)'
MAC_CFLAGS=-O2 -fno-common $(WARN) $(INCDIR) $(DEFS)

View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NPM_NAME:=hid
PKG_NAME:=node-$(PKG_NPM_NAME)
PKG_VERSION:=0.7.2
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/node-hid/node-hid.git
@ -43,7 +43,9 @@ endef
CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))
EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/include/libusb-1.0
TMPNPM:=$(shell mktemp -u XXXXXXXXXX)
TARGET_CFLAGS+=$(FPIC) -I$(STAGING_DIR)/usr/include/libusb-1.0
define Build/Compile
git init $(PKG_BUILD_DIR)
@ -51,7 +53,7 @@ define Build/Compile
$(MAKE_FLAGS) \
npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache-$(TMPNPM) \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \
npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
endef

View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NPM_NAME:=serialport
PKG_NAME:=node-$(PKG_NPM_NAME)
PKG_VERSION:=6.1.1
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz
PKG_SOURCE_URL:=http://registry.npmjs.org/$(PKG_NPM_NAME)/-/
@ -45,13 +45,16 @@ endef
CPU:=$(subst x86_64,x64,$(subst i386,ia32,$(ARCH)))
EXTRA_LDFLAGS="-L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \
EXTRA_LDFLAGS="$(FPIC) -L$(TOOLCHAIN_DIR)/lib/ -Wl,-rpath-link $(TOOLCHAIN_DIR)/lib/" \
TMPNPM:=$(shell mktemp -u XXXXXXXXXX)
TARGET_CFLAGS+=$(FPIC)
define Build/Compile
$(MAKE_FLAGS) \
npm_config_arch=$(CONFIG_ARCH) \
npm_config_nodedir=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/ \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache \
npm_config_cache=$(BUILD_DIR)/node-v$(PKG_NODE_VERSION)/npm-cache-$(TMPNPM) \
PREFIX="$(PKG_INSTALL_DIR)/usr/" \
npm install --build-from-source --target_arch=$(CPU) -g $(PKG_BUILD_DIR)
endef

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=node
PKG_VERSION:=v8.10.0
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
PKG_HASH:=b72d4e71618d6bcbd039b487b51fa7543631a4ac3331d7caf69bdf55b5b2901a
@ -73,62 +73,32 @@ NODEJS_CPU:=$(subst powerpc,ppc,$(subst aarch64,arm64,$(subst x86_64,x64,$(subst
MAKE_VARS+= \
DESTCPU=$(NODEJS_CPU)
CONFIGURE_VARS:= \
CC="$(TARGET_CC) $(TARGET_OPTIMIZATION)" \
CXX="$(TARGET_CXX) $(TARGET_OPTIMIZATION)" \
CC_host="$(HOSTCC)" \
CXX_host="$(HOSTCXX)"
CONFIGURE_ARGS:= \
--dest-cpu=$(NODEJS_CPU) \
--dest-os=linux \
--without-snapshot \
--shared-zlib \
--shared-openssl \
--with-intl=$(if $(CONFIG_NODEJS_ICU),system-icu,none) \
$(if $(findstring mips,$(NODEJS_CPU)), \
$(if $(CONFIG_SOFT_FLOAT),--with-mips-float-abi=soft)) \
$(if $(findstring +neon,$(CONFIG_CPU_TYPE)),--with-arm-fpu=neon) \
$(if $(findstring +vfp",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfp) \
$(if $(findstring +vfpv3",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3-d16) \
$(if $(findstring +vfpv4",$(CONFIG_CPU_TYPE)),--with-arm-fpu=vfpv3) \
--prefix=/usr
ifneq ($(findstring arm,$(NODEJS_CPU)),)
ifeq ($(CONFIG_SOFT_FLOAT),y)
CONFIGURE_ARGS+= --with-arm-float-abi=softfp
else
CONFIGURE_ARGS+= --with-arm-float-abi=hard
ifneq ($(findstring vfp,$(CONFIG_CPU_TYPE)),)
ARM_FPU=vfp
endif
ifneq ($(findstring vfpv3,$(CONFIG_CPU_TYPE)),)
ARM_FPU=vfpv3
endif
ifneq ($(findstring vfpv3-d16,$(CONFIG_CPU_TYPE)),)
ARM_FPU=vfpv3-d16
endif
ifneq ($(findstring neon,$(CONFIG_CPU_TYPE)),)
ARM_FPU=neon
endif
CONFIGURE_ARGS+= --with-arm-fpu=$(ARM_FPU)
endif
endif
ifneq ($(findstring mips,$(NODEJS_CPU)),)
ifeq ($(CONFIG_SOFT_FLOAT),y)
CONFIGURE_ARGS+= \
--with-mips-float-abi=soft
endif
endif
ifeq ($(CONFIG_NODEJS_ICU),y)
CONFIGURE_ARGS+= \
--with-intl=system-icu
else
CONFIGURE_ARGS+= \
--with-intl=none
endif
HOST_CONFIGURE_VARS:=
HOST_CONFIGURE_ARGS:= \
--dest-os=linux \
--without-snapshot \
--shared-zlib \
--prefix=$(STAGING_DIR_HOSTPKG)
HOST_CONFIGURE_CMD:=python ./configure

View file

@ -1,13 +0,0 @@
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 972b1e4..7c0f65a 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -5623,7 +5623,7 @@ void PBKDF2(const FunctionCallbackInfo<Value>& args) {
}
raw_keylen = args[3]->NumberValue();
- if (raw_keylen < 0.0 || std::isnan(raw_keylen) || std::isinf(raw_keylen) ||
+ if (raw_keylen < 0.0 || isnan(raw_keylen) || isinf(raw_keylen) ||
raw_keylen > INT_MAX) {
type_error = "Bad key length";
goto err;

View file

@ -0,0 +1,25 @@
From 34825d50db18631a92902af3f51ddd27aa074c90 Mon Sep 17 00:00:00 2001
From: Jeroen Roovers <jer-gentoo@users.noreply.github.com>
Date: Fri, 13 Apr 2018 05:54:42 +0200
Subject: [PATCH 2/2] Include cmath ...
... instead of using the C implementations of isnan and isinf
---
src/node_crypto.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 7c0f65a5735..0aa4adbd467 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -44,9 +44,9 @@
#include "StartComAndWoSignData.inc"
#include <algorithm>
+#include <cmath>
#include <errno.h>
#include <limits.h> // INT_MAX
-#include <math.h>
#include <stdlib.h>
#include <string.h>
#include <vector>

View file

@ -1,5 +1,5 @@
#
# Copyright (C) 2006-2016 OpenWrt.org
# Copyright (C) 2006-2018 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -7,9 +7,11 @@
include $(TOPDIR)/rules.mk
include perlver.mk
PKG_NAME:=perl
PKG_VERSION:=5.26.2
PKG_RELEASE:=1
PKG_VERSION:=$(PERL_VERSION)
PKG_RELEASE:=3
PKG_SOURCE_URL:=\
https://cpan.metacpan.org/src/5.0 \
@ -19,7 +21,7 @@ PKG_SOURCE_URL:=\
https://mirrors.sonic.net/cpan/src/5.0 \
https://www.cpan.org/src/5.0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=0f8c0fb1b0db4681adb75c3ba0dd77a0472b1b359b9e80efd79fc27b4352132c
PKG_HASH:=059b3cb69970d8c8c5964caced0335b4af34ac990c8e61f7e3f90cd1c2d11e49
PKG_LICENSE:=GPL-1.0+ Artistic-1.0-Perl
PKG_LICENSE_FILES:=Copying Artistic README

View file

@ -69,6 +69,7 @@ d_PRIu64='define'
d_PRIx64='define'
d_SCNfldbl='define'
d__fwalk='undef'
d_accept4='define'
d_access='define'
d_accessx='undef'
d_acosh='define'
@ -94,8 +95,11 @@ d_bcopy='define'
d_bsd='undef'
d_bsdgetpgrp='undef'
d_bsdsetpgrp='undef'
d_builtin_add_overflow='define'
d_builtin_choose_expr='define'
d_builtin_expect='undef'
d_builtin_mul_overflow='define'
d_builtin_sub_overflow='define'
d_bzero='define'
d_c99_variadic_macros='define'
d_castneg='define'
@ -143,6 +147,7 @@ d_double_style_ieee='define'
d_double_style_vax='undef'
d_drand48proto='define'
d_dup2='define'
d_dup3='define'
d_duplocale='define'
d_eaccess='undef'
d_endgrent='define'
@ -166,6 +171,7 @@ d_expm1='define'
d_faststdio='undef'
d_fchdir='define'
d_fchmod='define'
d_fchmodat='define'
d_fchown='define'
d_fcntl='define'
d_fcntl_can_lock='define'
@ -282,10 +288,12 @@ d_lgamma_r='define'
d_libm_lib_version='define'
d_libname_unique='undef'
d_link='define'
d_linkat='define'
d_llrint='define'
d_llrintl='define'
d_llround='define'
d_llroundl='define'
d_localeconv_l='undef'
d_localtime64='undef'
d_locconv='define'
d_lockf='define'
@ -309,6 +317,8 @@ d_madvise='define'
d_malloc_good_size='undef'
d_malloc_size='undef'
d_mblen='define'
d_mbrlen='define'
d_mbrtowc='define'
d_mbstowcs='define'
d_mbtowc='define'
d_memchr='define'
@ -316,10 +326,12 @@ d_memcmp='define'
d_memcpy='define'
d_memmem='define'
d_memmove='define'
d_memrchr='undef'
d_memset='define'
d_mkdir='define'
d_mkdtemp='define'
d_mkfifo='define'
d_mkostemp='define'
d_mkstemp='define'
d_mkstemps='undef'
d_mktime='define'
@ -356,11 +368,13 @@ d_old_pthread_create_joinable='undef'
d_oldpthreads='undef'
d_oldsock='undef'
d_open3='define'
d_openat='define'
d_pathconf='define'
d_pause='define'
d_perl_otherlibdirs='undef'
d_phostname='undef'
d_pipe='define'
d_pipe2='define'
d_poll='define'
d_portable='define'
d_prctl='define'
@ -389,6 +403,7 @@ d_regcmp='undef'
d_regcomp='define'
d_remainder='define'
d_remquo='define'
d_renameat='define'
d_rename='define'
d_rewinddir='define'
d_rint='define'
@ -497,9 +512,12 @@ d_strerror_l='define'
d_strftime='define'
d_strlcat='define'
d_strlcpy='define'
d_strnlen='define'
d_strtod='define'
d_strtod_l='define'
d_strtol='define'
d_strtold='define'
d_strtold_l='define'
d_strtoll='define'
d_strtoq='define'
d_strtoul='define'
@ -519,6 +537,7 @@ d_tcsetpgrp='define'
d_telldir='define'
d_telldirproto='define'
d_tgamma='define'
d_thread_safe_nl_langinfo_l='define'
d_time='define'
d_timegm='define'
d_times='define'
@ -532,6 +551,7 @@ d_ualarm='define'
d_umask='define'
d_uname='define'
d_union_semun='undef'
d_unlinkat='define'
d_unordered='undef'
d_unsetenv='define'
d_uselocale='define'
@ -716,6 +736,7 @@ i_values='define'
i_varargs='undef'
i_varhdr='stdarg.h'
i_vfork='undef'
i_wchar='define'
i_xlocale='undef'
ignore_versioned_solibs='y'
inc_version_list=' '
@ -1022,7 +1043,7 @@ full_ar="${owrt:target_cross}ar"
# Tool flags
cppflags="$owrt:cflags"
ccflags="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $owrt:cflags"
ccflags="-fwrapv -fno-strict-aliasing -pipe -fstack-protector-strong -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $owrt:cflags"
ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
ccdlflags="-fPIC -rdynamic -Wl,-rpath,$owrt:perllibpath/CORE"
cccdlflags='-fPIC'

View file

@ -1,11 +1,11 @@
# Set the version here
PERL_REVISION=5
PERL_VERSION=26
PERL_SUBVERSION=2
PERL_VERSION=28
PERL_SUBVERSION=0
# (api_revison, api_version, api_subversion) = (revision, version, 0) usually
PERL_API_REVISION=5
PERL_API_VERSION=26
PERL_API_VERSION=28
PERL_API_SUBVERSION=0
known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/PPPort Devel/Peek Digest/MD5 Digest/SHA Encode Fcntl File/Glob Filter/Util/Call GDBM_File Hash/Util I18N/Langinfo IO IPC/SysV List/Util MIME/Base64 Math/BigInt/FastCalc NDBM_File ODBM_File Opcode POSIX PerlIO/encoding PerlIO/scalar PerlIO/via SDBM_File Socket Storable Sys/Hostname Sys/Syslog Text/Soundex Time/HiRes Time/Piece Unicode/Normalize Win32 Win32API/File Win32CORE XS/APItest XS/Typemap attrs re threads threads/shared Hash/Util/FieldHash'

View file

@ -0,0 +1,73 @@
From 682a4acb98783a7f9b5c286b308f12863599fec3 Mon Sep 17 00:00:00 2001
From: Tony Cook <tony@develop-help.com>
Date: Mon, 30 Jul 2018 21:00:52 +1000
Subject: (perl #133411) don't try to load Storable with -Dusecrosscompile
---
dist/Storable/Makefile.PL | 9 ++++++++-
dist/Storable/stacksize | 10 +++++++---
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/dist/Storable/Makefile.PL b/dist/Storable/Makefile.PL
index a5d9e66891..db420ab30b 100644
--- a/dist/Storable/Makefile.PL
+++ b/dist/Storable/Makefile.PL
@@ -90,12 +90,19 @@ sub depend {
# blib.pm needs arch/lib
$extra_deps = ' Storable.pm';
}
+ my $whichperl;
+ if ($Config::Config{usecrosscompile}) {
+ $whichperl = '$(PERLRUN)';
+ }
+ else {
+ $whichperl = '$(FULLPERLRUNINST)';
+ }
my $linktype = uc($_[0]->{LINKTYPE});
my $limit_pm = File::Spec->catfile('lib', 'Storable', 'Limit.pm');
"
$limit_pm : stacksize \$(INST_$linktype)$extra_deps
\$(MKPATH) \$(INST_LIB)
- \$(FULLPERLRUNINST) stacksize $options
+ $whichperl stacksize $options
release : dist
git tag \$(VERSION)
diff --git a/dist/Storable/stacksize b/dist/Storable/stacksize
index 7abd3a84cc..14e0739734 100644
--- a/dist/Storable/stacksize
+++ b/dist/Storable/stacksize
@@ -7,6 +7,9 @@ use Cwd;
use File::Spec;
use strict;
+-d "lib" or mkdir "lib";
+-d "lib/Storable" or mkdir "lib/Storable";
+
my $fn = "lib/Storable/Limit.pm";
my $ptrsize = $Config{ptrsize};
my ($bad1, $bad2) = (65001, 25000);
@@ -29,6 +32,10 @@ sub is_miniperl {
}
if (is_miniperl()) {
+ if ($Config{usecrosscompile}) {
+ write_limits(500, 265);
+ exit;
+ }
die "Should not run during miniperl\n";
}
my $prefix = "";
@@ -68,9 +75,6 @@ if ($ENV{PERL_CORE}) {
}
}
--d "lib" or mkdir "lib";
--d "lib/Storable" or mkdir "lib/Storable";
-
if ($^O eq "MSWin32") {
require Win32;
my ($str, $major, $minor) = Win32::GetOSVersion();
--
2.11.0

View file

@ -0,0 +1,19 @@
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -2738,14 +2738,14 @@ sub _find_static_libs {
Called by a utility method of makeaperl. Checks whether a given file
is an XS library by seeing whether it defines any symbols starting
-with C<boot_>.
+with C<boot_> (with an optional leading underscore needed on MacOS).
=cut
sub xs_static_lib_is_xs {
my ($self, $libfile) = @_;
my $devnull = File::Spec->devnull;
- return `nm $libfile 2>$devnull` =~ /\bboot_/;
+ return `nm $libfile 2>$devnull` =~ /\b_?boot_/;
}
=item makefile (o)

View file

@ -1,6 +1,6 @@
--- a/Makefile.SH 2017-10-17 11:59:52.938763142 -0600
+++ b/Makefile.SH 2017-10-17 12:13:46.202555604 -0600
@@ -270,6 +270,7 @@ LNS = $lns
@@ -275,6 +275,7 @@ LNS = $lns
# NOTE: some systems don't grok "cp -f". XXX Configure test needed?
CPS = $cp
RMS = rm -f
@ -8,7 +8,7 @@
ranlib = $ranlib
# The following are mentioned only to make metaconfig include the
@@ -731,7 +731,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
@@ -736,7 +737,7 @@ bitcount.h: generate_uudmap$(HOST_EXE_EX
./generate_uudmap$(HOST_EXE_EXT) $(generated_headers)
generate_uudmap$(HOST_EXE_EXT): generate_uudmap$(OBJ_EXT)
@ -17,7 +17,7 @@
$(LNS) $(HOST_GENERATE) generate_uudmap$(HOST_EXE_EXT)
!NO!SUBS!
@@ -871,26 +872,26 @@ mydtrace.h: $(DTRACE_H)
@@ -876,26 +877,26 @@ mydtrace.h: $(DTRACE_H)
define)
$spitshell >>$Makefile <<'!NO!SUBS!'
$(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt)
@ -48,7 +48,7 @@
!NO!SUBS!
;;
@@ -901,13 +902,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
@@ -906,13 +907,13 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
case "$useshrplib" in
true)
$spitshell >>$Makefile <<'!NO!SUBS!'
@ -64,7 +64,7 @@
mv $@ libperl$(OBJ_EXT)
$(AR) qv $(LIBPERL) libperl$(OBJ_EXT)
!NO!SUBS!
@@ -916,7 +917,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
@@ -921,7 +922,7 @@ $(LIBPERL): $& $(perllib_dep) $(DYNALOAD
;;
*)
$spitshell >>$Makefile <<'!NO!SUBS!'
@ -73,7 +73,7 @@
$(AR) rc $(LIBPERL) $(perllib_objs) $(DYNALOADER)
@$(ranlib) $(LIBPERL)
!NO!SUBS!
@@ -949,7 +950,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
@@ -954,7 +955,7 @@ $(MINIPERL_EXE): lib/buildcustomize.pl
amigaos*)
$spitshell >>$Makefile <<'!NO!SUBS!'
lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
@ -82,7 +82,7 @@
$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
$(miniperl_objs) $(libs)
# $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
@@ -987,7 +988,7 @@ NAMESPACEFLAGS = -force_flat_namespace
@@ -992,7 +993,7 @@ NAMESPACEFLAGS = -force_flat_namespace
esac
$spitshell >>$Makefile <<'!NO!SUBS!'
lib/buildcustomize.pl: $& $(miniperl_objs) write_buildcustomize.pl
@ -91,7 +91,7 @@
$(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
$(miniperl_objs) $(libs)
$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
@@ -998,8 +999,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj
@@ -1003,8 +1004,8 @@ lib/buildcustomize.pl: $& $(miniperl_obj
if test "X$hostperl" != X; then
$spitshell >>$Makefile <<!GROK!THIS!
lib/buildcustomize.pl: \$& \$(miniperl_dep) write_buildcustomize.pl
@ -102,7 +102,7 @@
\$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
\$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
\$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
@@ -1007,7 +1008,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
@@ -1012,7 +1013,7 @@ lib/buildcustomize.pl: \$& \$(miniperl_d
else
$spitshell >>$Makefile <<'!NO!SUBS!'
lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl
@ -111,7 +111,7 @@
$(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
$(miniperl_objs) $(libs)
$(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
@@ -1020,7 +1021,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
@@ -1025,7 +1026,7 @@ lib/buildcustomize.pl: $& $(miniperl_dep
$spitshell >>$Makefile <<'!NO!SUBS!'
$(PERL_EXE): $& $(perlmain_dep) $(LIBPERL) $(static_ext) ext.libs $(PERLEXPORT) write_buildcustomize.pl
@ -120,8 +120,8 @@
!NO!SUBS!
case $osname in
@@ -1114,8 +1115,8 @@ pod/perl5261delta.pod: pod/perldelta.pod
$(LNS) perldelta.pod pod/perl5261delta.pod
@@ -1119,8 +1120,8 @@ pod/perl5280delta.pod: pod/perldelta.pod
$(LNS) perldelta.pod pod/perl5280delta.pod
extra.pods: $(MINIPERL_EXE)
- -@test ! -f extra.pods || rm -f `cat extra.pods`
@ -131,7 +131,7 @@
-@for x in `grep -l '^=[a-z]' README.* | grep -v README.vms` ; do \
nx=`echo $$x | sed -e "s/README\.//"`; \
$(LNS) ../$$x "pod/perl"$$nx".pod" ; \
@@ -1332,11 +1333,11 @@ realclean: _realcleaner _mopup
@@ -1340,11 +1341,11 @@ realclean: _realcleaner _mopup
@echo "Note that '$(MAKE) realclean' does not delete config.sh or Policy.sh"
_clobber:
@ -148,7 +148,7 @@
clobber: _realcleaner _mopup _clobber
@@ -1344,23 +1345,23 @@ distclean: clobber
@@ -1352,23 +1353,23 @@ distclean: clobber
# Like distclean but also removes emacs backups and *.orig.
veryclean: _verycleaner _mopup _clobber
@ -183,7 +183,7 @@
-cd pod; $(LDLIBPTH) $(MAKE) $(CLEAN)
-cd utils; $(LDLIBPTH) $(MAKE) $(CLEAN)
-@if test -f $(MINIPERL_EXE) ; then \
@@ -1370,31 +1371,31 @@ _cleaner1:
@@ -1378,31 +1379,31 @@ _cleaner1:
else \
sh $(CLEAN).sh ; \
fi
@ -233,7 +233,7 @@
-rmdir lib/version lib/threads lib/inc/ExtUtils lib/inc lib/encoding
-rmdir lib/autodie/exception lib/autodie/Scope lib/autodie lib/XS
-rmdir lib/Win32API lib/VMS lib/Unicode/Collate/Locale
@@ -1443,11 +1444,11 @@ _realcleaner:
@@ -1452,11 +1453,11 @@ _realcleaner:
_verycleaner:
@$(LDLIBPTH) $(MAKE) _cleaner1 CLEAN=veryclean
@$(LDLIBPTH) $(MAKE) _cleaner2
@ -247,16 +247,16 @@
lint $(lintflags) -DPERL_CORE -D_REENTRANT -DDEBUGGING -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(c)
cscopeflags = -Rb # Recursive, build-only.
@@ -1505,7 +1506,7 @@ case "$targethost" in
@@ -1514,7 +1515,7 @@ case "$targethost" in
'') $spitshell >>$Makefile <<'!NO!SUBS!'
test_prep test-prep: test_prep_pre $(MINIPERL_EXE) $(unidatafiles) $(PERL_EXE) \
$(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods)
$(dynamic_ext) $(TEST_PERL_DLL) runtests $(generated_pods) common_build
- cd t && (rm -f $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
+ cd t && ($(RMS) $(PERL_EXE); $(LNS) ../$(PERL_EXE) $(PERL_EXE))
!NO!SUBS!
;;
@@ -1555,7 +1556,7 @@ test_prep test-prep: test_prep_pre \$(MI
@@ -1564,7 +1565,7 @@ test_prep test-prep: test_prep_pre \$(MI
$to config.sh
# --- For lib/diagnostics.t with -Duseshrplib
$to \$(PERL_EXE)
@ -265,7 +265,7 @@
$to t/\$(PERL_EXE)
!GROK!THIS!
@@ -1565,7 +1566,7 @@ esac
@@ -1574,7 +1575,7 @@ esac
$spitshell >>$Makefile <<'!NO!SUBS!'
test_prep_reonly: $(MINIPERL_EXE) $(PERL_EXE) $(dynamic_ext_re) $(TEST_PERL_DLL)
$(MINIPERL) make_ext.pl $(dynamic_ext_re) MAKE="$(MAKE)" LIBPERL_A=$(LIBPERL) LINKTYPE=dynamic
@ -274,7 +274,7 @@
!NO!SUBS!
case "$targethost" in
@@ -1620,7 +1621,7 @@ minitest_prep:
@@ -1629,7 +1630,7 @@ minitest_prep:
@echo "You may see some irrelevant test failures if you have been unable"
@echo "to build lib/Config.pm, or the Unicode data files."
@echo " "

View file

@ -37,44 +37,3 @@
$(MINIPERL) -f write_buildcustomize.pl
!NO!SUBS!
fi
--- a/cpan/Devel-PPPort/PPPort_pm.PL 2017-07-18 16:59:59.000000000 -0600
+++ b/cpan/Devel-PPPort/PPPort_pm.PL 2017-10-15 19:19:27.341543182 -0600
@@ -15,6 +15,7 @@
use strict;
$^W = 1;
+push(@INC, '.');
require "parts/ppptools.pl";
my $INCLUDE = 'parts/inc';
--- a/cpan/Devel-PPPort/ppport_h.PL 2017-07-18 16:59:59.000000000 -0600
+++ b/cpan/Devel-PPPort/ppport_h.PL 2017-10-15 19:27:16.594178623 -0600
@@ -14,6 +14,7 @@
################################################################################
package Devel::PPPort;
+push(@INC, '.');
require "PPPort.pm";
rename 'ppport.h', 'ppport.old' if -f 'ppport.h';
unlink "ppport.old" if WriteFile("ppport.h") && -f 'ppport.h';
--- a/cpan/Devel-PPPort/PPPort_xs.PL 2017-07-18 16:59:59.000000000 -0600
+++ b/cpan/Devel-PPPort/PPPort_xs.PL 2017-10-15 19:38:09.296679968 -0600
@@ -15,6 +15,7 @@
use strict;
$^W = 1;
+push(@INC, '.');
require "parts/ppptools.pl";
my %SECTION = (
--- a/cpan/Unicode-Collate/Makefile.PL 2017-07-18 16:49:51.000000000 -0600
+++ b/cpan/Unicode-Collate/Makefile.PL 2017-10-15 20:19:31.890439791 -0600
@@ -6,7 +6,7 @@ my $clean = {};
if (-f "Collate.xs") {
print "Making header files for XS...\n";
- do 'mkheader' or die $@ || "mkheader: $!";
+ do './mkheader' or die $@ || "mkheader: $!";
$clean = { FILES => 'ucatbl.h' };
}

View file

@ -0,0 +1,399 @@
commit d36adde059ed1c4f7af210b4f9fc3a7bd2d7d343
Author: Karl Williamson <khw@cpan.org>
Date: Wed May 23 15:32:47 2018 -0600
Fix to compile under -DNO_LOCALE
Several problems with this compile option were not caught before 5.28
was frozen.
diff --git a/embed.fnc b/embed.fnc
index 0f06e38..36f9f97 100644
--- a/embed.fnc
+++ b/embed.fnc
@@ -2765,9 +2765,11 @@ s |bool |isa_lookup |NN HV *stash|NN const char * const name \
#endif
#if defined(PERL_IN_LOCALE_C)
+# ifdef USE_LOCALE
sn |const char*|category_name |const int category
s |const char*|switch_category_locale_to_template|const int switch_category|const int template_category|NULLOK const char * template_locale
s |void |restore_switched_locale|const int category|NULLOK const char * const original_locale
+# endif
# ifdef HAS_NL_LANGINFO
sn |const char*|my_nl_langinfo|const nl_item item|bool toggle
# else
diff --git a/embed.h b/embed.h
index cf3ad9e..fb66c26 100644
--- a/embed.h
+++ b/embed.h
@@ -1724,16 +1724,16 @@
#define unshare_hek_or_pvn(a,b,c,d) S_unshare_hek_or_pvn(aTHX_ a,b,c,d)
# endif
# if defined(PERL_IN_LOCALE_C)
-#define category_name S_category_name
-#define restore_switched_locale(a,b) S_restore_switched_locale(aTHX_ a,b)
#define save_to_buffer S_save_to_buffer
-#define switch_category_locale_to_template(a,b,c) S_switch_category_locale_to_template(aTHX_ a,b,c)
# if defined(USE_LOCALE)
+#define category_name S_category_name
#define new_collate(a) S_new_collate(aTHX_ a)
#define new_ctype(a) S_new_ctype(aTHX_ a)
#define new_numeric(a) S_new_numeric(aTHX_ a)
+#define restore_switched_locale(a,b) S_restore_switched_locale(aTHX_ a,b)
#define set_numeric_radix(a) S_set_numeric_radix(aTHX_ a)
#define stdize_locale(a) S_stdize_locale(aTHX_ a)
+#define switch_category_locale_to_template(a,b,c) S_switch_category_locale_to_template(aTHX_ a,b,c)
# if defined(USE_POSIX_2008_LOCALE)
#define emulate_setlocale S_emulate_setlocale
# endif
diff --git a/locale.c b/locale.c
index 7653340..f8f77fb 100644
--- a/locale.c
+++ b/locale.c
@@ -1264,6 +1264,7 @@ S_locking_setlocale(pTHX_
}
#endif
+#ifdef USE_LOCALE
STATIC void
S_set_numeric_radix(pTHX_ const bool use_locale)
@@ -1299,6 +1300,10 @@ S_set_numeric_radix(pTHX_ const bool use_locale)
}
# endif
+#else
+
+ PERL_UNUSED_ARG(use_locale);
+
#endif /* USE_LOCALE_NUMERIC and can find the radix char */
}
@@ -1481,7 +1486,6 @@ S_new_ctype(pTHX_ const char *newctype)
#ifndef USE_LOCALE_CTYPE
- PERL_ARGS_ASSERT_NEW_CTYPE;
PERL_UNUSED_ARG(newctype);
PERL_UNUSED_CONTEXT;
@@ -1994,6 +1998,8 @@ S_new_collate(pTHX_ const char *newcoll)
}
+#endif
+
#ifdef WIN32
STATIC char *
@@ -2139,11 +2145,20 @@ Perl_setlocale(const int category, const char * locale)
{
/* This wraps POSIX::setlocale() */
+#ifdef NO_LOCALE
+
+ PERL_UNUSED_ARG(category);
+ PERL_UNUSED_ARG(locale);
+
+ return "C";
+
+#else
+
const char * retval;
const char * newlocale;
dSAVEDERRNO;
- DECLARATION_FOR_LC_NUMERIC_MANIPULATION;
dTHX;
+ DECLARATION_FOR_LC_NUMERIC_MANIPULATION;
#ifdef USE_LOCALE_NUMERIC
@@ -2262,6 +2277,8 @@ Perl_setlocale(const int category, const char * locale)
return retval;
+#endif
+
}
PERL_STATIC_INLINE const char *
@@ -2414,13 +2431,16 @@ S_my_nl_langinfo(const int item, bool toggle)
dTHX;
const char * retval;
+#ifdef USE_LOCALE_NUMERIC
+
/* We only need to toggle into the underlying LC_NUMERIC locale for these
* two items, and only if not already there */
if (toggle && (( item != RADIXCHAR && item != THOUSEP)
|| PL_numeric_underlying))
- {
+
+#endif /* No toggling needed if not using LC_NUMERIC */
+
toggle = FALSE;
- }
#if defined(HAS_NL_LANGINFO) /* nl_langinfo() is available. */
# if ! defined(HAS_THREAD_SAFE_NL_LANGINFO_L) \
@@ -2468,6 +2488,8 @@ S_my_nl_langinfo(const int item, bool toggle)
do_free = TRUE;
}
+# ifdef USE_LOCALE_NUMERIC
+
if (toggle) {
if (PL_underlying_numeric_obj) {
cur = PL_underlying_numeric_obj;
@@ -2478,6 +2500,8 @@ S_my_nl_langinfo(const int item, bool toggle)
}
}
+# endif
+
/* We have to save it to a buffer, because the freelocale() just below
* can invalidate the internal one */
retval = save_to_buffer(nl_langinfo_l(item, cur),
@@ -5169,9 +5193,7 @@ Perl_my_strerror(pTHX_ const int errnum)
LOCALE_UNLOCK;
# endif /* End of doesn't have strerror_l */
-#endif /* End of does have locale messages */
-
-#ifdef DEBUGGING
+# ifdef DEBUGGING
if (DEBUG_Lv_TEST) {
PerlIO_printf(Perl_debug_log, "Strerror returned; saving a copy: '");
@@ -5179,7 +5201,8 @@ Perl_my_strerror(pTHX_ const int errnum)
PerlIO_printf(Perl_debug_log, "'\n");
}
-#endif
+# endif
+#endif /* End of does have locale messages */
SAVEFREEPV(errstr);
return errstr;
@@ -5301,10 +5324,17 @@ L<C<Perl_switch_to_global_locale>|perlapi/switch_to_global_locale>.
bool
Perl_sync_locale()
{
+
+#ifndef USE_LOCALE
+
+ return TRUE;
+
+#else
+
const char * newlocale;
dTHX;
-#ifdef USE_POSIX_2008_LOCALE
+# ifdef USE_POSIX_2008_LOCALE
bool was_in_global_locale = FALSE;
locale_t cur_obj = uselocale((locale_t) 0);
@@ -5316,11 +5346,11 @@ Perl_sync_locale()
* will affect the */
if (cur_obj == LC_GLOBAL_LOCALE) {
-# ifdef HAS_QUERY_LOCALE
+# ifdef HAS_QUERY_LOCALE
do_setlocale_c(LC_ALL, setlocale(LC_ALL, NULL));
-# else
+# else
unsigned int i;
@@ -5330,17 +5360,17 @@ Perl_sync_locale()
do_setlocale_r(categories[i], setlocale(categories[i], NULL));
}
-# endif
+# endif
was_in_global_locale = TRUE;
}
-#else
+# else
bool was_in_global_locale = TRUE;
-#endif
-#ifdef USE_LOCALE_CTYPE
+# endif
+# ifdef USE_LOCALE_CTYPE
newlocale = savepv(do_setlocale_c(LC_CTYPE, NULL));
DEBUG_Lv(PerlIO_printf(Perl_debug_log,
@@ -5349,8 +5379,8 @@ Perl_sync_locale()
new_ctype(newlocale);
Safefree(newlocale);
-#endif /* USE_LOCALE_CTYPE */
-#ifdef USE_LOCALE_COLLATE
+# endif /* USE_LOCALE_CTYPE */
+# ifdef USE_LOCALE_COLLATE
newlocale = savepv(do_setlocale_c(LC_COLLATE, NULL));
DEBUG_Lv(PerlIO_printf(Perl_debug_log,
@@ -5359,8 +5389,8 @@ Perl_sync_locale()
new_collate(newlocale);
Safefree(newlocale);
-#endif
-#ifdef USE_LOCALE_NUMERIC
+# endif
+# ifdef USE_LOCALE_NUMERIC
newlocale = savepv(do_setlocale_c(LC_NUMERIC, NULL));
DEBUG_Lv(PerlIO_printf(Perl_debug_log,
@@ -5369,9 +5399,12 @@ Perl_sync_locale()
new_numeric(newlocale);
Safefree(newlocale);
-#endif /* USE_LOCALE_NUMERIC */
+# endif /* USE_LOCALE_NUMERIC */
return was_in_global_locale;
+
+#endif
+
}
#if defined(DEBUGGING) && defined(USE_LOCALE)
diff --git a/makedef.pl b/makedef.pl
index dbd756d..661b71d 100644
--- a/makedef.pl
+++ b/makedef.pl
@@ -574,6 +574,9 @@ unless ($define{USE_LOCALE_COLLATE}) {
PL_collxfrm_mult
Perl_sv_collxfrm
Perl_sv_collxfrm_flags
+ PL_strxfrm_NUL_replacement
+ PL_strxfrm_is_behaved
+ PL_strxfrm_max_cp
);
}
@@ -583,6 +586,9 @@ unless ($define{USE_LOCALE_NUMERIC}) {
PL_numeric_name
PL_numeric_radix_sv
PL_numeric_standard
+ PL_numeric_underlying
+ PL_numeric_underlying_is_standard
+ PL_underlying_numeric_obj
);
}
diff --git a/perl.h b/perl.h
index 3e1f6cd..d457776 100644
--- a/perl.h
+++ b/perl.h
@@ -5657,6 +5657,9 @@ typedef struct am_table_short AMTS;
# define IN_LC_COMPILETIME(category) 0
# define IN_LC_RUNTIME(category) 0
# define IN_LC(category) 0
+# define _CHECK_AND_WARN_PROBLEMATIC_LOCALE
+# define _CHECK_AND_OUTPUT_WIDE_LOCALE_UTF8_MSG(s, send)
+# define _CHECK_AND_OUTPUT_WIDE_LOCALE_CP_MSG(c)
#endif
diff --git a/proto.h b/proto.h
index 3e027ab..558c33a 100644
--- a/proto.h
+++ b/proto.h
@@ -4669,8 +4669,6 @@ PERL_CALLCONV SV* Perl_hfree_next_entry(pTHX_ HV *hv, STRLEN *indexp);
assert(hv); assert(indexp)
#endif
#if defined(PERL_IN_LOCALE_C)
-STATIC const char* S_category_name(const int category);
-STATIC void S_restore_switched_locale(pTHX_ const int category, const char * const original_locale);
#ifndef PERL_NO_INLINE_FUNCTIONS
PERL_STATIC_INLINE const char * S_save_to_buffer(const char * string, char **buf, Size_t *buf_size, const Size_t offset)
__attribute__warn_unused_result__;
@@ -4678,17 +4676,19 @@ PERL_STATIC_INLINE const char * S_save_to_buffer(const char * string, char **buf
assert(buf_size)
#endif
-STATIC const char* S_switch_category_locale_to_template(pTHX_ const int switch_category, const int template_category, const char * template_locale);
# if defined(USE_LOCALE)
+STATIC const char* S_category_name(const int category);
STATIC void S_new_collate(pTHX_ const char* newcoll);
STATIC void S_new_ctype(pTHX_ const char* newctype);
#define PERL_ARGS_ASSERT_NEW_CTYPE \
assert(newctype)
STATIC void S_new_numeric(pTHX_ const char* newnum);
+STATIC void S_restore_switched_locale(pTHX_ const int category, const char * const original_locale);
STATIC void S_set_numeric_radix(pTHX_ const bool use_locale);
STATIC char* S_stdize_locale(pTHX_ char* locs);
#define PERL_ARGS_ASSERT_STDIZE_LOCALE \
assert(locs)
+STATIC const char* S_switch_category_locale_to_template(pTHX_ const int switch_category, const int template_category, const char * template_locale);
# if defined(USE_POSIX_2008_LOCALE)
STATIC const char* S_emulate_setlocale(const int category, const char* locale, unsigned int index, const bool is_index_valid);
# endif
diff --git a/sv.c b/sv.c
index 07865bb..81223ca 100644
--- a/sv.c
+++ b/sv.c
@@ -13330,10 +13330,15 @@ Perl_sv_vcatpvfn_flags(pTHX_ SV *const sv, const char *const pat, const STRLEN p
SvTAINT(sv);
+#ifdef USE_LOCALE_NUMERIC
+
if (lc_numeric_set) {
RESTORE_LC_NUMERIC(); /* Done outside loop, so don't have to
save/restore each iteration. */
}
+
+#endif
+
}
/* =========================================================================
diff --git a/t/lib/warnings/regexec b/t/lib/warnings/regexec
index 900dd6e..b9e53c9 100644
--- a/t/lib/warnings/regexec
+++ b/t/lib/warnings/regexec
@@ -215,6 +215,10 @@ Use of \b{} or \B{} for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at -
Use of \b{} or \B{} for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 17.
########
# NAME (?[ ]) in non-UTF-8 locale
+require '../loc_tools.pl';
+unless (locales_enabled()) {
+ print("SKIPPED\n# locales not available\n"),exit;
+}
eval { require POSIX; POSIX->import("locale_h") };
if ($@) {
print("SKIPPED\n# no POSIX\n"),exit;
@@ -229,14 +233,14 @@ setlocale(&POSIX::LC_CTYPE, "C");
":" =~ /(?[ \: ])/;
no warnings 'locale';
EXPECT
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 9.
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 9.
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 10.
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 10.
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 11.
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 11.
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 12.
-Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 12.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 13.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 13.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 14.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 14.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 15.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 15.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 16.
+Use of (?[ ]) for non-UTF-8 locale is wrong. Assuming a UTF-8 locale at - line 16.
########
# NAME (?[ ]) in UTF-8 locale
require '../loc_tools.pl';

View file

@ -1,7 +1,17 @@
# This makefile simplifies perl module builds.
#
PERL_VERSION:=5.26
ifeq ($(origin PERL_INCLUDE_DIR),undefined)
PERL_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
endif
include $(PERL_INCLUDE_DIR)/perlver.mk
ifneq ($(PKG_NAME),perl)
PKG_VERSION:=$(PKG_VERSION)+perl$(PERL_VERSION2)
endif
PERL_VERSION:=$(PERL_VERSION2)
# Build environment
HOST_PERL_PREFIX:=$(STAGING_DIR_HOSTPKG)/usr
@ -9,7 +19,7 @@ ifneq ($(CONFIG_USE_GLIBC),)
EXTRA_LIBS:=bsd
EXTRA_LIBDIRS:=$(STAGING_DIR)/lib
endif
PERL_CMD:=$(STAGING_DIR_HOSTPKG)/usr/bin/perl$(PERL_VERSION).0
PERL_CMD:=$(STAGING_DIR_HOSTPKG)/usr/bin/perl$(PERL_VERSION3)
MOD_CFLAGS_PERL:=-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(TARGET_CFLAGS) $(TARGET_CPPFLAGS)
ifdef CONFIG_PERL_THREADS
@ -25,8 +35,8 @@ PERLMOD_TESTSDIR:=/usr/share/perl/perlmod-tests
define perlmod/host/relink
rm -f $(1)/Makefile.aperl
$(MAKE) -C $(1) perl
$(CP) $(1)/perl $(PERL_CMD)
$(CP) $(1)/perl $(STAGING_DIR_HOSTPKG)/usr/bin/perl
$(INSTALL_BIN) $(1)/perl $(PERL_CMD)
$(INSTALL_BIN) $(1)/perl $(STAGING_DIR_HOSTPKG)/usr/bin/perl
endef
define perlmod/host/Configure

10
lang/perl/perlver.mk Normal file
View file

@ -0,0 +1,10 @@
PERL_VERSION:=5.28.0
PERL_EXPLODE:=$(subst ., ,$(PERL_VERSION))
PERL_MAJOR:=$(word 1,$(PERL_EXPLODE))
PERL_MINOR:=$(word 2,$(PERL_EXPLODE))
PERL_REL:=$(word 3,$(PERL_EXPLODE))
PERL_VERSION3:=$(PERL_VERSION)
PERL_VERSION2:=$(PERL_MAJOR).$(PERL_MINOR)

View file

@ -6,17 +6,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=php
PKG_VERSION:=7.2.5
PKG_RELEASE:=2
PKG_VERSION:=7.2.34
PKG_RELEASE:=1
PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
PKG_LICENSE:=PHPv3.01
PKG_LICENSE:=PHP-3.01
PKG_LICENSE_FILES:=LICENSE
PKG_CPE_ID:=cpe:/a:php:php
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=http://www.php.net/distributions/
PKG_HASH:=af70a33b3f7a51510467199b39af151333fbbe4cc21923bad9c7cf64268cddb2
PKG_HASH:=409e11bc6a2c18707dfc44bc61c820ddfd81e17481470f3405ee7822d8379903
PKG_FIXUP:=libtool autoreconf
PKG_BUILD_PARALLEL:=1
@ -33,7 +34,7 @@ PHP7_MODULES = \
iconv imap intl \
json \
ldap \
mbstring mysqli \
mbstring mysqli mysqlnd \
opcache openssl \
pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql phar \
session shmop simplexml snmp soap sockets sqlite3 sysvmsg sysvsem sysvshm \
@ -74,7 +75,6 @@ define Package/php7/config
config PHP7_SYSTEMTZDATA
bool "Use system timezone data instead of php's built-in database"
depends on PACKAGE_php7-cli || PACKAGE_php7-cgi
select PACKAGE_zoneinfo-core
default y
help
Enabling this feature automatically selects the zoneinfo-core package
@ -86,7 +86,8 @@ define Package/php7
$(call Package/php7/Default)
DEPENDS:=+libpcre +zlib \
+PHP7_LIBXML:libxml2
+PHP7_LIBXML:libxml2 \
+PHP7_SYSTEMTZDATA:zoneinfo-core
endef
define Package/php7/description
@ -158,6 +159,7 @@ CONFIGURE_ARGS+= \
--enable-fpm \
--enable-shared \
--disable-static \
--with-pic \
--disable-rpath \
--disable-debug \
--disable-phpdbg \
@ -292,11 +294,17 @@ else
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-mysqli),)
CONFIGURE_ARGS+= --with-mysqli=shared,"$(STAGING_DIR)/usr/bin/mysql_config"
CONFIGURE_ARGS+= --with-mysqli=shared
else
CONFIGURE_ARGS+= --without-mysqli
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-mysqlnd),)
CONFIGURE_ARGS+= --enable-mysqlnd=shared
else
CONFIGURE_ARGS+= --disable-mysqlnd
endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-opcache),)
CONFIGURE_ARGS+= --enable-opcache=shared
else
@ -321,7 +329,7 @@ endif
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo),)
CONFIGURE_ARGS+= --enable-pdo=shared
ifneq ($(SDK)$(CONFIG_PACKAGE_php7-mod-pdo-mysql),)
CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr"
CONFIGURE_ARGS+= --with-pdo-mysql=shared
else
CONFIGURE_ARGS+= --without-pdo-mysql
endif
@ -501,6 +509,10 @@ define Package/php7-fastcgi/install
$(INSTALL_BIN) ./files/php7-fastcgi.init $(1)/etc/init.d/php7-fastcgi
endef
define Package/php7-fastcgi/conffiles
/etc/config/php7-fastcgi
endef
define Package/php7-fpm/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/sapi/fpm/php-fpm $(1)/usr/bin/php-fpm
@ -601,12 +613,13 @@ $(eval $(call BuildModule,intl,Internationalization Functions,+PACKAGE_php7-mod-
$(eval $(call BuildModule,json,JSON))
$(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php7-mod-ldap:libopenldap +PACKAGE_php7-mod-ldap:libsasl2))
$(eval $(call BuildModule,mbstring,MBString))
$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:libmysqlclient))
$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php7-mod-mysqli:php7-mod-mysqlnd,30))
$(eval $(call BuildModule,mysqlnd,MySQL Native Driver,+php7-mod-hash +PACKAGE_php7-mod-openssl:php7-mod-openssl))
$(eval $(call BuildModule,opcache,OPcache,,,zend))
$(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php7-mod-openssl:libopenssl))
$(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php7-mod-openssl:libopenssl,15))
$(eval $(call BuildModule,pcntl,PCNTL))
$(eval $(call BuildModule,pdo,PHP Data Objects))
$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-mysql:libmysqlclient))
$(eval $(call BuildModule,pdo-mysql,PDO driver for MySQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-mysql:php7-mod-mysqlnd))
$(eval $(call BuildModule,pdo-pgsql,PDO driver for PostgreSQL,+php7-mod-pdo +PACKAGE_php7-mod-pdo-pgsql:libpq))
$(eval $(call BuildModule,pdo-sqlite,PDO driver for SQLite 3.x,+php7-mod-pdo +PACKAGE_php7-mod-pdo-sqlite:libsqlite3 +PACKAGE_php7-mod-pdo-sqlite:librt))
$(eval $(call BuildModule,pgsql,PostgreSQL,+PACKAGE_php7-mod-pgsql:libpq))
@ -623,6 +636,6 @@ $(eval $(call BuildModule,sysvsem,System V shared memory))
$(eval $(call BuildModule,sysvshm,System V semaphore))
$(eval $(call BuildModule,tokenizer,Tokenizer))
$(eval $(call BuildModule,xml,XML,+PHP7_LIBXML:libxml2 +!PHP7_LIBXML:libexpat))
$(eval $(call BuildModule,xmlreader,XMLReader,+@PHP7_LIBXML +PACKAGE_php7-mod-xmlreader:libxml2))
$(eval $(call BuildModule,xmlreader,XMLReader,+@PHP7_LIBXML +PACKAGE_php7-mod-dom:php7-mod-dom +PACKAGE_php7-mod-xmlreader:libxml2))
$(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP7_LIBXML +PACKAGE_php7-mod-xmlwriter:libxml2))
$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php7-mod-zip:zlib))

View file

@ -1,3 +1,10 @@
From: Debian PHP Maintainers <team+pkg-php@tracker.debian.org>
Date: Thu, 7 Mar 2019 19:36:30 +0000
Subject: Add-support-for-use-of-the-system-timezone-database
# License: MIT
# http://opensource.org/licenses/MIT
# License: MIT
# http://opensource.org/licenses/MIT
@ -5,6 +12,8 @@ Add support for use of the system timezone database, rather
than embedding a copy. Discussed upstream but was not desired.
History:
r17: adapt for autotool change in 7.2.16RC1
r16: adapt for timelib 2017.06 (in 7.2.3RC1)
r15: adapt for timelib 2017.05beta7 (in 7.2.0RC1)
r14: improve check for valid tz file
r13: adapt for upstream changes to use PHP allocator
@ -25,10 +34,39 @@ r4: added "System/Localtime" tzname which uses /etc/localtime
r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert)
r2: add filesystem trawl to set up name alias index
r1: initial revision
---
ext/date/config0.m4 | 13 ++
ext/date/lib/parse_tz.c | 536 +++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 546 insertions(+), 3 deletions(-)
diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
--- ./ext/date/lib/parse_tz.c.systzdata 2017-08-22 09:40:38.000000000 +0200
+++ ./ext/date/lib/parse_tz.c 2017-08-22 12:16:00.370298079 +0200
diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index e464156..00dae8b 100644
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -10,6 +10,19 @@ io.h
dnl Check for strtoll, atoll
AC_CHECK_FUNCS(strtoll atoll)
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
+no, no)
+
+if test "$PHP_SYSTEM_TZDATA" != "no"; then
+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
+
+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
+ [Define for location of system timezone data])
+ fi
+fi
+
PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -DHAVE_TIMELIB_CONFIG_H=1"
timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c lib/parse_iso_intervals.c lib/interval.c"
diff --git a/ext/date/lib/parse_tz.c b/ext/date/lib/parse_tz.c
index 960e528..501b09e 100644
--- a/ext/date/lib/parse_tz.c
+++ b/ext/date/lib/parse_tz.c
@@ -25,8 +25,21 @@
#include "timelib.h"
#include "timelib_private.h"
@ -51,7 +89,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
#if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__))
# if defined(__LITTLE_ENDIAN__)
@@ -67,6 +80,11 @@ static int read_php_preamble(const unsig
@@ -67,6 +80,11 @@ static int read_php_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
{
uint32_t version;
@ -63,7 +101,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
/* read ID */
version = (*tzf)[3] - '0';
*tzf += 4;
@@ -374,7 +392,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
@@ -374,7 +392,429 @@ void timelib_dump_tzinfo(timelib_tzinfo *tz)
}
}
@ -266,7 +304,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
+ }
+
+ for (l = li[hash]; l; l = l->next) {
+ if (strcasecmp(l->name, name) == 0)
+ if (timelib_strcasecmp(l->name, name) == 0)
+ return l;
+ }
+
@ -290,7 +328,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
+{
+ const timelib_tzdb_index_entry *alpha = first, *beta = second;
+
+ return strcasecmp(alpha->id, beta->id);
+ return timelib_strcasecmp(alpha->id, beta->id);
+}
+
+
@ -493,8 +531,8 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
+static int inmem_seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb)
{
int left = 0, right = tzdb->index_size - 1;
#ifdef HAVE_SETLOCALE
@@ -419,9 +859,48 @@ static int seek_to_tz_position(const uns
@@ -400,9 +840,48 @@ static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const
return 0;
}
@ -542,8 +580,8 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
+#endif
}
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(timelib_tzdb *tzdb, int *count)
@@ -433,7 +912,30 @@ const timelib_tzdb_index_entry *timelib_
const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_tzdb *tzdb, int *count)
@@ -414,7 +893,30 @@ const timelib_tzdb_index_entry *timelib_timezone_identifiers_list(const timelib_
int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb)
{
const unsigned char *tzf;
@ -575,7 +613,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
}
static int skip_64bit_preamble(const unsigned char **tzf, timelib_tzinfo *tz)
@@ -475,12 +977,14 @@ static timelib_tzinfo* timelib_tzinfo_ct
@@ -456,12 +958,14 @@ static timelib_tzinfo* timelib_tzinfo_ctor(char *name)
timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, int *error_code)
{
const unsigned char *tzf;
@ -591,7 +629,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
tmp = timelib_tzinfo_ctor(timezone);
version = read_preamble(&tzf, tmp, &type);
@@ -503,6 +1007,29 @@ timelib_tzinfo *timelib_parse_tzfile(cha
@@ -484,6 +988,29 @@ timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, i
timelib_tzinfo_dtor(tmp);
return NULL;
}
@ -621,7 +659,7 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
if (version == 2 || version == 3) {
if (!skip_64bit_preamble(&tzf, tmp)) {
/* 64 bit preamble is not in place */
@@ -520,6 +1047,9 @@ timelib_tzinfo *timelib_parse_tzfile(cha
@@ -501,6 +1028,9 @@ timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb, i
} else {
set_default_location_and_comments(&tzf, tmp);
}
@ -631,23 +669,3 @@ diff -up ./ext/date/lib/parse_tz.c.systzdata ./ext/date/lib/parse_tz.c
} else {
*error_code = TIMELIB_ERROR_NO_SUCH_TIMEZONE;
tmp = NULL;
diff -up ./ext/date/lib/timelib.m4.systzdata ./ext/date/lib/timelib.m4
--- ./ext/date/lib/timelib.m4.systzdata 2017-08-22 09:40:38.000000000 +0200
+++ ./ext/date/lib/timelib.m4 2017-08-22 11:32:29.357799927 +0200
@@ -81,3 +81,16 @@ io.h
dnl Check for strtoll, atoll
AC_CHECK_FUNCS(strtoll atoll strftime gettimeofday)
+
+PHP_ARG_WITH(system-tzdata, for use of system timezone data,
+[ --with-system-tzdata[=DIR] to specify use of system timezone data],
+no, no)
+
+if test "$PHP_SYSTEM_TZDATA" != "no"; then
+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used])
+
+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then
+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA",
+ [Define for location of system timezone data])
+ fi
+fi

View file

@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
@@ -453,7 +453,10 @@ PHP_CHECK_FUNC(gethostname, nsl)
@@ -422,7 +422,10 @@ PHP_CHECK_FUNC(gethostname, nsl)
PHP_CHECK_FUNC(gethostbyaddr, nsl)
PHP_CHECK_FUNC(yp_get_default_domain, nsl)
@ -25,35 +25,3 @@
])
PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -227,7 +227,14 @@ AC_TRY_RUN([
flock_type=linux
AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
AC_MSG_RESULT("yes")
-], AC_MSG_RESULT("no") )
+], [
+ AC_MSG_RESULT("no")
+], [
+ dnl cross-compiling; assume Linux
+ flock_type=linux
+ AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type])
+ AC_MSG_RESULT("yes")
+])
AC_MSG_CHECKING("whether flock struct is BSD ordered")
AC_TRY_RUN([
@@ -243,7 +250,12 @@ AC_TRY_RUN([
flock_type=bsd
AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type])
AC_MSG_RESULT("yes")
-], AC_MSG_RESULT("no") )
+], [
+ AC_MSG_RESULT("no")
+], [
+ dnl cross-compiling; assume Linux
+ AC_MSG_RESULT("no")
+])
if test "$flock_type" == "unknown"; then
AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no])

View file

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=Jinja2
PKG_VERSION:=2.9.6
PKG_VERSION:=2.10
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/90/61/f820ff0076a2599dd39406dcb858ecb239438c02ce706c8e91131ab9c7f1/
PKG_HASH:=ddaa01a212cd6d641401cb01b605f4a4d9f37bfc93043d7f760ec70fb99ff9ff
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/J/Jinja2
PKG_HASH:=f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4
PKG_BUILD_DEPENDS:=python3
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE
@ -28,7 +28,7 @@ define Package/python3-jinja2
SUBMENU:=Python
URL:=http://jinja.pocoo.org/
TITLE:=python3-jinja2
DEPENDS:=+python3-light
DEPENDS:=+python3-light +python3-markupsafe
VARIANT:=python3
endef

View file

@ -8,16 +8,18 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=django
PKG_VERSION:=1.8.18
PKG_RELEASE=1
PKG_LICENSE:=BSD-3-Clause
PKG_VERSION:=1.8.19
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/django/django.git
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_VERSION:=2d4bc5a60aa8a076689667c550ded96b87bc463e
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=c82c2cc338ae46ba8572d9960fc98dca932edc43a00f011fed102810a86185ae
PKG_SOURCE:=Django-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/D/Django
PKG_HASH:=33d44a5cf9d333247a9a374ae1478b78b83c9b78eb316fc04adde62053b4c047
PKG_BUILD_DIR:=$(BUILD_DIR)/Django-$(PKG_VERSION)
PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE LICENSE.python
PKG_CPE_ID:=cpe:/a:djangoproject:django
include $(INCLUDE_DIR)/package.mk
include ../python-package.mk
@ -27,7 +29,6 @@ define Package/django
SECTION:=lang
CATEGORY:=Languages
TITLE:=The web framework for perfectionists with deadlines.
MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
URL:=https://www.djangoproject.com/
DEPENDS:=+python
endef

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-attrs
PKG_VERSION:=17.4.0
PKG_RELEASE:=2
PKG_VERSION:=18.1.0
PKG_RELEASE:=1
PKG_SOURCE:=attrs-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/8b/0b/a06cfcb69d0cb004fde8bc6f0fd192d96d565d1b8aa2829f0f20adb796e5
PKG_HASH:=1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/a/attrs
PKG_HASH:=e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-attrs-$(PKG_VERSION)
@ -31,19 +31,19 @@ define Package/python-attrs/Default
SECTION:=lang
CATEGORY:=Languages
SUBMENU:=Python
URL:=https://attrs.readthedocs.org/
URL:=http://www.attrs.org/
endef
define Package/python-attrs
$(call Package/python-attrs/Default)
TITLE:=python-attrs
TITLE:=Classes Without Boilerplate
DEPENDS:=+PACKAGE_python-attrs:python-light
VARIANT:=python
endef
define Package/python3-attrs
$(call Package/python-attrs/Default)
TITLE:=python3-attrs
TITLE:=Classes Without Boilerplate
DEPENDS:=+PACKAGE_python3-attrs:python3-light
VARIANT:=python3
endef

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-automat
PKG_VERSION:=0.6.0
PKG_VERSION:=0.7.0
PKG_RELEASE:=1
PKG_SOURCE:=Automat-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/A/Automat
PKG_HASH:=3c1fd04ecf08ac87b4dd3feae409542e9bf7827257097b2b6ed5692f69d6f6a8
PKG_HASH:=cbd78b83fa2d81fe2a4d23d258e1661dd7493c9a50ee2f1a5b2cac61c1793b0e
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-automat-$(PKG_VERSION)

View file

@ -26,5 +26,5 @@
- 'm2r',
- ],
install_requires=[
"attrs",
"attrs>=16.1.0",
"six",

View file

@ -1,7 +1,7 @@
--- a/setup.py
+++ b/setup.py
@@ -27,15 +27,6 @@ setup(
"attrs",
"attrs>=16.1.0",
"six",
],
- extras_require={

View file

@ -8,7 +8,7 @@
+ packages=find_packages(exclude=["*._test", "*._test.*"]),
package_dir={'automat': 'automat'},
install_requires=[
"attrs",
"attrs>=16.1.0",
@@ -30,6 +30,7 @@ setup(
author='Glyph',
author_email='glyph@twistedmatrix.com',
@ -16,4 +16,4 @@
+ exclude_package_data={'':['_test/*']},
license="MIT",
keywords='fsm finite state machine automata',
)
classifiers=[

View file

@ -9,16 +9,17 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-crypto
PKG_VERSION:=2.6.1
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=pycrypto-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/p/pycrypto
PKG_HASH:=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-crypto-$(PKG_VERSION)
PKG_LICENSE:=Public Domain
PKG_LICENSE_FILES:=COPYRIGHT
PKG_CPE_ID:=cpe:/a:dlitz:pycrypto
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
include $(INCLUDE_DIR)/package.mk
@ -31,7 +32,7 @@ define Package/python-crypto/Default
SECTION:=lang-python
CATEGORY:=Languages
SUBMENU:=Python
URL:=http://www.pycrypto.org/
URL:=https://www.dlitz.net/software/pycrypto/
endef
define Package/python-crypto

View file

@ -0,0 +1,106 @@
From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001
From: Legrandin <helderijs@gmail.com>
Date: Sun, 22 Dec 2013 22:24:46 +0100
Subject: [PATCH] Throw exception when IV is used with ECB or CTR
The IV parameter is currently ignored when initializing
a cipher in ECB or CTR mode.
For CTR mode, it is confusing: it takes some time to see
that a different parameter is needed (the counter).
For ECB mode, it is outright dangerous.
This patch forces an exception to be raised.
---
lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++--------
src/block_template.c | 11 +++++++++++
2 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/lib/Crypto/SelfTest/Cipher/common.py b/lib/Crypto/SelfTest/Cipher/common.py
index 420b6ff..a5f8a88 100644
--- a/lib/Crypto/SelfTest/Cipher/common.py
+++ b/lib/Crypto/SelfTest/Cipher/common.py
@@ -239,16 +239,30 @@ class RoundtripTest(unittest.TestCase):
return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,)
def runTest(self):
- for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP):
+
+ ## ECB mode
+ mode = self.module.MODE_ECB
+ encryption_cipher = self.module.new(a2b_hex(self.key), mode)
+ ciphertext = encryption_cipher.encrypt(self.plaintext)
+ decryption_cipher = self.module.new(a2b_hex(self.key), mode)
+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
+ self.assertEqual(self.plaintext, decrypted_plaintext)
+
+ ## OPENPGP mode
+ mode = self.module.MODE_OPENPGP
+ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
+ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext)
+ eiv = eiv_ciphertext[:self.module.block_size+2]
+ ciphertext = eiv_ciphertext[self.module.block_size+2:]
+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
+ self.assertEqual(self.plaintext, decrypted_plaintext)
+
+ ## All other non-AEAD modes (but CTR)
+ for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB):
encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
ciphertext = encryption_cipher.encrypt(self.plaintext)
-
- if mode != self.module.MODE_OPENPGP:
- decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
- else:
- eiv = ciphertext[:self.module.block_size+2]
- ciphertext = ciphertext[self.module.block_size+2:]
- decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv)
+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv)
decrypted_plaintext = decryption_cipher.decrypt(ciphertext)
self.assertEqual(self.plaintext, decrypted_plaintext)
diff --git a/src/block_template.c b/src/block_template.c
index f940e0e..d555ceb 100644
--- a/src/block_template.c
+++ b/src/block_template.c
@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, PyObject *kwdict)
"Key cannot be the null string");
return NULL;
}
+ if (IVlen != 0 && mode == MODE_ECB)
+ {
+ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV");
+ return NULL;
+ }
+ if (IVlen != 0 && mode == MODE_CTR)
+ {
+ PyErr_Format(PyExc_ValueError,
+ "CTR mode needs counter parameter, not IV");
+ return NULL;
+ }
if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR)
{
PyErr_Format(PyExc_ValueError,
From 58de28a5d32bc10e15766e5a59f41b07397cc6cb Mon Sep 17 00:00:00 2001
From: Richard Mitchell <richard.j.mitchell@gmail.com>
Date: Mon, 28 Apr 2014 16:58:27 +0100
Subject: [PATCH] Fix speedtest run for ECB modes.
---
pct-speedtest.py | 2 ++
1 file changed, 2 insertions(+)
diff --git a/pct-speedtest.py b/pct-speedtest.py
index 4ce18be..c7b893a 100644
--- a/pct-speedtest.py
+++ b/pct-speedtest.py
@@ -121,6 +121,8 @@ class Benchmark:
blocks = self.random_blocks(16384, 1000)
if mode is None:
cipher = module.new(key)
+ elif mode==module.MODE_ECB:
+ cipher = module.new(key, module.MODE_ECB)
else:
cipher = module.new(key, mode, iv)

View file

@ -0,0 +1,51 @@
--- a/lib/Crypto/PublicKey/ElGamal.py
+++ b/lib/Crypto/PublicKey/ElGamal.py
@@ -153,33 +153,33 @@ def generate(bits, randfunc, progress_fu
if number.isPrime(obj.p, randfunc=randfunc):
break
# Generate generator g
- # See Algorithm 4.80 in Handbook of Applied Cryptography
- # Note that the order of the group is n=p-1=2q, where q is prime
if progress_func:
progress_func('g\n')
while 1:
+ # Choose a square residue; it will generate a cyclic group of order q.
+ obj.g = pow(number.getRandomRange(2, obj.p, randfunc), 2, obj.p)
+
# We must avoid g=2 because of Bleichenbacher's attack described
# in "Generating ElGamal signatures without knowning the secret key",
# 1996
- #
- obj.g = number.getRandomRange(3, obj.p, randfunc)
- safe = 1
- if pow(obj.g, 2, obj.p)==1:
- safe=0
- if safe and pow(obj.g, q, obj.p)==1:
- safe=0
+ if obj.g in (1, 2):
+ continue
+
# Discard g if it divides p-1 because of the attack described
# in Note 11.67 (iii) in HAC
- if safe and divmod(obj.p-1, obj.g)[1]==0:
- safe=0
+ if (obj.p - 1) % obj.g == 0:
+ continue
+
# g^{-1} must not divide p-1 because of Khadir's attack
# described in "Conditions of the generator for forging ElGamal
# signature", 2011
ginv = number.inverse(obj.g, obj.p)
- if safe and divmod(obj.p-1, ginv)[1]==0:
- safe=0
- if safe:
- break
+ if (obj.p - 1) % ginv == 0:
+ continue
+
+ # Found
+ break
+
# Generate private key x
if progress_func:
progress_func('x\n')

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-cryptography
PKG_VERSION:=2.1.4
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=cryptography-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/78/c5/7188f15a92413096c93053d5304718e1f6ba88b818357d05d19250ebff85

View file

@ -0,0 +1,182 @@
From d651daa2ffab54f0b7f9ab1177db7c58486bc785 Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Thu, 31 May 2018 10:35:40 +0800
Subject: [PATCH] LibreSSL 2.7.x support
Pull request: https://github.com/pyca/cryptography/pull/4270
Fixes issue: https://github.com/openwrt/packages/issues/10329
introduced with Python 2.7.17
---
src/_cffi_src/openssl/bio.py | 2 +-
src/_cffi_src/openssl/cryptography.py | 2 ++
src/_cffi_src/openssl/dh.py | 2 +-
src/_cffi_src/openssl/dsa.py | 2 +-
src/_cffi_src/openssl/rsa.py | 2 +-
src/_cffi_src/openssl/ssl.py | 2 +-
src/_cffi_src/openssl/x509.py | 23 +++++++++++++----------
src/_cffi_src/openssl/x509_vfy.py | 4 +++-
8 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py
index 2d9659e..9176d13 100644
--- a/src/_cffi_src/openssl/bio.py
+++ b/src/_cffi_src/openssl/bio.py
@@ -135,7 +135,7 @@ void BIO_clear_retry_flags(BIO *);
"""
CUSTOMIZATIONS = """
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE4
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
int BIO_up_ref(BIO *b) {
CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO);
return 1;
diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py
index 9095e3a..a46c178 100644
--- a/src/_cffi_src/openssl/cryptography.py
+++ b/src/_cffi_src/openssl/cryptography.py
@@ -25,6 +25,8 @@ INCLUDES = """
#include <windows.h>
#endif
+#define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER \
+ (CRYPTOGRAPHY_IS_LIBRESSL && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
#define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \
(OPENSSL_VERSION_NUMBER >= 0x10002000 && !CRYPTOGRAPHY_IS_LIBRESSL)
#define CRYPTOGRAPHY_OPENSSL_102L_OR_GREATER \
diff --git a/src/_cffi_src/openssl/dh.py b/src/_cffi_src/openssl/dh.py
index 7ab06ae..2b6c825 100644
--- a/src/_cffi_src/openssl/dh.py
+++ b/src/_cffi_src/openssl/dh.py
@@ -46,7 +46,7 @@ int Cryptography_i2d_DHxparams_bio(BIO *bp, DH *x);
CUSTOMIZATIONS = """
/* These functions were added in OpenSSL 1.1.0-pre5 (beta2) */
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
void DH_get0_pqg(const DH *dh,
const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
{
diff --git a/src/_cffi_src/openssl/dsa.py b/src/_cffi_src/openssl/dsa.py
index d61b692..00b6adb 100644
--- a/src/_cffi_src/openssl/dsa.py
+++ b/src/_cffi_src/openssl/dsa.py
@@ -35,7 +35,7 @@ int DSA_generate_parameters_ex(DSA *, int, unsigned char *, int,
CUSTOMIZATIONS = """
/* These functions were added in OpenSSL 1.1.0-pre5 (beta2) */
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
void DSA_get0_pqg(const DSA *d,
const BIGNUM **p, const BIGNUM **q, const BIGNUM **g)
{
diff --git a/src/_cffi_src/openssl/rsa.py b/src/_cffi_src/openssl/rsa.py
index 459d5cb..f505127 100644
--- a/src/_cffi_src/openssl/rsa.py
+++ b/src/_cffi_src/openssl/rsa.py
@@ -87,7 +87,7 @@ int (*EVP_PKEY_CTX_set0_rsa_oaep_label)(EVP_PKEY_CTX *, unsigned char *,
#endif
/* These functions were added in OpenSSL 1.1.0-pre5 (beta2) */
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
{
/* If the fields n and e in r are NULL, the corresponding input
diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py
index 7f9eff0..69e30ae 100644
--- a/src/_cffi_src/openssl/ssl.py
+++ b/src/_cffi_src/openssl/ssl.py
@@ -453,7 +453,7 @@ const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx) {
/* Added in 1.1.0 in the great opaquing, but we need to define it for older
OpenSSLs. Such is our burden. */
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
/* from ssl/ssl_lib.c */
size_t SSL_get_client_random(const SSL *ssl, unsigned char *out, size_t outlen)
{
diff --git a/src/_cffi_src/openssl/x509.py b/src/_cffi_src/openssl/x509.py
index 394c37c..f3e6d93 100644
--- a/src/_cffi_src/openssl/x509.py
+++ b/src/_cffi_src/openssl/x509.py
@@ -339,7 +339,7 @@ void X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **,
CUSTOMIZATIONS = """
/* Added in 1.0.2 beta but we need it in all versions now due to the great
opaquing. */
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
/* from x509/x_x509.c version 1.0.2 */
void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
const X509 *x)
@@ -383,6 +383,17 @@ X509_REVOKED *Cryptography_X509_REVOKED_dup(X509_REVOKED *rev) {
opaquing. */
#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110
+int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp)
+{
+ req->req_info->enc.modified = 1;
+ return i2d_X509_REQ_INFO(req->req_info, pp);
+}
+int i2d_re_X509_CRL_tbs(X509_CRL *crl, unsigned char **pp) {
+ crl->crl->enc.modified = 1;
+ return i2d_X509_CRL_INFO(crl->crl, pp);
+}
+
+#if !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
int X509_up_ref(X509 *x) {
return CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
}
@@ -401,15 +412,6 @@ void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
if (palg != NULL)
*palg = req->sig_alg;
}
-int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp)
-{
- req->req_info->enc.modified = 1;
- return i2d_X509_REQ_INFO(req->req_info, pp);
-}
-int i2d_re_X509_CRL_tbs(X509_CRL *crl, unsigned char **pp) {
- crl->crl->enc.modified = 1;
- return i2d_X509_CRL_INFO(crl->crl, pp);
-}
void X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
const X509_ALGOR **palg)
@@ -428,4 +430,5 @@ const ASN1_INTEGER *X509_REVOKED_get0_serialNumber(const X509_REVOKED *x)
return x->serialNumber;
}
#endif
+#endif
"""
diff --git a/src/_cffi_src/openssl/x509_vfy.py b/src/_cffi_src/openssl/x509_vfy.py
index 58069eb..ad5fb07 100644
--- a/src/_cffi_src/openssl/x509_vfy.py
+++ b/src/_cffi_src/openssl/x509_vfy.py
@@ -246,6 +246,7 @@ static const long X509_V_FLAG_SUITEB_128_LOS_ONLY = 0;
static const long X509_V_FLAG_SUITEB_192_LOS = 0;
static const long X509_V_FLAG_SUITEB_128_LOS = 0;
+#if !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
int (*X509_VERIFY_PARAM_set1_host)(X509_VERIFY_PARAM *, const char *,
size_t) = NULL;
int (*X509_VERIFY_PARAM_set1_email)(X509_VERIFY_PARAM *, const char *,
@@ -256,6 +257,7 @@ int (*X509_VERIFY_PARAM_set1_ip_asc)(X509_VERIFY_PARAM *, const char *) = NULL;
void (*X509_VERIFY_PARAM_set_hostflags)(X509_VERIFY_PARAM *,
unsigned int) = NULL;
#endif
+#endif
/* OpenSSL 1.0.2+ or Solaris's backport */
#ifdef X509_V_FLAG_PARTIAL_CHAIN
@@ -285,7 +287,7 @@ int X509_OBJECT_get_type(const X509_OBJECT *x) {
}
#endif
-#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110PRE5
+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_110 && !CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER
/* from x509/x509_vfy.c */
X509 *X509_STORE_CTX_get0_cert(X509_STORE_CTX *ctx)
{
--
2.20.1

View file

@ -0,0 +1,78 @@
From 688e0f673bfbf43fa898994326c6877f00ab19ef Mon Sep 17 00:00:00 2001
From: Paul Kehrer <paul.l.kehrer@gmail.com>
Date: Tue, 17 Jul 2018 10:47:57 +0800
Subject: [PATCH] disallow implicit tag truncation with finalize_with_tag
Pull request: https://github.com/pyca/cryptography/pull/4342
---
docs/hazmat/primitives/symmetric-encryption.rst | 1 +
.../hazmat/backends/openssl/ciphers.py | 5 +++++
.../hazmat/primitives/ciphers/modes.py | 1 +
tests/hazmat/primitives/test_aes.py | 16 ++++++++++++++++
5 files changed, 28 insertions(+)
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
index 5ebcca754d..5b60009027 100644
--- a/docs/hazmat/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -670,6 +670,7 @@ Interfaces
:raises ValueError: This is raised when the data provided isn't
a multiple of the algorithm's block size, if ``min_tag_length`` is
less than 4, or if ``len(tag) < min_tag_length``.
+ ``min_tag_length`` is an argument to the ``GCM`` constructor.
:raises NotImplementedError: This is raised if the version of the
OpenSSL backend used is 1.0.1 or earlier.
diff --git a/src/cryptography/hazmat/backends/openssl/ciphers.py b/src/cryptography/hazmat/backends/openssl/ciphers.py
index 462ffea251..e0ee06ee26 100644
--- a/src/cryptography/hazmat/backends/openssl/ciphers.py
+++ b/src/cryptography/hazmat/backends/openssl/ciphers.py
@@ -199,6 +199,11 @@ def finalize_with_tag(self, tag):
"finalize_with_tag requires OpenSSL >= 1.0.2. To use this "
"method please update OpenSSL"
)
+ if len(tag) < self._mode._min_tag_length:
+ raise ValueError(
+ "Authentication tag must be {0} bytes or longer.".format(
+ self._mode._min_tag_length)
+ )
res = self._backend._lib.EVP_CIPHER_CTX_ctrl(
self._ctx, self._backend._lib.EVP_CTRL_AEAD_SET_TAG,
len(tag), tag
diff --git a/src/cryptography/hazmat/primitives/ciphers/modes.py b/src/cryptography/hazmat/primitives/ciphers/modes.py
index 598dfaa4a4..543015fef7 100644
--- a/src/cryptography/hazmat/primitives/ciphers/modes.py
+++ b/src/cryptography/hazmat/primitives/ciphers/modes.py
@@ -220,6 +220,7 @@ def __init__(self, initialization_vector, tag=None, min_tag_length=16):
min_tag_length)
)
self._tag = tag
+ self._min_tag_length = min_tag_length
tag = utils.read_only_property("_tag")
initialization_vector = utils.read_only_property("_initialization_vector")
diff --git a/tests/hazmat/primitives/test_aes.py b/tests/hazmat/primitives/test_aes.py
index d6f83ebc28..4ceccf1553 100644
--- a/tests/hazmat/primitives/test_aes.py
+++ b/tests/hazmat/primitives/test_aes.py
@@ -439,3 +439,19 @@ def test_gcm_tag_decrypt_finalize(self, backend):
decryptor.finalize()
else:
decryptor.finalize_with_tag(tag)
+
+ @pytest.mark.supported(
+ only_if=lambda backend: (
+ not backend._lib.CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 or
+ backend._lib.CRYPTOGRAPHY_IS_LIBRESSL
+ ),
+ skip_message="Not supported on OpenSSL 1.0.1",
+ )
+ def test_gcm_tag_decrypt_finalize_tag_length(self, backend):
+ decryptor = base.Cipher(
+ algorithms.AES(b"0" * 16),
+ modes.GCM(b"0" * 12),
+ backend=backend
+ ).decryptor()
+ with pytest.raises(ValueError):
+ decryptor.finalize_with_tag(b"tagtooshort")

View file

@ -50,7 +50,7 @@ define host_python_settings
LDSHARED="$(HOSTCC) -shared" \
CFLAGS="$(HOST_CFLAGS)" \
CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON_INC_DIR)" \
LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib" \
LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON_VERSION) -Wl$(comma)-rpath$(comma)$(STAGING_DIR_HOSTPKG)/lib" \
_PYTHON_HOST_PLATFORM=linux2
endef

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-hyperlink
PKG_VERSION:=17.3.1
PKG_VERSION:=18.0.0
PKG_RELEASE:=1
PKG_SOURCE:=hyperlink-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/h/hyperlink
PKG_HASH:=bc4ffdbde9bdad204d507bd8f554f16bba82dd356f6130cb16f41422909c33bc
PKG_HASH:=f01b4ff744f14bc5d0a22a6b9f1525ab7d6312cb0ff967f59414bbac52f0a306
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-hyperlink-$(PKG_VERSION)
@ -37,14 +37,18 @@ endef
define Package/python-hyperlink
$(call Package/python-hyperlink/Default)
TITLE:=Pure-Python immutable URLs
DEPENDS:=+PACKAGE_python-hyperlink:python-light
DEPENDS:= \
+PACKAGE_python-hyperlink:python-light \
+PACKAGE_python-hyperlink:python-idna
VARIANT:=python
endef
define Package/python3-hyperlink
$(call Package/python-hyperlink/Default)
TITLE:=Pure-Python immutable URLs
DEPENDS:=+PACKAGE_python3-hyperlink:python3-light
DEPENDS:= \
+PACKAGE_python3-hyperlink:python3-light \
+PACKAGE_python3-hyperlink:python3-idna
VARIANT:=python3
endef

View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=python-idna
PKG_VERSION:=2.6
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=idna-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/f4/bd/0467d62790828c23c47fc1dfa1b1f052b24efdf5290f071c7a91d0d82fd3
@ -37,14 +37,14 @@ endef
define Package/python-idna
$(call Package/python-idna/Default)
TITLE:=python-idna
DEPENDS:=+PACKAGE_python-idna:python-light
DEPENDS:=+PACKAGE_python-idna:python-light +PACKAGE_python-idna:python-codecs
VARIANT:=python
endef
define Package/python3-idna
$(call Package/python-idna/Default)
TITLE:=python3-idna
DEPENDS:=+PACKAGE_python3-idna:python3-light
DEPENDS:=+PACKAGE_python3-idna:python3-light +PACKAGE_python3-idna:python3-codecs
VARIANT:=python3
endef

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-ipaddress
PKG_VERSION:=1.0.19
PKG_RELEASE:=2
PKG_VERSION:=1.0.22
PKG_RELEASE:=1
PKG_SOURCE:=ipaddress-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/f0/ba/860a4a3e283456d6b7e2ab39ce5cf11a3490ee1a363652ac50abf9f0f5df
PKG_HASH:=200d8686011d470b5e4de207d803445deee427455cd0cb7c982b68cf82524f81
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/i/ipaddress
PKG_HASH:=b146c751ea45cad6188dd6cf2d9b757f6f4f8d6ffb96a023e6f2e26eea02a72c
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-ipaddress-$(PKG_VERSION)
@ -34,7 +34,7 @@ endef
define Package/python-ipaddress
$(call Package/python-ipaddress/Default)
TITLE:=python-ipaddress
TITLE:=Python 3.3+'s ipaddress
DEPENDS:=+PACKAGE_python-ipaddress:python-light
VARIANT:=python
endef

View file

@ -47,11 +47,19 @@ python="$4"
mode="$5"
filespec="$6"
SED="${SED:-sed -e}"
process_filespec "$src_dir" "$dst_dir" "$filespec" || {
echo "process filespec error-ed"
exit 1
}
usr_bin_dir="$dst_dir/usr/bin"
if [ -d "$usr_bin_dir" ] ; then
$SED "1"'!'"b;s,^#"'!'".*python.*,#"'!'"/usr/bin/python${ver}," -i --follow-symlinks $usr_bin_dir/*
fi
if [ "$mode" == "sources" ] ; then
# Copy only python source files
find $dst_dir -not -type d -not -name "*\.py" | xargs rm -f

View file

@ -70,6 +70,7 @@ define PyPackage
define Package/$(1)/install
$(call PyPackage/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
SED="$(SED)" \
$(SHELL) $(python_mk_path)python-package-install.sh "2" \
"$(PKG_INSTALL_DIR)" "$$(1)" \
"$(HOST_PYTHON_BIN)" "$$(2)" \

View file

@ -8,12 +8,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-ply
PKG_VERSION:=3.10
PKG_RELEASE:=2
PKG_VERSION:=3.11
PKG_RELEASE:=1
PKG_SOURCE:=ply-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.dabeaz.com/ply
PKG_HASH:=96e94af7dd7031d8d6dd6e2a8e0de593b511c211a86e28a9c9621c275ac8bacb
PKG_SOURCE_URL:=http://www.dabeaz.com/ply \
https://files.pythonhosted.org/packages/source/p/ply
PKG_HASH:=00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-ply-$(PKG_VERSION)
@ -36,14 +37,14 @@ endef
define Package/python-ply
$(call Package/python-ply/Default)
TITLE:=python-ply
TITLE:=lex and yacc for Python
DEPENDS:=+PACKAGE_python-ply:python-light
VARIANT:=python
endef
define Package/python3-ply
$(call Package/python-ply/Default)
TITLE:=python3-ply
TITLE:=lex and yacc for Python
DEPENDS:=+PACKAGE_python3-ply:python3-light
VARIANT:=python3
endef

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-pyasn1
PKG_VERSION:=0.4.2
PKG_RELEASE:=2
PKG_VERSION:=0.4.3
PKG_RELEASE:=1
PKG_SOURCE:=pyasn1-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/eb/3d/b7d0fdf4a882e26674c68c20f40682491377c4db1439870f5b6f862f76ed
PKG_HASH:=d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/p/pyasn1
PKG_HASH:=fb81622d8f3509f0026b0683fe90fea27be7284d3826a5f2edf97f69151ab0fc
PKG_LICENSE:=BSD-2-Clause
PKG_LICENSE_FILES:=LICENSE.txt
@ -31,19 +31,19 @@ define Package/python-pyasn1/Default
SECTION:=lang
CATEGORY:=Languages
SUBMENU:=Python
URL:=http://pyasn1.sourceforge.net/
URL:=https://github.com/etingof/pyasn1
endef
define Package/python-pyasn1
$(call Package/python-pyasn1/Default)
TITLE:=python-pyasn1
TITLE:=ASN.1 library for Python
DEPENDS:=+PACKAGE_python-pyasn1:python-light
VARIANT:=python
endef
define Package/python3-pyasn1
$(call Package/python-pyasn1/Default)
TITLE:=python3-pyasn1
TITLE:=ASN.1 library for Python
DEPENDS:=+PACKAGE_python3-pyasn1:python3-light
VARIANT:=python3
endef

View file

@ -8,14 +8,17 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-urllib3
PKG_VERSION:=1.22
PKG_VERSION:=1.24.3
PKG_RELEASE:=1
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE.txt
PKG_SOURCE:=urllib3-$(PKG_VERSION).tar.gz
PKG_BUILD_DIR:=$(BUILD_DIR)/urllib3-$(PKG_VERSION)/
PKG_SOURCE_URL:=https://pypi.python.org/packages/ee/11/7c59620aceedcc1ef65e156cc5ce5a24ef87be4107c2b74458464e437a5d/
PKG_HASH:=cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/u/urllib3
PKG_HASH:=2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4
PKG_BUILD_DIR:=$(BUILD_DIR)/urllib3-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
include ../python-package.mk
@ -24,25 +27,16 @@ define Package/python-urllib3
SUBMENU:=Python
SECTION:=lang
CATEGORY:=Languages
MAINTAINER:=Gergely Kiss <mail.gery@gmail.com>
TITLE:=HTTP library with thread-safe connection pooling, file post, and more.
TITLE:=Sanity-friendly HTTP client
URL:=https://urllib3.readthedocs.io/
DEPENDS:=+python
VARIANT:=python
endef
define Package/python-urllib3/description
HTTP library with thread-safe connection pooling, file post, and more.
endef
define Build/Compile
$(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
endef
define Package/python-urllib3/install
$(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
$(CP) \
$(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
$(1)$(PYTHON_PKG_DIR)
endef
$(eval $(call PyPackage,python-urllib3))
$(eval $(call BuildPackage,python-urllib3))
$(eval $(call BuildPackage,python-urllib3-src))

View file

@ -6,14 +6,10 @@
#
PYTHON_VERSION:=2.7
PYTHON_VERSION_MICRO:=15
PYTHON_VERSION_MICRO:=18
PYTHON_SETUPTOOLS_PKG_RELEASE:=1
PYTHON_PIP_PKG_RELEASE:=1
PYTHON_SETUPTOOLS_VERSION:=39.0.1
PYTHON_PIP_VERSION:=9.0.3
PYTHON_SETUPTOOLS_VERSION:=$(PYTHON_SETUPTOOLS_VERSION)-$(PYTHON_SETUPTOOLS_PKG_RELEASE)
PYTHON_PIP_VERSION:=$(PYTHON_PIP_VERSION)-$(PYTHON_PIP_PKG_RELEASE)
PYTHON_SETUPTOOLS_VERSION:=41.2.0
PYTHON_PIP_VERSION:=19.2.3

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=python-zope-interface
PKG_VERSION:=4.4.3
PKG_RELEASE:=2
PKG_VERSION:=4.5.0
PKG_RELEASE:=1
PKG_SOURCE:=zope.interface-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/bd/d2/25349ed41f9dcff7b3baf87bd88a4c82396cf6e02f1f42bb68657a3132af
PKG_HASH:=d6d26d5dfbfd60c65152938fcb82f949e8dada37c041f72916fef6621ba5c5ce
PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/z/zope.interface
PKG_HASH:=57c38470d9f57e37afb460c399eb254e7193ac7fb8042bd09bdc001981a9c74c
PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-zope-interface-$(PKG_VERSION)
@ -36,14 +36,14 @@ endef
define Package/python-zope-interface
$(call Package/python-zope-interface/Default)
TITLE:=python-zope-interface
TITLE:=Interfaces for Python
DEPENDS:=+PACKAGE_python-zope-interface:python-light
VARIANT:=python
endef
define Package/python3-zope-interface
$(call Package/python-zope-interface/Default)
TITLE:=python3-zope-interface
TITLE:=Interfaces for Python
DEPENDS:=+PACKAGE_python3-zope-interface:python3-light
VARIANT:=python3
endef
@ -61,18 +61,6 @@ $(call Package/python-zope-interface/description)
(Variant for Python3)
endef
define PyPackage/python-zope-interface/filespec
+|$(PYTHON_PKG_DIR)
-|$(PYTHON_PKG_DIR)/zope/interface/common/tests
-|$(PYTHON_PKG_DIR)/zope/interface/tests
endef
define Py3Package/python3-zope-interface/filespec
+|$(PYTHON3_PKG_DIR)
-|$(PYTHON3_PKG_DIR)/zope/interface/common/tests
-|$(PYTHON3_PKG_DIR)/zope/interface/tests
endef
$(eval $(call PyPackage,python-zope-interface))
$(eval $(call BuildPackage,python-zope-interface))
$(eval $(call BuildPackage,python-zope-interface-src))

View file

@ -0,0 +1,21 @@
diff --git a/setup.py b/setup.py
index 0eb36ea..2e64aae 100644
--- a/setup.py
+++ b/setup.py
@@ -121,7 +121,7 @@ setup(name='zope.interface',
"Framework :: Zope3",
"Topic :: Software Development :: Libraries :: Python Modules",
],
- packages=find_packages('src'),
+ packages=find_packages('src', exclude=["*.tests", "*.tests.*"]),
package_dir={'': 'src'},
namespace_packages=["zope"],
cmdclass={
@@ -129,6 +129,7 @@ setup(name='zope.interface',
},
test_suite='zope.interface.tests',
include_package_data=True,
+ exclude_package_data={'':['tests/*']},
zip_safe=False,
tests_require=tests_require,
install_requires=['setuptools'],

View file

@ -12,11 +12,11 @@ include ../python-version.mk
PKG_NAME:=python
PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
PKG_HASH:=22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574
PKG_HASH:=b62c0e7937551d0cc02b8fd5cb0f544f9405bafc9a54d3808ed4594812edef43
PKG_LICENSE:=PSF
PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
@ -268,7 +268,7 @@ define PyPackage/python/filespec
endef
HOST_LDFLAGS += \
$$$$(pkg-config --static --libs libcrypto libssl)
$$$$(pkg-config --static --libs libcrypto libssl) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib
ifeq ($(HOST_OS),Linux)
HOST_LDFLAGS += \

View file

@ -8,7 +8,7 @@
define Package/python-openssl
$(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) SSL module
DEPENDS:=+python-light +libopenssl
DEPENDS:=+python-light +libopenssl +ca-bundle
endef
$(eval $(call PyBasePackage,python-openssl, \

View file

@ -8,17 +8,16 @@
define Package/python-pip
$(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) pip module
VERSION:=$(PYTHON_PIP_VERSION)
VERSION:=$(PYTHON_PIP_VERSION)-$(PYTHON_PIP_PKG_RELEASE)
DEPENDS:=+python +python-setuptools +python-pip-conf
endef
define PyPackage/python-pip/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages
# Adjust shebang to proper python location on target
sed "1s@.*@#\!/usr/bin/python$(PYTHON_VERSION)@" -i $(PKG_BUILD_DIR)/install-pip/bin/*
$(CP) $(PKG_BUILD_DIR)/install-pip/bin/* $(1)/usr/bin
$(CP) \
$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON_VERSION)/site-packages/pip \
$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON_VERSION)/site-packages/pip-$(PYTHON_PIP_VERSION).dist-info \
$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages/
endef

View file

@ -8,18 +8,17 @@
define Package/python-setuptools
$(call Package/python/Default)
TITLE:=Python $(PYTHON_VERSION) setuptools module
VERSION:=$(PYTHON_SETUPTOOLS_VERSION)
VERSION:=$(PYTHON_SETUPTOOLS_VERSION)-$(PYTHON_SETUPTOOLS_PKG_RELEASE)
DEPENDS:=+python
endef
define PyPackage/python-setuptools/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON_VERSION)/site-packages
# Adjust shebang to proper python location on target
sed "1s@.*@#\!/usr/bin/python$(PYTHON_VERSION)@" -i $(PKG_BUILD_DIR)/install-setuptools/bin/*
$(CP) $(PKG_BUILD_DIR)/install-setuptools/bin/* $(1)/usr/bin
$(CP) \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/pkg_resources \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/setuptools \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/setuptools-$(PYTHON_SETUPTOOLS_VERSION).dist-info \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON_VERSION)/site-packages/easy_install.py \
$(1)/usr/lib/python$(PYTHON_VERSION)/site-packages
endef

View file

@ -17,4 +17,4 @@ Subject: [PATCH] enable zlib
+zlib zlibmodule.c -lz
# Interface to the Expat XML parser
#
# More information on Expat can be found at www.libexpat.org.

View file

@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -497,7 +497,8 @@ class PyBuildExt(build_ext):
@@ -543,7 +543,8 @@ class PyBuildExt(build_ext):
add_dir_to_list(dir_list, directory)
if os.path.normpath(sys.prefix) != '/usr' \

View file

@ -1,6 +1,6 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -1127,6 +1127,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
@@ -1133,6 +1133,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
done; \
done
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
@ -8,7 +8,7 @@
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
@@ -1153,6 +1154,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
@@ -1159,6 +1160,7 @@ libinstall: build_all $(srcdir)/Lib/$(PL
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt

View file

@ -3,7 +3,7 @@
@@ -71,7 +71,7 @@ int Py_InteractiveFlag; /* Needed by Py_
int Py_InspectFlag; /* Needed to determine whether to exit at SystemExit */
int Py_NoSiteFlag; /* Suppress 'import site' */
int Py_BytesWarningFlag; /* Warn on str(bytes) and str(buffer) */
int Py_BytesWarningFlag; /* Warn on comparison between bytearray and unicode */
-int Py_DontWriteBytecodeFlag; /* Suppress writing bytecode files (*.py[co]) */
+int Py_DontWriteBytecodeFlag = 1; /* Suppress writing bytecode files (*.py[co]) */
int Py_UseClassExceptionsFlag = 1; /* Needed by bltinmodule.c: deprecated */

View file

@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
@@ -7077,7 +7077,7 @@ sys/param.h sys/poll.h sys/random.h sys/
@@ -7084,7 +7084,7 @@ sys/param.h sys/poll.h sys/random.h sys/
sys/termio.h sys/time.h \
sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
@ -9,7 +9,7 @@
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -7299,6 +7299,24 @@ fi
@@ -7306,6 +7306,24 @@ fi
fi
@ -36,7 +36,7 @@
do :
--- a/configure.ac
+++ b/configure.ac
@@ -1732,10 +1732,17 @@ sys/param.h sys/poll.h sys/random.h sys/
@@ -1739,10 +1739,17 @@ sys/param.h sys/poll.h sys/random.h sys/
sys/termio.h sys/time.h \
sys/times.h sys/types.h sys/un.h sys/utsname.h sys/wait.h pty.h libutil.h \
sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \

View file

@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -454,13 +454,8 @@ class PyBuildExt(build_ext):
@@ -500,13 +500,8 @@ class PyBuildExt(build_ext):
os.unlink(tmpfile)
def detect_modules(self):

View file

@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -1083,6 +1083,7 @@ class PyBuildExt(build_ext):
@@ -1129,6 +1129,7 @@ class PyBuildExt(build_ext):
if db_setup_debug: print "db lib: ", dblib, "not found"
except db_found:
@ -8,7 +8,7 @@
if db_setup_debug:
print "bsddb using BerkeleyDB lib:", db_ver, dblib
print "bsddb lib dir:", dblib_dir, " inc dir:", db_incdir
@@ -1097,7 +1098,7 @@ class PyBuildExt(build_ext):
@@ -1143,7 +1144,7 @@ class PyBuildExt(build_ext):
exts.append(Extension('_bsddb', ['_bsddb.c'],
depends = ['bsddb.h'],
library_dirs=dblib_dir,
@ -17,7 +17,7 @@
include_dirs=db_incs,
libraries=dblibs))
else:
@@ -1308,10 +1309,11 @@ class PyBuildExt(build_ext):
@@ -1354,10 +1355,11 @@ class PyBuildExt(build_ext):
break
elif cand == "bdb":
if db_incs is not None:

View file

@ -1,6 +1,6 @@
--- a/setup.py
+++ b/setup.py
@@ -463,8 +463,9 @@ class PyBuildExt(build_ext):
@@ -509,8 +509,9 @@ class PyBuildExt(build_ext):
# directly since an inconsistently reproducible issue comes up where
# the environment variable is not set even though the value were passed
# into configure and stored in the Makefile (issue found on OS X 10.3).

View file

@ -0,0 +1,74 @@
https://bugs.python.org/issue21622
Based on the patch from Alpine Linux
https://git.alpinelinux.org/aports/tree/main/python2/musl-find_library.patch
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -86,6 +86,8 @@ if os.name == "posix" and sys.platform =
elif os.name == "posix":
# Andreas Degert's find functions, using gcc, /sbin/ldconfig, objdump
import re, tempfile, errno
+ from glob import glob
+ musl_ldso = glob('/lib/ld-musl-*.so.1')
def _findLib_gcc(name):
# Run GCC's linker with the -t (aka --trace) option and examine the
@@ -232,6 +234,57 @@ elif os.name == "posix":
def find_library(name, is64 = False):
return _get_soname(_findLib_crle(name, is64) or _findLib_gcc(name))
+ elif musl_ldso and os.path.isfile(musl_ldso[0]):
+
+ def _is_elf(filepath):
+ try:
+ with open(filepath, 'rb') as fh:
+ return fh.read(4) == b'\x7fELF'
+ except:
+ return False
+
+ def find_library(name):
+ # absolute name?
+ if os.path.isabs(name):
+ if _is_elf(name):
+ return name
+ else:
+ return None
+
+ # special case for unified standard libs
+ stdlibs = ['libcrypt.so', 'libdl.so', 'libm.so', 'libpthread.so', 'libresolv.so', 'librt.so', 'libutil.so', 'libxnet.so']
+ if name in stdlibs:
+ name = 'libc.so'
+ elif ('lib' + name + '.so') in stdlibs:
+ name = 'c'
+
+ paths = []
+ # read path list from /etc/ld-musl-$(ARCH).path
+ path_list = musl_ldso[0].replace('/lib/', '/etc/').replace('.so.1', '.path')
+ try:
+ with open(path_list, 'r') as fh:
+ paths = [path for line in fh for path in line.rstrip('\n').split(':') if path]
+ except:
+ paths = []
+ # default path list if /etc/ld-musl-$(ARCH).path is empty or does not exist
+ if not paths:
+ paths = ['/lib', '/usr/local/lib', '/usr/lib']
+
+ # prepend paths from LD_LIBRARY_PATH
+ if 'LD_LIBRARY_PATH' in os.environ:
+ paths = os.environ['LD_LIBRARY_PATH'].split(':') + paths
+
+ for d in paths:
+ f = os.path.join(d, name)
+ if _is_elf(f):
+ return os.path.basename(f)
+
+ prefix = os.path.join(d, 'lib'+name)
+ for suffix in ['.so', '.so.*']:
+ for f in glob('{0}{1}'.format(prefix, suffix)):
+ if _is_elf(f):
+ return os.path.basename(f)
+
else:
def _findSoname_ldconfig(name):

View file

@ -50,7 +50,7 @@ define host_python3_settings
LDSHARED="$(HOSTCC) -shared" \
CFLAGS="$(HOST_CFLAGS)" \
CPPFLAGS="$(HOST_CPPFLAGS) -I$(HOST_PYTHON3_INC_DIR)" \
LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON3_VERSION) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib" \
LDFLAGS="$(HOST_LDFLAGS) -lpython$(PYTHON3_VERSION) -Wl$(comma)-rpath$(comma)$(STAGING_DIR_HOSTPKG)/lib" \
_PYTHON_HOST_PLATFORM=linux2
endef

View file

@ -69,6 +69,7 @@ define Py3Package
define Package/$(1)/install
$(call Py3Package/$(1)/install,$$(1))
find $(PKG_INSTALL_DIR) -name "*\.exe" | xargs rm -f
SED="$(SED)" \
$(SHELL) $(python3_mk_path)python-package-install.sh "3" \
"$(PKG_INSTALL_DIR)" "$$(1)" \
"$(HOST_PYTHON3_BIN)" "$$(2)" \

View file

@ -8,16 +8,12 @@
# Note: keep in sync with setuptools & pip
PYTHON3_VERSION_MAJOR:=3
PYTHON3_VERSION_MINOR:=6
PYTHON3_VERSION_MICRO:=5
PYTHON3_VERSION_MICRO:=15
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
PYTHON3_PIP_PKG_RELEASE:=1
PYTHON3_SETUPTOOLS_VERSION:=39.0.1
PYTHON3_PIP_VERSION:=9.0.3
PYTHON3_SETUPTOOLS_VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE)
PYTHON3_PIP_VERSION:=$(PYTHON3_PIP_VERSION)-$(PYTHON3_PIP_PKG_RELEASE)
PYTHON3_PIP_PKG_RELEASE:=2
PYTHON3_SETUPTOOLS_VERSION:=40.6.2
PYTHON3_PIP_VERSION:=18.1

View file

@ -19,7 +19,7 @@ PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
PKG_HASH:=f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
PKG_HASH:=6e28d7cdd6dd513dd190e49bca3972e20fcf455090ccf2ef3f1a227614135d91
PKG_LICENSE:=PSF
PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
@ -264,7 +264,7 @@ define Py3Package/python3/filespec
endef
HOST_LDFLAGS += \
$$$$(pkg-config --static --libs libcrypto libssl)
$$$$(pkg-config --static --libs libcrypto libssl) -Wl$(comma)-rpath=$(STAGING_DIR_HOSTPKG)/lib
ifeq ($(HOST_OS),Linux)
HOST_LDFLAGS += \

View file

@ -8,7 +8,7 @@
define Package/python3-openssl
$(call Package/python3/Default)
TITLE:=Python $(PYTHON3_VERSION) SSL module
DEPENDS:=+python3-light +libopenssl
DEPENDS:=+python3-light +libopenssl +ca-bundle
endef
$(eval $(call Py3BasePackage,python3-openssl, \

View file

@ -8,17 +8,16 @@
define Package/python3-pip
$(call Package/python3/Default)
TITLE:=Python $(PYTHON3_VERSION) pip module
VERSION:=$(PYTHON3_PIP_VERSION)
VERSION:=$(PYTHON3_PIP_VERSION)-$(PYTHON3_PIP_PKG_RELEASE)
DEPENDS:=+python3 +python3-setuptools +python-pip-conf
endef
define Package/python3-pip/install
define Py3Package/python3-pip/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages
# Adjust shebang to proper python location on target
sed "1s@.*@#\!/usr/bin/python$(PYTHON3_VERSION)@" -i $(PKG_BUILD_DIR)/install-pip/bin/*
$(CP) $(PKG_BUILD_DIR)/install-pip/bin/pip3* $(1)/usr/bin
$(CP) \
$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip \
$(PKG_BUILD_DIR)/install-pip/lib/python$(PYTHON3_VERSION)/site-packages/pip-$(PYTHON3_PIP_VERSION).dist-info \
$(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/
find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf
endef

View file

@ -8,19 +8,18 @@
define Package/python3-setuptools
$(call Package/python3/Default)
TITLE:=Python $(PYTHON3_VERSION) setuptools module
VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)
VERSION:=$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE)
DEPENDS:=+python3
endef
define Py3Package/python3-setuptools/install
$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages
# Adjust shebang to proper python location on target
sed "1s@.*@#\!/usr/bin/python$(PYTHON3_VERSION)@" -i $(PKG_BUILD_DIR)/install-setuptools/bin/*
$(CP) $(PKG_BUILD_DIR)/install-setuptools/bin/easy_install-* $(1)/usr/bin
$(LN) easy_install-$(PYTHON3_VERSION) $(1)/usr/bin/easy_install-3
$(CP) \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/pkg_resources \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/setuptools \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/setuptools-$(PYTHON3_SETUPTOOLS_VERSION).dist-info \
$(PKG_BUILD_DIR)/install-setuptools/lib/python$(PYTHON3_VERSION)/site-packages/easy_install.py \
$(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages
find $(1)/usr/lib/python$(PYTHON3_VERSION)/site-packages/ -name __pycache__ | xargs rm -rf

Some files were not shown because too many files have changed in this diff Show more