diff --git a/netcfg.changes b/netcfg.changes index 0a0388b..0d47358 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jun 5 11:21:06 UTC 2013 - pgajdos@suse.com + +- services: map sieve to 4190 instead of 2000 as upstream (IANA) + does + ------------------------------------------------------------------- Mon Mar 7 12:29:41 CET 2011 - ro@suse.de diff --git a/netcfg.spec b/netcfg.spec index c4a4b17..f25a44c 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -1,7 +1,7 @@ # # spec file for package netcfg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: netcfg -License: BSD-3-Clause -Group: System/Base -AutoReqProv: on PreReq: coreutils aaa_base Summary: Network Configuration Files in /etc +License: BSD-3-Clause +Group: System/Base Version: 11.5 -Release: 1 +Release: 0 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: defaultdomain diff --git a/services-suse.diff b/services-suse.diff index 3c316b0..9c8d308 100644 --- a/services-suse.diff +++ b/services-suse.diff @@ -1,5 +1,5 @@ ---- services.orig 2010-10-21 17:20:04.000000000 +0200 -+++ services 2010-10-21 17:24:00.000000000 +0200 +--- services.orig 2013-06-05 13:19:34.927684739 +0200 ++++ services 2013-06-05 13:19:45.331733989 +0200 @@ -1,3 +1,13 @@ +# +# Network services, Internet style @@ -44,17 +44,7 @@ smpnameres 901/tcp # SMPNAMERES smpnameres 901/udp # SMPNAMERES # Leif Ekblad -@@ -4973,6 +4984,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 -+# Port 2000 is illegal used by sieve -+sieve 2000/tcp # Cyrus SIEVE -+sieve 2000/udp # Cyrus SIEVE - # - cisco-sccp 2000/tcp # Cisco SCCP - cisco-sccp 2000/udp # Cisco SCCp -@@ -5081,8 +5095,8 @@ +@@ -5081,8 +5092,8 @@ dls-monitor 2048/tcp dls-monitor 2048/udp # <== NOTE Conflict on 2049 ! @@ -65,6 +55,18 @@ nfs 2049/tcp # Network File System - Sun Microsystems nfs 2049/udp # Network File System - Sun Microsystems # Brent Callaghan +@@ -11064,7 +11075,10 @@ + universe_suite 4184/tcp # UNIVERSE SUITE MESSAGE SERVICE + universe_suite 4184/udp # UNIVERSE SUITE MESSAGE SERVICE + # Gary ANDREWS 07 January 2008 +-# 4185-4198 Unassigned ++# 4185-4189 Unassigned ++sieve 4190/tcp # ManageSieve Protocol ++# 4190/udp Reserved ++# 4191-1298 Unassigned + eims-admin 4199/tcp # EIMS ADMIN + eims-admin 4199/udp # EIMS ADMIN + # Glenn Anderson @@ -12184,6 +12198,7 @@ netops-broker 5465/udp # NETOPS-BROKER # John R. Deuel