-#
-# Copyright (C) 2006-2011 OpenWrt.org
+#
+# Copyright (C) 2006-2012 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=xinetd
-PKG_VERSION:=2.3.14
-PKG_RELEASE:=3
+PKG_VERSION:=2.3.15
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://www.xinetd.org/
-PKG_MD5SUM:=567382d7972613090215c6c54f9b82d9
+PKG_SOURCE_URL:=http://www.xinetd.org
+PKG_MD5SUM:=77358478fd58efa6366accae99b8b04c
+
+PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
TARGET_CFLAGS += -DNO_RPC
-define Build/Configure
- $(call Build/Configure/Default, \
- --without-libwrap \
- --with-loadavg \
- , \
- ac_cv_header_rpc_pmap_clnt_h=no \
- ac_cv_header_rpc_rpc_h=no \
- ac_cv_header_rpc_rpcent_h=no \
- )
-endef
+CONFIGURE_ARGS += \
+ --without-libwrap \
+ --with-loadavg
-define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) \
- DESTDIR="$(PKG_INSTALL_DIR)" \
- build install
-endef
+CONFIGURE_VARS += \
+ ac_cv_header_rpc_pmap_clnt_h=no \
+ ac_cv_header_rpc_rpc_h=no \
+ ac_cv_header_rpc_rpcent_h=no
define Package/xinetd/install
$(INSTALL_DIR) $(1)/usr/sbin
--- a/libs/src/misc/Makefile.in
+++ b/libs/src/misc/Makefile.in
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ libopt: clean
$(LIBNAME): $(OBJECTS)
install: $(LIBNAME)
--- a/libs/src/portable/Makefile.in
+++ b/libs/src/portable/Makefile.in
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ libopt: clean
$(LIBNAME): $(OBJECTS)
install: $(LIBNAME)
--- a/libs/src/pset/Makefile.in
+++ b/libs/src/pset/Makefile.in
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ libopt: clean
mv $(LIBNAME) $(LIBDIR)/optimized
$(LIBNAME): $(OBJECTS)
install: $(LIBNAME)
--- a/libs/src/sio/Makefile.in
+++ b/libs/src/sio/Makefile.in
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ libopt: clean
$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
$(LIBNAME): $(OBJECTS)
install: $(LIBNAME)
--- a/libs/src/str/Makefile.in
+++ b/libs/src/str/Makefile.in
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ libopt: clean
$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O
$(LIBNAME): $(OBJECTS)
LINT_IGNORE=possible pointer alignment|RCSid unused
--- a/libs/src/xlog/Makefile.in
+++ b/libs/src/xlog/Makefile.in
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ libopt: clean
$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
$(LIBNAME): $(OBJECTS)
--- a/Makefile.in
+++ b/Makefile.in
-@@ -75,15 +75,15 @@
+@@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
install: build
for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
--- a/xinetd/confparse.c
+++ b/xinetd/confparse.c
-@@ -716,7 +716,7 @@ static status_e check_entry( struct serv
+@@ -745,7 +745,7 @@ static status_e check_entry( struct serv
}
}
#if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
{
-@@ -730,6 +730,7 @@ static status_e check_entry( struct serv
+@@ -759,6 +759,7 @@ static status_e check_entry( struct serv
SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
}
else