From fda20d4b1723e00591c8d3f84999299de34b574a Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Wed, 26 Mar 2008 22:57:58 +0000 Subject: [PATCH] Refresh patches against the current upstream release and remove patches that have been applied upstream. --- debian/patches/afs-man-name | 1888 -------------------------- debian/patches/alloc-vnode | 34 - debian/patches/bos-permissions | 2 +- debian/patches/compiler-flags | 105 +- debian/patches/dfsg | 3 +- debian/patches/find-core-files | 18 +- debian/patches/fstrace-paths | 4 +- debian/patches/linux-2.6.24 | 421 ------ debian/patches/multiple-local-realms | 34 +- debian/patches/pam-build | 4 +- debian/patches/paths | 2 +- debian/patches/series | 3 - 12 files changed, 50 insertions(+), 2468 deletions(-) delete mode 100644 debian/patches/afs-man-name delete mode 100644 debian/patches/alloc-vnode delete mode 100644 debian/patches/linux-2.6.24 diff --git a/debian/patches/afs-man-name b/debian/patches/afs-man-name deleted file mode 100644 index 88fc4c005..000000000 --- a/debian/patches/afs-man-name +++ /dev/null @@ -1,1888 +0,0 @@ -Current groff can't deal with NAME sections with a space on the left -side of the -. This patch has also been applied upstream and will be -in the next release after 1.4.5. - ---- openafs.orig/doc/man-pages/README -+++ openafs/doc/man-pages/README -@@ -78,7 +78,10 @@ - documents common options, and discusses the general use of the suite. - Then, each operation code in the suite should have a separate man page, - named after the command with the space between the command suite and the -- operation code replaced with an underscore. -+ operation code replaced with an underscore. The NAME section of the -+ operation man page must also use an underscore (fs_listacl, not fs -+ listacl) for compatibility with some man programs. The SYNOPSIS section -+ should, of course, use a space, since that's what the user must type. - - All man pages must follow the standard layout for man page sections and - formatting. The best general reference is the pod2man man page, ---- openafs.orig/doc/man-pages/pod1/fs_checkservers.pod -+++ openafs/doc/man-pages/pod1/fs_checkservers.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs checkservers - Displays the status of server machines -+fs_checkservers - Displays the status of server machines - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_checkvolumes.pod -+++ openafs/doc/man-pages/pod1/fs_checkvolumes.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs checkvolumes - Forces the Cache Manager to update volume information -+fs_checkvolumes - Forces the Cache Manager to update volume information - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_cleanacl.pod -+++ openafs/doc/man-pages/pod1/fs_cleanacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs cleanacl - Remove obsolete entries from an ACL -+fs_cleanacl - Remove obsolete entries from an ACL - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_copyacl.pod -+++ openafs/doc/man-pages/pod1/fs_copyacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs copyacl - Copies an ACL from a directory to one or more other directories -+fs_copyacl - Copies an ACL from a directory to one or more other directories - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_diskfree.pod -+++ openafs/doc/man-pages/pod1/fs_diskfree.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs diskfree - Shows data about the partition housing a directory or file -+fs_diskfree - Shows data about the partition housing a directory or file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_examine.pod -+++ openafs/doc/man-pages/pod1/fs_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs examine - Shows data about the volume containing a directory or file -+fs_examine - Shows data about the volume containing a directory or file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_exportafs.pod -+++ openafs/doc/man-pages/pod1/fs_exportafs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs exportafs - Configures export of AFS to clients of other file systems -+fs_exportafs - Configures export of AFS to clients of other file systems - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flush.pod -+++ openafs/doc/man-pages/pod1/fs_flush.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flush - Forces the Cache Manager to discard a cached file or directory -+fs_flush - Forces the Cache Manager to discard a cached file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flushall.pod -+++ openafs/doc/man-pages/pod1/fs_flushall.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flushall - Force the AFS Cache Manager to discard all data -+fs_flushall - Force the AFS Cache Manager to discard all data - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flushmount.pod -+++ openafs/doc/man-pages/pod1/fs_flushmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flushmount - Forces the Cache Manager to discard a mount point -+fs_flushmount - Forces the Cache Manager to discard a mount point - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flushvolume.pod -+++ openafs/doc/man-pages/pod1/fs_flushvolume.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flushvolume - Forces the Cache Manager to discard cached data from a volume -+fs_flushvolume - Forces the Cache Manager to discard cached data from a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcacheparms.pod -+++ openafs/doc/man-pages/pod1/fs_getcacheparms.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcacheparms - Displays the current size and usage of the cache -+fs_getcacheparms - Displays the current size and usage of the cache - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcalleraccess.pod -+++ openafs/doc/man-pages/pod1/fs_getcalleraccess.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcalleraccess - Show the current user's access to a file or directory -+fs_getcalleraccess - Show the current user's access to a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcellstatus.pod -+++ openafs/doc/man-pages/pod1/fs_getcellstatus.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcellstatus - Reports whether setuid programs are honored in a cell -+fs_getcellstatus - Reports whether setuid programs are honored in a cell - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getclientaddrs.pod -+++ openafs/doc/man-pages/pod1/fs_getclientaddrs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getclientaddrs - Displays the client interfaces to register -+fs_getclientaddrs - Displays the client interfaces to register - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcrypt.pod -+++ openafs/doc/man-pages/pod1/fs_getcrypt.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcrypt - Displays the state of encryption for AFS file transfers -+fs_getcrypt - Displays the state of encryption for AFS file transfers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getserverprefs.pod -+++ openafs/doc/man-pages/pod1/fs_getserverprefs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getserverprefs - Displays preference ranks for file servers or VL servers -+fs_getserverprefs - Displays preference ranks for file servers or VL servers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_help.pod -+++ openafs/doc/man-pages/pod1/fs_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs help - Displays help for fs commands -+fs_help - Displays help for fs commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listacl.pod -+++ openafs/doc/man-pages/pod1/fs_listacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listacl - Displays ACLs -+fs_listacl - Displays ACLs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listaliases.pod -+++ openafs/doc/man-pages/pod1/fs_listaliases.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listaliases - Displays the current list of aliases for AFS cells -+fs_listaliases - Displays the current list of aliases for AFS cells - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listcells.pod -+++ openafs/doc/man-pages/pod1/fs_listcells.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listcells - Displays the database server machines known to the Cache Manager -+fs_listcells - Displays the database server machines known to the Cache Manager - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listquota.pod -+++ openafs/doc/man-pages/pod1/fs_listquota.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listquota - Displays quota information for a volume -+fs_listquota - Displays quota information for a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_lsmount.pod -+++ openafs/doc/man-pages/pod1/fs_lsmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs lsmount - Reports the volume for which a directory is the mount point. -+fs_lsmount - Reports the volume for which a directory is the mount point. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_messages.pod -+++ openafs/doc/man-pages/pod1/fs_messages.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs messages - Sets whether the Cache Manager writes log messages -+fs_messages - Sets whether the Cache Manager writes log messages - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_mkmount.pod -+++ openafs/doc/man-pages/pod1/fs_mkmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs mkmount - Creates a mount point for a volume -+fs_mkmount - Creates a mount point for a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_newalias.pod -+++ openafs/doc/man-pages/pod1/fs_newalias.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs newalias - Creates a new alias for a cell -+fs_newalias - Creates a new alias for a cell - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_newcell.pod -+++ openafs/doc/man-pages/pod1/fs_newcell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs newcell - Changes the kernel-resident list of a cell's database servers -+fs_newcell - Changes the kernel-resident list of a cell's database servers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_quota.pod -+++ openafs/doc/man-pages/pod1/fs_quota.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs quota - Displays the quota used in the volume containing a directory or file -+fs_quota - Displays the quota used in the volume containing a directory or file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_rmmount.pod -+++ openafs/doc/man-pages/pod1/fs_rmmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs rmmount - Removes a mount point -+fs_rmmount - Removes a mount point - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setacl.pod -+++ openafs/doc/man-pages/pod1/fs_setacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setacl - Sets the ACL for a directory -+fs_setacl - Sets the ACL for a directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setcachesize.pod -+++ openafs/doc/man-pages/pod1/fs_setcachesize.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setcachesize - Sets the size of the disk cache -+fs_setcachesize - Sets the size of the disk cache - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setcell.pod -+++ openafs/doc/man-pages/pod1/fs_setcell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setcell - Configures permissions for setuid programs from specified cells -+fs_setcell - Configures permissions for setuid programs from specified cells - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setclientaddrs.pod -+++ openafs/doc/man-pages/pod1/fs_setclientaddrs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setclientaddrs - Sets the client interfaces to register with the File Server -+fs_setclientaddrs - Sets the client interfaces to register with the File Server - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setcrypt.pod -+++ openafs/doc/man-pages/pod1/fs_setcrypt.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setcrypt - Enables of disables the encryption of AFS file transfers -+fs_setcrypt - Enables of disables the encryption of AFS file transfers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setquota.pod -+++ openafs/doc/man-pages/pod1/fs_setquota.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setquota - Sets the quota for the volume containing a file or directory -+fs_setquota - Sets the quota for the volume containing a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setserverprefs.pod -+++ openafs/doc/man-pages/pod1/fs_setserverprefs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setserverprefs - Sets the preference ranks for file servers or VL servers -+fs_setserverprefs - Sets the preference ranks for file servers or VL servers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setvol.pod -+++ openafs/doc/man-pages/pod1/fs_setvol.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setvol - Set quota and messages for a volume containing a file or directory -+fs_setvol - Set quota and messages for a volume containing a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_storebehind.pod -+++ openafs/doc/man-pages/pod1/fs_storebehind.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs storebehind - Enables asynchronous writes to the file server -+fs_storebehind - Enables asynchronous writes to the file server - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_sysname.pod -+++ openafs/doc/man-pages/pod1/fs_sysname.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs sysname - Reports or sets the CPU/operating system type -+fs_sysname - Reports or sets the CPU/operating system type - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_uuid.pod -+++ openafs/doc/man-pages/pod1/fs_uuid.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs uuid - Prints the uuid of the client or generates a new one -+fs_uuid - Prints the uuid of the client or generates a new one - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_whereis.pod -+++ openafs/doc/man-pages/pod1/fs_whereis.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs whereis - Reports each file server housing a file or directory -+fs_whereis - Reports each file server housing a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_whichcell.pod -+++ openafs/doc/man-pages/pod1/fs_whichcell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs whichcell - Returns the cell to which a file or directory belongs -+fs_whichcell - Returns the cell to which a file or directory belongs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_wscell.pod -+++ openafs/doc/man-pages/pod1/fs_wscell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs wscell - Returns the name of the cell to which a machine belongs -+fs_wscell - Returns the name of the cell to which a machine belongs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_adduser.pod -+++ openafs/doc/man-pages/pod1/pts_adduser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts adduser - Adds a user or machine to a Protection Database group -+pts_adduser - Adds a user or machine to a Protection Database group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_apropos.pod -+++ openafs/doc/man-pages/pod1/pts_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts apropos - Displays each help entry containing a keyword string -+pts_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_chown.pod -+++ openafs/doc/man-pages/pod1/pts_chown.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts chown - Changes the owner of a Protection Database entry -+pts_chown - Changes the owner of a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_creategroup.pod -+++ openafs/doc/man-pages/pod1/pts_creategroup.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts creategroup - Creates an (empty) Protection Database group entry -+pts_creategroup - Creates an (empty) Protection Database group entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_createuser.pod -+++ openafs/doc/man-pages/pod1/pts_createuser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts createuser - Creates a user or machine entry in the Protection Database -+pts_createuser - Creates a user or machine entry in the Protection Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_delete.pod -+++ openafs/doc/man-pages/pod1/pts_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts delete - Deletes a Protection Database entry -+pts_delete - Deletes a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_examine.pod -+++ openafs/doc/man-pages/pod1/pts_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts examine - Displays a Protection Database entry -+pts_examine - Displays a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_help.pod -+++ openafs/doc/man-pages/pod1/pts_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts help - Displays help for pts commands -+pts_help - Displays help for pts commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_interactive.pod -+++ openafs/doc/man-pages/pod1/pts_interactive.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts interactive - Enters interactive mode -+pts_interactive - Enters interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_listentries.pod -+++ openafs/doc/man-pages/pod1/pts_listentries.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts listentries - Displays all users or groups in the Protection Database -+pts_listentries - Displays all users or groups in the Protection Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_listmax.pod -+++ openafs/doc/man-pages/pod1/pts_listmax.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts listmax - Displays the max user id and max group id counters -+pts_listmax - Displays the max user id and max group id counters - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_listowned.pod -+++ openafs/doc/man-pages/pod1/pts_listowned.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts listowned - Show the Protection Database groups owned by a user or group -+pts_listowned - Show the Protection Database groups owned by a user or group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_membership.pod -+++ openafs/doc/man-pages/pod1/pts_membership.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts membership - Displays the membership list for a user or group -+pts_membership - Displays the membership list for a user or group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_quit.pod -+++ openafs/doc/man-pages/pod1/pts_quit.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts quit - Exit from pts interactive mode -+pts_quit - Exit from pts interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_removeuser.pod -+++ openafs/doc/man-pages/pod1/pts_removeuser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts removeuser - Removes a user from a Protection Database group -+pts_removeuser - Removes a user from a Protection Database group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_rename.pod -+++ openafs/doc/man-pages/pod1/pts_rename.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts rename - Changes the name of a Protection Database entry -+pts_rename - Changes the name of a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_setfields.pod -+++ openafs/doc/man-pages/pod1/pts_setfields.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts setfields - Sets privacy flags or quota for a Protection Database entry -+pts_setfields - Sets privacy flags or quota for a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_setmax.pod -+++ openafs/doc/man-pages/pod1/pts_setmax.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts setmax - Sets the value of the max group id or max user id counter -+pts_setmax - Sets the value of the max group id or max user id counter - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_sleep.pod -+++ openafs/doc/man-pages/pod1/pts_sleep.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts sleep - Pauses for a few seconds -+pts_sleep - Pauses for a few seconds - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_source.pod -+++ openafs/doc/man-pages/pod1/pts_source.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts source - Read pts commands from a file -+pts_source - Read pts commands from a file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_addsite.pod -+++ openafs/doc/man-pages/pod1/vos_addsite.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos addsite - Adds a read-only site definition to a volume's VLDB entry -+vos_addsite - Adds a read-only site definition to a volume's VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_apropos.pod -+++ openafs/doc/man-pages/pod1/vos_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos apropos - Displays each help entry containing a keyword string -+vos_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_backup.pod -+++ openafs/doc/man-pages/pod1/vos_backup.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos backup - Creates a backup volume for a single read/write volume -+vos_backup - Creates a backup volume for a single read/write volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_backupsys.pod -+++ openafs/doc/man-pages/pod1/vos_backupsys.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos backupsys - Creates a backup volume for several read/write volumes -+vos_backupsys - Creates a backup volume for several read/write volumes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_changeaddr.pod -+++ openafs/doc/man-pages/pod1/vos_changeaddr.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos changeaddr - Changes or removes a file server machine's entry in the VLDB -+vos_changeaddr - Changes or removes a file server machine's entry in the VLDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_changeloc.pod -+++ openafs/doc/man-pages/pod1/vos_changeloc.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos changeloc - Change a volume's entry in the VLDB -+vos_changeloc - Change a volume's entry in the VLDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_create.pod -+++ openafs/doc/man-pages/pod1/vos_create.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos create - Creates a read/write volume and associated VLDB entry -+vos_create - Creates a read/write volume and associated VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_delentry.pod -+++ openafs/doc/man-pages/pod1/vos_delentry.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos delentry - Removes a volume entry from the VLDB. -+vos_delentry - Removes a volume entry from the VLDB. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_dump.pod -+++ openafs/doc/man-pages/pod1/vos_dump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos dump - Converts a volume into ASCII format and writes it to a file -+vos_dump - Converts a volume into ASCII format and writes it to a file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_examine.pod -+++ openafs/doc/man-pages/pod1/vos_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos examine - Shows volume header and VLDB entry information for a volume -+vos_examine - Shows volume header and VLDB entry information for a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_help.pod -+++ openafs/doc/man-pages/pod1/vos_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos help - Displays help for vos commands -+vos_help - Displays help for vos commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listaddrs.pod -+++ openafs/doc/man-pages/pod1/vos_listaddrs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listaddrs - Displays all VLDB server entries -+vos_listaddrs - Displays all VLDB server entries - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listpart.pod -+++ openafs/doc/man-pages/pod1/vos_listpart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listpart - Displays all AFS partitions on a file server machine -+vos_listpart - Displays all AFS partitions on a file server machine - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listvldb.pod -+++ openafs/doc/man-pages/pod1/vos_listvldb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listvldb - Displays a volume's VLDB entry -+vos_listvldb - Displays a volume's VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listvol.pod -+++ openafs/doc/man-pages/pod1/vos_listvol.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listvol - Displays information from a volume header -+vos_listvol - Displays information from a volume header - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_lock.pod -+++ openafs/doc/man-pages/pod1/vos_lock.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos lock - Locks a VLDB volume entry -+vos_lock - Locks a VLDB volume entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_move.pod -+++ openafs/doc/man-pages/pod1/vos_move.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos move - Moves a read/write volume to another site -+vos_move - Moves a read/write volume to another site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_offline.pod -+++ openafs/doc/man-pages/pod1/vos_offline.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos offline - Takes a volume offline -+vos_offline - Takes a volume offline - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_online.pod -+++ openafs/doc/man-pages/pod1/vos_online.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos online - Brings a volume online -+vos_online - Brings a volume online - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_partinfo.pod -+++ openafs/doc/man-pages/pod1/vos_partinfo.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos partinfo - Reports the available and total space on a partition -+vos_partinfo - Reports the available and total space on a partition - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_release.pod -+++ openafs/doc/man-pages/pod1/vos_release.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos release - Updates read-only volumes to match the read/write source volume -+vos_release - Updates read-only volumes to match the read/write source volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_remove.pod -+++ openafs/doc/man-pages/pod1/vos_remove.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos remove - Removes a volume from a site -+vos_remove - Removes a volume from a site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_remsite.pod -+++ openafs/doc/man-pages/pod1/vos_remsite.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos remsite - Removes a read-only site definition from a VLDB entry -+vos_remsite - Removes a read-only site definition from a VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_rename.pod -+++ openafs/doc/man-pages/pod1/vos_rename.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos rename - Renames a volume -+vos_rename - Renames a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_restore.pod -+++ openafs/doc/man-pages/pod1/vos_restore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos restore - Converts an ASCII dump file into an AFS volume -+vos_restore - Converts an ASCII dump file into an AFS volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_size.pod -+++ openafs/doc/man-pages/pod1/vos_size.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos size - Computes the size of a volume dump -+vos_size - Computes the size of a volume dump - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_status.pod -+++ openafs/doc/man-pages/pod1/vos_status.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos status - Reports a Volume Server's status -+vos_status - Reports a Volume Server's status - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_syncserv.pod -+++ openafs/doc/man-pages/pod1/vos_syncserv.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos syncserv - Verifies VLDB entries that mention a specified site -+vos_syncserv - Verifies VLDB entries that mention a specified site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_syncvldb.pod -+++ openafs/doc/man-pages/pod1/vos_syncvldb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos syncvldb - Verifies VLDB entries for volumes residing at specified site -+vos_syncvldb - Verifies VLDB entries for volumes residing at specified site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_unlock.pod -+++ openafs/doc/man-pages/pod1/vos_unlock.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos unlock - Unlocks a single VLDB entry -+vos_unlock - Unlocks a single VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_unlockvldb.pod -+++ openafs/doc/man-pages/pod1/vos_unlockvldb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos unlockvldb - Unlocks several locked VLDB entries -+vos_unlockvldb - Unlocks several locked VLDB entries - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_zap.pod -+++ openafs/doc/man-pages/pod1/vos_zap.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos zap - Removes a volume from its site without writing to the VLDB -+vos_zap - Removes a volume from its site without writing to the VLDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_adddump.pod -+++ openafs/doc/man-pages/pod8/backup_adddump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup adddump - Defines a dump level in the dump hierarchy -+backup_adddump - Defines a dump level in the dump hierarchy - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_addhost.pod -+++ openafs/doc/man-pages/pod8/backup_addhost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup addhost - Adds a Tape Coordinator entry to the Backup Database -+backup_addhost - Adds a Tape Coordinator entry to the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_addvolentry.pod -+++ openafs/doc/man-pages/pod8/backup_addvolentry.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup addvolentry - Defines a volume entry in a volume set -+backup_addvolentry - Defines a volume entry in a volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_addvolset.pod -+++ openafs/doc/man-pages/pod8/backup_addvolset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup addvolset - Creates a new (empty) volume set -+backup_addvolset - Creates a new (empty) volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_apropos.pod -+++ openafs/doc/man-pages/pod8/backup_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup apropos - Displays each help entry containing a keyword string -+backup_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_dbverify.pod -+++ openafs/doc/man-pages/pod8/backup_dbverify.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup dbverify - Checks the integrity of the Backup Database -+backup_dbverify - Checks the integrity of the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_deldump.pod -+++ openafs/doc/man-pages/pod8/backup_deldump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup deldump - Deletes a dump level from the Backup Database -+backup_deldump - Deletes a dump level from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_deletedump.pod -+++ openafs/doc/man-pages/pod8/backup_deletedump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup deletedump - Deletes one or more dump records from the Backup Database -+backup_deletedump - Deletes one or more dump records from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_delhost.pod -+++ openafs/doc/man-pages/pod8/backup_delhost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup delhost - Deletes a Tape Coordinator entry from the Backup Database -+backup_delhost - Deletes a Tape Coordinator entry from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_delvolentry.pod -+++ openafs/doc/man-pages/pod8/backup_delvolentry.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup delvolentry - Deletes a volume entry from a volume set -+backup_delvolentry - Deletes a volume entry from a volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_delvolset.pod -+++ openafs/doc/man-pages/pod8/backup_delvolset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup delvolset - Deletes one or more volume sets from the Backup Database -+backup_delvolset - Deletes one or more volume sets from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_diskrestore.pod -+++ openafs/doc/man-pages/pod8/backup_diskrestore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup diskrestore - Restores the entire contents of a partition -+backup_diskrestore - Restores the entire contents of a partition - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_dump.pod -+++ openafs/doc/man-pages/pod8/backup_dump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup dump - Creates a dump (dumps a volume set at a particular dump level) -+backup_dump - Creates a dump (dumps a volume set at a particular dump level) - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_dumpinfo.pod -+++ openafs/doc/man-pages/pod8/backup_dumpinfo.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup dumpinfo - Displays a dump record from the Backup Database -+backup_dumpinfo - Displays a dump record from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_help.pod -+++ openafs/doc/man-pages/pod8/backup_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup help - Displays help for backup commands -+backup_help - Displays help for backup commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_interactive.pod -+++ openafs/doc/man-pages/pod8/backup_interactive.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup interactive - Enters interactive mode -+backup_interactive - Enters interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_jobs.pod -+++ openafs/doc/man-pages/pod8/backup_jobs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup jobs - Lists pending and running operations in interactive mode -+backup_jobs - Lists pending and running operations in interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_kill.pod -+++ openafs/doc/man-pages/pod8/backup_kill.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup kill - Terminates a pending or running operation -+backup_kill - Terminates a pending or running operation - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_labeltape.pod -+++ openafs/doc/man-pages/pod8/backup_labeltape.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup labeltape - Creates the magnetic label on a tape -+backup_labeltape - Creates the magnetic label on a tape - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_listdumps.pod -+++ openafs/doc/man-pages/pod8/backup_listdumps.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup listdumps - Displays the dump hierarchy from the Backup Database -+backup_listdumps - Displays the dump hierarchy from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_listhosts.pod -+++ openafs/doc/man-pages/pod8/backup_listhosts.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup listhosts - Lists Tape Coordinators registered in the Backup Database -+backup_listhosts - Lists Tape Coordinators registered in the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_listvolsets.pod -+++ openafs/doc/man-pages/pod8/backup_listvolsets.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup listvolsets - Lists volume set entries from the Backup Database -+backup_listvolsets - Lists volume set entries from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_quit.pod -+++ openafs/doc/man-pages/pod8/backup_quit.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup quit - Leaves interactive mode -+backup_quit - Leaves interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_readlabel.pod -+++ openafs/doc/man-pages/pod8/backup_readlabel.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup readlabel - Reads and displays a tape's label -+backup_readlabel - Reads and displays a tape's label - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_restoredb.pod -+++ openafs/doc/man-pages/pod8/backup_restoredb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup restoredb - Restores a saved copy of the Backup Database -+backup_restoredb - Restores a saved copy of the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_savedb.pod -+++ openafs/doc/man-pages/pod8/backup_savedb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup savedb - Creates a saved copy of the Backup Database -+backup_savedb - Creates a saved copy of the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_scantape.pod -+++ openafs/doc/man-pages/pod8/backup_scantape.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup scantape - Extracts dump information from a tape -+backup_scantape - Extracts dump information from a tape - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_setexp.pod -+++ openafs/doc/man-pages/pod8/backup_setexp.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup setexp - Sets the expiration date for existing dump levels. -+backup_setexp - Sets the expiration date for existing dump levels. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_status.pod -+++ openafs/doc/man-pages/pod8/backup_status.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup status - Reports a Tape Coordinator's status -+backup_status - Reports a Tape Coordinator's status - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_volinfo.pod -+++ openafs/doc/man-pages/pod8/backup_volinfo.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup volinfo - Displays a volume's dump history from the Backup Database -+backup_volinfo - Displays a volume's dump history from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_volrestore.pod -+++ openafs/doc/man-pages/pod8/backup_volrestore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup volrestore - Restores one or more volumes -+backup_volrestore - Restores one or more volumes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_volsetrestore.pod -+++ openafs/doc/man-pages/pod8/backup_volsetrestore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup volsetrestore - Restores all volumes in a volume set -+backup_volsetrestore - Restores all volumes in a volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_addhost.pod -+++ openafs/doc/man-pages/pod8/bos_addhost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos addhost - Adds a database server machine to the CellServDB file -+bos_addhost - Adds a database server machine to the CellServDB file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_addkey.pod -+++ openafs/doc/man-pages/pod8/bos_addkey.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos addkey - Adds a new server encryption key to the KeyFile file -+bos_addkey - Adds a new server encryption key to the KeyFile file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_adduser.pod -+++ openafs/doc/man-pages/pod8/bos_adduser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos adduser - Adds a privileged user to the UserList file -+bos_adduser - Adds a privileged user to the UserList file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_apropos.pod -+++ openafs/doc/man-pages/pod8/bos_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos apropos - Displays each help entry containing a keyword string -+bos_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_create.pod -+++ openafs/doc/man-pages/pod8/bos_create.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos create - Defines a new process in the BosConfig file and starts it -+bos_create - Defines a new process in the BosConfig file and starts it - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_delete.pod -+++ openafs/doc/man-pages/pod8/bos_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos delete - Deletes a server process from the BosConfig file -+bos_delete - Deletes a server process from the BosConfig file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_exec.pod -+++ openafs/doc/man-pages/pod8/bos_exec.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos exec - Executes a command on a remote server machine -+bos_exec - Executes a command on a remote server machine - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_getdate.pod -+++ openafs/doc/man-pages/pod8/bos_getdate.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos getdate - Displays the time stamps on an AFS binary file -+bos_getdate - Displays the time stamps on an AFS binary file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_getlog.pod -+++ openafs/doc/man-pages/pod8/bos_getlog.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos getlog - Prints a server process's log file -+bos_getlog - Prints a server process's log file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_getrestart.pod -+++ openafs/doc/man-pages/pod8/bos_getrestart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos getrestart - Displays the automatic restart times for server processes -+bos_getrestart - Displays the automatic restart times for server processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_help.pod -+++ openafs/doc/man-pages/pod8/bos_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos help - Displays help for bos commands -+bos_help - Displays help for bos commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_install.pod -+++ openafs/doc/man-pages/pod8/bos_install.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos install - Installs a new version of a binary file -+bos_install - Installs a new version of a binary file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_listhosts.pod -+++ openafs/doc/man-pages/pod8/bos_listhosts.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos listhosts - Displays the contents of the CellServDB file -+bos_listhosts - Displays the contents of the CellServDB file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_listkeys.pod -+++ openafs/doc/man-pages/pod8/bos_listkeys.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos listkeys - Displays the server encryption keys from the KeyFile file -+bos_listkeys - Displays the server encryption keys from the KeyFile file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_listusers.pod -+++ openafs/doc/man-pages/pod8/bos_listusers.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos listusers - Lists the privileged users from the UserList file -+bos_listusers - Lists the privileged users from the UserList file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_prune.pod -+++ openafs/doc/man-pages/pod8/bos_prune.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos prune - Removes obsolete files from /usr/afs/bin and /usr/afs/logs -+bos_prune - Removes obsolete files from /usr/afs/bin and /usr/afs/logs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_removehost.pod -+++ openafs/doc/man-pages/pod8/bos_removehost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos removehost - Removes a database server machine from the CellServDB file -+bos_removehost - Removes a database server machine from the CellServDB file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_removekey.pod -+++ openafs/doc/man-pages/pod8/bos_removekey.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos removekey - Removes a server encryption key from the KeyFile file -+bos_removekey - Removes a server encryption key from the KeyFile file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_removeuser.pod -+++ openafs/doc/man-pages/pod8/bos_removeuser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos removeuser - Removes a privileged user from the UserList file -+bos_removeuser - Removes a privileged user from the UserList file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_restart.pod -+++ openafs/doc/man-pages/pod8/bos_restart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos restart - Restarts a server process -+bos_restart - Restarts a server process - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_salvage.pod -+++ openafs/doc/man-pages/pod8/bos_salvage.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos salvage - Restores internal consistency to a file system or volume -+bos_salvage - Restores internal consistency to a file system or volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_setauth.pod -+++ openafs/doc/man-pages/pod8/bos_setauth.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos setauth - Sets authorization checking requirements for all server processes -+bos_setauth - Sets authorization checking requirements for all server processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_setcellname.pod -+++ openafs/doc/man-pages/pod8/bos_setcellname.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos setcellname - Sets the cell's name in ThisCell and CellServDB -+bos_setcellname - Sets the cell's name in ThisCell and CellServDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_setrestart.pod -+++ openafs/doc/man-pages/pod8/bos_setrestart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos setrestart - Sets when the BOS Server restarts processes -+bos_setrestart - Sets when the BOS Server restarts processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_shutdown.pod -+++ openafs/doc/man-pages/pod8/bos_shutdown.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos shutdown - Stops a process without changing its status flag -+bos_shutdown - Stops a process without changing its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_start.pod -+++ openafs/doc/man-pages/pod8/bos_start.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos start - Starts a process after setting its status flag -+bos_start - Starts a process after setting its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_startup.pod -+++ openafs/doc/man-pages/pod8/bos_startup.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos startup - Starts a process without changing its status flag -+bos_startup - Starts a process without changing its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_status.pod -+++ openafs/doc/man-pages/pod8/bos_status.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos status - Displays the status of server processes -+bos_status - Displays the status of server processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_stop.pod -+++ openafs/doc/man-pages/pod8/bos_stop.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos stop - Stops a process after changing its status flag -+bos_stop - Stops a process after changing its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_uninstall.pod -+++ openafs/doc/man-pages/pod8/bos_uninstall.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos uninstall - Reverts to the former version of a process's binary file -+bos_uninstall - Reverts to the former version of a process's binary file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_apropos.pod -+++ openafs/doc/man-pages/pod8/fstrace_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace apropos - Displays each help entry containing a keyword string -+fstrace_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_clear.pod -+++ openafs/doc/man-pages/pod8/fstrace_clear.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace clear - Clears the trace log -+fstrace_clear - Clears the trace log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_dump.pod -+++ openafs/doc/man-pages/pod8/fstrace_dump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace dump - Dumps a trace log -+fstrace_dump - Dumps a trace log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_help.pod -+++ openafs/doc/man-pages/pod8/fstrace_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace help - Displays help for fstrace commands -+fstrace_help - Displays help for fstrace commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_lslog.pod -+++ openafs/doc/man-pages/pod8/fstrace_lslog.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace lslog - Displays information about a log -+fstrace_lslog - Displays information about a log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_lsset.pod -+++ openafs/doc/man-pages/pod8/fstrace_lsset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace lsset - Reports the status of an event set -+fstrace_lsset - Reports the status of an event set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_setlog.pod -+++ openafs/doc/man-pages/pod8/fstrace_setlog.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace setlog - Sets the size of a trace log -+fstrace_setlog - Sets the size of a trace log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_setset.pod -+++ openafs/doc/man-pages/pod8/fstrace_setset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace setset - Sets the status of an event set -+fstrace_setset - Sets the status of an event set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_apropos.pod -+++ openafs/doc/man-pages/pod8/kas_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas apropos - Displays each help entry containing a keyword string -+kas_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_create.pod -+++ openafs/doc/man-pages/pod8/kas_create.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas create - Creates an entry in the Authentication Database -+kas_create - Creates an entry in the Authentication Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_delete.pod -+++ openafs/doc/man-pages/pod8/kas_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas delete - Deletes an entry from the Authentication Database -+kas_delete - Deletes an entry from the Authentication Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_examine.pod -+++ openafs/doc/man-pages/pod8/kas_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas examine - Displays information from an Authentication Database entry -+kas_examine - Displays information from an Authentication Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_forgetticket.pod -+++ openafs/doc/man-pages/pod8/kas_forgetticket.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas forgetticket - Discards all tickets for the issuer -+kas_forgetticket - Discards all tickets for the issuer - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_help.pod -+++ openafs/doc/man-pages/pod8/kas_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas help - Displays help for kas commands -+kas_help - Displays help for kas commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_interactive.pod -+++ openafs/doc/man-pages/pod8/kas_interactive.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas interactive - Enters interactive mode -+kas_interactive - Enters interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_list.pod -+++ openafs/doc/man-pages/pod8/kas_list.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas list - Displays all entries in the Authentication Database -+kas_list - Displays all entries in the Authentication Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_listtickets.pod -+++ openafs/doc/man-pages/pod8/kas_listtickets.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas listtickets - Displays all of the issuer's tickets (tokens) -+kas_listtickets - Displays all of the issuer's tickets (tokens) - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_noauthentication.pod -+++ openafs/doc/man-pages/pod8/kas_noauthentication.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas noauthentication - Discards an authenticated identity in interactive mode -+kas_noauthentication - Discards an authenticated identity in interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_quit.pod -+++ openafs/doc/man-pages/pod8/kas_quit.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas quit - Leaves interactive mode -+kas_quit - Leaves interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_setfields.pod -+++ openafs/doc/man-pages/pod8/kas_setfields.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas setfields - Sets fields in an Authentication Database entry -+kas_setfields - Sets fields in an Authentication Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_setpassword.pod -+++ openafs/doc/man-pages/pod8/kas_setpassword.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas setpassword - Changes the key field in an Authentication Database entry -+kas_setpassword - Changes the key field in an Authentication Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_statistics.pod -+++ openafs/doc/man-pages/pod8/kas_statistics.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas statistics - Displays statistics from an Authentication Server process -+kas_statistics - Displays statistics from an Authentication Server process - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_stringtokey.pod -+++ openafs/doc/man-pages/pod8/kas_stringtokey.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas stringtokey - Converts a character string into an octal key -+kas_stringtokey - Converts a character string into an octal key - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_unlock.pod -+++ openafs/doc/man-pages/pod8/kas_unlock.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas unlock - Unlocks a locked user account -+kas_unlock - Unlocks a locked user account - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_add.pod -+++ openafs/doc/man-pages/pod8/uss_add.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss add - Creates a user account -+uss_add - Creates a user account - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_apropos.pod -+++ openafs/doc/man-pages/pod8/uss_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss apropos - Displays each help entry containing a keyword string. -+uss_apropos - Displays each help entry containing a keyword string. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_bulk.pod -+++ openafs/doc/man-pages/pod8/uss_bulk.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss bulk - Executes multiple uss commands listed in a file -+uss_bulk - Executes multiple uss commands listed in a file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_delete.pod -+++ openafs/doc/man-pages/pod8/uss_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss delete - Deletes a user account -+uss_delete - Deletes a user account - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_help.pod -+++ openafs/doc/man-pages/pod8/uss_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss help - Displays help for uss commands -+uss_help - Displays help for uss commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_apropos.pod -+++ openafs/doc/man-pages/pod1/fs_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs apropos - Displays each help entry containing a keyword string -+fs_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - diff --git a/debian/patches/alloc-vnode b/debian/patches/alloc-vnode deleted file mode 100644 index 9c4d535c3..000000000 --- a/debian/patches/alloc-vnode +++ /dev/null @@ -1,34 +0,0 @@ -Allocate vnodes rather than using the stack, which fixes file server -problems on SPARC. Upstream delta: - -STABLE14-volprocs-alloc-vnode-instead-of-using-stack-20071126 - -Debian Bug#448380 - ---- openafs.orig/src/volser/volprocs.c -+++ openafs/src/volser/volprocs.c -@@ -210,14 +210,14 @@ - struct acl_accessList *ACL; - ViceFid did; - Inode inodeNumber, nearInode; -- char buf[SIZEOF_LARGEDISKVNODE]; -- struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf; -+ struct VnodeDiskObject *vnode; - struct VnodeClassInfo *vcp = &VnodeClassInfo[vLarge]; - IHandle_t *h; - FdHandle_t *fdP; - int code; - afs_fsize_t length; - -+ vnode = (struct VnodeDiskObject *)malloc(SIZEOF_LARGEDISKVNODE); - memset(vnode, 0, SIZEOF_LARGEDISKVNODE); - - V_pref(vp, nearInode); -@@ -282,6 +282,7 @@ - VNDISK_GET_LEN(length, vnode); - V_diskused(vp) = nBlocks(length); - -+ free(vnode); - return 1; - } - diff --git a/debian/patches/bos-permissions b/debian/patches/bos-permissions index cae2297fe..0dace41dd 100644 --- a/debian/patches/bos-permissions +++ b/debian/patches/bos-permissions @@ -7,7 +7,7 @@ some documentation. --- openafs.orig/src/bozo/bosoprocs.c +++ openafs/src/bozo/bosoprocs.c -@@ -1324,12 +1324,12 @@ +@@ -1317,12 +1317,12 @@ struct bozo_bosEntryStats bozo_bosEntryStats[] = { {NULL, 1, 1, 0755, 02}, /* AFSDIR_SERVER_AFS_DIRPATH */ diff --git a/debian/patches/compiler-flags b/debian/patches/compiler-flags index eddf6d449..2adad334b 100644 --- a/debian/patches/compiler-flags +++ b/debian/patches/compiler-flags @@ -20,23 +20,17 @@ Also combines the sparc sysnames together, which is suitable upstream. XLIBS="${LIB_AFSDB}" dnl debugging and optimization flag defaults -@@ -244,6 +243,7 @@ +@@ -318,8 +317,8 @@ MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' MT_LIBS="-lpthread" PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" +- SHLIB_LDFLAGS="-shared -Xlinker -x" + SHLIB_CFLAGS="-fPIC" ++ SHLIB_LDFLAGS="-shared -Xlinker -x" TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -G0" -@@ -271,6 +271,7 @@ - MT_LIBS="-lpthread" - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" -+ SHLIB_CFLAGS="-fPIC" - TXLIBS="/usr/lib64/libncurses.so" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" - SHLIB_LINKER="${MT_CC} -shared" -@@ -291,14 +292,14 @@ + XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -fPIC" + YACC="bison -y" +@@ -327,9 +326,8 @@ ;; i386_umlinux22) @@ -48,13 +42,7 @@ Also combines the sparc sysnames together, which is suitable upstream. KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" -@@ -307,9 +308,8 @@ +@@ -344,9 +342,8 @@ ;; i386_linux*) @@ -66,15 +54,7 @@ Also combines the sparc sysnames together, which is suitable upstream. KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' -@@ -320,6 +320,7 @@ - LWP_OPTMZ=-O2 - OPTMZ=-O2 - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" -@@ -327,9 +328,8 @@ +@@ -365,9 +362,8 @@ ;; i386_umlinux24) @@ -86,15 +66,7 @@ Also combines the sparc sysnames together, which is suitable upstream. KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' -@@ -340,6 +340,7 @@ - LWP_OPTMZ=-O2 - OPTMZ=-O2 - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" -@@ -347,9 +348,8 @@ +@@ -386,9 +382,8 @@ ;; i386_umlinux26) @@ -106,23 +78,7 @@ Also combines the sparc sysnames together, which is suitable upstream. KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' -@@ -360,6 +360,7 @@ - LWP_OPTMZ=-O2 - OPTMZ=-O2 - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" -@@ -385,6 +386,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" -@@ -557,8 +559,7 @@ +@@ -601,8 +596,7 @@ ;; s390_linux22) @@ -132,15 +88,7 @@ Also combines the sparc sysnames together, which is suitable upstream. LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" -@@ -566,6 +567,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" -@@ -574,8 +576,7 @@ +@@ -619,8 +613,7 @@ ;; s390_linux24|s390_linux26) @@ -150,15 +98,7 @@ Also combines the sparc sysnames together, which is suitable upstream. LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" -@@ -583,6 +584,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" -@@ -591,8 +593,7 @@ +@@ -637,8 +630,7 @@ ;; s390x_linux24|s390x_linux26) @@ -168,15 +108,7 @@ Also combines the sparc sysnames together, which is suitable upstream. LD="ld" KERN_OPTMZ=-O2 LEX="flex -l" -@@ -600,6 +601,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic" - TXLIBS="-lncurses" - XCFLAGS="-O -g -D_LARGEFILE64_SOURCE -D__s390x__" -@@ -669,12 +671,13 @@ +@@ -716,7 +708,7 @@ SHLIB_LINKER="${CC} -shared" ;; @@ -185,13 +117,7 @@ Also combines the sparc sysnames together, which is suitable upstream. KERN_OPTMZ=-O2 LEX="flex -l" MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" -@@ -684,19 +687,6 @@ +@@ -732,20 +724,6 @@ SHLIB_LINKER="${MT_CC} -shared" ;; @@ -201,6 +127,7 @@ Also combines the sparc sysnames together, which is suitable upstream. - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" +- SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" diff --git a/debian/patches/dfsg b/debian/patches/dfsg index 4604db1db..f969444e3 100644 --- a/debian/patches/dfsg +++ b/debian/patches/dfsg @@ -62,12 +62,13 @@ upstream for obvious reasons. + afs_atomlist.c afs_lhash.c snprintf.c --- openafs.orig/configure.in +++ openafs/configure.in -@@ -82,8 +82,6 @@ +@@ -83,9 +83,6 @@ src/mpp/Makefile \ src/null/Makefile \ src/package/Makefile \ -src/packaging/MacOS/OpenAFS.Info.plist \ -src/packaging/MacOS/OpenAFS.info \ +-src/packaging/MacOS/buildpkg.sh \ src/packaging/RedHat/openafs.spec \ src/pam/Makefile \ src/pinstall/Makefile \ diff --git a/debian/patches/find-core-files b/debian/patches/find-core-files index d8c292ef0..0e0882317 100644 --- a/debian/patches/find-core-files +++ b/debian/patches/find-core-files @@ -1,14 +1,14 @@ --- openafs.orig/src/bozo/bnode.c +++ openafs/src/bozo/bnode.c -@@ -28,6 +28,7 @@ - #include - #endif - #include +@@ -16,6 +16,7 @@ + #include + #include + #include +#include - - #ifdef HAVE_STRING_H - #include -@@ -105,13 +106,45 @@ + #include + #include + #ifdef AFS_NT40_ENV +@@ -99,13 +100,45 @@ char tbuffer[256]; struct stat tstat; register afs_int32 code; @@ -54,7 +54,7 @@ if (code) return; -@@ -124,7 +157,12 @@ +@@ -118,7 +151,12 @@ TimeFields->tm_hour, TimeFields->tm_min, TimeFields->tm_sec); strcpy(tbuffer, FileName); #endif diff --git a/debian/patches/fstrace-paths b/debian/patches/fstrace-paths index bdc45baff..728e193a0 100644 --- a/debian/patches/fstrace-paths +++ b/debian/patches/fstrace-paths @@ -6,7 +6,7 @@ would be appropriate. --- openafs.orig/src/venus/fstrace.c +++ openafs/src/venus/fstrace.c -@@ -1471,7 +1471,7 @@ +@@ -1466,7 +1466,7 @@ */ #ifndef RPC_NLS_FORMAT @@ -15,7 +15,7 @@ would be appropriate. #endif dce1_error_inq_text(status_to_convert, error_text, status) -@@ -1488,7 +1488,8 @@ +@@ -1483,7 +1483,8 @@ char component_name[4]; char *facility_name; char filename_prefix[7]; diff --git a/debian/patches/linux-2.6.24 b/debian/patches/linux-2.6.24 deleted file mode 100644 index 930e29996..000000000 --- a/debian/patches/linux-2.6.24 +++ /dev/null @@ -1,421 +0,0 @@ -Add support for Linux 2.6.24. This patch combines the upstream deltas: - -STABLE14-linux-afs-unlinked-file-dentry-flagging-20071031 -STABLE14-linux-nsec-timestamp-zero-20071106 -STABLE14-linux-splice-support-20071106 -STABLE14-linux-2624-20071123 -STABLE14-linux-try-kbuild-deal-with-old-modpost-20071127 -STABLE14-linux24-kernel-configure-test-20071208 - -Debian Bug#456258, Bug#458331 - ---- openafs.orig/acinclude.m4 -+++ openafs/acinclude.m4 -@@ -582,6 +582,9 @@ - ) - - LINUX_KERNEL_COMPILE_WORKS -+ LINUX_KBUILD_USES_EXTRA_CFLAGS -+ LINUX_HAVE_CURRENT_KERNEL_TIME -+ LINUX_KMEM_CACHE_INIT - LINUX_HAVE_KMEM_CACHE_T - LINUX_KMEM_CACHE_CREATE_TAKES_DTOR - LINUX_CONFIG_H_EXISTS -@@ -614,12 +617,14 @@ - LINUX_AOP_WRITEBACK_CONTROL - LINUX_FS_STRUCT_FOP_HAS_FLOCK - LINUX_FS_STRUCT_FOP_HAS_SENDFILE -+ LINUX_FS_STRUCT_FOP_HAS_SPLICE - LINUX_KERNEL_LINUX_SYSCALL_H - LINUX_KERNEL_LINUX_SEQ_FILE_H - LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG - LINUX_KERNEL_SELINUX - LINUX_KERNEL_SOCK_CREATE - LINUX_KERNEL_PAGE_FOLLOW_LINK -+ LINUX_KEY_TYPE_H_EXISTS - LINUX_NEED_RHCONFIG - LINUX_RECALC_SIGPENDING_ARG_TYPE - LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT -@@ -647,6 +652,7 @@ - LINUX_GENERIC_FILE_AIO_READ - LINUX_INIT_WORK_HAS_DATA - LINUX_REGISTER_SYSCTL_TABLE_NOFLAG -+ LINUX_SYSCTL_TABLE_CHECKING - LINUX_EXPORTS_SYS_CHDIR - LINUX_EXPORTS_SYS_CLOSE - LINUX_EXPORTS_SYS_OPEN -@@ -720,6 +726,9 @@ - if test "x$ac_cv_linux_config_h_exists" = "xyes" ; then - AC_DEFINE(CONFIG_H_EXISTS, 1, [define if config.h exists]) - fi -+ if test "x$ac_cv_linux_key_type_h_exists" = "xyes" ; then -+ AC_DEFINE(KEY_TYPE_H_EXISTS, 1, [define if key-type.h exists]) -+ fi - if test "x$ac_cv_linux_defines_for_each_process" = "xyes" ; then - AC_DEFINE(DEFINED_FOR_EACH_PROCESS, 1, [define if for_each_process defined]) - fi -@@ -861,15 +870,27 @@ - if test "x$ac_cv_linux_fs_struct_fop_has_sendfile" = "xyes" ; then - AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_SENDFILE, 1, [define if your struct file_operations has sendfile]) - fi -+ if test "x$ac_cv_linux_fs_struct_fop_has_splice" = "xyes" ; then -+ AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_SPLICE, 1, [define if your struct file_operations has splice_write and splice_read]) -+ fi - if test "x$ac_cv_linux_register_sysctl_table_noflag" = "xyes" ; then - AC_DEFINE(REGISTER_SYSCTL_TABLE_NOFLAG, 1, [define if register_sysctl_table has no insert_at head flag]) - fi -+ if test "x$ac_cv_linux_sysctl_table_checking" = "xyes" ; then -+ AC_DEFINE(SYSCTL_TABLE_CHECKING, 1, [define if your kernel has sysctl table checking]) -+ fi - if test "x$ac_cv_linux_exports_tasklist_lock" = "xyes" ; then - AC_DEFINE(EXPORTED_TASKLIST_LOCK, 1, [define if tasklist_lock exported]) - fi - if test "x$ac_cv_linux_have_kmem_cache_t" = "xyes" ; then - AC_DEFINE(HAVE_KMEM_CACHE_T, 1, [define if kmem_cache_t exists]) - fi -+ if test "x$ac_cv_linux_kmem_cache_init" = "xyes" ; then -+ AC_DEFINE(KMEM_CACHE_INIT, 1, [define for new kmem_cache init function parameters]) -+ fi -+ if test "x$ac_cv_linux_have_current_kernel_time" = "xyes" ; then -+ AC_DEFINE(HAVE_CURRENT_KERNEL_TIME, 1, [define if current_kernel_time() exists]) -+ fi - if test "x$ac_cv_linux_have_kmem_cache_t" = "xyes" ; then - AC_DEFINE(KMEM_CACHE_TAKES_DTOR, 1, [define if kmem_cache_create takes a destructor argument]) - fi ---- openafs.orig/src/afs/LINUX/osi_machdep.h -+++ openafs/src/afs/LINUX/osi_machdep.h -@@ -76,7 +76,18 @@ - - #define afs_hz HZ - #include "h/sched.h" -+#if defined(HAVE_CURRENT_KERNEL_TIME) -+static inline time_t osi_Time(void) { -+ struct timespec xtime; -+ xtime = current_kernel_time(); -+ return xtime.tv_sec; -+} -+#else - #define osi_Time() (xtime.tv_sec) -+#endif -+ -+ -+ - #ifdef AFS_LINUX_64BIT_KERNEL - #define osi_GetTime(V) \ - do { \ ---- openafs.orig/src/afs/LINUX/osi_sysctl.c -+++ openafs/src/afs/LINUX/osi_sysctl.c -@@ -1,7 +1,7 @@ - /* - * osi_sysctl.c: Linux sysctl interface to OpenAFS - * -- * $Id: osi_sysctl.c,v 1.7.2.5 2007/06/12 18:28:49 shadow Exp $ -+ * $Id: osi_sysctl.c,v 1.7.2.6 2007/11/23 13:45:04 shadow Exp $ - * - * Written Jan 30, 2002 by Kris Van Hees (Sine Nomine Associates) - */ -@@ -28,7 +28,11 @@ - - static ctl_table afs_sysctl_table[] = { - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 1, -+#endif - .procname = "hm_retry_RO", - .data = &hm_retry_RO, - .maxlen = sizeof(afs_int32), -@@ -36,7 +40,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 2, -+#endif - .procname = "hm_retry_RW", - .data = &hm_retry_RW, - .maxlen = sizeof(afs_int32), -@@ -44,7 +52,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 3, -+#endif - .procname = "hm_retry_int", - .data = &hm_retry_int, - .maxlen = sizeof(afs_int32), -@@ -52,7 +64,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 4, -+#endif - .procname = "GCPAGs", - .data = &afs_gcpags, - .maxlen = sizeof(afs_int32), -@@ -60,7 +76,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 5, -+#endif - .procname = "rx_deadtime", - .data = &afs_rx_deadtime, - .maxlen = sizeof(afs_int32), -@@ -68,7 +88,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 6, -+#endif - .procname = "bkVolPref", - .data = &afs_bkvolpref, - .maxlen = sizeof(afs_int32), -@@ -80,7 +104,11 @@ - - static ctl_table fs_sysctl_table[] = { - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 1, -+#endif - .procname = "afs", - .mode = 0555, - .child = afs_sysctl_table ---- openafs.orig/src/afs/LINUX/osi_vfsops.c -+++ openafs/src/afs/LINUX/osi_vfsops.c -@@ -16,7 +16,7 @@ - #include "afs/param.h" - - RCSID -- ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.29.2.26 2007/10/15 12:42:26 shadow Exp $"); -+ ("$Header: /cvs/openafs/src/afs/LINUX/osi_vfsops.c,v 1.29.2.28 2007/11/23 13:45:04 shadow Exp $"); - - #define __NO_VERSION__ /* don't define kernel_version in module.h */ - #include /* early to avoid printf->printk mapping */ -@@ -295,8 +295,12 @@ - #if defined(HAVE_KMEM_CACHE_T) - init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) - #else -+#if defined(KMEM_CACHE_INIT) -+init_once(struct kmem_cache * cachep, void * foo) -+#else - init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) - #endif -+#endif - { - struct vcache *vcp = (struct vcache *) foo; - -@@ -531,8 +535,11 @@ - ip->i_size = vp->va_size; - #if defined(AFS_LINUX26_ENV) - ip->i_atime.tv_sec = vp->va_atime.tv_sec; -+ ip->i_atime.tv_nsec = 0; - ip->i_mtime.tv_sec = vp->va_mtime.tv_sec; -+ ip->i_mtime.tv_nsec = 0; - ip->i_ctime.tv_sec = vp->va_ctime.tv_sec; -+ ip->i_ctime.tv_nsec = 0; - #else - ip->i_atime = vp->va_atime.tv_sec; - ip->i_mtime = vp->va_mtime.tv_sec; ---- openafs.orig/src/afs/LINUX/osi_vnodeops.c -+++ openafs/src/afs/LINUX/osi_vnodeops.c -@@ -22,7 +22,7 @@ - #include "afs/param.h" - - RCSID -- ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.81.2.57 2007/10/15 12:42:26 shadow Exp $"); -+ ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.81.2.59 2007/11/06 18:35:32 shadow Exp $"); - - #include "afs/sysincludes.h" - #include "afsincludes.h" -@@ -643,6 +643,10 @@ - #if defined(AFS_LINUX26_ENV) && defined(STRUCT_FILE_OPERATIONS_HAS_SENDFILE) - .sendfile = generic_file_sendfile, - #endif -+#if defined(AFS_LINUX26_ENV) && defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE) -+ .splice_write = generic_file_splice_write, -+ .splice_read = generic_file_splice_read, -+#endif - .release = afs_linux_release, - .fsync = afs_linux_fsync, - .lock = afs_linux_lock, -@@ -878,6 +882,15 @@ - AFS_GLOCK(); - (void) afs_InactiveVCache(vcp, NULL); - AFS_GUNLOCK(); -+#ifdef DCACHE_NFSFS_RENAMED -+#ifdef AFS_LINUX26_ENV -+ spin_lock(&dp->d_lock); -+#endif -+ dp->d_flags &= ~DCACHE_NFSFS_RENAMED; -+#ifdef AFS_LINUX26_ENV -+ spin_unlock(&dp->d_lock); -+#endif -+#endif - - iput(ip); - } -@@ -1095,6 +1108,15 @@ - } - tvc->uncred = credp; - tvc->states |= CUnlinked; -+#ifdef DCACHE_NFSFS_RENAMED -+#ifdef AFS_LINUX26_ENV -+ spin_lock(&dp->d_lock); -+#endif -+ dp->d_flags |= DCACHE_NFSFS_RENAMED; -+#ifdef AFS_LINUX26_ENV -+ spin_unlock(&dp->d_lock); -+#endif -+#endif - } else { - osi_FreeSmallSpace(__name); - } ---- openafs.orig/src/afs/sysincludes.h -+++ openafs/src/afs/sysincludes.h -@@ -75,6 +75,9 @@ - #if defined(LINUX_KEYRING_SUPPORT) - #include - #include -+#if defined(KEY_TYPE_H_EXISTS) -+#include -+#endif - #ifndef KEY_ALLOC_IN_QUOTA - #define KEY_ALLOC_IN_QUOTA 1 - #endif ---- openafs.orig/src/cf/linux-test1.m4 -+++ openafs/src/cf/linux-test1.m4 -@@ -2,9 +2,12 @@ - # [ACTION-IF-SUCCESS], [ACTION-IF-FAILURE]) - # - AC_DEFUN([AC_TRY_KBUILD26],[ rm -fr conftest.dir -+ if test "x$ac_linux_kbuild_requires_extra_cflags" = "xyes" ; then -+ CFLAGS_PREFIX='EXTRA_' -+ fi - if mkdir conftest.dir && - cat >conftest.dir/Makefile <<_ACEOF && --CFLAGS += $CPPFLAGS -+${CFLAGS_PREFIX}CFLAGS += $CPPFLAGS - - obj-m += conftest.o - _ACEOF -@@ -24,8 +27,9 @@ - - MODULE_LICENSE("http://www.openafs.org/dl/license10.html"); - _ACEOF -- echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD -- make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err -+ echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD && -+ make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err && -+ ! grep "^WARNING: .* undefined!$" conftest.err >/dev/null 2>&1 - then [$3] - else - sed '/^ *+/d' conftest.err >&AS_MESSAGE_LOG_FD -@@ -42,8 +46,10 @@ - # - AC_DEFUN([AC_TRY_KBUILD24], [ - ac_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ $CPPFLAGS" -- AC_TRY_COMPILE([$1], [$2], [$3], [$4]) -+ CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ -Werror-implicit-function-declaration $CPPFLAGS" -+ AC_TRY_COMPILE([ -+#include -+$1], [$2], [$3], [$4]) - CPPFLAGS="$ac_save_CPPFLAGS"]) - - -@@ -65,3 +71,16 @@ - [],:,AC_MSG_RESULT(no) - AC_MSG_FAILURE([Fix problem or use --disable-kernel-module...])) - AC_MSG_RESULT(yes)]) -+ -+AC_DEFUN([LINUX_KBUILD_USES_EXTRA_CFLAGS], [ -+ AC_MSG_CHECKING([if linux kbuild requires EXTRA_CFLAGS]) -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS=-Wall -+ AC_TRY_KBUILD( -+[#include -+#include ], -+ [], -+ ac_linux_kbuild_requires_extra_cflags=no, -+ ac_linux_kbuild_requires_extra_cflags=yes) -+ CPPFLAGS="$save_CPPFLAGS" -+ AC_MSG_RESULT($ac_linux_kbuild_requires_extra_cflags)]) ---- openafs.orig/src/cf/linux-test4.m4 -+++ openafs/src/cf/linux-test4.m4 -@@ -894,3 +894,58 @@ - ac_cv_linux_fs_struct_fop_has_sendfile=no)]) - AC_MSG_RESULT($ac_cv_linux_fs_struct_fop_has_sendfile)]) - -+AC_DEFUN([LINUX_FS_STRUCT_FOP_HAS_SPLICE], [ -+ AC_MSG_CHECKING([for splice_write and splice_read in struct file_operations]) -+ AC_CACHE_VAL([ac_cv_linux_fs_struct_fop_has_splice], [ -+ AC_TRY_KBUILD( -+[#include ], -+[struct file_operations _fop; -+_fop.splice_write(NULL, NULL, NULL, 0, 0); -+_fop.splice_read(NULL, NULL, NULL, 0, 0);], -+ ac_cv_linux_fs_struct_fop_has_splice=yes, -+ ac_cv_linux_fs_struct_fop_has_splice=no)]) -+ AC_MSG_RESULT($ac_cv_linux_fs_struct_fop_has_splice)]) -+ -+AC_DEFUN([LINUX_KEY_TYPE_H_EXISTS], [ -+ AC_MSG_CHECKING([whether linux/key-type.h exists]) -+ AC_CACHE_VAL([ac_cv_linux_key_type_h_exists], [ -+ AC_TRY_KBUILD( -+[#include ], -+[return;], -+ ac_cv_linux_key_type_h_exists=yes, -+ ac_cv_linux_key_type_h_exists=no)]) -+ AC_MSG_RESULT($ac_cv_linux_key_type_h_exists)]) -+ -+AC_DEFUN([LINUX_HAVE_CURRENT_KERNEL_TIME], [ -+ AC_MSG_CHECKING([for current_kernel_time()]) -+ AC_CACHE_VAL([ac_cv_linux_have_current_kernel_time], [ -+ AC_TRY_KBUILD( -+[#include ], -+[struct timespec s = current_kernel_time();], -+ ac_cv_linux_have_current_kernel_time=yes, -+ ac_cv_linux_have_current_kernel_time=no)]) -+ AC_MSG_RESULT($ac_cv_linux_have_current_kernel_time)]) -+ -+AC_DEFUN([LINUX_KMEM_CACHE_INIT], [ -+ AC_MSG_CHECKING([for new kmem_cache init function parameters]) -+ AC_CACHE_VAL([ac_cv_linux_kmem_cache_init], [ -+ AC_TRY_KBUILD( -+[#include ], -+[extern struct kmem_cache *kmem_cache_create(const char *, size_t, size_t, -+ unsigned long, -+ void (*)(struct kmem_cache *, void *)); -+return;], -+ ac_cv_linux_kmem_cache_init=yes, -+ ac_cv_linux_kmem_cache_init=no)]) -+ AC_MSG_RESULT($ac_cv_linux_kmem_cache_init)]) -+ -+AC_DEFUN([LINUX_SYSCTL_TABLE_CHECKING], [ -+ AC_MSG_CHECKING([for sysctl table checking]) -+ AC_CACHE_VAL([ac_cv_linux_sysctl_table_checking], [ -+ AC_TRY_KBUILD( -+[#include ], -+[ sysctl_check_table(NULL);], -+ ac_cv_linux_sysctl_table_checking=yes, -+ ac_cv_linux_sysctl_table_checking=no)]) -+ AC_MSG_RESULT($ac_cv_linux_sysctl_table_checking)]) -+ diff --git a/debian/patches/multiple-local-realms b/debian/patches/multiple-local-realms index c2655613a..e3612c4b2 100644 --- a/debian/patches/multiple-local-realms +++ b/debian/patches/multiple-local-realms @@ -58,7 +58,7 @@ has been working in production at Stanford University for some time. strcat(vname, "@"); --- openafs.orig/src/auth/userok.c +++ openafs/src/auth/userok.c -@@ -403,7 +403,9 @@ +@@ -382,7 +382,9 @@ afs_uint32 exp; static char lcell[MAXCELLCHARS] = ""; @@ -69,7 +69,7 @@ has been working in production at Stanford University for some time. /* get auth details from server connection */ code = -@@ -440,11 +442,40 @@ +@@ -419,11 +421,40 @@ /* if running a krb environment, also get the local realm */ /* note - this assumes AFS_REALM_SZ <= MAXCELLCHARS */ /* just set it to lcell if it fails */ @@ -113,7 +113,7 @@ has been working in production at Stanford University for some time. /* start with no uname and no authorization */ strcpy(uname, ""); -@@ -456,8 +487,8 @@ +@@ -435,8 +466,8 @@ strcpy(uname, ""); flag = 1; @@ -124,7 +124,7 @@ has been working in production at Stanford University for some time. if ((tmp = CompFindUser(adir, tname, ".", tinst, NULL))) { strcpy(uname, tmp); flag = 1; -@@ -467,7 +498,6 @@ +@@ -446,7 +477,6 @@ flag = 1; #endif } @@ -134,7 +134,7 @@ has been working in production at Stanford University for some time. if ((tmp = CompFindUser(adir, tname, ".", tinst, tcell))) { --- openafs.orig/src/config/afs_sysnames.h +++ openafs/src/config/afs_sysnames.h -@@ -286,4 +286,6 @@ +@@ -291,4 +291,6 @@ #ifdef AFS_KERBREALM_ENV #define AFS_REALM_SZ 64 #endif @@ -143,7 +143,7 @@ has been working in production at Stanford University for some time. #endif /* __AFS_SYSNAMES_INCL_ENV_ */ --- openafs.orig/src/ptserver/ptprocs.c +++ openafs/src/ptserver/ptprocs.c -@@ -93,6 +93,7 @@ +@@ -87,6 +87,7 @@ extern afs_int32 Initdb(); extern int pr_noAuth; extern afs_int32 initd; @@ -151,7 +151,7 @@ has been working in production at Stanford University for some time. afs_int32 iNewEntry(), newEntry(), whereIsIt(), dumpEntry(), addToGroup(), nameToID(), Delete(), removeFromGroup(); afs_int32 getCPS(), getCPS2(), getHostCPS(), listMax(), setMax(), listEntry(); -@@ -178,22 +179,9 @@ +@@ -172,22 +173,9 @@ if (exp < FT_ApproxTime()) goto done; #endif @@ -177,7 +177,7 @@ has been working in production at Stanford University for some time. strncpy(vname, name, sizeof(vname)); if (ilen = strlen(inst)) { if (strlen(vname) + 1 + ilen >= sizeof(vname)) -@@ -640,7 +628,24 @@ +@@ -634,7 +622,24 @@ ABORT_WITH(tt, code); for (i = 0; i < aname->namelist_len; i++) { @@ -203,7 +203,7 @@ has been working in production at Stanford University for some time. if (code != PRSUCCESS) aid->idlist_val[i] = ANONYMOUSID; osi_audit(PTS_NmToIdEvent, code, AUD_STR, -@@ -2281,7 +2286,6 @@ +@@ -2275,7 +2280,6 @@ } #endif /* IP_WILDCARDS */ @@ -211,7 +211,7 @@ has been working in production at Stanford University for some time. afs_int32 WhoIsThisWithName(acall, at, aid, aname) struct rx_call *acall; -@@ -2309,11 +2313,12 @@ +@@ -2303,11 +2307,12 @@ } else if (code == 2) { /* kad class */ int clen; @@ -225,7 +225,7 @@ has been working in production at Stanford University for some time. strncpy(vname, name, sizeof(vname)); if ((ilen = strlen(inst))) { if (strlen(vname) + 1 + ilen >= sizeof(vname)) -@@ -2322,19 +2327,9 @@ +@@ -2316,19 +2321,9 @@ strcat(vname, inst); } if ((clen = strlen(tcell))) { @@ -324,7 +324,7 @@ has been working in production at Stanford University for some time. #define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID) --- openafs.orig/src/util/get_krbrlm.c +++ openafs/src/util/get_krbrlm.c -@@ -26,21 +26,148 @@ +@@ -28,21 +28,148 @@ #define KSUCCESS 0 #define KFAILURE (-1) @@ -492,7 +492,7 @@ has been working in production at Stanford University for some time. printf("AFSDIR_CLIENT_THISCELL_FILEPATH = %s\n", --- openafs.orig/src/viced/host.c +++ openafs/src/viced/host.c -@@ -1793,7 +1793,8 @@ +@@ -1809,7 +1809,8 @@ static char localcellname[PR_MAXNAMELEN + 1]; @@ -502,7 +502,7 @@ has been working in production at Stanford University for some time. /* not reentrant */ void -@@ -1801,13 +1802,26 @@ +@@ -1817,13 +1818,26 @@ { memset(&nulluuid, 0, sizeof(afsUUID)); afsconf_GetLocalCell(confDir, localcellname, PR_MAXNAMELEN); @@ -532,7 +532,7 @@ has been working in production at Stanford University for some time. } rxcon_ident_key = rx_KeyCreate((rx_destructor_t) free); rxcon_client_key = rx_KeyCreate((rx_destructor_t) 0); -@@ -1837,11 +1851,10 @@ +@@ -1853,11 +1867,10 @@ cnamelen = strlen(acell); if (cnamelen) { @@ -549,7 +549,7 @@ has been working in production at Stanford University for some time. ("MapName: Name too long, using AnonymousID for %s@%s\n", --- openafs.orig/src/viced/viced.c +++ openafs/src/viced/viced.c -@@ -1077,7 +1077,8 @@ +@@ -1074,7 +1074,8 @@ return -1; } } else if (!strcmp(argv[i], "-realm")) { @@ -559,7 +559,7 @@ has been working in production at Stanford University for some time. if ((i + 1) >= argc) { fprintf(stderr, "missing argument for -realm\n"); return -1; -@@ -1088,7 +1089,15 @@ +@@ -1085,7 +1086,15 @@ AFS_REALM_SZ); return -1; } diff --git a/debian/patches/pam-build b/debian/patches/pam-build index 9000aab04..70f0d0efc 100644 --- a/debian/patches/pam-build +++ b/debian/patches/pam-build @@ -6,7 +6,7 @@ modules against it. --- openafs.orig/Makefile.in +++ openafs/Makefile.in -@@ -515,8 +515,6 @@ +@@ -512,8 +512,6 @@ # pthread based user space RX library shlibafsrpc: rx rxkad des case ${SYS_NAME} in \ @@ -15,7 +15,7 @@ modules against it. alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \ *) \ -@@ -525,8 +523,6 @@ +@@ -522,8 +520,6 @@ shlibafsauthent: ubik auth kauth shlibafsrpc case ${SYS_NAME} in \ diff --git a/debian/patches/paths b/debian/patches/paths index 4d9a27c35..d5d58c83d 100644 --- a/debian/patches/paths +++ b/debian/patches/paths @@ -5,7 +5,7 @@ database path. --- openafs.orig/src/ptserver/pt_util.c +++ openafs/src/ptserver/pt_util.c -@@ -136,7 +136,7 @@ +@@ -137,7 +137,7 @@ struct prentry uentry, gentry; struct ubik_hdr *uh; char *dfile = 0; diff --git a/debian/patches/series b/debian/patches/series index 3e4513d15..0033a68e5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,7 +9,4 @@ no-admin-reference ucontext-everywhere find-core-files ktc-prototypes -afs-man-name -linux-2.6.24 -alloc-vnode multiple-local-realms -- 2.39.5