Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wondershaper for openSUSE:Factory checked in at 2022-04-12 21:51:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wondershaper (Old) and /work/SRC/openSUSE:Factory/.wondershaper.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wondershaper" Tue Apr 12 21:51:00 2022 rev:22 rq:969488 version:1.4.1+git.20211015 Changes: -------- --- /work/SRC/openSUSE:Factory/wondershaper/wondershaper.changes 2022-02-17 00:32:03.997417415 +0100 +++ /work/SRC/openSUSE:Factory/.wondershaper.new.1900/wondershaper.changes 2022-04-12 21:51:54.873890542 +0200 @@ -1,0 +2,34 @@ +Sat Mar 12 07:05:17 UTC 2022 - Carsten Ziepke <[email protected]> + +- Update to 1.4.1+git.20211015 + - use Debian systemd paths + - add high priority host support +- Changes since version 1.4 + - download limiting has been added from (removed in 1.3), it had + to be reworked the script now directs ingress to ifb virtual + interface where it is properly limited. + Source for this work are: + - https://gist.github.com/ole1986/d9d6be5218affd41796610a35e3b069c + - https://wiki.archlinux.org/index.php/advanced_traffic_control + - make upload or download limiting optional +- Changes since version 1.3 + - move from CBQ to HTB queuing. + CBQ didn't cope well on a ~100Mbps link : individual downloads + were ceiling at 3Mbit/s. Moving to HTB allows to really use all + the available bandwidth, event with a single TCP connection, + and without any caveats on SIP telephony or link reactivity. +- Changes since version 1.2 + - added command-line interface (through options and flags) + that didn't seem to be working before as the options were + hardcoded in the script. +- Run spec-cleaner +- Update project URL +- Drop rcwondershaper, wondershaper.service, wondershaper-1.1a.diff +- Drop sysconfig.wondershaper, wondershaper comes now itself with + a .conf file for configuration +- Add wondershaper-fix-conf-path.patch: using /etc/wondershaper + instead /etc/systemd +- Add _service files +- Add wondershaper-systemd-hardening.patch: bsc#1181400 + +------------------------------------------------------------------- Old: ---- rcwondershaper sysconfig.wondershaper wondershaper-1.1a.diff wondershaper-1.1a.tar.bz2 wondershaper.service New: ---- _service _servicedata wondershaper-1.4.1+git.20211015.tar.xz wondershaper-fix-conf-path.patch wondershaper-systemd-hardening.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wondershaper.spec ++++++ --- /var/tmp/diff_new_pack.Ic25GA/_old 2022-04-12 21:51:55.621882141 +0200 +++ /var/tmp/diff_new_pack.Ic25GA/_new 2022-04-12 21:51:55.625882096 +0200 @@ -1,7 +1,7 @@ # # spec file for package wondershaper # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,30 +16,21 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - Name: wondershaper -Version: 1.1a +Version: 1.4.1+git.20211015 Release: 0 Summary: A network QoS (Quality of Service) script License: GPL-2.0-or-later Group: Productivity/Networking/System -Url: http://lartc.org/wondershaper/ - -Source0: wondershaper-1.1a.tar.bz2 -Source1: sysconfig.wondershaper -Source2: rcwondershaper -Source3: wondershaper.service -Patch0: %{name}-%{version}.diff -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +URL: https://github.com/magnific0/wondershaper +Source0: %{name}-%{version}.tar.xz +# PATCH-FIX-OPENSUSE wondershaper-fix-conf-path.patch -- Use /etc/wondershaper for wondershaper.conf place +Patch0: wondershaper-fix-conf-path.patch +# PATCH-FIX-OPENSUSE wondershaper-systemd-hardening.patch -- Added hardening to systemd service(s) (bsc#1181400) +Patch1: wondershaper-systemd-hardening.patch BuildRequires: systemd-rpm-macros Requires: iproute2 -Requires(post): %fillup_prereq -%{?systemd_ordering} +BuildArch: noarch %description Many cablemodem and ADSL users experience horrifying latency while @@ -49,44 +40,36 @@ over a loaded link happily. %prep -%setup -cp %{S:1} %{S:2} . -%patch0 -p1 +%autosetup + +# Fix E: env-script-interpreter (Badness: 9) +sed -i 's|/usr/bin/env bash|/usr/bin/bash|' %{name} %build %install -mv wshaper wshaper.cbq -install -m 755 -d %{buildroot}/usr/sbin -install -m 755 -d %{buildroot}/%{_fillupdir} -install -d %{buildroot}/%{_datadir}/%{name}/scripts -install -m 755 %{SOURCE2} %{buildroot}/%{_datadir}/%{name}/scripts -install -d %{buildroot}/%{_unitdir} -install -m 644 %{SOURCE3} %{buildroot}/%{_unitdir} -install -d %{buildroot}/ -install -m 750 wshaper.* %{buildroot}/usr/sbin/ -install -m 644 sysconfig.wondershaper %{buildroot}/%{_fillupdir}/ -ln -sf service %{buildroot}/usr/sbin/rcwondershaper +install -pDm 755 %{name} %{buildroot}/%{_sbindir}/%{name} +install -pDm 644 %{name}.service %{buildroot}/%{_unitdir}/%{name}.service +install -pDm 644 %{name}.conf %{buildroot}/%{_sysconfdir}/%{name}/%{name}.conf %pre -%service_add_pre wondershaper.service +%service_add_pre %{name}.service %post -%service_add_post wondershaper.service -%{fillup_only} +%service_add_post %{name}.service %preun -%service_del_preun wondershaper.service +%service_del_preun %{name}.service %postun -%service_del_postun wondershaper.service +%service_del_postun %{name}.service %files -%defattr(-, root, root) -%doc COPYING ChangeLog README TODO VERSION -%{_datadir}/%{name} -%{_unitdir} -%{_sbindir}/* -%{_fillupdir}/* +%license COPYING +%doc ChangeLog README.bhubert README.md VERSION +%{_sbindir}/%{name} +%{_unitdir}/%{name}.service +%dir %{_sysconfdir}/%{name} +%config %{_sysconfdir}/%{name}/%{name}.conf %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/magnific0/wondershaper.git</param> <param name="revision">98792b55c2ebf4ab4cafffb0780e0c4185fdc03d</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">wondershaper</param> <param name="versionformat">1.4.1+git.%cd</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/magnific0/wondershaper.git</param> <param name="changesrevision">98792b55c2ebf4ab4cafffb0780e0c4185fdc03d</param> </service> </servicedata> ++++++ wondershaper-fix-conf-path.patch ++++++ diff -Nur wondershaper-1.4.1+git.20211015.orig/wondershaper wondershaper-1.4.1+git.20211015/wondershaper --- wondershaper-1.4.1+git.20211015.orig/wondershaper 2021-10-15 19:58:00.000000000 +0200 +++ wondershaper-1.4.1+git.20211015/wondershaper 2022-03-12 08:20:27.116819755 +0100 @@ -23,7 +23,7 @@ QUANTUM="6000"; VERSION="1.4.1"; -CONF="/etc/systemd/wondershaper.conf"; +CONF="/etc/wondershaper/wondershaper.conf"; CONFLEGACY="/etc/conf.d/wondershaper.conf"; # shellcheck disable=SC2086 eval export HIPRIODST=$HIPRIODST; diff -Nur wondershaper-1.4.1+git.20211015.orig/wondershaper.service wondershaper-1.4.1+git.20211015/wondershaper.service --- wondershaper-1.4.1+git.20211015.orig/wondershaper.service 2021-10-15 19:58:00.000000000 +0200 +++ wondershaper-1.4.1+git.20211015/wondershaper.service 2022-03-12 08:20:41.212861557 +0100 @@ -6,7 +6,7 @@ [Service] Type=oneshot RemainAfterExit=yes -EnvironmentFile=/etc/systemd/wondershaper.conf +EnvironmentFile=/etc/wondershaper/wondershaper.conf ExecStart=/usr/sbin/wondershaper -a $IFACE -d $DSPEED -u $USPEED ExecStop=/usr/sbin/wondershaper -c -a $IFACE ++++++ wondershaper-systemd-hardening.patch ++++++ diff -Nur wondershaper-1.4.1+git.20211015.orig/wondershaper.service wondershaper-1.4.1+git.20211015/wondershaper.service --- wondershaper-1.4.1+git.20211015.orig/wondershaper.service 2021-10-15 19:58:00.000000000 +0200 +++ wondershaper-1.4.1+git.20211015/wondershaper.service 2022-03-12 08:36:24.819800761 +0100 @@ -4,9 +4,18 @@ Wants=network.target [Service] +# added automatically, for details please see +# https://en.opensuse.org/openSUSE:Security_Features#Systemd_hardening_effort +ProtectSystem=full +ProtectHome=true +ProtectHostname=true +ProtectKernelModules=true +ProtectKernelLogs=true +RestrictRealtime=true +# end of automatic additions Type=oneshot RemainAfterExit=yes EnvironmentFile=/etc/wondershaper/wondershaper.conf ExecStart=/usr/sbin/wondershaper -a $IFACE -d $DSPEED -u $USPEED ExecStop=/usr/sbin/wondershaper -c -a $IFACE
