bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] xinetd: update to 2.3.15 (CVE-2012-0862), use CONFIGURE_{ARGS,VARS} & PKG_INSTALL

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@31866 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
swalker 2012-05-27 00:09:00 +00:00
parent 2671533448
commit 7cb5df81b9
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
net/xinetd/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2011 OpenWrt.org # Copyright (C) 2006-2012 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -8,12 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=xinetd PKG_NAME:=xinetd
PKG_VERSION:=2.3.14 PKG_VERSION:=2.3.15
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.xinetd.org/ PKG_SOURCE_URL:=http://www.xinetd.org
PKG_MD5SUM:=567382d7972613090215c6c54f9b82d9 PKG_MD5SUM:=77358478fd58efa6366accae99b8b04c
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -38,22 +40,14 @@ endef
TARGET_CFLAGS += -DNO_RPC TARGET_CFLAGS += -DNO_RPC
define Build/Configure CONFIGURE_ARGS += \
$(call Build/Configure/Default, \ --without-libwrap \
--without-libwrap \ --with-loadavg
--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
define Build/Compile CONFIGURE_VARS += \
$(MAKE) -C $(PKG_BUILD_DIR) \ ac_cv_header_rpc_pmap_clnt_h=no \
DESTDIR="$(PKG_INSTALL_DIR)" \ ac_cv_header_rpc_rpc_h=no \
build install ac_cv_header_rpc_rpcent_h=no
endef
define Package/xinetd/install define Package/xinetd/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin

12
net/xinetd/patches/001-ar.patch
View File

@ -1,6 +1,6 @@
--- a/libs/src/misc/Makefile.in --- a/libs/src/misc/Makefile.in
+++ b/libs/src/misc/Makefile.in +++ b/libs/src/misc/Makefile.in
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@ libopt: clean
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
@ -11,7 +11,7 @@
install: $(LIBNAME) install: $(LIBNAME)
--- a/libs/src/portable/Makefile.in --- a/libs/src/portable/Makefile.in
+++ b/libs/src/portable/Makefile.in +++ b/libs/src/portable/Makefile.in
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@ libopt: clean
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
@ -22,7 +22,7 @@
install: $(LIBNAME) install: $(LIBNAME)
--- a/libs/src/pset/Makefile.in --- a/libs/src/pset/Makefile.in
+++ b/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 mv $(LIBNAME) $(LIBDIR)/optimized
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
@ -33,7 +33,7 @@
install: $(LIBNAME) install: $(LIBNAME)
--- a/libs/src/sio/Makefile.in --- a/libs/src/sio/Makefile.in
+++ b/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 $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
@ -44,7 +44,7 @@
install: $(LIBNAME) install: $(LIBNAME)
--- a/libs/src/str/Makefile.in --- a/libs/src/str/Makefile.in
+++ b/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 $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)
@ -55,7 +55,7 @@
LINT_IGNORE=possible pointer alignment|RCSid unused LINT_IGNORE=possible pointer alignment|RCSid unused
--- a/libs/src/xlog/Makefile.in --- a/libs/src/xlog/Makefile.in
+++ b/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 $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
$(LIBNAME): $(OBJECTS) $(LIBNAME): $(OBJECTS)

2
net/xinetd/patches/002-destdir.patch
View File

@ -1,6 +1,6 @@
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -75,15 +75,15 @@ @@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
install: build install: build
for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \ for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \

4
net/xinetd/patches/003-rpc_fix.patch
View File

@ -1,6 +1,6 @@
--- a/xinetd/confparse.c --- a/xinetd/confparse.c
+++ b/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
} }
} }
@ -9,7 +9,7 @@
#if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H) #if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) ) 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 ; SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
} }
else else