rpms/nfs-utils/devel nfs-utils-1.0.7-compile.patch,1.5,1.6
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Sep 23 16:37:11 UTC 2005
Author: steved
Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5072
Modified Files:
nfs-utils-1.0.7-compile.patch
Log Message:
Updated compile patch to work on x86_64 archs
nfs-utils-1.0.7-compile.patch:
Makefile | 2 +-
config.mk.in | 6 +++---
configure.in | 24 +++++++++++++++---------
support/Makefile | 2 +-
support/event/Makefile.in | 10 ++++++++--
support/gssapi/Makefile.in | 9 +++++++--
support/gssapi/configure | 2 ++
support/include/Makefile | 10 ++++++++--
support/lib/Makefile | 12 +++++++++++-
support/nfsidmap/Makefile.in | 9 ++++++++-
support/rpcsecgss/Makefile.in | 10 ++++++++--
support/rpcsecgss/configure | 2 ++
utils/gssd/Makefile | 4 +++-
utils/idmapd/Makefile | 2 +-
utils/svcgssd/Makefile | 9 ++++++---
15 files changed, 84 insertions(+), 29 deletions(-)
Index: nfs-utils-1.0.7-compile.patch
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils-1.0.7-compile.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nfs-utils-1.0.7-compile.patch 22 Sep 2005 18:27:55 -0000 1.5
+++ nfs-utils-1.0.7-compile.patch 23 Sep 2005 16:37:08 -0000 1.6
@@ -1,5 +1,83 @@
+--- nfs-utils-1.0.7/config.mk.in.compile 2005-09-23 12:27:45.288539568 -0400
++++ nfs-utils-1.0.7/config.mk.in 2005-09-23 12:28:20.082250120 -0400
+@@ -6,9 +6,9 @@ VERSION = nfs-utils @VERSION@
+
+ prefix = $(install_prefix)@prefix@
+ exec_prefix = $(install_prefix)@prefix@
+-BINDIR = @bindir@
+-SBINDIR = @sbindir@
+-MANDIR = @mandir@
++BINDIR = $(install_prefix)@bindir@
++SBINDIR = $(install_prefix)@sbindir@
++MANDIR = $(install_prefix)@mandir@
+ STATEDIR = $(install_prefix)@statedir@
+ STATDUSER = @statduser@
+
+--- nfs-utils-1.0.7/Makefile.compile 2003-09-14 20:06:15.000000000 -0400
++++ nfs-utils-1.0.7/Makefile 2005-09-23 12:28:20.081250272 -0400
+@@ -33,4 +33,4 @@ install:: installman
+ mkdir -p $(STATEDIR)/sm $(STATEDIR)/sm.bak
+ touch $(STATEDIR)/state
+ chmod go-rwx $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state
+- chown $(STATDUSER) $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state
++ #chown $(STATDUSER) $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state
+--- nfs-utils-1.0.7/utils/idmapd/Makefile.compile 2005-09-23 12:27:45.303537288 -0400
++++ nfs-utils-1.0.7/utils/idmapd/Makefile 2005-09-23 12:28:20.079250576 -0400
+@@ -6,7 +6,7 @@ TOP = ../../
+ PROGRAM = idmapd
+ PREFIX = rpc.
+ OBJS = atomicio.o cfg.o idmapd.o setproctitle.o strlcat.o strlcpy.o
+-LIBS = -levent -lnfsidmap
++LIBS = -levent -lnfsidmap -lldap
+ MAN8 = idmapd
+ MAN5 = idmapd.conf
+
+--- nfs-utils-1.0.7/utils/svcgssd/Makefile.compile 2005-09-23 12:27:45.316535312 -0400
++++ nfs-utils-1.0.7/utils/svcgssd/Makefile 2005-09-23 12:28:20.080250424 -0400
+@@ -7,7 +7,7 @@ PROGRAM = svcgssd
+ PREFIX = rpc.
+ OBJS = svcgssd.o svcgssd_main_loop.o svcgssd_proc.o err_util.o gss_util.o \
+ gss_oids.o context.o context_heimdal.o cacheio.o svcgssd_mech2file.o
+-LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpcsecgss -lgssapi -ldl $(KRBLIB) -lnfsidmap
++LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpcsecgss -lgssapi -ldl $(KRBLIB) -lnfsidmap -lldap
+ MAN8 = svcgssd
+
+ LINKED = err_util.c gss_util.c gss_oids.c context.c context_heimdal.c
+@@ -27,5 +27,8 @@ distclean ::
+
+ include $(TOP)rules.mk
+
+-CFLAGS += -I../gssd -DKRB5_VERSION=$(KRB5_VERSION) \
+- -I$(TOP)support/rpc/include/ -I$(KRBDIR)/include
++CFLAGS += -DHAVE_KRB5 -DKRB5_VERSION=$(KRB5_VERSION) \
++ -I../gssd \
++ -I$(TOP)/support/gssapi/include \
++ -I$(TOP)/support/rpcsecgss/include \
++ -I$(KRBDIR)/include
+--- nfs-utils-1.0.7/utils/gssd/Makefile.compile 2005-09-23 12:27:45.314535616 -0400
++++ nfs-utils-1.0.7/utils/gssd/Makefile 2005-09-23 12:28:20.079250576 -0400
+@@ -12,5 +12,7 @@ MAN8 = gssd
+
+ include $(TOP)rules.mk
+
+-CFLAGS += -DKRB5_VERSION=$(KRB5_VERSION) -I$(TOP)support/rpc/include/ \
++CFLAGS += -DKRB5_VERSION=$(KRB5_VERSION) -I. \
++ -I$(TOP)/support/gssapi/include \
++ -I$(TOP)/support/rpcsecgss/include \
+ -I$(KRBDIR)/include
+--- nfs-utils-1.0.7/support/Makefile.compile 2005-09-23 12:27:45.326533792 -0400
++++ nfs-utils-1.0.7/support/Makefile 2005-09-23 12:28:20.075251184 -0400
+@@ -3,7 +3,7 @@
+ #
+
+ TOP = ../
+-SUBDIRS = include nfs export lib misc
++SUBDIRS = include nfs export lib misc nfsidmap event gssapi rpcsecgss
+ .DEFAULT: all
+
+ include $(TOP)rules.mk
--- nfs-utils-1.0.7/support/gssapi/Makefile.in.compile 2005-09-21 13:19:48.000000000 -0400
-+++ nfs-utils-1.0.7/support/gssapi/Makefile.in 2005-09-22 13:54:27.628227000 -0400
++++ nfs-utils-1.0.7/support/gssapi/Makefile.in 2005-09-23 12:28:20.073251488 -0400
@@ -83,7 +83,7 @@ AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
@@ -28,8 +106,19 @@
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
---- nfs-utils-1.0.7/support/include/Makefile.compile 2005-09-22 13:53:50.659450000 -0400
-+++ nfs-utils-1.0.7/support/include/Makefile 2005-09-22 13:54:27.632230000 -0400
+--- nfs-utils-1.0.7/support/gssapi/configure.compile 2005-08-15 14:56:37.000000000 -0400
++++ nfs-utils-1.0.7/support/gssapi/configure 2005-09-23 12:28:53.741133192 -0400
+@@ -22927,6 +22927,8 @@ _ACEOF
+
+ if test -f $dir/include/gssapi/gssapi_krb5.h -a \
+ \( -f $dir/lib/libgssapi_krb5.a -o \
++ -f $dir/lib64/libgssapi_krb5.a -o \
++ -f $dir/lib64/libgssapi_krb5.so -o \
+ -f $dir/lib/libgssapi_krb5.so \) ; then
+
+ cat >>confdefs.h <<\_ACEOF
+--- nfs-utils-1.0.7/support/include/Makefile.compile 2005-09-23 12:27:45.296538352 -0400
++++ nfs-utils-1.0.7/support/include/Makefile 2005-09-23 12:28:20.074251336 -0400
@@ -6,13 +6,19 @@ TOP = ../../
include $(TOP)rules.mk
@@ -52,46 +141,50 @@
+ $(LN_S) ../nfsidmap/nfsidmap.h .
+
# .EXPORT_ALL_VARIABLES:
---- nfs-utils-1.0.7/support/lib/Makefile.compile 2005-09-22 13:53:50.666450000 -0400
-+++ nfs-utils-1.0.7/support/lib/Makefile 2005-09-22 13:54:27.637227000 -0400
-@@ -2,7 +2,8 @@
- TOP = ../../
- include $(TOP)rules.mk
-
--LIBS = libnfs.a libexport.a libmisc.a librpc.a libgssapi.a
-+LIBS = libnfs.a libexport.a libmisc.a libgssapi.a libnfsidmap.a \
-+ libevent.a librpcsecgss.a
-
- all install:: $(LIBS)
- @:
-@@ -10,5 +11,14 @@ all install:: $(LIBS)
- clean distclean::
- rm -f $(LIBS)
-
-+libgssapi.a:
-+ ln -sf ../gssapi/src/.libs/$@ .
-+
-+librpcsecgss.a:
-+ ln -sf ../rpcsecgss/src/.libs/$@ .
-+
-+libevent.a:
-+ ln -sf ../event/.libs/$@ .
-+
- lib%.a:
- ln -sf ../$*/$@ .
---- nfs-utils-1.0.7/support/Makefile.compile 2005-09-22 13:53:51.019472000 -0400
-+++ nfs-utils-1.0.7/support/Makefile 2005-09-22 13:54:27.641228000 -0400
-@@ -3,7 +3,7 @@
- #
-
- TOP = ../
--SUBDIRS = include nfs export lib misc
-+SUBDIRS = include nfs export lib misc nfsidmap event gssapi rpcsecgss
- .DEFAULT: all
-
- include $(TOP)rules.mk
+--- nfs-utils-1.0.7/support/rpcsecgss/Makefile.in.compile 2005-06-22 14:58:51.000000000 -0400
++++ nfs-utils-1.0.7/support/rpcsecgss/Makefile.in 2005-09-23 12:28:20.078250728 -0400
+@@ -81,7 +81,7 @@ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -I../include ../../gssapi/include -I../../include
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+@@ -498,12 +498,18 @@ distcleancheck: distclean
+ || { echo "ERROR: files left in build directory after distclean:" ; \
+ $(distcleancheck_listfiles) ; \
+ exit 1; } >&2
++predep::
++depend dep:: predep
++ cd ./src ; $(CC) $(CFLAGS) -M *.c > .depend
+ check-am: all-am
+ check: check-recursive
+ all-am: Makefile
+ installdirs: installdirs-recursive
+ installdirs-am:
+-install: install-recursive
++#install: install-recursive
++install:
++install:
++installman:
+ install-exec: install-exec-recursive
+ install-data: install-data-recursive
+ uninstall: uninstall-recursive
+--- nfs-utils-1.0.7/support/rpcsecgss/configure.compile 2005-03-22 17:27:18.000000000 -0500
++++ nfs-utils-1.0.7/support/rpcsecgss/configure 2005-09-23 12:29:11.573422272 -0400
+@@ -21267,6 +21267,8 @@ _ACEOF
+
+ if test -f $dir/include/gssapi/gssapi_krb5.h -a \
+ \( -f $dir/lib/libgssapi_krb5.a -o \
++ -f $dir/lib64/libgssapi_krb5.a -o \
++ -f $dir/lib64/libgssapi_krb5.so -o \
+ -f $dir/lib/libgssapi_krb5.so \) ; then
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_KRB5 1
--- nfs-utils-1.0.7/support/nfsidmap/Makefile.in.compile 2005-09-21 12:56:29.000000000 -0400
-+++ nfs-utils-1.0.7/support/nfsidmap/Makefile.in 2005-09-22 13:54:27.648227000 -0400
++++ nfs-utils-1.0.7/support/nfsidmap/Makefile.in 2005-09-23 12:28:20.076251032 -0400
@@ -264,8 +264,14 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
@@ -118,7 +211,7 @@
install-data: install-data-am
uninstall: uninstall-am
--- nfs-utils-1.0.7/support/event/Makefile.in.compile 2005-06-12 13:59:18.000000000 -0400
-+++ nfs-utils-1.0.7/support/event/Makefile.in 2005-09-22 13:54:27.655227000 -0400
++++ nfs-utils-1.0.7/support/event/Makefile.in 2005-09-23 12:28:20.077250880 -0400
@@ -206,7 +206,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -150,91 +243,35 @@
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive
---- nfs-utils-1.0.7/support/rpcsecgss/Makefile.in.compile 2005-06-22 14:58:51.000000000 -0400
-+++ nfs-utils-1.0.7/support/rpcsecgss/Makefile.in 2005-09-22 13:54:27.669228000 -0400
-@@ -81,7 +81,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I../include ../../gssapi/include -I../../include
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
-@@ -498,12 +498,18 @@ distcleancheck: distclean
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-+predep::
-+depend dep:: predep
-+ cd ./src ; $(CC) $(CFLAGS) -M *.c > .depend
- check-am: all-am
- check: check-recursive
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--install: install-recursive
-+#install: install-recursive
-+install:
-+install:
-+installman:
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
---- nfs-utils-1.0.7/utils/gssd/Makefile.compile 2005-09-22 13:53:50.924453000 -0400
-+++ nfs-utils-1.0.7/utils/gssd/Makefile 2005-09-22 13:54:27.674227000 -0400
-@@ -12,5 +12,7 @@ MAN8 = gssd
-
- include $(TOP)rules.mk
-
--CFLAGS += -DKRB5_VERSION=$(KRB5_VERSION) -I$(TOP)support/rpc/include/ \
-+CFLAGS += -DKRB5_VERSION=$(KRB5_VERSION) -I. \
-+ -I$(TOP)/support/gssapi/include \
-+ -I$(TOP)/support/rpcsecgss/include \
- -I$(KRBDIR)/include
---- nfs-utils-1.0.7/utils/idmapd/Makefile.compile 2005-09-22 13:53:50.753450000 -0400
-+++ nfs-utils-1.0.7/utils/idmapd/Makefile 2005-09-22 13:54:27.678229000 -0400
-@@ -6,7 +6,7 @@ TOP = ../../
- PROGRAM = idmapd
- PREFIX = rpc.
- OBJS = atomicio.o cfg.o idmapd.o setproctitle.o strlcat.o strlcpy.o
--LIBS = -levent -lnfsidmap
-+LIBS = -levent -lnfsidmap -lldap
- MAN8 = idmapd
- MAN5 = idmapd.conf
-
---- nfs-utils-1.0.7/utils/svcgssd/Makefile.compile 2005-09-22 13:53:50.944450000 -0400
-+++ nfs-utils-1.0.7/utils/svcgssd/Makefile 2005-09-22 13:54:44.443584000 -0400
-@@ -7,7 +7,7 @@ PROGRAM = svcgssd
- PREFIX = rpc.
- OBJS = svcgssd.o svcgssd_main_loop.o svcgssd_proc.o err_util.o gss_util.o \
- gss_oids.o context.o context_heimdal.o cacheio.o svcgssd_mech2file.o
--LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpcsecgss -lgssapi -ldl $(KRBLIB) -lnfsidmap
-+LIBS = -Wl,-rpath=$(KRBDIR)/lib -lrpcsecgss -lgssapi -ldl $(KRBLIB) -lnfsidmap -lldap
- MAN8 = svcgssd
+--- nfs-utils-1.0.7/support/lib/Makefile.compile 2005-09-23 12:27:45.296538352 -0400
++++ nfs-utils-1.0.7/support/lib/Makefile 2005-09-23 12:28:20.075251184 -0400
+@@ -2,7 +2,8 @@
+ TOP = ../../
+ include $(TOP)rules.mk
- LINKED = err_util.c gss_util.c gss_oids.c context.c context_heimdal.c
-@@ -27,5 +27,8 @@ distclean ::
+-LIBS = libnfs.a libexport.a libmisc.a librpc.a libgssapi.a
++LIBS = libnfs.a libexport.a libmisc.a libgssapi.a libnfsidmap.a \
++ libevent.a librpcsecgss.a
- include $(TOP)rules.mk
+ all install:: $(LIBS)
+ @:
+@@ -10,5 +11,14 @@ all install:: $(LIBS)
+ clean distclean::
+ rm -f $(LIBS)
--CFLAGS += -I../gssd -DKRB5_VERSION=$(KRB5_VERSION) \
-- -I$(TOP)support/rpc/include/ -I$(KRBDIR)/include
-+CFLAGS += -DHAVE_KRB5 -DKRB5_VERSION=$(KRB5_VERSION) \
-+ -I../gssd \
-+ -I$(TOP)/support/gssapi/include \
-+ -I$(TOP)/support/rpcsecgss/include \
-+ -I$(KRBDIR)/include
---- nfs-utils-1.0.7/Makefile.compile 2003-09-14 20:06:15.000000000 -0400
-+++ nfs-utils-1.0.7/Makefile 2005-09-22 13:54:27.688227000 -0400
-@@ -33,4 +33,4 @@ install:: installman
- mkdir -p $(STATEDIR)/sm $(STATEDIR)/sm.bak
- touch $(STATEDIR)/state
- chmod go-rwx $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state
-- chown $(STATDUSER) $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state
-+ #chown $(STATDUSER) $(STATEDIR)/sm $(STATEDIR)/sm.bak $(STATEDIR)/state
---- nfs-utils-1.0.7/configure.in.compile 2005-09-22 13:53:50.889450000 -0400
-+++ nfs-utils-1.0.7/configure.in 2005-09-22 13:54:27.694227000 -0400
++libgssapi.a:
++ ln -sf ../gssapi/src/.libs/$@ .
++
++librpcsecgss.a:
++ ln -sf ../rpcsecgss/src/.libs/$@ .
++
++libevent.a:
++ ln -sf ../event/.libs/$@ .
++
+ lib%.a:
+ ln -sf ../$*/$@ .
+--- nfs-utils-1.0.7/configure.in.compile 2005-09-23 12:27:45.311536072 -0400
++++ nfs-utils-1.0.7/configure.in 2005-09-23 12:28:20.082250120 -0400
@@ -117,10 +117,12 @@ AC_CHECK_LIB(socket, main, [LIBSOCKET="-
AC_CHECK_LIB(nsl, main, [LIBNSL="-lnsl"])
AC_CHECK_LIB(crypt, crypt, [LIBCRYPT="-lcrypt"])
@@ -287,18 +324,3 @@
AC_SUBST([KRBDIR])
AC_SUBST([KRBLIB])
---- nfs-utils-1.0.7/config.mk.in.compile 2005-09-22 13:53:50.584450000 -0400
-+++ nfs-utils-1.0.7/config.mk.in 2005-09-22 13:54:27.700227000 -0400
-@@ -6,9 +6,9 @@ VERSION = nfs-utils @VERSION@
-
- prefix = $(install_prefix)@prefix@
- exec_prefix = $(install_prefix)@prefix@
--BINDIR = @bindir@
--SBINDIR = @sbindir@
--MANDIR = @mandir@
-+BINDIR = $(install_prefix)@bindir@
-+SBINDIR = $(install_prefix)@sbindir@
-+MANDIR = $(install_prefix)@mandir@
- STATEDIR = $(install_prefix)@statedir@
- STATDUSER = @statduser@
-
More information about the fedora-cvs-commits
mailing list