[xinetd] Update to 2.3.15 Drop patches merged by upstream (-log-crash, -tcp_rpc, -label, -contextconf, -ssiz

jsynacek jsynacek at fedoraproject.org
Mon May 14 08:41:38 UTC 2012 

commit 8b25de519ca3bcfe4fda7fe709995e66dc25ee46
Author: Jan Synacek <jsynacek at redhat.com>
Date:   Mon May 14 09:55:36 2012 +0200

    Update to 2.3.15
    Drop patches merged by upstream
     (-log-crash, -tcp_rpc, -label, -contextconf, -ssize_t)
    Update -pie, -PIE, -poll patch
    Resolves: #820927

 .gitignore                      |    1 +
 sources                         |    2 +-
 xinetd-2.3.11-PIE.patch         |   22 --
 xinetd-2.3.11-pie.patch         |   22 --
 xinetd-2.3.12-tcp_rpc.patch     |   34 --
 xinetd-2.3.13-log-crash.patch   |   17 -
 xinetd-2.3.14-contextconf.patch |  110 -------
 xinetd-2.3.14-label.patch       |  227 --------------
 xinetd-2.3.14-poll.patch        |    2 +-
 xinetd-2.3.14-ssize_t.patch     |  660 ---------------------------------------
 xinetd-2.3.15-PIE.patch         |   22 ++
 xinetd-2.3.15-pie.patch         |   22 ++
 xinetd.spec                     |   29 +-
 13 files changed, 60 insertions(+), 1110 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 85e4324..bb93fed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xinetd-2.3.14.tar.gz
+/xinetd-2.3.15.tar.gz
diff --git a/sources b/sources
index a7d61b7..d77687c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-567382d7972613090215c6c54f9b82d9  xinetd-2.3.14.tar.gz
+77358478fd58efa6366accae99b8b04c  xinetd-2.3.15.tar.gz
diff --git a/xinetd-2.3.14-poll.patch b/xinetd-2.3.14-poll.patch
index 73d3ec6..bd87ae5 100644
--- a/xinetd-2.3.14-poll.patch
+++ b/xinetd-2.3.14-poll.patch
@@ -796,7 +796,7 @@ diff -Nurp xinetd-2.3.14-orig/xinetd/service.h xinetd-2.3.14-poll/xinetd/service
 +#endif
  
  /*
-  * $Id: service.h,v 1.5 2005/03/29 15:50:34 bbraun Exp $
+  * $Id: service.h,v 1.6 2012-05-09 15:40:29 bbraun Exp $
 @@ -45,7 +48,13 @@ struct service
     state_e                svc_state ;
     int                    svc_ref_count ;   /* # of pters to this struct */
diff --git a/xinetd-2.3.15-PIE.patch b/xinetd-2.3.15-PIE.patch
new file mode 100644
index 0000000..d601949
--- /dev/null
+++ b/xinetd-2.3.15-PIE.patch
@@ -0,0 +1,22 @@
+--- xinetd-2.3.15/Makefile.in	2012-05-14 09:22:22.661617117 +0200
++++ xinetd-2.3.15.new/Makefile.in	2012-05-14 09:32:05.260103054 +0200
+@@ -14,7 +14,7 @@ topdir = @top_srcdir@
+ 
+ LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
+ 
+-CFLAGS += @CFLAGS@ 
++CFLAGS += @CFLAGS@ -fPIE
+ DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g
+ 
+ 
+--- xinetd-2.3.15/xinetd/Makefile.in	2005-03-31 01:15:28.000000000 +0200
++++ xinetd-2.3.15.new/xinetd/Makefile.in	2012-05-14 09:32:24.183659971 +0200
+@@ -119,7 +119,7 @@ itox: itox.c
+ 	$(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS)
+ 
+ xinetd: $(OBJS)
+-	$(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
++	$(CC) $(CFLAGS) $(DEBUG) -o $@ -PIE $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
+ 
+ clean:
+ 	rm -f $(OBJS) $(NAME) core itox
diff --git a/xinetd-2.3.15-pie.patch b/xinetd-2.3.15-pie.patch
new file mode 100644
index 0000000..255a10a
--- /dev/null
+++ b/xinetd-2.3.15-pie.patch
@@ -0,0 +1,22 @@
+--- xinetd-2.3.15/Makefile.in	2012-05-14 09:22:22.661617117 +0200
++++ xinetd-2.3.15.new/Makefile.in	2012-05-14 09:32:05.260103054 +0200
+@@ -14,7 +14,7 @@ topdir = @top_srcdir@
+ 
+ LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
+ 
+-CFLAGS += @CFLAGS@ 
++CFLAGS += @CFLAGS@ -fpie
+ DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -Wno-unused -g
+ 
+ 
+--- xinetd-2.3.15/xinetd/Makefile.in	2005-03-31 01:15:28.000000000 +0200
++++ xinetd-2.3.15.new/xinetd/Makefile.in	2012-05-14 09:32:24.183659971 +0200
+@@ -119,7 +119,7 @@ itox: itox.c
+ 	$(CC) $(CFLAGS) $(DEBUG) $(SRCDIR)/itox.c -o $@ $(LDFLAGS) $(LIBS)
+ 
+ xinetd: $(OBJS)
+-	$(CC) $(CFLAGS) $(DEBUG) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
++	$(CC) $(CFLAGS) $(DEBUG) -o $@ -pie $(OBJS) $(LDFLAGS) $(LIBS) || rm -f $@
+ 
+ clean:
+ 	rm -f $(OBJS) $(NAME) core itox
diff --git a/xinetd.spec b/xinetd.spec
index 8ecf3c0..4760642 100644
--- a/xinetd.spec
+++ b/xinetd.spec
@@ -1,7 +1,7 @@
 Summary: A secure replacement for inetd
 Name: xinetd
-Version: 2.3.14
-Release: 46%{?dist}
+Version: 2.3.15
+Release: 1%{?dist}
 License: xinetd 
 Group: System Environment/Daemons
 Epoch: 2
@@ -9,14 +9,10 @@ URL: http://www.xinetd.org
 Source: http://www.xinetd.org/xinetd-%{version}.tar.gz
 Source1: xinetd.service
 Source3: xinetd.sysconf
-Patch0: xinetd-2.3.11-pie.patch
-Patch1: xinetd-2.3.12-tcp_rpc.patch
-Patch2: xinetd-2.3.14-label.patch
-Patch3: xinetd-2.3.14-contextconf.patch
+Patch0: xinetd-2.3.15-pie.patch
 Patch4: xinetd-2.3.14-bind-ipv6.patch
-Patch5: xinetd-2.3.14-ssize_t.patch
 Patch6: xinetd-2.3.14-man-section.patch
-Patch7: xinetd-2.3.11-PIE.patch
+Patch7: xinetd-2.3.15-PIE.patch
 Patch8: xinetd-2.3.14-ident-bind.patch
 Patch9: xinetd-2.3.14-readable-debuginfo.patch
 # Patch for clean reconfiguration using newer versions of autotools
@@ -39,7 +35,6 @@ Patch15: xinetd-2.3.14-ipv6confusion.patch
 # This fixes bug #593904 - online reconfiguration caused log message
 # flood when turning off UDP service
 Patch16: xinetd-2.3.14-udp-reconfig.patch
-Patch17: xinetd-2.3.13-log-crash.patch
 Patch18: xinetd-2.3.14-rpc-specific-port.patch
 Patch19: xinetd-2.3.14-signal-log-hang.patch
 Patch20: xinetd-2.3.14-fix-type-punned-ptr.patch
@@ -86,15 +81,11 @@ located in the /etc/xinetd.d directory.
 # SPARC/SPARC64 needs -fPIE/-PIE
 # This really should be detected by configure.
 %ifarch sparcv9 sparc64
-%patch7 -p0 -b .PIE
+%patch7 -p1 -b .PIE
 %else
-%patch0 -p0 -b .pie
+%patch0 -p1 -b .pie
 %endif
-%patch1 -p1 -b .tcp_rpc
-%patch2 -p1 -b .lspp
-%patch3 -p1 -b .confcntx
 %patch4 -p1 -b .bind
-%patch5 -p1 -b .ssize_t
 %patch6 -p1 -b .man-section
 %patch8 -p1 -b .ident-bind
 %patch9 -p1 -b .readable-debuginfo
@@ -105,7 +96,6 @@ located in the /etc/xinetd.d directory.
 %patch14 -p1 -b .clean-pfd
 %patch15 -p1 -b .ipv6confusion
 %patch16 -p1 -b .udp-reconfig
-%patch17 -p1 -b .log-crash
 %patch18 -p1 -b .rpc-specific-port
 %patch19 -p1 -b .signal-log-hang
 %patch20 -p1 -b .fix-type-punned-ptr
@@ -184,6 +174,13 @@ fi
 %{_mandir}/*/*
 
 %changelog
+* Mon May 14 2012 Jan Synáček <jsynacek at redhat.com> - 2:2.3.15-1
+- Update to 2.3.15
+- Drop patches merged by upstream
+  (-log-crash, -tcp_rpc, -label, -contextconf, -ssize_t)
+- Update -pie, -PIE, -poll patch
+- Resolves: #820927
+
 * Fri Apr 13 2012 Jan Synáček <jsynacek at redhat.com> - 2:2.3.14-46
 - Fix: service file: avoid problems when name resolution is not ready
 - Resolves: #748931

More information about the scm-commits mailing list