From 0cce6b159b2fb2ccc8afde1ebb2219e40b097454 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 20 Aug 2007 05:38:39 +0000 Subject: [PATCH] * Use the upstream man page for pt_util, which lets us remove the docbook-to-man build dependency. --- debian/changelog | 2 + debian/control | 3 +- debian/openafs-dbserver.install | 1 + debian/patches/pt_util-man-page | 193 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/pt_util.sgml | 185 ------------------------------ debian/rules | 2 - 7 files changed, 198 insertions(+), 189 deletions(-) create mode 100644 debian/patches/pt_util-man-page delete mode 100644 debian/pt_util.sgml diff --git a/debian/changelog b/debian/changelog index 304ee3ae2..f1d552290 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ openafs (1.4.4.dfsg1-7) unstable; urgency=low * Switch to quilt for managing patches to the upstream source. + * Use the upstream man page for pt_util, which lets us remove the + docbook-to-man build dependency. * Restructure the source for the module package. The build files for the module build are now in debian/module in the source package and there is a completely separate rules file. This way, the module build diff --git a/debian/control b/debian/control index 5c941631e..fdc960c46 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,7 @@ Priority: optional Maintainer: Sam Hartman Uploaders: Russ Allbery Build-Depends: debhelper (>= 5), libncurses5-dev, libpam0g-dev, bison, - docbook-to-man, flex, perl, comerr-dev, libkrb5-dev, autoconf, automake, - quilt (>= 0.40) + flex, perl, comerr-dev, libkrb5-dev, autoconf, automake, quilt (>= 0.40) Standards-Version: 3.7.2 Package: openafs-client diff --git a/debian/openafs-dbserver.install b/debian/openafs-dbserver.install index 04fd46709..dc1a856ee 100644 --- a/debian/openafs-dbserver.install +++ b/debian/openafs-dbserver.install @@ -19,6 +19,7 @@ debian/tmp/usr/share/man/man5/vldb.DB0.5 usr/share/man/man5 debian/tmp/usr/share/man/man8/buserver.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/prdb_check.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/pt_util.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/ptserver.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/vldb_check.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/vlserver.8 usr/share/man/man8 diff --git a/debian/patches/pt_util-man-page b/debian/patches/pt_util-man-page new file mode 100644 index 000000000..1210958ef --- /dev/null +++ b/debian/patches/pt_util-man-page @@ -0,0 +1,193 @@ +Man page for pt_util. Pulled from the upstream stable branch, will be in +1.4.5. + +--- /dev/null ++++ openafs/doc/man-pages/pod8/pt_util.pod +@@ -0,0 +1,187 @@ ++=head1 NAME ++ ++pt_util - Load or dump a Protection Server database ++ ++=head1 SYNOPSIS ++ ++=for html ++
++ ++B ++ S<<< [B<-w>] >>> S<<< [B<-user>] >>> S<<< [B<-group>] >>> ++ S<<< [B<-members>] >>> S<<< [B<-name>] >>> S<<< [B<-system>] >>> ++ S<<< [B<-xtra>] >>> S<<< [B<-prdb> >] >>> ++ S<<< [B<-datafile> >] >>> S<<< [B<-help>] >>> ++ ++=for html ++
++ ++=head1 DESCRIPTION ++ ++The B command can be used to load or dump the protection ++database. It should only be used when B is not running. ++ ++The most likely reason to use it is to initialize the protection database ++when bringing up a new cell. The current syntax for this, presented ++below, needs improvement. B can also be used when problems are ++suspected with the database. It can be used to dump the database or ++portions thereof, in several different ways, and to reload it. ++ ++The textual representation of the database has the following form: ++For users, ++ ++ name flags/quota viceid ownerid creatorid ++ ++For groups, ++ ++ name flags/quota viceid ownerid creatorid ++ a-username a-user-viceid ++ ++The second line is repeated for each member of the group. When reading ++the database, membership is not reported unless B<-members> is also ++included. ++ ++=head1 OPTIONS ++ ++If you don't specify any options, the only thing you'll learn is the ubik ++database epoch and version. ++ ++=over 4 ++ ++=item B<-w> ++ ++Write to the protection database instead of reading. Only the file ++arguments make sense in combination with this argument. ++ ++=item B<-user> ++ ++When reading, display users. ++ ++=item B<-group> ++ ++When reading, display groups (but not necessarily members). ++ ++=item B<-members> ++ ++When reading, display groups and also group members. ++ ++=item B<-name> ++ ++When reading, ++follow name hashes, instead of id hashes. ++This may print different information if the database was corrupted. ++Otherwise, it should print exactly the same information, except ++in a different order. ++ ++=item B<-system> ++ ++When reading, display system data, or more precisely, do not display ++entries with a viced <= -32768 or >= +97537. ++ ++=item B<-xtra> ++ ++When reading, display extra users and groups, or more precisely, do not ++display entries that are in the range -32767...+97536 inclusive. ++ ++=item B<-prdb> > ++ ++Specifies the complete pathname of the file in which the Protection ++Database resides. Provide the complete name, including the ending ++F<.DB0>. ++ ++=item B<-datafile> > ++ ++Specify the file to which to dump (or B<-w> from which to read) textual ++database records. ++ ++=back ++ ++=head1 CAUTIONS ++ ++The file dump format does not include supergroup information, so should ++not be used if you have and are using groups within groups. ++ ++In all cases, entry timestamps and other information is also not ++preserved. ++ ++The epoch and version are reported on standard error. On little-endian ++machines, they'll be byte swapped, so may be very random. ++ ++=head1 EXAMPLES ++ ++The following example shows how to initialize the database from scratch. ++ ++Before you do this, make sure B is not running. If you have ++multiple database servers, make sure F does not exist on any ++server machine. ++ ++Now, type this in EXACTLY, including the leading space on the line ++indicated. But do use Control-D at the end, not up-arrow D. ++ ++ pt_util -w ++ admin 128/20 1 -204 -204 ++ system:administrators 130/20 -204 -204 -204 ++ admin 1 ++ ^D ++ ++You will see this: ++ ++ # pt_util -w ++ pt_util: /usr/afs/db/prdb.DB0: Bad UBIK_MAGIC. Is 0 should be 354545 ++ Ubik Version is: 2.0 ++ admin 128/20 1 -204 -204 ++ system:administrators 130/20 -204 -204 -204 ++ Error while creating system:administrators: Entry for id already exists ++ admin 1 ++ pt_util: Ubik Version number changed during execution. ++ Old Version = 2.0, new version = 33554432.0 ++ # ++ ++To make a complete copy of the database, ++ ++ # pt_util -user -members -datafile /tmp/out ++ ++To load from the complete copy, ++ ++ # pt_util -w -datafile /tmp/out ++ ++Don't do this until you read cautions, above. ++ ++=head1 PRIVILEGE REQUIRED ++ ++The issuer must be logged in as the superuser C on a file server ++machine to use B. ++ ++=head1 SEE ALSO ++ ++L, ++L ++ ++=head1 COPYRIGHT ++ ++The following copyright covers this documentation: ++ ++Copyright (c) 2005 The Regents of the University of Michigan. ALL RIGHTS ++RESERVED. ++ ++Permission is granted to use, copy, create derivative works and ++redistribute this software and such derivative works for any purpose, so ++long as the name of the University of Michigan is not used in any ++advertising or publicity pertaining to the use or distribution of this ++software without specific, written prior authorization. If the above ++copyright notice or any other identification of the University of Michigan ++is included in any copy of any portion of this software, then the ++disclaimer below must also be included. ++ ++This software is provided as is, without representation from the ++University of Michigan as to its fitness for any purpose, and without ++warranty by the University of Michigan of any kind, either express or ++implied, including without limitation the implied warranties of ++merchantability and fitness for a particular purpose. The regents of the ++University of Michigan shall not be liable for any damages, including ++special, indirect, incidental, or consequential damages, with respect to ++any claim arising out of or in connection with the use of the software, ++even if it has been or is hereafter advised of the possibility of such ++damages. ++ ++=cut diff --git a/debian/patches/series b/debian/patches/series index 203a6a449..b018bdcdc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,4 +15,5 @@ null-uuid-client null-uuid-server pag-cleanup-lock ucontext-everywhere +pt_util-man-page paravirt-workaround diff --git a/debian/pt_util.sgml b/debian/pt_util.sgml deleted file mode 100644 index 9d93e91e1..000000000 --- a/debian/pt_util.sgml +++ /dev/null @@ -1,185 +0,0 @@ - - Sam"> - Hartman"> - - November 23, 2000"> - - 8"> - hartmans@mit.edu"> - - OPENAFS-PTUTIL"> - - - Debian GNU/Linux"> - GNU"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2000 - &dhusername; - - &dhdate; - - - - pt_util - &dhsection; - - - pt_util - - Utility to load/dump AFS protection database - - - - pt_util - - - - - - - - - - - - - - DESCRIPTION - - This manual page documents pt_util, a - utility for dumping, loading and creating AFS protection - databases. The protection database is normally made available - by the ptserver daemon running on the AFS - database servers. However, pt_util - provides a mechanism for manipulating the database when - ptserver is unavailable. This is useful to - create an initial database, to effect large batch changes or - when the database has a damaged - system:administrators group. - - By default, pt_util opens the - database and prints the version. Options allow extraction of - information from the database or writing new entries into the - database. - - - - - OPTIONS - - - - - - - Show summary of options. - - - - - - Update PRDB with contents of data file or standard input if the is not used - - - - - - List users in the database. - - - - - - List groups in the database. - - - - - - List group members. - - - - - - Follow name hash chains instead of ID hashes. - - - - - - List only system: groups. Used by MIT's Moira. - - - - - - Read from or write printable representation of the - database from datafile. - - - - - - Manipulate the protection database - prdb. The running protection - database is - /var/lib/openafs/db/prdb.DB0 - - - - - - SEE ALSO - - ptserver(8) - - - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). - - - - - - - diff --git a/debian/rules b/debian/rules index a01f1be98..573880e52 100755 --- a/debian/rules +++ b/debian/rules @@ -136,8 +136,6 @@ install: build debian/libpam-openafs-kaserver/lib/security/pam_afs.krb.so install -d debian/openafs-dbserver/usr/share/man/man8 - /usr/bin/docbook-to-man debian/pt_util.sgml \ - >debian/openafs-dbserver/usr/share/man/man8/pt_util.8 ( cd debian && pod2man --section 8 --center "Debian GNU/Linux" \ afs-rootvol ) \ >debian/openafs-dbserver/usr/share/man/man8/afs-rootvol.8 -- 2.39.5