diff --git a/.gitignore b/.gitignore index bd13c70..a1e0faf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initscripts-10.00.1.tar.gz +SOURCES/initscripts-10.00.4.tar.gz diff --git a/.initscripts.metadata b/.initscripts.metadata index d911355..14924a8 100644 --- a/.initscripts.metadata +++ b/.initscripts.metadata @@ -1 +1 @@ -d8fb24363ea22868f81c6b5d1d9a49753d1c3c2f SOURCES/initscripts-10.00.1.tar.gz +da8a69d5fc07799718b03ac43cc7675a981bd8b7 SOURCES/initscripts-10.00.4.tar.gz diff --git a/SOURCES/patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch b/SOURCES/patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch deleted file mode 100644 index a548bc6..0000000 --- a/SOURCES/patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/etc/rc.d/init.d/functions b/etc/rc.d/init.d/functions -index 97f09d13..9b0add1c 100644 ---- a/etc/rc.d/init.d/functions -+++ b/etc/rc.d/init.d/functions -@@ -84,8 +84,9 @@ if [ -z "${BOOTUP:-}" ]; then - LOGLEVEL=1 - fi - -- # NOTE: /dev/ttyS* is serial console. -- if tty | grep --quiet -e '/dev/ttyS'; then -+ # NOTE: /dev/ttyS* is serial console. "not a tty" is such as -+ # /dev/null associated when executed under systemd service units. -+ if LANG=C tty | grep --quiet -e '\(/dev/ttyS\|not a tty\)'; then - BOOTUP=serial - MOVE_TO_COL= - SETCOLOR_SUCCESS= diff --git a/SOURCES/patch001-fix_missing_python3_during_build_phase.patch b/SOURCES/patch001-fix_missing_python3_during_build_phase.patch deleted file mode 100644 index 8e97a13..0000000 --- a/SOURCES/patch001-fix_missing_python3_during_build_phase.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/Makefile b/Makefile -index d91b9bcf..7dbadae4 100644 ---- a/Makefile -+++ b/Makefile -@@ -42,7 +42,7 @@ make-binaries: - $(MAKE) -C src - - make-translations: -- $(MAKE) -C po -+ $(MAKE) -C po PYTHON=$(PYTHON) - - - # NOTE: We are no longer installing into /usr/sbin directory, because this is -diff --git a/po/Makefile b/po/Makefile -index abb0258d..02a58b08 100644 ---- a/po/Makefile -+++ b/po/Makefile -@@ -38,7 +38,11 @@ POTFILES = $(shell ls ../network-scripts/* | grep -v ifcfg-) \ - all: $(NLSPACKAGE).pot $(FMTCATALOGS) - - $(NLSPACKAGE).pot: $(POTFILES) -- ./xgettext_sh.py $(POTFILES) > $(NLSPACKAGE).po -+ if [ -z "$(PYTHON)" ]; then \ -+ ./xgettext_sh.py $(POTFILES) > $(NLSPACKAGE).po; \ -+ else \ -+ $(PYTHON) xgettext_sh.py $(POTFILES) > $(NLSPACKAGE).po; \ -+ fi - if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \ - rm -f $(NLSPACKAGE).po; \ - else \ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index 46871af..120953d 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -18,8 +18,8 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.00.1 -Release: 1%{?dist}.1 +Version: 10.00.4 +Release: 1%{?dist} License: GPLv2 @@ -63,9 +63,8 @@ Obsoletes: %{name} < 9.82-2 # Upstream patches -- official upstream patches released by upstream since the # ---------------- last rebase that are necessary for any reason: -#Patch000: example000.patch -Patch000: patch000-fix_escape_sequence_being_output_under_systemd_service_units.patch -Patch001: patch001-fix_missing_python3_during_build_phase.patch +#Patch000: example000.patch + # Downstream patches -- these should be always included when doing rebase: # ------------------ @@ -183,7 +182,7 @@ support. Additional configuration is required after installation. # --------------- %build -%make_build PYTHON=%{__python3} +%make_build # --------------- @@ -347,8 +346,15 @@ fi # ============================================================================= %changelog -* Mon Aug 12 2019 Jan Macku - 10.00.1-1.1 +* Fri Aug 23 2019 Lukas Nykryn - 10.00.4-1 +- ifup-eth: Fix bridge setting stp option + +* Wed Aug 07 2019 Jan Macku - 10.00.3-1 - rc.d/functions: fix escape sequence being output under systemd service units +- Replace not working awk command with sed + +* Thu Jun 06 2019 Jan Macku - 10.00.2-1 +- ifup-post: fix incorrect condition for RESOLV_MODS * Fri Aug 03 2018 David Kaspar [Dee'Kej] - 10.00.1-1 - consoletype/genhostid/usleep: allow disabling of deprecation warnings