From 448fd4d1e3a1c5e356633d9447e1c3dc6dea011c Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 5 Jul 2008 13:05:00 +0000 Subject: [PATCH] Upgrade xinetd to 2.3.14 (#3669) SVN-Revision: 11655 --- net/xinetd/Makefile | 17 ++++++---- net/xinetd/patches/001-ar.patch | 30 +++++++---------- net/xinetd/patches/002-destdir.patch | 5 ++- .../patches/003-xinetd_2.3.13_gcc41.patch | 33 ------------------- 4 files changed, 25 insertions(+), 60 deletions(-) diff --git a/net/xinetd/Makefile b/net/xinetd/Makefile index bf242513f4..7e6f84023a 100644 --- a/net/xinetd/Makefile +++ b/net/xinetd/Makefile @@ -9,15 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xinetd -PKG_VERSION:=2.3.13 -PKG_RELEASE:=2 +PKG_VERSION:=2.3.14 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.xinetd.org/ -PKG_MD5SUM:=4295b5fe12350f09b5892b363348ac8b - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install +PKG_MD5SUM:=567382d7972613090215c6c54f9b82d9 include $(INCLUDE_DIR)/package.mk @@ -28,6 +25,14 @@ define Package/xinetd URL:=http://www.xinetd.org/ endef +define Package/xinetd/description + xinetd has access control mechanisms, extensive logging capabilities, + the ability to make services available based on time, can place limits + on the number of servers that can be started, and has deployable + defence mechanisms to protect against port scanners, among other + things. +endef + define Package/xinetd/conffiles /etc/xinetd.conf endef diff --git a/net/xinetd/patches/001-ar.patch b/net/xinetd/patches/001-ar.patch index f0d4f0dea5..b956648b0a 100644 --- a/net/xinetd/patches/001-ar.patch +++ b/net/xinetd/patches/001-ar.patch @@ -1,6 +1,5 @@ -diff -ruN xinetd-2.3.13-orig/libs/src/misc/Makefile.in xinetd-2.3.13-6/libs/src/misc/Makefile.in ---- xinetd-2.3.13-orig/libs/src/misc/Makefile.in 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.13-6/libs/src/misc/Makefile.in 2005-03-09 22:53:15.000000000 +0100 +--- a/libs/src/misc/Makefile.in ++++ b/libs/src/misc/Makefile.in @@ -62,7 +62,7 @@ @@ -10,9 +9,8 @@ diff -ruN xinetd-2.3.13-orig/libs/src/misc/Makefile.in xinetd-2.3.13-6/libs/src/ $(RANLIB) $@ install: $(LIBNAME) -diff -ruN xinetd-2.3.13-orig/libs/src/portable/Makefile.in xinetd-2.3.13-6/libs/src/portable/Makefile.in ---- xinetd-2.3.13-orig/libs/src/portable/Makefile.in 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.13-6/libs/src/portable/Makefile.in 2005-03-09 22:53:15.000000000 +0100 +--- a/libs/src/portable/Makefile.in ++++ b/libs/src/portable/Makefile.in @@ -57,7 +57,7 @@ @@ -22,9 +20,8 @@ diff -ruN xinetd-2.3.13-orig/libs/src/portable/Makefile.in xinetd-2.3.13-6/libs/ $(RANLIB) $@ install: $(LIBNAME) -diff -ruN xinetd-2.3.13-orig/libs/src/pset/Makefile.in xinetd-2.3.13-6/libs/src/pset/Makefile.in ---- xinetd-2.3.13-orig/libs/src/pset/Makefile.in 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.13-6/libs/src/pset/Makefile.in 2005-03-09 22:53:15.000000000 +0100 +--- a/libs/src/pset/Makefile.in ++++ b/libs/src/pset/Makefile.in @@ -53,7 +53,7 @@ mv $(LIBNAME) $(LIBDIR)/optimized @@ -34,9 +31,8 @@ diff -ruN xinetd-2.3.13-orig/libs/src/pset/Makefile.in xinetd-2.3.13-6/libs/src/ $(RANLIB) $@ install: $(LIBNAME) -diff -ruN xinetd-2.3.13-orig/libs/src/sio/Makefile.in xinetd-2.3.13-6/libs/src/sio/Makefile.in ---- xinetd-2.3.13-orig/libs/src/sio/Makefile.in 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.13-6/libs/src/sio/Makefile.in 2005-03-09 22:53:15.000000000 +0100 +--- a/libs/src/sio/Makefile.in ++++ b/libs/src/sio/Makefile.in @@ -52,7 +52,7 @@ $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized @@ -46,9 +42,8 @@ diff -ruN xinetd-2.3.13-orig/libs/src/sio/Makefile.in xinetd-2.3.13-6/libs/src/s $(RANLIB) $@ install: $(LIBNAME) -diff -ruN xinetd-2.3.13-orig/libs/src/str/Makefile.in xinetd-2.3.13-6/libs/src/str/Makefile.in ---- xinetd-2.3.13-orig/libs/src/str/Makefile.in 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.13-6/libs/src/str/Makefile.in 2005-03-09 22:53:15.000000000 +0100 +--- a/libs/src/str/Makefile.in ++++ b/libs/src/str/Makefile.in @@ -63,7 +63,7 @@ $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O @@ -58,9 +53,8 @@ diff -ruN xinetd-2.3.13-orig/libs/src/str/Makefile.in xinetd-2.3.13-6/libs/src/s $(RANLIB) $@ LINT_IGNORE=possible pointer alignment|RCSid unused -diff -ruN xinetd-2.3.13-orig/libs/src/xlog/Makefile.in xinetd-2.3.13-6/libs/src/xlog/Makefile.in ---- xinetd-2.3.13-orig/libs/src/xlog/Makefile.in 2003-02-19 18:29:27.000000000 +0100 -+++ xinetd-2.3.13-6/libs/src/xlog/Makefile.in 2005-03-09 22:53:15.000000000 +0100 +--- a/libs/src/xlog/Makefile.in ++++ b/libs/src/xlog/Makefile.in @@ -58,7 +58,7 @@ $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized diff --git a/net/xinetd/patches/002-destdir.patch b/net/xinetd/patches/002-destdir.patch index 91fd816606..ebecaaebb9 100644 --- a/net/xinetd/patches/002-destdir.patch +++ b/net/xinetd/patches/002-destdir.patch @@ -1,6 +1,5 @@ -diff -ruN xinetd-2.3.13-orig/Makefile.in xinetd-2.3.13-6/Makefile.in ---- xinetd-2.3.13-orig/Makefile.in 2003-08-15 16:00:45.000000000 +0200 -+++ xinetd-2.3.13-6/Makefile.in 2005-03-09 22:53:15.000000000 +0100 +--- a/Makefile.in ++++ b/Makefile.in @@ -75,15 +75,15 @@ install: build diff --git a/net/xinetd/patches/003-xinetd_2.3.13_gcc41.patch b/net/xinetd/patches/003-xinetd_2.3.13_gcc41.patch index 49ac327bc1..e69de29bb2 100644 --- a/net/xinetd/patches/003-xinetd_2.3.13_gcc41.patch +++ b/net/xinetd/patches/003-xinetd_2.3.13_gcc41.patch @@ -1,33 +0,0 @@ -Submitted By: Randy McMurchy -Date: 2005-08-07 -Initial Package Version: 2.3.13 -Upstream Status: Not submitted -Origin: Fedora Development CVS -Description: Fixes compilation error if using GCC-4.x - - -diff -Naur xinetd-2.3.13-orig/xinetd/service.c xinetd-2.3.13/xinetd/service.c ---- xinetd-2.3.13-orig/xinetd/service.c 2003-11-16 12:44:10.000000000 +0000 -+++ xinetd-2.3.13/xinetd/service.c 2005-08-07 18:37:33.395942648 +0000 -@@ -764,8 +764,8 @@ - return FAILED; - - if ( last == NULL ) { -- last = SAIN( SVC_LAST_DGRAM_ADDR(sp) ) = -- SAIN( calloc( 1, sizeof(union xsockaddr) ) ); -+ SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) ); -+ last = SAIN(SVC_LAST_DGRAM_ADDR(sp)); - } - - (void) time( ¤t_time ) ; -@@ -791,8 +791,8 @@ - return FAILED; - - if( last == NULL ) { -- last = SAIN6(SVC_LAST_DGRAM_ADDR(sp)) = -- SAIN6(calloc( 1, sizeof(union xsockaddr) ) ); -+ SVC_LAST_DGRAM_ADDR(sp) = calloc( 1, sizeof(union xsockaddr) ); -+ last = SAIN6( SVC_LAST_DGRAM_ADDR(sp) ); - } - - (void) time( ¤t_time ) ; -- 2.30.2