Sync changes to SLFO-1.2 branch

netcfg.changes

@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Mon Jan  1 05:06:05 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
+Thu May 22 12:41:23 UTC 2025 - Antonio Teixeira <antonio.teixeira@suse.com>
 
-- Add krb-prop entry, fix for bsc#1211886.
+- Re-add /etc/services with a warning saying it was moved to
+  /usr/etc/services [jsc#PED-12191]. 
 
 -------------------------------------------------------------------
 Tue Nov 21 08:39:54 UTC 2023 - Thorsten Kukuk <kukuk@suse.com>

netcfg.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package netcfg
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,7 +36,7 @@ Source100:      services-compare.pl
 Source101:      services-compare.sh
 Source102:      services-create.pl
 Source103:      services_UPDATING
-Patch0:         services-suse.diff
+Source104:      services-suse.diff
 BuildRequires:  libnss_usrfiles2
 Requires:       libnss_usrfiles2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -69,6 +69,8 @@ rm -f %{buildroot}%{_prefix}%{_sysconfdir}/services.orig
 
 install -d -m 0755 %{buildroot}/%{_sysconfdir}/exports.d
 
+echo "#This file was moved to %{_prefix}%{_sysconfdir}/services. This file will be removed soon." > %{buildroot}%{_sysconfdir}/services
+
 %files
 %defattr(644,root,root,755)
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname
@@ -82,5 +84,6 @@ install -d -m 0755 %{buildroot}/%{_sysconfdir}/exports.d
 %config(noreplace) %{_sysconfdir}/ethertypes
 %dir %{_sysconfdir}/exports.d
 %license COPYING
+%{_sysconfdir}/services
 
 %changelog

services-suse.diff

@@ -145,7 +145,7 @@
  wnn6               22273/tcp    # wnn6  [Yasunari_Gon_Yamasit]
  wnn6               22273/udp    # wnn6  [Yasunari_Gon_Yamasit]
  cis                22305/tcp    # CompactIS Tunnel  [Justin_Paupore]
-@@ -12531,3 +12561,15 @@
+@@ -12531,3 +12561,13 @@
  nusdp-disc         49001/udp    # Nuance Unity Service Discovery Protocol  [Nuance_Communications_Inc3] [Andrew_Andrews]
  inspider           49150/tcp    # InSpider System  [AnRobot] [Zhang_Xinnan]
  #                  49150/udp    Reserved 
@@ -159,5 +159,3 @@
 +nbp                2/ddp        # Name Binding Protocol
 +echo               4/ddp        # AppleTalk Echo Protocol
 +zip                6/ddp        # Zone Information Protocol
-+# Kerberos slave propagation
-+krb-prop           754/tcp      krb_prop krb5_prop hprop