Please approve openafs 1.3.81-3sarge1
openafs 1.3.81-3sarge1 has been uploaded to testing-proposed-updates. It
fixes one grave error in libpam-openafs-kaserver (#308844) and an annoying
importantish bug in the init script (#305389, #307280, #307797), as well
as including a few documentation updates (including for the later 2.6
kernel issue) and a translation update.
Could you please approve for sarge? Thanks!
Changelog:
openafs (1.3.81-3sarge1) testing-proposed-updates; urgency=medium
* libpam-openafs-kaserver: Fix compilation so that the PAM module isn't
missing symbols and therefore unusable. (Closes: #308844)
* In the init script, handle modules named either with or without the
.mp extension on SMP hosts. (Closes: #305389, #307280, #307797)
* README.Debian: Document that the client cache partition must be ext2
or ext3 and that XFS and ReiserFS will not work. upserver and
upclient are now provided. Provide some information about why
kaserver is not provided. (Closes: #249315)
* README.modules: Mention problems with preempt kernels later than
2.6.8. Add documentation for module-assistant and recommend it when
using Debian kernels. Mention divergences from upstream in module
naming. (Closes: #253168) Emphasize that the kernel source tree used
for make-kpkg must be identically configured to the kernel the module
will be used with.
* New French translations from Christian Perrier. (Closes: #305780)
-- Russ Allbery <rra@stanford.edu> Thu, 12 May 2005 18:30:37 -0700
Here is the code patch; I've omitted the documentation changes:
=== openafs/src/rx/Makefile.in
==================================================================
--- openafs/src/rx/Makefile.in (revision 839)
+++ openafs/src/rx/Makefile.in (revision 847)
@@ -41,15 +41,15 @@
LIBS=librx.a ${TOP_LIBDIR}/liblwp.a ${TOP_LIBDIR}/libcmd.a \
${TOP_LIBDIR}/util.a
-all: \
- includes \
- ${TOP_LIBDIR}/librx.a $(PICOBJS)
-
PICTARGET =../pic/rx
PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
$(PICTARGET)/%.o: %.c $(PICTARGET)
$(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+all: \
+ includes \
+ ${TOP_LIBDIR}/librx.a $(PICOBJS)
+
depinstall: includes
$(PICTARGET):
=== openafs/src/ubik/Makefile.in
==================================================================
--- openafs/src/ubik/Makefile.in (revision 839)
+++ openafs/src/ubik/Makefile.in (revision 847)
@@ -20,8 +20,6 @@
${TOP_LIBDIR}/libcom_err.a ${TOP_LIBDIR}/libcmd.a \
${TOP_LIBDIR}/util.a ${TOP_LIBDIR}/libsys.a ${XLIBS}
-all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client $(PICOBJS)
-
PICTARGET =../pic/ubik
PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(LIBOBJS))
$(PICTARGET)/%.o: %.c $(PICTARGET)
@@ -34,6 +32,7 @@
$(PICTARGET):
mkdir -p $(PICTARGET)
+all: depinstall ${TOP_LIBDIR}/libubik.a udebug utst_server utst_client $(PICOBJS)
utst_server: utst_server.o utst_int.ss.o utst_int.xdr.o libubik.a
=== openafs/src/kauth/Makefile.in
==================================================================
--- openafs/src/kauth/Makefile.in (revision 839)
+++ openafs/src/kauth/Makefile.in (revision 847)
@@ -51,7 +51,15 @@
OBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.o krb_tf.o
KOBJS=kauth.xdr.o kauth.cs.o kaaux.o client.o authclient.o token.o kautils.o kalocalcell.o kaerrors.o user.krb.o krb_tf.o
+PICTARGET =../pic/kauth
+PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
+$(PICTARGET)/%.o: %.c $(PICTARGET)
+ $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
+$(PICTARGET):
+ mkdir -p $(PICTARGET)
+
+
all: kaserver kas kpwvalid klog klog.krb knfs kpasswd rebuild kdb \
${TOP_LIBDIR}/libkauth.a \
${TOP_LIBDIR}/libkauth.krb.a \
@@ -63,16 +71,8 @@
${TOP_INCDIR}/afs/kauth.h \
${TOP_INCDIR}/afs/kaport.h
-PICTARGET =../pic/kauth
-PICOBJS = $(patsubst %.o,$(PICTARGET)/%.o,$(OBJS))
-$(PICTARGET)/%.o: %.c $(PICTARGET)
- $(CC) -c $(PAM_CFLAGS) $(CFLAGS) $< -o $@
-$(PICTARGET):
- mkdir -p $(PICTARGET)
-
-
test tests: all
cd test; $(MAKE)
=== openafs/src/afsd/afs.rc.linux
==================================================================
--- openafs/src/afsd/afs.rc.linux (revision 839)
+++ openafs/src/afsd/afs.rc.linux (revision 847)
@@ -53,7 +53,22 @@
# For now, just use uname -r to get the module version.
VERSION=`uname -r`
- LIBAFS=openafs.*o
+ # The Debian OpenAFS packages do not add the .mp by default as of 1.3,
+ # but modules obtained from other sources may. If a module with the
+ # .mp exists and this is an SMP system, use it; otherwise, use the
+ # default value. Unset $MP if not using it so that we can use it
+ # later in the call to modprobe.
+ if [ -n "$MP" -a -f "$MODLOADDIR/openafs${MP}.o" ] ; then
+ LIBAFS=openafs${MP}.o
+ elif [ -n "$MP" -a -f "$MODLOADDIR/openafs${MP}.ko" ] ; then
+ LIBAFS=openafs${MP}.ko
+ elif [ -f "$MODLOADDIR/openafs.ko" ] ; then
+ MP=
+ LIBAFS=openafs.ko
+ else
+ MP=
+ LIBAFS=openafs.o
+ fi
}
#
@@ -120,18 +135,20 @@
choose_client
fi
- if [ ! -f $MODLOADDIR/$LIBAFS ] ; then
- echo AFS module $MODLOADDIR/$LIBAFS does not exist. Not starting AFS.
- echo Please consider building kernel modules using instructions in
- echo /usr/share/doc/openafs-client/README.modules
+ if [ ! -f "$MODLOADDIR/$LIBAFS" ] ; then
+ echo <<EOF
+AFS module $MODLOADDIR/$LIBAFS does not exist.
+Not starting AFS. Please consider building kernel modules using
+instructions in /usr/share/doc/openafs-client/README.modules
+EOF
exit 0
fi
# use the prefix command if required
# set_prefix
- LOADED=`/sbin/lsmod | fgrep openafs`
+ LOADED=`/sbin/lsmod | fgrep openafs`
if [ -z "$LOADED" ] ; then
- modprobe openafs
+ modprobe openafs${MP}
fi
}
--
Russ Allbery (rra@stanford.edu) <http://www.eyrie.org/~eagle/>
Reply to: