Commit db21bfcf authored by Danomi Manchego's avatar Danomi Manchego Committed by Peter Korsgaard
Browse files

New package: xinetd

parent c75e768d
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -607,6 +607,7 @@ source "package/wget/Config.in"
endif
source "package/wireless_tools/Config.in"
source "package/wpa_supplicant/Config.in"
source "package/xinetd/Config.in"
source "package/xl2tp/Config.in"

endmenu
+8 −0
Original line number Diff line number Diff line
config BR2_PACKAGE_XINETD
	bool "xinetd"
	depends on BR2_INET_RPC
	help
	  xinetd is a secure replacement for inetd. It was originally written by
	  panos@cs.colorado.edu.

	  http://www.xinetd.org
+74 −0
Original line number Diff line number Diff line
This patch changes all of the hard-coded invocations of "ar" to $(AR), to
support a cross-compilation toolchain.

The content of this patch was copied from the OpenWrt project:
https://dev.openwrt.org/browser/packages/net/xinetd/patches/001-ar.patch

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

--- a/libs/src/misc/Makefile.in
+++ b/libs/src/misc/Makefile.in
@@ -62,7 +62,7 @@
 
 
 $(LIBNAME): $(OBJECTS)
-	ar r $@ $?
+	$(AR) r $@ $?
 	$(RANLIB) $@
 
 install: $(LIBNAME)
--- a/libs/src/portable/Makefile.in
+++ b/libs/src/portable/Makefile.in
@@ -57,7 +57,7 @@
 
 
 $(LIBNAME): $(OBJECTS)
-	ar r $@ $?
+	$(AR) r $@ $?
 	$(RANLIB) $@
 
 install: $(LIBNAME)
--- a/libs/src/pset/Makefile.in
+++ b/libs/src/pset/Makefile.in
@@ -53,7 +53,7 @@
 	mv $(LIBNAME) $(LIBDIR)/optimized
 
 $(LIBNAME): $(OBJECTS)
-	ar r $@ $?
+	$(AR) r $@ $?
 	$(RANLIB) $@
 
 install: $(LIBNAME)
--- a/libs/src/sio/Makefile.in
+++ b/libs/src/sio/Makefile.in
@@ -52,7 +52,7 @@
 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
 
 $(LIBNAME): $(OBJECTS)
-	ar r $@ $?
+	$(AR) r $@ $?
 	$(RANLIB) $@
 
 install: $(LIBNAME)
--- a/libs/src/str/Makefile.in
+++ b/libs/src/str/Makefile.in
@@ -63,7 +63,7 @@
 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O
 
 $(LIBNAME): $(OBJECTS)
-	ar r $@ $?
+	$(AR) r $@ $?
 	$(RANLIB) $@
 
 LINT_IGNORE=possible pointer alignment|RCSid unused
--- a/libs/src/xlog/Makefile.in
+++ b/libs/src/xlog/Makefile.in
@@ -58,7 +58,7 @@
 	$(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized
 
 $(LIBNAME): $(OBJECTS)
-	ar r $@ $?
+	$(AR) r $@ $?
 	$(RANLIB) $@
 
 install: $(LIBNAME)
+35 −0
Original line number Diff line number Diff line
This patch adds $(DESTDIR) to xinetd's installation paths, to support 
installation to a cross-compiled RFS area.

The content of this patch was copied from the OpenWrt project:
https://dev.openwrt.org/browser/packages/net/xinetd/patches/002-destdir.patch

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

--- a/Makefile.in
+++ b/Makefile.in
@@ -75,15 +75,15 @@ dlibxlog: dlibsio dlibstr
 
 install: build
 	for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \
-	   test -d $$i || mkdir -p $$i ; done
-	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR)
-	$(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR)
-	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR)
-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5
-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8
-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8
-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8
-	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8
+	   test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done
+	$(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR)
+	$(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR)
+	$(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR)
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8
+	$(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8
 	@echo "You must put your xinetd.conf in /etc/xinetd.conf"
 	@echo "There is a sample config file in xinetd/sample.conf and you can"
 	@echo "use xconv.pl to convert your old inetd.conf file to an xinetd format"
+26 −0
Original line number Diff line number Diff line
This patch fixes compiling xinetd without RPC support.

The content of this patch was copied from the OpenWrt project:
https://dev.openwrt.org/browser/packages/net/xinetd/patches/003-rpc_fix.patch

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>

--- a/xinetd/confparse.c
+++ b/xinetd/confparse.c
@@ -745,7 +745,7 @@ static status_e check_entry( struct serv
 	   }
    }
 
-/* #ifndef NO_RPC */
+#ifndef NO_RPC
 #if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
    if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
    {
@@ -759,6 +759,7 @@ static status_e check_entry( struct serv
       SC_RPCDATA( scp )->rd_program_number = rep->r_number ;
    }
    else
+#endif
 #endif   /* ! NO_RPC */
    {
        if ( !SC_IS_UNLISTED( scp ) ) 
Loading