packages: setup/setup-services.patch, setup/setup.spec, setup/setup-zsh.pat...
arekm
arekm at pld-linux.org
Mon Nov 28 21:40:59 CET 2011
Author: arekm Date: Mon Nov 28 20:40:59 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2.8.0; /etc/mtab as /proc/self/mounts symlink
---- Files affected:
packages/setup:
setup-services.patch (1.5 -> 1.6) , setup.spec (1.161 -> 1.162) , setup-zsh.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/setup/setup-services.patch
diff -u packages/setup/setup-services.patch:1.5 packages/setup/setup-services.patch:1.6
--- packages/setup/setup-services.patch:1.5 Tue Nov 17 09:13:03 2009
+++ packages/setup/setup-services.patch Mon Nov 28 21:40:54 2011
@@ -1,82 +1,82 @@
--- setup-2.6.2/iana-etc/services~ 2009-11-17 09:24:45.201520053 +0200
+++ setup-2.6.2/iana-etc/services 2009-11-17 09:25:17.102361782 +0200
-@@ -196,8 +196,6 @@
- graphics 41/udp # Graphics
- name 42/tcp # Host Name Server
- name 42/udp # Host Name Server
--nameserver 42/tcp # Host Name Server
--nameserver 42/udp # Host Name Server
+@@ -198,8 +198,6 @@
+ graphics 41/udp # Graphics
+ name 42/tcp # Host Name Server
+ name 42/udp # Host Name Server
+-nameserver 42/tcp # Host Name Server
+-nameserver 42/udp # Host Name Server
nicname 43/tcp whois # Who Is
nicname 43/udp whois # Who Is
- mpm-flags 44/tcp # MPM FLAGS Protocol
-@@ -302,10 +300,6 @@
- # David Zimmerman <dpz&RUTGERS.EDU>
- http 80/tcp # World Wide Web HTTP
- http 80/udp # World Wide Web HTTP
--www 80/tcp # World Wide Web HTTP
--www 80/udp # World Wide Web HTTP
--www-http 80/tcp # World Wide Web HTTP
--www-http 80/udp # World Wide Web HTTP
+ mpm-flags 44/tcp # MPM FLAGS Protocol
+@@ -303,10 +303,6 @@
+ # Unauthorized use by some mail users (see [RFC4146] for details)
+ http 80/tcp # World Wide Web HTTP
+ http 80/udp # World Wide Web HTTP
+-www 80/tcp # World Wide Web HTTP
+-www 80/udp # World Wide Web HTTP
+-www-http 80/tcp # World Wide Web HTTP
+-www-http 80/udp # World Wide Web HTTP
# Tim Berners-Lee <timbl&W3.org>
http 80/sctp # HTTP
# IETF TSVWG
-@@ -327,8 +321,8 @@
- mfcobol 86/tcp # Micro Focus Cobol
- mfcobol 86/udp # Micro Focus Cobol
+@@ -324,8 +324,8 @@
+ mfcobol 86/tcp # Micro Focus Cobol
+ mfcobol 86/udp # Micro Focus Cobol
# Simon Edwards <--none--->
--# 87/tcp any private terminal link
--# 87/udp any private terminal link
-+ttylink 87/tcp any private terminal link
-+ttylink 87/udp any private terminal link
+-# 87/tcp any private terminal link
+-# 87/udp any private terminal link
++ttylink 87/tcp # any private terminal link
++ttylink 87/udp # any private terminal link
# Jon Postel <postel&isi.edu>
- kerberos 88/tcp # Kerberos
- kerberos 88/udp # Kerberos
-@@ -382,10 +376,7 @@
+ kerberos 88/tcp # Kerberos
+ kerberos 88/udp # Kerberos
+@@ -379,10 +379,7 @@
# Patrick McNamee <--none--->
- cso 105/tcp # CCSO name server protocol
- cso 105/udp # CCSO name server protocol
+ cso 105/tcp # CCSO name server protocol
+ cso 105/udp # CCSO name server protocol
-# Martin Hamilton <martin&mrrl.lut.as.uk>
--csnet-ns 105/tcp # Mailbox Name Nameserver
--csnet-ns 105/udp # Mailbox Name Nameserver
+-csnet-ns 105/tcp # Mailbox Name Nameserver
+-csnet-ns 105/udp # Mailbox Name Nameserver
-# Marvin Solomon <solomon&CS.WISC.EDU>
+# Martin Hamilton <martin&mrrl.lut.as.uk>, Marvin Solomon <solomon at CS.WISC.EDU>
- 3com-tsmux 106/tcp # 3COM-TSMUX
- 3com-tsmux 106/udp # 3COM-TSMUX
+ 3com-tsmux 106/tcp # 3COM-TSMUX
+ 3com-tsmux 106/udp # 3COM-TSMUX
# Jeremy Siegel <jzs&NSD.3Com.COM>
-@@ -408,9 +399,9 @@
- mcidas 112/tcp # McIDAS Data Transmission Protocol
- mcidas 112/udp # McIDAS Data Transmission Protocol
+@@ -402,9 +402,9 @@
+ mcidas 112/tcp # McIDAS Data Transmission Protocol
+ mcidas 112/udp # McIDAS Data Transmission Protocol
# Glenn Davis <support&unidata.ucar.edu>
--ident 113/tcp #
- auth 113/tcp # Authentication Service
- auth 113/udp # Authentication Service
-+auth 113/tcp tap ident # Authentication Service
+-ident 113/tcp #
+ auth 113/tcp # Authentication Service
+ auth 113/udp # Authentication Service
++auth 113/tcp tap ident # Authentication Service
# Mike St. Johns <stjohns&arpa.mil>
# 114 Deprecated June 2004
- sftp 115/tcp # Simple File Transfer Protocol
-@@ -1215,6 +1206,7 @@
- kpasswd 464/tcp # kpasswd
- kpasswd 464/udp # kpasswd
+ sftp 115/tcp # Simple File Transfer Protocol
+@@ -1221,6 +1221,7 @@
+ kpasswd 464/udp # kpasswd
# Theodore Ts'o <tytso&MIT.EDU>
-+smtps 465/tcp ssmtp # (not in IANA!)
- urd 465/tcp # URL Rendesvous Directory for SSM
- igmpv3lite 465/udp # IGMP over UDP for SSM
+ urd 465/tcp # URL Rendesvous Directory for SSM
++smtps 465/tcp ssmtp # (not in IANA!)
+ igmpv3lite 465/udp # IGMP over UDP for SSM
# Toerless Eckert <eckert&cisco.com>
-@@ -1360,7 +1352,6 @@
- exec 512/tcp # remote process execution;
+ digital-vrc 466/tcp # digital-vrc
+@@ -1366,7 +1366,6 @@
+ exec 512/tcp # remote process execution;
# authentication performed using
# passwords and UNIX login names
-comsat 512/udp
- biff 512/udp # used by mail system to notify users
+ biff 512/udp # used by mail system to notify users
# of new mail received; currently
# receives messages only from
-@@ -2100,6 +2091,7 @@
- omginitialrefs 900/tcp # OMG Initial Refs
- omginitialrefs 900/udp # OMG Initial Refs
+@@ -2109,6 +2109,7 @@
+ omginitialrefs 900/tcp # OMG Initial Refs
+ omginitialrefs 900/udp # OMG Initial Refs
# Christian Callsen <Christian.Callsen&eng.sun.com>
-+swat 901/tcp # (not in IANA!) Samba Web Administration Tool
- smpnameres 901/tcp # SMPNAMERES
- smpnameres 901/udp # SMPNAMERES
++swat 901/tcp # (not in IANA!) Samba Web Administration Tool
+ smpnameres 901/tcp # SMPNAMERES
+ smpnameres 901/udp # SMPNAMERES
# Leif Ekblad <leif&rdos.net>
@@ -4972,7 +4964,8 @@
tcp-id-port 1999/tcp # cisco identification port
================================================================
Index: packages/setup/setup.spec
diff -u packages/setup/setup.spec:1.161 packages/setup/setup.spec:1.162
--- packages/setup/setup.spec:1.161 Fri Feb 25 07:32:27 2011
+++ packages/setup/setup.spec Mon Nov 28 21:40:54 2011
@@ -14,12 +14,12 @@
Summary(pt_BR.UTF-8): Vários arquivos básicos de configuração
Summary(tr.UTF-8): Basit kurulum dosyaları
Name: setup
-Version: 2.7.3
-Release: 3
+Version: 2.8.0
+Release: 1
License: Public Domain, partially BSD-like
Group: Base
Source0: %{name}-%{version}.tar.bz2
-# Source0-md5: 44f8637f91d3ed5c23f6195061e68e69
+# Source0-md5: 99eb9773800ff08fc475f73fe6e61c78
# http://sethwklein.net/iana-etc
Source1: http://sethwklein.net/projects/iana-etc/downloads/iana-etc-%{iana_etc_ver}.tar.bz2
# Source1-md5: 3ba3afb1d1b261383d247f46cb135ee8
@@ -31,7 +31,6 @@
# This is source of non-iana changes in services file
Patch1: %{name}-services.patch
Patch2: protocols-fmt.patch
-Patch3: %{name}-zsh.patch
BuildRequires: dietlibc-static
BuildRequires: gawk
Requires: FHS >= 2.3-24.1
@@ -41,6 +40,8 @@
# tape,dialout and cdrom groups support
Conflicts: dev < 3.4-4
Conflicts: udev < 1:138-5
+# /etc/mtab being symlink to /proc/self/mounts
+Conflicts: rc-scripts < 0.4.5.1-3
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sbindir /sbin
@@ -85,7 +86,6 @@
%patch0 -p1
mv iana-etc{-%{iana_etc_ver},}
%patch2 -p1
-%patch3 -p1
cp -a %{SOURCE2} iana-etc/protocol-numbers.iana
cp -a %{SOURCE3} iana-etc/port-numbers.iana
@@ -162,6 +162,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.162 2011/11/28 20:40:54 arekm
+- up to 2.8.0; /etc/mtab as /proc/self/mounts symlink
+
Revision 1.161 2011/02/25 06:32:27 arekm
- rel 3; use gotar fix
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/setup/setup-services.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/setup/setup.spec?r1=1.161&r2=1.162&f=u
More information about the pld-cvs-commit
mailing list