rpms/nfs-utils/devel nfs-utils-1.0.8-rc2-Makefileam.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 nfs-utils-1.0.7-compile.patch, 1.7, 1.8 nfs-utils.spec, 1.73, 1.74 rpcgssd.init, 1.3, 1.4 sources, 1.13, 1.14 gssapi_mech.conf, 1.1, NONE nfs-utils-1.0.6-pie.patch, 1.1, NONE nfs-utils-1.0.7-idmapd-mapinit.patch, 1.1, NONE nfs-utils-1.0.7-post0.patch, 1.1, NONE nfs-utils-1.0.7-post1.patch, 1.2, NONE nfs-utils-1.0.7-post2.patch, 1.2, NONE nfs-utils-1.0.7-post3.patch, 1.1, NONE nfs-utils-1.0.7-post4.patch, 1.1, NONE nfs-utils-1.0.7-post5.patch, 1.1, NONE nfs-utils-1.0.7-post6.patch, 1.1, NONE nfs-utils-1.0.7-strip.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Jan 9 20:18:01 UTC 2006
- Previous message (by thread): rpms/selinux-policy/devel modules-targeted.conf, 1.10, 1.11 policy-20060104.patch, 1.4, 1.5 selinux-policy.spec, 1.77, 1.78 policy-20051208.patch, 1.36, NONE
- Next message (by thread): rpms/selinux-policy/devel .cvsignore,1.20,1.21 sources,1.22,1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: steved
Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11423
Modified Files:
.cvsignore nfs-utils-1.0.7-compile.patch nfs-utils.spec
rpcgssd.init sources
Added Files:
nfs-utils-1.0.8-rc2-Makefileam.patch
Removed Files:
gssapi_mech.conf nfs-utils-1.0.6-pie.patch
nfs-utils-1.0.7-idmapd-mapinit.patch
nfs-utils-1.0.7-post0.patch nfs-utils-1.0.7-post1.patch
nfs-utils-1.0.7-post2.patch nfs-utils-1.0.7-post3.patch
nfs-utils-1.0.7-post4.patch nfs-utils-1.0.7-post5.patch
nfs-utils-1.0.7-post6.patch nfs-utils-1.0.7-strip.patch
Log Message:
- Updated to 1.0.8-rc2 release
- Broke out libgssapi into its own rpm
- Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm
- Removed libevent code; Required to be installed.
nfs-utils-1.0.8-rc2-Makefileam.patch:
Makefile.am | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE nfs-utils-1.0.8-rc2-Makefileam.patch ---
--- nfs-utils-1.0.8-rc2/Makefile.am.orig 2005-12-19 23:12:42.000000000 -0500
+++ nfs-utils-1.0.8-rc2/Makefile.am 2006-01-05 21:08:18.161171000 -0500
@@ -40,11 +40,11 @@ EXTRA_DIST = \
aclocal/tcp-wrappers.m4
install-data-hook:
- if [ ! -d $(statedir) ]; then mkdir -p $(statedir); fi
- touch $(statedir)/xtab; chmod 644 $(statedir)/xtab
- touch $(statedir)/etab; chmod 644 $(statedir)/etab
- touch $(statedir)/rmtab; chmod 644 $(statedir)/rmtab
- 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
+ if [ ! -d $(DESTDIR)/$(statedir) ]; then mkdir -p $(DESTDIR)/$(statedir); fi
+ touch $(DESTDIR)/$(statedir)/xtab; chmod 644 $(DESTDIR)/$(statedir)/xtab
+ touch $(DESTDIR)/$(statedir)/etab; chmod 644 $(DESTDIR)/$(statedir)/etab
+ touch $(DESTDIR)/$(statedir)/rmtab; chmod 644 $(DESTDIR)/$(statedir)/rmtab
+ mkdir -p $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak
+ touch $(DESTDIR)/$(statedir)/state
+ chmod go-rwx $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state
+ chown $(statduser) $(DESTDIR)/$(statedir)/sm $(DESTDIR)/$(statedir)/sm.bak $(DESTDIR)/$(statedir)/state
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 22 Sep 2005 14:43:09 -0000 1.12
+++ .cvsignore 9 Jan 2006 20:17:59 -0000 1.13
@@ -1,15 +1,5 @@
-libevent-0.9.tar.gz
-nfs-utils-1.0.6.tar.gz
+nfs-utils-1.0.8-rc2.tar.gz
+librpcsecgss-0.7.tar.gz
+libgssapi-0.7.tar.gz
+libnfsidmap-0.12.tar.gz
nfs.doc.tar.gz
-nfsidmap-0.1.tar.gz
-nfsidmap-0.5.tar.gz
-libgssapi-0.1.tar.gz
-librpcsecgss-0.1.tar.gz
-nfs-utils-1.0.7.tar.gz
-libevent-1.0b.tar.gz
-nfsidmap-0.10.tar.gz
-libevent-1.1a.tar.gz
-libgssapi-0.4.tar.gz
-librpcsecgss-0.6.tar.gz
-libgssapi-0.5.tar.gz
-nfsidmap-0.11.tar.gz
nfs-utils-1.0.7-compile.patch:
kerberos5.m4 | 2 ++
1 files changed, 2 insertions(+)
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nfs-utils-1.0.7-compile.patch 24 Oct 2005 19:14:49 -0000 1.7
+++ nfs-utils-1.0.7-compile.patch 9 Jan 2006 20:17:59 -0000 1.8
@@ -1,326 +1,11 @@
---- 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-10-23 18:01:47.000000000 -0400
-@@ -264,8 +264,14 @@ clean-libLTLIBRARIES:
- echo "rm -f \"$${dir}/so_locations\""; \
- rm -f "$${dir}/so_locations"; \
- done
-+
-+predep::
-+depend dep:: predep
-+ $(CC) $(CFLAGS) -M $(SOURCES) > .depend
-+
- libnfsidmap.la: $(libnfsidmap_la_OBJECTS) $(libnfsidmap_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libnfsidmap_la_LDFLAGS) $(libnfsidmap_la_OBJECTS) $(libnfsidmap_la_LIBADD) $(LIBS)
-+ rm -f libnfsidmap.a ; ln -s .libs/libnfsidmap.a || exit 1
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-@@ -556,7 +562,8 @@ installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
--install: install-am
-+install:
-+installman:
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
---- nfs-utils-1.0.7/support/include/Makefile.compile 2005-10-23 18:00:49.000000000 -0400
-+++ nfs-utils-1.0.7/support/include/Makefile 2005-10-23 18:01:47.000000000 -0400
-@@ -6,13 +6,19 @@ TOP = ../../
-
- include $(TOP)rules.mk
-
--all install:: mount.h
-+all install dep:: mount.h event.h nfsidmap.h
- @:
-
- distclean::
-- $(RM) mount.h config.h
-+ $(RM) mount.h config.h event.h nfsidmap.h
-
- mount.h:
- $(LN_S) ../export/mount.h .
-
-+event.h:
-+ $(LN_S) ../event/event.h .
-+
-+nfsidmap.h:
-+ $(LN_S) ../nfsidmap/nfsidmap.h .
-+
- # .EXPORT_ALL_VARIABLES:
---- nfs-utils-1.0.7/support/lib/Makefile.compile 2005-10-23 18:00:49.000000000 -0400
-+++ nfs-utils-1.0.7/support/lib/Makefile 2005-10-23 18:01:47.000000000 -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/event/Makefile.in.compile 2005-06-12 13:59:18.000000000 -0400
-+++ nfs-utils-1.0.7/support/event/Makefile.in 2005-10-23 18:01:47.000000000 -0400
-@@ -206,7 +206,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign no-dependencies
--SUBDIRS = . sample test
-+SUBDIRS = . #sample test
- EXTRA_DIST = acconfig.h event.h event-internal.h log.h evsignal.h event.3 \
- kqueue.c epoll_sub.c epoll.c select.c rtsig.c poll.c signal.c \
- devpoll.c \
-@@ -271,6 +271,10 @@ $(top_srcdir)/configure: @MAINTAINER_MOD
- $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-+predep::
-+depend dep:: predep
-+ $(CC) $(CFLAGS) $(INCLUDES) -M $(SOURCES) > .depend
-+
- config.h: stamp-h1
- @if test ! -f $@; then \
- rm -f stamp-h1; \
-@@ -674,7 +678,9 @@ installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(includedir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
--install: install-recursive
-+install: #install-recursive
-+installman:
-+
- 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-10-23 18:01:47.000000000 -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-10-23 18:01:47.000000000 -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/gssapi/Makefile.in.compile 2005-09-21 13:19:48.000000000 -0400
-+++ nfs-utils-1.0.7/support/gssapi/Makefile.in 2005-10-23 18:01:47.000000000 -0400
-@@ -83,7 +83,7 @@ AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
- CC = @CC@
- CCDEPMODE = @CCDEPMODE@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I../include ../../rpcsecgss/include -I../../include
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
-@@ -503,12 +503,17 @@ 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:
-+installman:
- install-exec: install-exec-recursive
- install-data: install-data-recursive
- uninstall: uninstall-recursive
---- 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-10-23 18:01:47.000000000 -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/Makefile.compile 2005-10-23 18:00:50.000000000 -0400
-+++ nfs-utils-1.0.7/support/Makefile 2005-10-23 18:01:47.000000000 -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/utils/gssd/Makefile.compile 2005-10-23 18:00:50.000000000 -0400
-+++ nfs-utils-1.0.7/utils/gssd/Makefile 2005-10-23 18:01:47.000000000 -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-10-23 18:00:50.000000000 -0400
-+++ nfs-utils-1.0.7/utils/idmapd/Makefile 2005-10-23 18:02:12.000000000 -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 -lnfs
-+LIBS = -levent -lnfsidmap -lnfs -lldap
- MAN8 = idmapd
- MAN5 = idmapd.conf
-
---- nfs-utils-1.0.7/utils/svcgssd/Makefile.compile 2005-10-23 18:00:50.000000000 -0400
-+++ nfs-utils-1.0.7/utils/svcgssd/Makefile 2005-10-23 18:03:25.000000000 -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 = -lnfs -lrpcsecgss -lgssapi -lnfsidmap -ldl \
-+LIBS = -lnfs -lrpcsecgss -lgssapi -lnfsidmap -ldl -lldap \
- -Wl,-rpath=$(KRBDIR)/lib $(KRBLIB)
- MAN8 = svcgssd
-
-@@ -28,5 +28,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/config.mk.in.compile 2005-10-23 18:00:51.000000000 -0400
-+++ nfs-utils-1.0.7/config.mk.in 2005-10-23 18:01:46.000000000 -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-10-23 18:01:46.000000000 -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-10-23 18:00:50.000000000 -0400
-+++ nfs-utils-1.0.7/configure.in 2005-10-23 18:01:47.000000000 -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"])
- if test "$enable_nfsv4" = yes; then
-- AC_CHECK_LIB(event, event_dispatch, [libevent=1], [AC_MSG_ERROR(libevent needed for nfsv4 support)])
-- AC_CHECK_LIB(nfsidmap, nfs4_init_name_mapping, [libnfsidmap=1], [AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
-- AC_CHECK_HEADERS(event.h, ,[AC_MSG_ERROR(libevent needed for nfsv4 support)])
-- AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
-+ #AC_CHECK_LIB(event, event_dispatch, [libevent=1], [AC_MSG_ERROR(libevent needed for nfsv4 support)])
-+ #AC_CHECK_LIB(nfsidmap, nfs4_init_name_mapping, [libnfsidmap=1], [AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
-+ #AC_CHECK_HEADERS(event.h, ,[AC_MSG_ERROR(libevent needed for nfsv4 support)])
-+ #AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for nfsv4 support)])
-+ AC_DEFINE(libevent)
-+ AC_DEFINE(libnfsidmap)
- fi
- if test "$knfsd_cv_glibc2" = no; then
- AC_CHECK_LIB(bsd, daemon, [LIBBSD="-lbsd"])
-@@ -134,8 +136,8 @@ AC_TCP_WRAPPER
- AC_SUBST(LIBWRAP)
-
- if test "$enable_gss" = yes; then
-- dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c
-- AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for gss support)])
-+# dnl 'gss' also depends on nfsidmap.h - at least for svcgssd_proc.c
-+# AC_CHECK_HEADERS(nfsidmap.h, ,[AC_MSG_ERROR(libnfsidmap needed for gss support)])
-
- dnl Checks for Kerberos
- dnl NOTE: while we intend to do generic gss-api, currently we
-@@ -172,6 +174,8 @@ if test "$enable_gss" = yes; then
+--- nfs-utils-1.0.7/aclocal/kerberos5.m4.orig 2005-12-15 17:11:03.694036000 -0500
++++ nfs-utils-1.0.7/aclocal/kerberos5.m4 2005-12-15 17:11:09.201155000 -0500
+@@ -34,6 +34,8 @@ AC_DEFUN([AC_KERBEROS_V5],[
AC_DEFINE_UNQUOTED(KRB5_VERSION, $K5VERS, [Define this as the Kerberos version number])
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
+ \( -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
AC_DEFINE(HAVE_KRB5, 1, [Define this if you have MIT Kerberos libraries])
KRBDIR="$dir"
-@@ -225,9 +229,11 @@ if test "$enable_gss" = yes; then
-
- dnl This is not done until here because we need to have KRBLIB set
- dnl "librpcsecgss=1" is so that it doesn't get added to LIBS
-- AC_CHECK_LIB(rpcsecgss, authgss_create_default, [librpcsecgss=1], [AC_MSG_ERROR(librpcsecgss needed for nfsv4 support)], $KRBLIB)
-- AC_CHECK_LIB(rpcsecgss, authgss_set_debug_level,
-- AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, $KRBLIB)
-+ #AC_CHECK_LIB(rpcsecgss, authgss_create_default, [librpcsecgss=1], [AC_MSG_ERROR(librpcsecgss needed for nfsv4 support)], $KRBLIB)
-+ #AC_CHECK_LIB(rpcsecgss, authgss_set_debug_level,
-+ # AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL, 1, [Define this if the rpcsec_gss library has the function authgss_set_debug_level]),, $KRBLIB)
-+ AC_DEFINE(librpcsecgss)
-+ AC_DEFINE(HAVE_AUTHGSS_SET_DEBUG_LEVEL)
-
- AC_SUBST([KRBDIR])
- AC_SUBST([KRBLIB])
Index: nfs-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- nfs-utils.spec 9 Dec 2005 22:42:22 -0000 1.73
+++ nfs-utils.spec 9 Jan 2006 20:17:59 -0000 1.74
@@ -1,67 +1,29 @@
Summary: NFS utlilities and supporting daemons for the kernel NFS server.
Name: nfs-utils
-Version: 1.0.7
-Release: 19.FC5.1
+Version: 1.0.8.rc2
+Release: 1.FC5
# group all 32bit related archs
%define all_32bit_archs i386 i686 athlon
-Source0: http://unc.dl.sourceforge.net/sourceforge/nfs/nfs-utils-1.0.7.tar.gz
+Source0: http://prdownloads.sourceforge.net/nfs/nfs-utils-1.0.8-rc2.tar.gz
Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
-%define idmapvers 0.11
-Source2: http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/nfsidmap-%{idmapvers}.tar.gz
-%define eventvers 1.1a
-Source3: http://monkey.org/~provos/libevent-%{eventvers}.tar.gz
-%define gssapivers 0.5
-Source4: http://www.citi.umich.edu/projects/nfsv4/linux/libgssapi/libgssapi-%{gssapivers}.tar.gz
-%define rpcsecgssvers 0.6
-Source5: http://www.citi.umich.edu/projects/nfsv4/linux/librpcsecgss/librpcsecgss-%{rpcsecgssvers}.tar.gz
-
Source10: nfs.init
Source11: nfslock.init
Source12: rpcidmapd.init
Source13: rpcgssd.init
Source14: rpcsvcgssd.init
-Source15: gssapi_mech.conf
-
-# Updstream Patches
-#
-Patch0: nfs-utils-1.0.7-post0.patch
-Patch1: nfs-utils-1.0.7-post1.patch
-Patch2: nfs-utils-1.0.7-post2.patch
-Patch3: nfs-utils-1.0.7-post3.patch
-Patch4: nfs-utils-1.0.7-post4.patch
-Patch5: nfs-utils-1.0.7-post5.patch
-Patch6: nfs-utils-1.0.7-post6.patch
-
-#
-# CITI Patches
-#
-Patch20: nfs-utils-1.0.7-037-svcgssd_closeall_lib.dif
-Patch21: nfs-utils-1.0.7-040-idmapd_fix_error_reporting.dif
-Patch22: nfs-utils-1.0.7-041-svcgssd_error_reporting.dif
-Patch23: nfs-utils-1.0.7-042-spkm3_lucid_context.dif
-Patch24: nfs-utils-1.0.7-043-svcgssd_continue_init.dif
-Patch25: nfs-utils-1.0.7-044-gssd_continue_init.dif
-Patch26: nfs-utils-1.0.7-045-gssd_clnt_create_error.dif
-Patch27: nfs-utils-1.0.7-046-gssd_error_messages.dif
-
-#
-# Local Patches
-#
Patch50: nfs-utils-1.0.5-statdpath.patch
Patch51: nfs-utils-1.0.6-mountd.patch
Patch52: nfs-utils-1.0.6-idmap.conf.patch
Patch53: nfs-utils-1.0.7-rquotad-curblocks.patch
Patch54: nfs-utils-1.0.7-mountd-stat64.patch
Patch55: nfs-utils-1.0.7-nfsd-ctlbits.patch
-Patch56: nfs-utils-1.0.7-idmapd-mapinit.patch
+Patch56: nfs-utils-1.0.8-rc2-Makefileam.patch
-Patch100: nfs-utils-1.0.7-compile.patch
-Patch150: nfs-utils-1.0.6-pie.patch
-Patch151: nfs-utils-1.0.7-strip.patch
+Patch100: nfs-utils-1.0.8-compile.patch
Group: System Environment/Daemons
Obsoletes: nfs-server
@@ -75,12 +37,14 @@
Provides: knfsd-clients
Provides: knfsd
License: GPL
-Buildroot: %{_tmppath}/%{name}-root
+Buildroot: %{_tmppath}/%{name}-%{version}-root
Requires: portmap >= 4.0, sed, gawk, sh-utils, fileutils, textutils, grep
Requires: modutils >= 2.4.26-9
BuildRequires: krb5-libs >= 1.4 autoconf >= 2.57 openldap-devel >= 2.2
+BuildRequires: nfs-utils-lib-devel
PreReq: shadow-utils >= 4.0.3-25
-Prereq: /sbin/chkconfig /sbin/nologin
+PreReq: /sbin/chkconfig /sbin/nologin
+PreReq: nfs-utils-lib libevent
%description
The nfs-utils package provides a daemon for the kernel NFS server and
@@ -93,77 +57,43 @@
clients which are mounted on that host.
%prep
-%setup -q -a1 -a2 -a3 -a4 -a5
-#
-# Remove code that no longer used
-#
-rm -r support/rpc
-rm -r support/gssapi
-
-#
-# Set up the support libs
-#
-mv nfsidmap-%{idmapvers} support/nfsidmap
-mv libevent-%{eventvers} support/event
-mv librpcsecgss-%{rpcsecgssvers} support/rpcsecgss
-mv libgssapi-%{gssapivers} support/gssapi
-
-# Upstream Patches
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-
-# CITI Patches
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-
-# Local Patches
+%setup -q -n nfs-utils-1.0.8-rc2 -a1
%patch50 -p1 -b .statdpath
%patch51 -p1 -b .mountd
%patch52 -p1 -b .conf
%patch53 -p1 -b .curblocks
%patch54 -p1 -b .stat64
%patch55 -p1 -b .ctlbits
-%patch56 -p1 -b .mapinit
-
+%patch56 -p1 -b .makeam
# Do the magic to get things to compile
%patch100 -p1 -b .compile
-%patch150 -p1 -b .pie
-%patch151 -p1 -b .strip
-%ifarch s390 s390x
-perl -pi -e 's/-fpie/-fPIE/' */*/Makefile
-%endif
# Remove .orig files
find . -name "*.orig" | xargs rm -f
%build
-autoconf
+%ifarch s390 s390x
+PIE="-fPIE"
+%else
+PIE="-fpie"
+%endif
+export PIE
+sh autogen.sh
+
+CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`"
#
# Hack to enable netgroups. If anybody knows the right way to do
# this, please help yourself.
#
ac_cv_func_innetgr=yes \
- CFLAGS="$RPM_OPT_FLAGS" %configure --enable-secure-statd
-
-cd support/nfsidmap; %configure --prefix=$RPM_BUILD_ROOT
-cd ../event; %configure --prefix=$RPM_BUILD_ROOT
-cd ../gssapi; %configure --prefix=$RPM_BUILD_ROOT
-cd ../rpcsecgss; %configure --prefix=$RPM_BUILD_ROOT
-cd ../../
+%configure \
+ CFLAGS="$CFLAGS" \
+ CPPFLAGS="$DEFINES" \
+ LDFLAGS="-pie" \
+ --prefix=$RPM_BUILD_ROOT
make all
@@ -172,14 +102,13 @@
mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-make install install_prefix=$RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/sbin
install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd
install -m 755 %{SOURCE13} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcgssd
install -m 755 %{SOURCE14} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcsvcgssd
-install -m 644 %{SOURCE15} $RPM_BUILD_ROOT/etc/gssapi_mech.conf
install -m 644 utils/idmapd/idmapd.conf \
$RPM_BUILD_ROOT/etc/idmapd.conf
@@ -262,7 +191,6 @@
%config /etc/rc.d/init.d/rpcgssd
%config /etc/rc.d/init.d/rpcsvcgssd
%config(noreplace) /etc/idmapd.conf
-%config(noreplace) /etc/gssapi_mech.conf
%dir /var/lib/nfs/rpc_pipefs
%dir /var/lib/nfs
%dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd
@@ -287,6 +215,12 @@
%config /etc/rc.d/init.d/nfslock
%changelog
+* Mon Jan 9 2006 1.0.8-1
+- Updated to 1.0.8-rc2 release
+- Broke out libgssapi into its own rpm
+- Move librpcsecgss and libnfsidmap in the new nfs-utils-lib rpm
+- Removed libevent code; Required to be installed.
+
* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt
Index: rpcgssd.init
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/rpcgssd.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpcgssd.init 14 Feb 2005 19:29:31 -0000 1.3
+++ rpcgssd.init 9 Jan 2006 20:17:59 -0000 1.4
@@ -31,7 +31,7 @@
# Try to use machine credentials by default
-OPTIONS="-m"
+OPTIONS=""
RETVAL=0
prog="rpc.gssd"
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 22 Sep 2005 14:43:09 -0000 1.13
+++ sources 9 Jan 2006 20:17:59 -0000 1.14
@@ -1,8 +1,2 @@
-8f863120261cd572ad320a9152581e11 nfs-utils-1.0.7.tar.gz
+d0ce78b60ea88995350c9c3b4e4f9f5f nfs-utils-1.0.8-rc2.tar.gz
ae7db9c61c5ad04f83bb99e5caed73da nfs.doc.tar.gz
-7f72edd613b8ca30f0dfcc401b0b96a4 nfsidmap-0.10.tar.gz
-6cc776458ecaf9247550863702a44d7c libevent-1.1a.tar.gz
-ed457ee28c252225d1988d5a580d4b99 libgssapi-0.4.tar.gz
-962da89d2f2e7a70b2b90cb125cbceaa librpcsecgss-0.6.tar.gz
-64746c8f015ce5f6a57785853425b7ee libgssapi-0.5.tar.gz
-b9ee2b726abf2f6500e44a0074dd713a nfsidmap-0.11.tar.gz
--- gssapi_mech.conf DELETED ---
--- nfs-utils-1.0.6-pie.patch DELETED ---
--- nfs-utils-1.0.7-idmapd-mapinit.patch DELETED ---
--- nfs-utils-1.0.7-post0.patch DELETED ---
--- nfs-utils-1.0.7-post1.patch DELETED ---
--- nfs-utils-1.0.7-post2.patch DELETED ---
--- nfs-utils-1.0.7-post3.patch DELETED ---
--- nfs-utils-1.0.7-post4.patch DELETED ---
--- nfs-utils-1.0.7-post5.patch DELETED ---
--- nfs-utils-1.0.7-post6.patch DELETED ---
--- nfs-utils-1.0.7-strip.patch DELETED ---
- Previous message (by thread): rpms/selinux-policy/devel modules-targeted.conf, 1.10, 1.11 policy-20060104.patch, 1.4, 1.5 selinux-policy.spec, 1.77, 1.78 policy-20051208.patch, 1.36, NONE
- Next message (by thread): rpms/selinux-policy/devel .cvsignore,1.20,1.21 sources,1.22,1.23
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list