From 7d2246ecd6367e69fe9e141784bdd8c8803078da5866e27062795c9c246668ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 17 Dec 2019 07:53:58 +0000 Subject: [PATCH 1/2] Accepting request 757363 from home:kukuk:etc - Remove host.conf, nothing is using that anymore - Move ethers, networks, protocols and services to /usr/etc OBS-URL: https://build.opensuse.org/request/show/757363 OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=63 --- host.conf | 16 ---------------- netcfg.changes | 10 ++++++++++ netcfg.spec | 28 +++++++++++++++------------- 3 files changed, 25 insertions(+), 29 deletions(-) delete mode 100644 host.conf diff --git a/host.conf b/host.conf deleted file mode 100644 index 0752731..0000000 --- a/host.conf +++ /dev/null @@ -1,16 +0,0 @@ -# -# /etc/host.conf - resolver configuration file -# -# Please read the manual page host.conf(5) for more information. -# -# -# The following option is only used by binaries linked against -# libc4 or libc5. This line should be in sync with the "hosts" -# option in /etc/nsswitch.conf. -# -order hosts, bind -# -# The following options are used by the resolver library: -# -multi on - diff --git a/netcfg.changes b/netcfg.changes index 5497aae..f047d7b 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Dec 6 08:41:17 UTC 2019 - Thorsten Kukuk + +- Remove host.conf, nothing is using that anymore + +------------------------------------------------------------------- +Mon Aug 19 16:16:41 CEST 2019 - kukuk@suse.de + +- Move ethers, networks, protocols and services to /usr/etc + ------------------------------------------------------------------- Wed Apr 17 09:25:24 CEST 2019 - kukuk@suse.de diff --git a/netcfg.spec b/netcfg.spec index eacaca7..8d98dbc 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -1,7 +1,7 @@ # # spec file for package netcfg # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,6 @@ Group: System/Base Source0: defaultdomain Source1: exports Source2: ftpusers -Source3: host.conf Source4: hosts Source5: hosts.allow Source6: hosts.deny @@ -61,32 +60,35 @@ must be installed for all network programs. cp %{SOURCE16} . %install -mkdir -p %{buildroot}/etc -for i in hostname aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup networks protocols services.bz2 ethers ethertypes; do - install $RPM_SOURCE_DIR/$i %{buildroot}/etc +mkdir -p %{buildroot}%{_sysconfdir} +for i in hostname aliases defaultdomain exports ftpusers hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup ethertypes; do + install $RPM_SOURCE_DIR/$i %{buildroot}/%{_sysconfdir} done -bunzip2 %{buildroot}%{_sysconfdir}/services.bz2 -patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff -rm -f %{buildroot}%{_sysconfdir}/services.orig +mkdir -p %{buildroot}%{_prefix}%{_sysconfdir} +for i in networks protocols services.bz2 ethers; do + install $RPM_SOURCE_DIR/$i %{buildroot}%{_prefix}%{_sysconfdir} +done +bunzip2 %{buildroot}%{_prefix}%{_sysconfdir}/services.bz2 +patch -p0 %{buildroot}%{_prefix}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff +rm -f %{buildroot}%{_prefix}%{_sysconfdir}/services.orig %files %defattr(644,root,root,755) %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/aliases %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/defaultdomain -%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ethers +%verify(not md5 size mtime) %{_distconfdir}/ethers %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/exports %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ftpusers -%config(noreplace) %{_sysconfdir}/host.conf %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.allow %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.deny %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.equiv %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.lpd %config(noreplace) %{_sysconfdir}/netgroup -%config(noreplace) %{_sysconfdir}/networks -%config(noreplace) %{_sysconfdir}/protocols -%config(noreplace) %{_sysconfdir}/services +%{_distconfdir}/networks +%{_distconfdir}/protocols +%{_distconfdir}/services %config(noreplace) %{_sysconfdir}/ethertypes %license COPYING From acd78952187ed62b0ab76eda453f57ddb5902a212027c0f88fe8d18b406089bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 29 Jan 2020 07:21:03 +0000 Subject: [PATCH 2/2] Accepting request 768178 from home:kukuk:branches:Base:System - Re-add host.conf with fixed comments, only remove libc 4/5 comments/entries. OBS-URL: https://build.opensuse.org/request/show/768178 OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=64 --- host.conf | 6 ++++++ netcfg.changes | 6 ++++++ netcfg.spec | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 host.conf diff --git a/host.conf b/host.conf new file mode 100644 index 0000000..5e26355 --- /dev/null +++ b/host.conf @@ -0,0 +1,6 @@ +# +# /etc/host.conf - resolver configuration file +# +# Please read the manual page host.conf(5) for more information. +# +multi on diff --git a/netcfg.changes b/netcfg.changes index f047d7b..2aa4239 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 28 20:15:47 UTC 2020 - Thorsten Kukuk + +- Re-add host.conf with fixed comments, only remove libc 4/5 + comments/entries. + ------------------------------------------------------------------- Fri Dec 6 08:41:17 UTC 2019 - Thorsten Kukuk diff --git a/netcfg.spec b/netcfg.spec index 8d98dbc..84d2c2a 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -1,7 +1,7 @@ # # spec file for package netcfg # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Group: System/Base Source0: defaultdomain Source1: exports Source2: ftpusers +Source3: host.conf Source4: hosts Source5: hosts.allow Source6: hosts.deny @@ -61,7 +62,7 @@ cp %{SOURCE16} . %install mkdir -p %{buildroot}%{_sysconfdir} -for i in hostname aliases defaultdomain exports ftpusers hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup ethertypes; do +for i in hostname aliases defaultdomain exports ftpusers host.conf hosts hosts.allow hosts.deny hosts.equiv hosts.lpd netgroup ethertypes; do install $RPM_SOURCE_DIR/$i %{buildroot}/%{_sysconfdir} done mkdir -p %{buildroot}%{_prefix}%{_sysconfdir} @@ -80,6 +81,7 @@ rm -f %{buildroot}%{_prefix}%{_sysconfdir}/services.orig %verify(not md5 size mtime) %{_distconfdir}/ethers %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/exports %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/ftpusers +%config(noreplace) %{_sysconfdir}/host.conf %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.allow %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hosts.deny