From e27ccf2bc39bc5bd22af970dde175c02e7d422d2 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 24 Mar 2014 09:58:36 +0100
Subject: fix for musl, update to latest

---
 package/xinetd/Makefile                         |  7 ++++---
 package/xinetd/patches/patch-Makefile_in        | 13 ++-----------
 package/xinetd/patches/patch-xinetd_confparse_c | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 package/xinetd/patches/patch-xinetd_confparse_c

(limited to 'package/xinetd')

diff --git a/package/xinetd/Makefile b/package/xinetd/Makefile
index 42e3f7b83..deae22563 100644
--- a/package/xinetd/Makefile
+++ b/package/xinetd/Makefile
@@ -4,18 +4,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xinetd
-PKG_VERSION:=		2.3.14
+PKG_VERSION:=		2.3.15
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		567382d7972613090215c6c54f9b82d9
+PKG_MD5SUM:=		77358478fd58efa6366accae99b8b04c
 PKG_DESCR:=		a powerful and secure superserver
 PKG_SECTION:=		net/misc
 PKG_URL:=		http://www.xinetd.org/
-PKG_SITES:=		http://www.xinetd.org/
+PKG_SITES:=		ftp://mirror.ovh.net/gentoo-distfiles/distfiles/
 
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XINETD,xinetd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+CONFIGURE_ENV+=		xinetd_cv_type_rlim_t=yes
 CONFIGURE_ARGS+=	--without-libwrap \
 			--with-loadavg
 ALL_TARGET:=		build
diff --git a/package/xinetd/patches/patch-Makefile_in b/package/xinetd/patches/patch-Makefile_in
index a89962c2e..bfc02b9ab 100644
--- a/package/xinetd/patches/patch-Makefile_in
+++ b/package/xinetd/patches/patch-Makefile_in
@@ -1,14 +1,5 @@
---- xinetd-2.3.14.orig/Makefile.in	2003-08-15 16:00:45.000000000 +0200
-+++ xinetd-2.3.14/Makefile.in	2011-01-22 20:53:07.924898364 +0100
-@@ -14,7 +14,7 @@ topdir = @top_srcdir@
- 
- LIBS = -lsio -lstr -lmisc -lxlog -lportable -lpset @LIBS@
- 
--CFLAGS += @CFLAGS@ 
-+CFLAGS = @CFLAGS@ 
- DCFLAGS = -Wall -Wredundant-decls -W -Wfloat-equal -Wundef -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Wmissing-format-attribute -Wshadow -Wpointer-arith -g
- 
- 
+--- xinetd-2.3.15.orig/Makefile.in	2007-09-20 19:01:52.000000000 +0200
++++ xinetd-2.3.15/Makefile.in	2014-03-23 22:50:01.000000000 +0100
 @@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
  
  install: build
diff --git a/package/xinetd/patches/patch-xinetd_confparse_c b/package/xinetd/patches/patch-xinetd_confparse_c
new file mode 100644
index 000000000..e6aa32e68
--- /dev/null
+++ b/package/xinetd/patches/patch-xinetd_confparse_c
@@ -0,0 +1,18 @@
+--- xinetd-2.3.15.orig/xinetd/confparse.c	2007-09-20 16:58:27.000000000 +0200
++++ xinetd-2.3.15/xinetd/confparse.c	2014-03-23 22:39:37.000000000 +0100
+@@ -746,6 +746,7 @@ static status_e check_entry( struct serv
+    }
+ 
+ /* #ifndef NO_RPC */
++#if 0
+ #if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
+    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
+    {
+@@ -760,6 +761,7 @@ static status_e check_entry( struct serv
+    }
+    else
+ #endif   /* ! NO_RPC */
++#endif
+    {
+        if ( !SC_IS_UNLISTED( scp ) ) 
+        { 
-- 
cgit v1.2.3