[Gluster-devel] nfs-utils,portmap,tcp-wrappers
Harshavardhana Ranganath
harsha at 80x25.org
Sun Apr 2 15:28:17 UTC 2006
added
-- nfs-utils-1.0.8rc4
-- portmap_4
-- tcp_wrapper_7.6
added cross compile patches for these packages.
Regards
Harshavardhana
-------------- next part --------------
nfs-utils.%: PACKAGE_NAME=nfs-utils-1.0.8-rc4
nfs-utils.%: CROSS_PREPARE_CMD=[ -f .prep ] || (sh autogen.sh && touch .prep)
nfs-utils.%: CROSS_CONFIGURE_CMD=$(DEFAULT_CROSS_CONFIGURE_CMD) --disable-nfsv4 --disable-gss
-------------- next part --------------
portmap.%: PACKAGE_NAME=portmap_4
portmap.%: CROSS_INSTALL_CMD=make install $(CROSS_BUILD_ENV)
-------------- next part --------------
tcp-wrappers.%: PACKAGE_NAME=tcp_wrappers_7.6
tcp-wrappers.%: CROSS_INSTALL_CMD=make install INSTPREFIX=$(DESTDIR_CROSS) $(CROSS_BUILD_ENV)
-------------- next part --------------
diff -pru nfs-utils-1.0.8-rc4/configure.in nfs-utils-1.0.8-rc4-h/configure.in
--- nfs-utils-1.0.8-rc4/configure.in 2006-03-28 09:52:44.000000000 +0530
+++ nfs-utils-1.0.8-rc4-h/configure.in 2006-03-30 22:10:39.000000000 +0530
@@ -135,7 +135,7 @@ AC_CHECK_TOOL(LD, ld)
AC_HEADER_STDC([])
AC_GNULIBC
-AC_BSD_SIGNALS
+#AC_BSD_SIGNALS
dnl *************************************************************
dnl * Check for required libraries
-------------- next part --------------
diff -pru portmap_4/Makefile portmap_4-h/Makefile
--- portmap_4/Makefile 1996-05-31 19:20:40.000000000 +0530
+++ portmap_4-h/Makefile 2006-04-02 20:29:22.000000000 +0530
@@ -46,11 +46,11 @@ CHECK_PORT = -DCHECK_PORT
# libwrap.a object library. WRAP_DIR should specify the directory with
# that library.
-WRAP_DIR= ../tcp_wrappers
+WRAP_DIR=$(DESTDIR_CROSS)/usr/lib
# Auxiliary object files that may be missing from your C library.
#
-AUX = daemon.o strerror.o
+#AUX = daemon.o strerror.o
# NEXTSTEP is a little different. The following seems to work with NS 3.2
#
@@ -66,14 +66,22 @@ AUX = daemon.o strerror.o
##############################
SHELL = /bin/sh
+BINARIES = rpc.portmap pmap_dump pmap_set
+DESTDIR = $(DESTDIR_CROSS)
+SBINDIR = $(DESTDIR)/usr/sbin
-COPT = -Dconst= -Dperror=xperror $(HOSTS_ACCESS) $(CHECK_PORT) \
+COPT = $(HOSTS_ACCESS) $(CHECK_PORT) \
$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN)
CFLAGS = $(COPT) -O $(NSARCHS) $(SETPGRP)
OBJECTS = portmap.o pmap_check.o from_local.o $(AUX)
all: portmap pmap_dump pmap_set
+install: all
+ mkdir -p $(SBINDIR)
+ mv -f portmap rpc.portmap
+ install -m 755 $(BINARIES) $(SBINDIR)
+
portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a
$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_DIR)/libwrap.a $(LIBS)
diff -pru portmap_4/portmap.c portmap_4-h/portmap.c
--- portmap_4/portmap.c 1996-05-31 19:22:59.000000000 +0530
+++ portmap_4-h/portmap.c 2006-04-02 20:16:19.000000000 +0530
@@ -85,6 +85,7 @@ static char sccsid[] = "@(#)portmap.c 1.
#include <stdio.h>
#include <syslog.h>
#include <netdb.h>
+#include <errno.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <sys/wait.h>
@@ -233,13 +234,13 @@ main(argc, argv)
#ifndef lint
/* need to override perror calls in rpc library */
-void
+/*void
perror(what)
const char *what;
{
syslog(LOG_ERR, "%s: %m", what);
-}
+}*/
#endif
static struct pmaplist *
-------------- next part --------------
diff -pru tcp_wrappers_7.6/Makefile tcp_wrappers_7.6-h/Makefile
--- tcp_wrappers_7.6/Makefile 1997-03-21 23:57:21.000000000 +0530
+++ tcp_wrappers_7.6-h/Makefile 2006-04-02 20:00:51.000000000 +0530
@@ -44,7 +44,7 @@ what:
#REAL_DAEMON_DIR=/usr/etc
#
# SysV.4 Solaris 2.x OSF AIX
-#REAL_DAEMON_DIR=/usr/sbin
+REAL_DAEMON_DIR=/usr/sbin
#
# BSD 4.4
#REAL_DAEMON_DIR=/usr/libexec
@@ -144,7 +144,7 @@ freebsd:
linux:
@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
- NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
+ NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" install
# This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
hpux hpux8 hpux9 hpux10:
@@ -229,7 +229,7 @@ tandem:
# Amdahl UTS 2.1.5 (Richard.Richmond at bridge.bst.bls.com)
uts215:
- @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+ @make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
LIBS="-lsocket" RANLIB=echo \
ARFLAGS=rv AUX_OBJ=setenv.o NETGROUP=-DNO_NETGROUP TLI= all
@@ -472,7 +472,7 @@ BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS
# If your system supports vsyslog(), comment out the following definition.
# If in doubt leave it in, it won't harm.
-VSYSLOG = -Dvsyslog=myvsyslog
+#VSYSLOG = -Dvsyslog=myvsyslog
# End of the system dependencies.
#################################
@@ -657,6 +657,11 @@ HOSTNAME= -DALWAYS_HOSTNAME
# Protection against weird shells or weird make programs.
SHELL = /bin/sh
+INSTPREFIX = $(DESTDIR_CROSS)
+SBINDIR = $(INSTPREFIX)/usr/sbin
+MAN8DIR = $(INSTPREFIX)/usr/man/man8
+LIBDIR = $(INSTPREFIX)/usr/lib
+
.c.o:; $(CC) $(CFLAGS) -c $*.c
CFLAGS = -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
@@ -684,12 +689,24 @@ KIT = README miscd.c tcpd.c fromhost.c h
refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
scaffold.h tcpdmatch.8 README.NIS
+MAN8FILES = tcpd.8 tcpdchk.8 tcpdmatch.8
+
+BINARIES = tcpdchk tcpd tcpdmatch try-from safe_finger
+
LIB = libwrap.a
-all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
+all other: install
# Invalidate all object files when the compiler options (CFLAGS) have changed.
+install: config-check tcpdchk tcpd tcpdmatch try-from safe_finger
+ mkdir -p $(LIBDIR)
+ install -m 644 $(LIB) $(LIBDIR)
+ mkdir -p $(SBINDIR)
+ install -m 755 $(BINARIES) $(SBINDIR)
+ mkdir -p $(MAN8DIR)
+ install -m 644 $(MAN8FILES) $(MAN8DIR)
+
config-check:
@set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
@set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \
Only in tcp_wrappers_7.6-h/: aap.c
diff -pru tcp_wrappers_7.6/percent_m.c tcp_wrappers_7.6-h/percent_m.c
--- tcp_wrappers_7.6/percent_m.c 1994-12-28 22:12:37.000000000 +0530
+++ tcp_wrappers_7.6-h/percent_m.c 2006-04-02 19:14:45.000000000 +0530
@@ -14,8 +14,8 @@ static char sccsid[] = "@(#) percent_m.c
extern int errno;
#ifndef SYS_ERRLIST_DEFINED
-extern char *sys_errlist[];
-extern int sys_nerr;
+/* extern char *sys_errlist[];
+ extern int sys_nerr; */
#endif
#include "mystdarg.h"
diff -pru tcp_wrappers_7.6/scaffold.c tcp_wrappers_7.6-h/scaffold.c
--- tcp_wrappers_7.6/scaffold.c 1997-03-21 23:57:24.000000000 +0530
+++ tcp_wrappers_7.6-h/scaffold.c 2006-04-02 19:24:30.000000000 +0530
@@ -25,7 +25,7 @@ static char sccs_id[] = "@(#) scaffold.c
#define INADDR_NONE (-1) /* XXX should be 0xffffffff */
#endif
-extern char *malloc();
+/* extern char *malloc();*/
/* Application-specific. */
-------------- next part --------------
? Makefile
? Makefile.in
? aclocal.m4
? autom4te.cache
? compile
? config.guess
? config.log
? config.status
? config.sub
? configure
? deps.diff
? log
? ltmain.sh
? doc/Makefile
? doc/Makefile.in
? extensions/GlusterBenchmark
? extensions/GlusterBenchmark.gex
? extensions/GlusterBenchmark.mk
? extensions/mpich
? extensions/mpich.gex
? extensions/mpich.mk
? extensions/GlusterEP/Makefile
? extensions/GlusterEP/Makefile.in
? extensions/GlusterHPC/Makefile
? extensions/GlusterHPC/Makefile.in
? extensions/bootdisk-manager/Makefile
? extensions/bootdisk-manager/Makefile.in
? extensions/bootp-manager/Makefile
? extensions/bootp-manager/Makefile.in
? extensions/client-boot/Makefile
? extensions/client-boot/Makefile.in
? extensions/client-reg/Makefile
? extensions/client-reg/Makefile.in
? extensions/core/.deps
? extensions/core/Makefile
? extensions/core/Makefile.in
? extensions/fs-utils/Makefile
? extensions/fs-utils/Makefile.in
? extensions/ginstaller/Makefile
? extensions/ginstaller/Makefile.in
? extensions/gpartdump/Makefile
? extensions/gpartdump/Makefile.in
? extensions/ib-utils/Makefile
? extensions/ib-utils/Makefile.in
? extensions/mac-collector/Makefile
? extensions/mac-collector/Makefile.in
? patches/guile-1.6.7
? patches/nfs-utils-1.0.8-rc4
? patches/portmap_4
? patches/tcp_wrappers_7.6
? stage3/Attic
? stage3/mpich.mk
? stage3/nfs-utils.mk
? stage3/portmap.mk
? stage3/rpcbind.mk
? stage3/tcp-wrappers.mk
Index: deps.mk
===================================================================
RCS file: /sources/gluster/gluster-alpha1/deps.mk,v
retrieving revision 1.31
diff -p -u -r1.31 deps.mk
--- deps.mk 30 Mar 2006 10:16:45 -0000 1.31
+++ deps.mk 2 Apr 2006 15:07:38 -0000
@@ -12,7 +12,7 @@ APPS_STAGE3 = python disktype udpcast dh
xfsprogs e2fsprogs jfsutils sysfs ib-prepare ib-libibcommon \
ib-libibumad ib-libibmad ib-libosmvendor ib-libosmcomp ib-tools \
ib-osm ib-osminclude ib-osmtest ib-libibverbs ib-libibat ib-libibcm \
- ib-libmthca ib-libsdp netcat guile libtool gmp freeipmi parted libgpg-error libgcrypt
+ ib-libmthca ib-libsdp netcat guile libtool gmp freeipmi parted libgpg-error libgcrypt nfs-utils portmap tcp-wrappers
APPS_RAMDISK = busybox
APPS_BUILD = cdrtools genext2fs kernel-prepare kernel-bzimage
@@ -89,3 +89,4 @@ freeipmi.cross: guile.cross libgcrypt.cr
libgcrypt.cross: libgpg-error.cross # libgpg-error dependency for libgcrypt
libgcrypt.cross: libgpg-error.native # for gpg-error-config during ./configure
parted.cross: e2fsprogs.cross reiserfsprogs.cross jfsutils.cross xfsprogs.cross # support
+portmap.cross: tcp-wrappers.cross # dependency for libwrap.a
More information about the Gluster-devel
mailing list