Turris Build merge requestshttps://gitlab.nic.cz/turris/os/build/-/merge_requests2019-06-18T15:16:21+02:00https://gitlab.nic.cz/turris/os/build/-/merge_requests/15patches: luci: dont use opkg --force-overwrite2019-06-18T15:16:21+02:00Josef Schlehoferpatches: luci: dont use opkg --force-overwriteIn case of installing ntpd package in LuCI, which is in conflict due to file, which is provided by another package (in this case busybox). It uses opkg install ntpd --force-overwrite. When you want to use switch-branch hbs from hbk it wi...In case of installing ntpd package in LuCI, which is in conflict due to file, which is provided by another package (in this case busybox). It uses opkg install ntpd --force-overwrite. When you want to use switch-branch hbs from hbk it will fail because of collision.
```
DIE:
[string "transaction"]:330: [string "transaction"]:153: Collisions:
• /sbin/ntpd: busybox (new-file), ntpd (existing-file)
Aborted
```
All the details are included in the commit message of the patch.
Forum thread: https://forum.turris.cz/t/recommended-way-to-install-additional-packages/10338
Github issue: https://github.com/openwrt/luci/issues/2771
(Upstream doesn't seem that they want to change the behavior as it is intended by them. Already for 7 years)
The patch is marked as wip not as hack, because it would be nice, if we (or maybe someon else) could improve a little bit LuCI to be more user-friendly. At least to provide choice, if the user wants to overwrite it or not.Josef SchlehoferJosef Schlehoferhttps://gitlab.nic.cz/turris/os/build/-/merge_requests/17ntpd section isn't shown in LuCI as there is no /usr/sbin/ntpd2019-06-24T07:49:57+02:00Josef Schlehoferntpd section isn't shown in LuCI as there is no /usr/sbin/ntpdI'm not quite sure what we would like to achieve with `https://gitlab.labs.nic.cz/turris/turris-build/blob/master/patches/openwrt/hack/0003-busybox-Try-to-install-everything-into-s-bin.patch` as there is no commit message.
Unfortunate...I'm not quite sure what we would like to achieve with `https://gitlab.labs.nic.cz/turris/turris-build/blob/master/patches/openwrt/hack/0003-busybox-Try-to-install-everything-into-s-bin.patch` as there is no commit message.
Unfortunately, with that patch we diverged a little bit from OpenWrt and LuCI doesn't count with that.
In LuCI, there is a hard-coded path, which is looking for /usr/sbin/ntpd , if it's not there then it doesn't show ntpd section, but we have it in /sbin/ntpd. That's why I need to add `/sbin/ntpd` to LuCI and LuCI seems to be happy about it as it works.
This is an issue across all our Turris OS releases.
Forum related thread: https://forum.turris.cz/t/ntp-server-choice-removed/10405/13?u=pepeJosef SchlehoferJosef Schlehoferhttps://gitlab.nic.cz/turris/os/build/-/merge_requests/38NEWS: add release notes for Turris OS 4.02019-09-03T16:00:52+02:00Josef SchlehoferNEWS: add release notes for Turris OS 4.0I need to admit that this changelog is so long. We should release more often. :P Not sure tho, if you want to specify somehow that it is going to be RC version in the changelog or not. I would just rather avoid it for cases when everyth...I need to admit that this changelog is so long. We should release more often. :P Not sure tho, if you want to specify somehow that it is going to be RC version in the changelog or not. I would just rather avoid it for cases when everything works as it should. :-D So we dont need to compile it again.
libarchive and as well bind has a lot of CVEs. I didn't mention them and just said "multiple CVE fixes"
Suggestions are highly appreciated.https://gitlab.nic.cz/turris/os/build/-/merge_requests/42Remove powerdown workaround2019-09-05T09:39:30+02:00Josef SchlehoferRemove powerdown workaroundI will remove it as well from packages and will do the same for 5.0/master branches.I will remove it as well from packages and will do the same for 5.0/master branches.https://gitlab.nic.cz/turris/os/build/-/merge_requests/46patches/openwrt: kernel: enable CONFIG_BRIDGE_VLAN_FILTERING2019-10-07T13:35:24+02:00Josef Schlehoferpatches/openwrt: kernel: enable CONFIG_BRIDGE_VLAN_FILTERINGIt was suggested by one of our user on [forum](https://forum.turris.cz/t/turris-os-4-0-is-out/11182/5?u=pepe). It is enabled in OpenWrt 19.07 and master by this [patch](https://lists.openwrt.org/pipermail/openwrt-devel/2018-April/011715....It was suggested by one of our user on [forum](https://forum.turris.cz/t/turris-os-4-0-is-out/11182/5?u=pepe). It is enabled in OpenWrt 19.07 and master by this [patch](https://lists.openwrt.org/pipermail/openwrt-devel/2018-April/011715.html). Let's enable it also in OpenWrt 18.06. I put it to backport folder and will try to ask upstream if can they backport it to stable branch.
More details about this config can be found [here](https://cateee.net/lkddb/web-lkddb/BRIDGE_VLAN_FILTERING.html).Turris OS 4.0.1https://gitlab.nic.cz/turris/os/build/-/merge_requests/62Wget: don't compile non-ssl variant and use gnu-wget instead of uclient-fetch2019-11-26T11:57:33+01:00Josef SchlehoferWget: don't compile non-ssl variant and use gnu-wget instead of uclient-fetch[Our users](https://forum.turris.cz/t/turris-os-4-0-2-is-released-into-hbt-testing-branch/11428/33?u=pepe) notified us that Subordinates tab is no longer present in Foris in HBT branch and above. I've tested it on Turris 1.1 running the ...[Our users](https://forum.turris.cz/t/turris-os-4-0-2-is-released-into-hbt-testing-branch/11428/33?u=pepe) notified us that Subordinates tab is no longer present in Foris in HBT branch and above. I've tested it on Turris 1.1 running the latest HBK build and I am able to reproduce it.
```
root@turris:~# opkg install foris-subordinates-plugin
Installing foris-subordinates-plugin (0.4-3.6-1.0) to root...
Downloading https://repo.turris.cz/hbk/turris1x/packages/turrispackages/foris-subordinates-plugin_0.4-3.6-1_powerpc_8540.ipk
Installing dtc (1.4.6-2.0) to root...
Downloading https://repo.turris.cz/hbk/turris1x/packages/packages/dtc_1.4.6-2_powerpc_8540.ipk
Installing uboot-mkimage (2018.03-1.0) to root...
Downloading https://repo.turris.cz/hbk/turris1x/packages/core/uboot-mkimage_2018.03-1_powerpc_8540.ipk
Installing wget-nossl (1.19.5-3.0) to root...
Downloading https://repo.turris.cz/hbk/turris1x/packages/packages/wget-nossl_1.19.5-3_powerpc_8540.ipk
Installing turris-netboot-tools (0.6.0-1.0) to root...
Downloading https://repo.turris.cz/hbk/turris1x/packages/turrispackages/turris-netboot-tools_0.6.0-1_powerpc_8540.ipk
Configuring uboot-mkimage.
Configuring wget-nossl.
Configuring dtc.
Collected errors:
* opkg_download: Failed to download https://repo.turris.cz/hbk/turris1x/packages/turrispackages/turris-netboot-tools_0.6.0-1_powerpc_8540.ipk, wget returned 1.
* opkg_install_pkg: Failed to download turris-netboot-tools. Perhaps you need to run 'opkg update'?
* opkg_install_cmd: Cannot install package foris-subordinates-plugin.
root@turris:~# opkg update
Downloading https://repo.turris.cz/hbk/turris1x/packages/core/Packages.gz
*** Failed to download the package list from https://repo.turris.cz/hbk/turris1x/packages/core/Packages.gz
```
It seems that the proposed solution from PR https://gitlab.labs.nic.cz/turris/turris-build/merge_requests/52 is not sufficient. When I installed gnu-wget it was better. It chose wget with SSL. I'm in favor to use gnu-wget instead of uclient-fetch which provides wget.
See: https://github.com/openwrt/packages/issues/9456#issuecomment-510729460
Anyway, the sizes of `wget` and `wget-nossl`
- wget-nossl: 176K
- wget: 194K
The difference is 18K, so let's don't compile wget-nossl and it will save us a lot of troubles.Turris OS 4.0.2https://gitlab.nic.cz/turris/os/build/-/merge_requests/83NEWS: changelog for Turris OS 4.0.52020-01-07T14:39:42+01:00Josef SchlehoferNEWS: changelog for Turris OS 4.0.5Notification created and it looks like this:
![image](/uploads/810e220da167d426185814e32737d5f6/image.png)
I think I quite like as it all CVEs is in human-readable text and can be used for copy-pasting if someone wants to look for more ...Notification created and it looks like this:
![image](/uploads/810e220da167d426185814e32737d5f6/image.png)
I think I quite like as it all CVEs is in human-readable text and can be used for copy-pasting if someone wants to look for more details.Turris OS 4.0.5https://gitlab.nic.cz/turris/os/build/-/merge_requests/109Remove hacky patch for mariadb removal and use suggested solution2020-02-03T19:12:47+01:00Josef SchlehoferRemove hacky patch for mariadb removal and use suggested solutionIn this pull request, I've removed my ugly patch, which removes mariadb from packages feed, however, mariadb was updated in OpenWrt 18.06/19.07/master branches and it is no longer applying. Let's use the suggested solution from https://g...In this pull request, I've removed my ugly patch, which removes mariadb from packages feed, however, mariadb was updated in OpenWrt 18.06/19.07/master branches and it is no longer applying. Let's use the suggested solution from https://github.com/openwrt/openwrt/pull/2624.
Commit messages are included.Turris OS 4.0.7