Accepting request 698228 from home:kukuk:branches:Base:System

- Remove pre/post isntall to get ride of coreutils dependency.
  We don't support upgrading of this old code anymore and coreutils
  is not wanted in busybox containers.
- Update services.bz2

OBS-URL: https://build.opensuse.org/request/show/698228
OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=60
This commit is contained in:
Tomáš Chvátal 2019-04-27 08:20:29 +00:00 committed by Git OBS Bridge
parent f6fb114c35
commit 6f7548ca57
4 changed files with 28 additions and 57 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Apr 17 09:25:24 CEST 2019 - kukuk@suse.de
- Remove pre/post isntall to get ride of coreutils dependency.
We don't support upgrading of this old code anymore and coreutils
is not wanted in busybox containers.
- Update services.bz2
-------------------------------------------------------------------
Wed Sep 12 08:18:06 UTC 2018 - Thorsten Kukuk <kukuk@suse.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package netcfg
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -45,8 +45,6 @@ Source101: services-compare.sh
Source102: services-create.pl
Source103: services_UPDATING
Patch0: services-suse.diff
Requires(post): coreutils
Requires(pre): coreutils
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -71,33 +69,6 @@ bunzip2 %{buildroot}%{_sysconfdir}/services.bz2
patch -p0 %{buildroot}%{_sysconfdir}/services < $RPM_SOURCE_DIR/services-suse.diff
rm -f %{buildroot}%{_sysconfdir}/services.orig
%pre
# HOSTNAME migration supported scenarios [bnc#858908]:
# /etc/HOSTNAME -> /etc/hostname content preservation.
# If hostname and HOSTNAME both exist HOSTNAME wins.
# Nothing apart from content of the document is preserved
# REMOVE after SLE11/openSUSE-13.1 out of MIGRATION support
if [ $1 -gt 1 ]; then
if [ -f %{_sysconfdir}/HOSTNAME -a ! -L %{_sysconfdir}/HOSTNAME ]; then
cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave
rm -rf %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname
touch %{_sysconfdir}/hostname
fi
fi
exit 0
%post
# If the defaultdomain changed just prune it, user is not interested in
# 0 size file anyway
if [ -f %{_sysconfdir}/defaultdomain.rpmnew ]; then
rm -f %{_sysconfdir}/defaultdomain.rpmnew
fi
if [ -f %{_sysconfdir}/hostname.rpmsave ]; then
cat %{_sysconfdir}/hostname.rpmsave > %{_sysconfdir}/hostname
rm -rf %{_sysconfdir}/HOSTNAME.rpmsave %{_sysconfdir}/hostname.rpmsave
fi
exit 0
%files
%defattr(644,root,root,755)
%verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/hostname

View File

@ -1,5 +1,5 @@
--- services.old 2016-01-05 10:57:51.955599939 +0100
+++ services 2016-01-05 11:03:07.600728374 +0100
--- ./services 2019/04/26 12:53:51 1.1
+++ ./services 2019/04/26 13:01:49
@@ -1,4 +1,16 @@
#
+# Network services, Internet style
@ -16,7 +16,7 @@
+#
# SERVICE NAME AND TRANSPORT PROTOCOL PORT NUMBER REGISTRY
#
# (last updated on 2015-12-28)
# (last updated on 2019-04-15)
@@ -133,8 +145,8 @@
name 42/udp # Host Name Server
nameserver 42/tcp # Host Name Server
@ -39,7 +39,7 @@
mcidas 112/tcp # McIDAS Data Transmission Protocol [Glenn_Davis]
mcidas 112/udp # McIDAS Data Transmission Protocol [Glenn_Davis]
ident 113/tcp
@@ -1475,6 +1487,7 @@
@@ -1479,6 +1491,7 @@
cddbp 888/tcp # CD Database Protocol [Steve_Scherf]
omginitialrefs 900/tcp # OMG Initial Refs [Christian_Callsen]
omginitialrefs 900/udp # OMG Initial Refs [Christian_Callsen]
@ -47,7 +47,7 @@
smpnameres 901/tcp # SMPNAMERES [Leif_Ekblad]
smpnameres 901/udp # SMPNAMERES [Leif_Ekblad]
ideafarm-door 902/tcp # self documenting Telnet Door
@@ -3505,6 +3518,9 @@
@@ -3515,6 +3528,9 @@
x25-svc-port 1998/udp # cisco X.25 service (XOT)
tcp-id-port 1999/tcp # cisco identification port
tcp-id-port 1999/udp # cisco identification port
@ -57,7 +57,7 @@
cisco-sccp 2000/tcp # Cisco SCCP [Dan_Wing]
cisco-sccp 2000/udp # Cisco SCCp [Dan_Wing]
dc 2001/tcp
@@ -3604,8 +3620,8 @@
@@ -3614,8 +3630,8 @@
dls 2047/udp
dls-monitor 2048/tcp
dls-monitor 2048/udp
@ -68,7 +68,7 @@
nfs 2049/tcp # Network File System - Sun Microsystems [Brent_Callaghan]
nfs 2049/udp # Network File System - Sun Microsystems [Brent_Callaghan]
nfs 2049/sctp # Network File System [RFC5665]
@@ -6104,8 +6120,8 @@
@@ -6114,8 +6130,8 @@
sysopt 3281/udp # SYSOPT [Tony_Hoffman]
datusorb 3282/tcp # Datusorb [Thomas_Martin]
datusorb 3282/udp # Datusorb [Thomas_Martin]
@ -79,7 +79,7 @@
4talk 3284/tcp # 4Talk [Tony_Bushnell]
4talk 3284/udp # 4Talk [Tony_Bushnell]
plato 3285/tcp # Plato [Jim_Battin]
@@ -6877,8 +6893,8 @@
@@ -6887,8 +6903,8 @@
roverlog 3677/udp # RoverLog IPC [Tom_Mayo]
ipr-dglt 3678/tcp # DataGuardianLT [Bruce_Carlson]
ipr-dglt 3678/udp # DataGuardianLT [Bruce_Carlson]
@ -90,7 +90,7 @@
npds-tracker 3680/tcp # NPDS Tracker [Paul_Guyot]
npds-tracker 3680/udp # NPDS Tracker [Paul_Guyot]
bts-x73 3681/tcp # BTS X73 Port [Todd_Cooper]
@@ -9097,6 +9113,7 @@
@@ -9154,6 +9170,7 @@
# 5474/tcp Reserved
apsolab-data 5475/tcp # The Apsolab company's data retrieval protocol [Apsolab_Inc] [Jean-Francois_Gauthier]
# 5475/udp Reserved
@ -98,7 +98,7 @@
fcp-addr-srvr1 5500/tcp # fcp-addr-srvr1 [Ken_Wittmer]
fcp-addr-srvr1 5500/udp # fcp-addr-srvr1 [Ken_Wittmer]
fcp-addr-srvr2 5501/tcp # fcp-addr-srvr2 [Ken_Wittmer]
@@ -9117,6 +9134,7 @@
@@ -9176,6 +9193,7 @@
sgi-eventmond 5553/udp # SGI Eventmond Port [Andrei_Vilkotski]
sgi-esphttp 5554/tcp # SGI ESP HTTP [Vladimir_Legalov]
sgi-esphttp 5554/udp # SGI ESP HTTP [Vladimir_Legalov]
@ -106,15 +106,7 @@
personal-agent 5555/tcp # Personal Agent [Jackie_Wu]
personal-agent 5555/udp # Personal Agent [Jackie_Wu]
freeciv 5556/tcp # Freeciv gameplay [Reinier_Post_and_Pau]
@@ -9201,6 +9219,7 @@
# 5639/udp Reserved
vfmobile 5646/tcp # Ventureforth Mobile [Ventureforth_Inc] [Blakely_Snyder]
# 5646/udp Reserved
+nrpe 5666/tcp # nagios nrpe
filemq 5670/tcp # ZeroMQ file publish-subscribe protocol (updated 2013-02-25) [Pieter_Hintjens2]
zre-disc 5670/udp # Local area discovery and messaging over ZeroMQ [Pieter_Hintjens_3]
amqps 5671/tcp # amqp protocol over TLS/SSL [Ted_Ross_2]
@@ -9351,8 +9370,8 @@
@@ -9418,8 +9436,8 @@
# 5868/udp Reserved
diameters 5868/sctp # Diameter over DTLS/SCTP [IESG] [IETF_Chair] [RFC6733]
jute 5883/tcp # Javascript Unit Test Environment [Mark_Ethan_Trostler]
@ -125,7 +117,7 @@
cm 5910/tcp # Context Management [Eivan_Cerasi]
cm 5910/udp # Context Management [Eivan_Cerasi]
cm 5910/sctp # Context Management [Justin_Yu]
@@ -11519,7 +11538,12 @@
@@ -11691,7 +11709,12 @@
hde-lcesrvr-2 14937/udp # hde-lcesrvr-2 [Horizon_Digital_Ente]
hydap 15000/tcp # Hypack Data Aquisition (updated 2011-10-27) [HYPACK_Inc] [Mircea_Neacsu]
hydap 15000/udp # Hypack Data Aquisition (updated 2011-10-27) [HYPACK_Inc] [Mircea_Neacsu]
@ -139,7 +131,7 @@
# 15002/udp Reserved
# 15118/tcp Reserved
v2g-secc 15118/udp # v2g Supply Equipment Communication Controller Discovery Protocol [Holger_Lochner]
@@ -11784,6 +11808,13 @@
@@ -11966,6 +11989,13 @@
# 22128/udp Reserved
easyengine 22222/tcp # EasyEngine is CLI tool to manage WordPress Sites on Nginx server [rtCamp_Solutions_Private_Limited] [Rahul_Bansal]
# 22222/udp Reserved
@ -153,10 +145,10 @@
wnn6 22273/tcp # wnn6 [Yasunari_Gon_Yamasit]
wnn6 22273/udp # wnn6 [Yasunari_Gon_Yamasit]
cis 22305/tcp # CompactIS Tunnel [Justin_Paupore]
@@ -12305,3 +12336,13 @@
robotraconteur 48653/udp # Robot Raconteur transport [Wason_Technology_LLC] [John_Wason]
matahari 49000/tcp # Matahari Broker [Matahari_Project] [Zane_Bitter]
# 49000/udp Reserved
@@ -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
+# The mrt entry is temporary until a official number is registerd
+mrt 50000/tcp # telnet interface of mrt programs
+mrt 50000/udp # telnet interface of mrt programs

BIN
services.bz2 (Stored with Git LFS)

Binary file not shown.