From c6d98322f1d30ca8028efb63bfde24b554abfda1 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 5 Jan 2011 10:05:33 +0200 Subject: [PATCH] A largish man-page update - Remove rpmquery and rpmverify manuals for now, the functionality didn't get split to separate binaries afterall and the manpages were in a rather bad shape afterall. - Add some missing options, remove no longer existing options - Remove rpmdb, rpmkeys, rpmsign and rpmspec related switches from man rpm manual, add them to the "see also"-section instead - Adjust database file list on main rpm manual, remove it from rpmbuild man. --- doc/Makefile.am | 3 +- doc/rpm.8 | 152 +++---------------------------- doc/rpmbuild.8 | 37 ++------ doc/rpmdb.8 | 2 - doc/rpmkeys.8 | 4 +- doc/rpmquery.8 | 274 -------------------------------------------------------- doc/rpmsign.8 | 2 - doc/rpmspec.8 | 11 ++- doc/rpmverify.8 | 142 ----------------------------- 9 files changed, 30 insertions(+), 597 deletions(-) delete mode 100644 doc/rpmquery.8 delete mode 100644 doc/rpmverify.8 diff --git a/doc/Makefile.am b/doc/Makefile.am index e87bf66..5f3dbf1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -8,8 +8,7 @@ EXTRA_DIST += $(man_man1_DATA) man_man8dir = $(mandir)/man8 man_man8_DATA = rpm.8 rpmbuild.8 rpmdeps.8 rpmgraph.8 rpm2cpio.8 -man_man8_DATA += rpmdb.8 rpmkeys.8 rpmsign.8 rpmverify.8 -man_man8_DATA += rpmquery.8 rpmspec.8 +man_man8_DATA += rpmdb.8 rpmkeys.8 rpmsign.8 rpmspec.8 EXTRA_DIST += $(man_man8_DATA) man_fr_man8dir = $(mandir)/fr/man8 diff --git a/doc/rpm.8 b/doc/rpm.8 index 499e892..f510fac 100644 --- a/doc/rpm.8 +++ b/doc/rpm.8 @@ -19,11 +19,7 @@ rpm \- RPM Package Manager -\fBrpm\fR \fB--import\fR \fB\fIPUBKEY\fB\fR\fI ...\fR - - - -\fBrpm\fR {\fB-K|--checksig\fR} [\fB--nosignature\fR] [\fB--nodigest\fR] +\fBrpm\fR [\fB--nosignature\fR] [\fB--nodigest\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR .SS "INSTALLING, UPGRADING, AND REMOVING PACKAGES:" @@ -49,14 +45,6 @@ rpm \- RPM Package Manager .PP -\fBrpm\fR {\fB--initdb|--rebuilddb\fR} - - - -\fBrpm\fR {\fB--addsign|--resign|--delsign\fR} \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR - - - \fBrpm\fR {\fB--querytags|--showrc\fR} @@ -97,12 +85,12 @@ rpm \- RPM Package Manager .PP - [\fB--aid\fR] [\fB--allfiles\fR] [\fB--badreloc\fR] [\fB--excludepath \fIOLDPATH\fB\fR] + [\fB--allfiles\fR] [\fB--badreloc\fR] [\fB--excludepath \fIOLDPATH\fB\fR] [\fB--excludedocs\fR] [\fB--force\fR] [\fB-h,--hash\fR] [\fB--ignoresize\fR] [\fB--ignorearch\fR] [\fB--ignoreos\fR] - [\fB--includedocs\fR] [\fB--justdb\fR] [\fB--nodeps\fR] - [\fB--nodigest\fR] [\fB--nosignature\fR] [\fB--nosuggest\fR] - [\fB--noorder\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] + [\fB--includedocs\fR] [\fB--justdb\fR] [\fB--nocollections\fR] + [\fB--nodeps\fR] [\fB--nodigest\fR] [\fB--nosignature\fR] + [\fB--noorder\fR] [\fB--noscripts\fR] [\fB--notriggers\fR] [\fB--oldpackage\fR] [\fB--percent\fR] [\fB--prefix \fINEWPATH\fB\fR] [\fB--relocate \fIOLDPATH\fB=\fINEWPATH\fB\fR] [\fB--replacefiles\fR] [\fB--replacepkgs\fR] @@ -125,13 +113,8 @@ packages. One of the following basic modes must be selected: \fBQuery\fR, \fBVerify\fR, -\fBSignature Check\fR, \fBInstall/Upgrade/Freshen\fR, \fBUninstall\fR, -\fBInitialize Database\fR, -\fBRebuild Database\fR, -\fBResign\fR, -\fBAdd Signature\fR, \fBSet Owners/Groups\fR, \fBShow Querytags\fR, and \fBShow Configuration\fR. @@ -218,9 +201,6 @@ This will upgrade packages, but only ones for which an earlier version is installed. .PP .TP -\fB--aid\fR -Add suggested packages to the transaction set when needed. -.TP \fB--allfiles\fR Installs or upgrades all the missingok files in the package, regardless if they exist. @@ -279,9 +259,6 @@ Don't verify package or header signatures when reading. Don't do a dependency check before installing or upgrading a package. .TP -\fB--nosuggest\fR -Don't suggest package(s) that provide a missing dependency. -.TP \fB--noorder\fR Don't reorder the packages for an install. The list of packages would normally be reordered to satisfy dependencies. @@ -316,15 +293,19 @@ scriptlet(s). .TP \fB--notriggerun\fR .TP +\fB--notriggerprein\fR +.TP \fB--notriggerpostun\fR Don't execute any trigger scriptlet of the named type. The \fB--notriggers\fR option is equivalent to +\fB--notriggerprein\fR \fB--notriggerin\fR \fB--notriggerun\fR \fB--notriggerpostun\fR and turns off execution of the corresponding +\fB%triggerprein\fR, \fB%triggerin\fR, \fB%triggerun\fR, and \fB%triggerpostun\fR @@ -732,111 +713,6 @@ the corresponding \fB--verify\fR test: \fBP\fR ca\fBP\fRabilities differ .fi -.SS "DIGITAL SIGNATURE AND DIGEST VERIFICATION" -.PP -The general forms of rpm digital signature commands are -.PP - - -\fBrpm\fR \fB--import\fR \fB\fIPUBKEY\fB\fR\fI ...\fR - - -\fBrpm\fR {\fB--checksig\fR} [\fB--nosignature\fR] [\fB--nodigest\fR] - \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR - -.PP -The \fB--checksig\fR option checks all the digests and signatures contained in -\fIPACKAGE_FILE\fR to ensure -the integrity and origin of the package. Note that -signatures are now verified whenever a package is read, -and \fB--checksig\fR is useful to verify -all of the digests and signatures associated with a package. -.PP -Digital signatures cannot be verified without a public key. -An ASCII armored public key can be added to the \fBrpm\fR database -using \fB--import\fR. An imported public key is -carried in a header, and key ring management is performed -exactly like package management. For example, all currently imported -public keys can be displayed by: -.PP -\fBrpm -qa gpg-pubkey*\fR -.PP -Details about a specific public key, when imported, can be displayed -by querying. Here's information about the Red Hat GPG/DSA key: -.PP -\fBrpm -qi gpg-pubkey-db42a60e\fR -.PP -Finally, public keys can be erased after importing just like -packages. Here's how to remove the Red Hat GPG/DSA key -.PP -\fBrpm -e gpg-pubkey-db42a60e\fR -.SS "SIGNING A PACKAGE" -.PP - -\fBrpm\fR \fB--addsign|--resign\fR \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR - -.PP -Both of the \fB--addsign\fR and \fB--resign\fR -options generate and insert new signatures for each package -\fIPACKAGE_FILE\fR given, replacing any -existing signatures. There are two options for historical reasons, -there is no difference in behavior currently. - -\fBrpm\fR \fB--delsign\fR \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR - -.PP -Delete all signatures from each package \fIPACKAGE_FILE\fR given. - -.SS "USING GPG TO SIGN PACKAGES" -.PP -In order to sign packages using GPG, \fBrpm\fR -must be configured to run GPG and be able to find a key -ring with the appropriate keys. By default, -\fBrpm\fR uses the same conventions as GPG -to find key rings, namely the \fB$GNUPGHOME\fR environment -variable. If your key rings are not located where GPG expects -them to be, you will need to configure the macro -\fB%_gpg_path\fR -to be the location of the GPG key rings to use. -.PP -For compatibility with older versions of GPG, PGP, and rpm, -only V3 OpenPGP signature packets should be configured. -Either DSA or RSA verification algorithms can be used, but DSA -is preferred. -.PP -If you want to be able to sign packages you create yourself, you -also need to create your own public and secret key pair (see the -GPG manual). You will also need to configure the \fBrpm\fR macros -.TP -\fB%_gpg_name\fR -The name of the "user" whose key you wish to use to sign your packages. -.PP -For example, to be able to use GPG to sign packages as the user -\fI"John Doe "\fR -from the key rings located in \fI/etc/rpm/.gpg\fR -using the executable \fI/usr/bin/gpg\fR you would include -.PP -.nf -%_gpg_path /etc/rpm/.gpg -%_gpg_name John Doe -%__gpg /usr/bin/gpg -.fi -.PP -in a macro configuration file. Use \fI/etc/rpm/macros\fR -for per-system configuration and \fI~/.rpmmacros\fR -for per-user configuration. Typically it's sufficient to set just %_gpg_name. -.SS "REBUILD DATABASE OPTIONS" -.PP -The general form of an rpm rebuild database command is -.PP - -\fBrpm\fR {\fB--initdb|--rebuilddb\fR} [\fB-v\fR] [\fB--dbpath \fIDIRECTORY\fB\fR] [\fB--root \fIDIRECTORY\fB\fR] - -.PP -Use \fB--initdb\fR to create a new database if one doesn't already exist -(existing database is not overwritten), use -\fB--rebuilddb\fR to rebuild the database indices from -the installed package headers. .SS "SHOWRC" .PP The command @@ -925,17 +801,13 @@ Install the package containing \fBrpmbuild\fR (usually \fBrpm-build\fR) and see \fI/var/lib/rpm/Basenames\fR \fI/var/lib/rpm/Conflictname\fR \fI/var/lib/rpm/Dirnames\fR -\fI/var/lib/rpm/Filemd5s\fR \fI/var/lib/rpm/Group\fR \fI/var/lib/rpm/Installtid\fR \fI/var/lib/rpm/Name\fR +\fI/var/lib/rpm/Obsoletename\fR \fI/var/lib/rpm/Packages\fR \fI/var/lib/rpm/Providename\fR -\fI/var/lib/rpm/Provideversion\fR -\fI/var/lib/rpm/Pubkeys\fR -\fI/var/lib/rpm/Removed\fR \fI/var/lib/rpm/Requirename\fR -\fI/var/lib/rpm/Requireversion\fR \fI/var/lib/rpm/Sha1header\fR \fI/var/lib/rpm/Sigmd5\fR \fI/var/lib/rpm/Triggername\fR @@ -949,6 +821,10 @@ Install the package containing \fBrpmbuild\fR (usually \fBrpm-build\fR) and see \fBpopt\fR(3), \fBrpm2cpio\fR(8), \fBrpmbuild\fR(8), +\fBrpmdb\fR(8), +\fBrpmkeys\fR(8), +\fBrpmsign\fR(8), +\fBrpmspec\fR(8), .fi \fBrpm --help\fR - as rpm supports customizing the options via popt aliases diff --git a/doc/rpmbuild.8 b/doc/rpmbuild.8 index 5432608..b45a926 100644 --- a/doc/rpmbuild.8 +++ b/doc/rpmbuild.8 @@ -32,7 +32,7 @@ rpmbuild \- Build RPM Package(s) [\fB--buildroot \fIDIRECTORY\fB\fR] [\fB--clean\fR] [\fB--nobuild\fR] - [\fB--rmsource\fR] [\fB--rmspec\fR] [\fB--short-circuit\fR] [\fB--sign\fR] + [\fB--rmsource\fR] [\fB--rmspec\fR] [\fB--short-circuit\fR] [\fB--target \fIPLATFORM\fB\fR] .SH "DESCRIPTION" @@ -175,13 +175,6 @@ and \fB-bb\fR. Useful for local testing only. Packages built this way will be marked with an unsatisfiable dependency to prevent their accidental use. .TP -\fB--sign\fR -Embed a GPG signature in the package. This signature can be used -to verify the integrity and the origin of the package. See the -section on GPG SIGNATURES in -\fBrpm\fR(8) -for configuration details. -.TP \fB--target \fIPLATFORM\fB\fR When building the package, interpret \fIPLATFORM\fR as \fBarch-vendor-os\fR and set the macros @@ -233,37 +226,19 @@ configuration file(s). \fI/etc/rpm/macros\fR \fI~/.rpmmacros\fR .fi -.SS "Database" -.PP -.nf -\fI/var/lib/rpm/Basenames\fR -\fI/var/lib/rpm/Conflictname\fR -\fI/var/lib/rpm/Dirnames\fR -\fI/var/lib/rpm/Filemd5s\fR -\fI/var/lib/rpm/Group\fR -\fI/var/lib/rpm/Installtid\fR -\fI/var/lib/rpm/Name\fR -\fI/var/lib/rpm/Packages\fR -\fI/var/lib/rpm/Providename\fR -\fI/var/lib/rpm/Provideversion\fR -\fI/var/lib/rpm/Pubkeys\fR -\fI/var/lib/rpm/Removed\fR -\fI/var/lib/rpm/Requirename\fR -\fI/var/lib/rpm/Requireversion\fR -\fI/var/lib/rpm/Sha1header\fR -\fI/var/lib/rpm/Sigmd5\fR -\fI/var/lib/rpm/Triggername\fR -.fi .SS "Temporary" .PP \fI/var/tmp/rpm*\fR .SH "SEE ALSO" .nf -\fBpopt\fR(3), -\fBrpm2cpio\fR(8), \fBgendiff\fR(1), +\fBpopt\fR(3), \fBrpm\fR(8), +\fBrpm2cpio\fR(8), +\fBrpmkeys\fR(8) +\fBrpmspec\fR(8), +\fBrpmsign\fR(8), .fi \fBrpmbuild --help\fR - as rpm supports customizing the options via popt diff --git a/doc/rpmdb.8 b/doc/rpmdb.8 index 06e1ceb..f1ee5dc 100644 --- a/doc/rpmdb.8 +++ b/doc/rpmdb.8 @@ -25,8 +25,6 @@ the installed package headers. \fBrpm\fR(8), \fBrpmkeys\fR(8), \fBrpmsign\fR(8), -\fBrpmquery\fR(8), -\fBrpmverify\fR(8), \fBrpm2cpio\fR(8), \fBrpmbuild\fR(8), \fBrpmspec\fR(8), diff --git a/doc/rpmkeys.8 b/doc/rpmkeys.8 index 3c218c9..5f26dc5 100644 --- a/doc/rpmkeys.8 +++ b/doc/rpmkeys.8 @@ -13,7 +13,7 @@ The general forms of rpm digital signature commands are \fBrpmkeys\fR \fB--import\fR \fB\fIPUBKEY\fB\fR\fI ...\fR -\fBrpmkeys\fR \fB--checksig\fR \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR +\fBrpmkeys\fR {\fB-K|--checksig\fR} \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR .\" These are not implemented yet... .\" \fBrpm\fR \fB--list-key[s]\fR \fB\fIKEY_ID\fB\fR\fI ...\fR @@ -55,8 +55,6 @@ packages. Here's how to remove the Red Hat GPG/DSA key \fBrpm\fR(8), \fBrpmdb\fR(8), \fBrpmsign\fR(8), -\fBrpmquery\fR(8), -\fBrpmverify\fR(8), \fBrpm2cpio\fR(8), \fBrpmbuild\fR(8), \fBrpmspec\fR(8), diff --git a/doc/rpmquery.8 b/doc/rpmquery.8 deleted file mode 100644 index 0e429eb..0000000 --- a/doc/rpmquery.8 +++ /dev/null @@ -1,274 +0,0 @@ -.TH "RPMQUERY" "8" "29 June 2010" "Red Hat, Inc" -.SH NAME -rpmquery \- RPM Query Tool -.SH SYNOPSIS - -\fBrpm\fR {\fB-q|--query\fR} [\fBselect-options\fR] [\fBquery-options\fR] - -.SS "select-options" -.PP - - [\fB\fIPACKAGE_NAME\fB\fR] [\fB-a,--all\fR] [\fB-f,--file \fIFILE\fB\fR] - [\fB-g,--group \fIGROUP\fB\fR] {\fB-p,--package \fIPACKAGE_FILE\fB\fR] - [\fB--hdrid \fISHA1\fB\fR] [\fB--pkgid \fIMD5\fB\fR] [\fB--tid \fITID\fB\fR] - [\fB--querybynumber \fIHDRNUM\fB\fR] [\fB--triggeredby \fIPACKAGE_NAME\fB\fR] - [\fB--whatprovides \fICAPABILITY\fB\fR] [\fB--whatrequires \fICAPABILITY\fB\fR] - -.SS "query-options" -.PP - - [\fB--changelog\fR] [\fB-c,--configfiles\fR] [\fB--conflicts\fR] - [\fB-d,--docfiles\fR] [\fB--dump\fR] [\fB--filesbypkg\fR] [\fB-i,--info\fR] - [\fB--last\fR] [\fB-l,--list\fR] [\fB--provides\fR] - [\fB--qf,--queryformat \fIQUERYFMT\fB\fR] [\fB-R,--requires\fR] - [\fB--scripts\fR] [\fB-s,--state\fR] [\fB--triggers,--triggerscripts\fR] - -.SS "QUERY OPTIONS" -.PP -The general form of an rpm query command is -.PP - -\fBrpm\fR {\fB-q|--query\fR} [\fBselect-options\fR] [\fBquery-options\fR] - -.PP -You may specify the format that package information should be -printed in. To do this, you use the - - \fB--qf|--queryformat\fR \fB\fIQUERYFMT\fB\fR - -option, followed by the \fIQUERYFMT\fR -format string. Query formats are modified versions of the -standard \fBprintf(3)\fR formatting. The format -is made up of static strings (which may include standard C -character escapes for newlines, tabs, and other special -characters) and \fBprintf(3)\fR type formatters. -As \fBrpm\fR already knows the type to print, the -type specifier must be omitted however, and replaced by the name -of the header tag to be printed, enclosed by \fB{}\fR -characters. Tag names are case insensitive, and the leading -\fBRPMTAG_\fR portion of the tag name may be omitted -as well. -.PP -Alternate output formats may be requested by following -the tag with \fB:\fItypetag\fB\fR. -Currently, the following types are supported: -.TP -\fB:armor\fR -Wrap a public key in ASCII armor. -.TP -\fB:arraysize\fR -Display number of elements in array tags. -.TP -\fB:base64\fR -Encode binary data using base64. -.TP -\fB:date\fR -Use strftime(3) "%c" format. -.TP -\fB:day\fR -Use strftime(3) "%a %b %d %Y" format. -.TP -\fB:depflags\fR -Format dependency comparison operator. -.TP -\fB:deptype\fR -Format dependency type. -.TP -\fB:expand\fR -Perform macro expansion. -.TP -\fB:fflags\fR -Format file flags. -.TP -\fB:fstate\fR -Format file state. -.TP -\fB:fstatus\fR -Format file verify status. -.TP -\fB:hex\fR -Format in hexadecimal. -.TP -\fB:octal\fR -Format in octal. -.TP -\fB:perms\fR -Format file permissions. -.TP -\fB:pgpsig\fR -Display signature fingerprint and time. -.TP -\fB:shescape\fR -Escape single quotes for use in a script. -.TP -\fB:triggertype\fR -Display trigger suffix. -.TP -\fB:vflags\fR -File verification flags. -.TP -\fB:xml\fR -Wrap data in simple xml markup. -.PP -For example, to print only the names of the packages queried, -you could use \fB%{NAME}\fR as the format string. -To print the packages name and distribution information in -two columns, you could use \fB%-30{NAME}%{DISTRIBUTION}\fR. -\fBrpm\fR will print a list of all of the tags it knows about when it -is invoked with the \fB--querytags\fR argument. -.PP -There are two subsets of options for querying: package selection, -and information selection. -.SS "PACKAGE SELECTION OPTIONS:" -.PP -.TP -\fB\fIPACKAGE_NAME\fB\fR -Query installed package named \fIPACKAGE_NAME\fR. -.TP -\fB-a, --all\fR -Query all installed packages. -.TP -\fB-f, --file \fIFILE\fB\fR -Query package owning \fIFILE\fR. -.TP -\fB-g, --group \fIGROUP\fB\fR -Query packages with the group of \fIGROUP\fR. -.TP -\fB--hdrid \fISHA1\fB\fR -Query package that contains a given header identifier, i.e. the -\fISHA1\fR digest of the immutable header region. -.TP -\fB-p, --package \fIPACKAGE_FILE\fB\fR -Query an (uninstalled) package \fIPACKAGE_FILE\fR. -The \fIPACKAGE_FILE\fR may be specified -as an \fBftp\fR or \fBhttp\fR style URL, in -which case the package header will be downloaded and queried. -See \fBFTP/HTTP OPTIONS\fR for information on -\fBrpm\fR's internal -\fBftp\fR and -\fBhttp\fR -client support. The \fIPACKAGE_FILE\fR argument(s), -if not a binary package, will be interpreted as an ASCII package -manifest unless \fB--nomanifest\fR option is used. -In manifests, comments are permitted, starting with a '#', and each -line of a package manifest file may include white space separated -glob expressions, including URL's, -that will be expanded to paths that are substituted in place of -the package manifest as additional \fIPACKAGE_FILE\fR -arguments to the query. -.TP -\fB--pkgid \fIMD5\fB\fR -Query package that contains a given package identifier, i.e. the -\fIMD5\fR digest of the combined header and -payload contents. -.TP -\fB--querybynumber \fIHDRNUM\fB\fR -Query the \fIHDRNUM\fRth database entry -directly; this is useful only for debugging. -.TP -\fB--tid \fITID\fB\fR -Query package(s) that have a given \fITID\fR -transaction identifier. A unix time stamp is currently used as a -transaction identifier. All package(s) installed or erased within -a single transaction have a common identifier. -.TP -\fB--triggeredby \fIPACKAGE_NAME\fB\fR -Query packages that are triggered by package(s) -\fIPACKAGE_NAME\fR. -.TP -\fB--whatprovides \fICAPABILITY\fB\fR -Query all packages that provide the \fICAPABILITY\fR capability. -.TP -\fB--whatrequires \fICAPABILITY\fB\fR -Query all packages that require \fICAPABILITY\fR for proper functioning. -.SS "PACKAGE QUERY OPTIONS:" -.PP -.TP -\fB--changelog\fR -Display change information for the package. -.TP -\fB-c, --configfiles\fR -List only configuration files (implies \fB-l\fR). -.TP -\fB--conflicts\fR -List capabilities this package conflicts with. -.TP -\fB-d, --docfiles\fR -List only documentation files (implies \fB-l\fR). -.TP -\fB--dump\fR -Dump file information as follows (implies \fB-l\fR): -.sp -.RS - -.nf -path size mtime filedigest mode owner group isconfig isdoc rdev symlink - -.fi -.RE -.TP -\fB--filesbypkg\fR -List all the files in each selected package. -.TP -\fB-i, --info\fR -Display package information, including name, version, and description. -This uses the \fB--queryformat\fR if one was specified. -.TP -\fB--last\fR -Orders the package listing by install time such that the latest -packages are at the top. -.TP -\fB-l, --list\fR -List files in package. -.TP -\fB--provides\fR -List capabilities this package provides. -.TP -\fB-R, --requires\fR -List capabilities on which this package depends. -.TP -\fB--scripts\fR -List the package specific scriptlet(s) that are used as part -of the installation and uninstallation processes. -.TP -\fB-s, --state\fR -Display the \fIstates\fR of files in the package -(implies \fB-l\fR). The state of each file is one of -\fInormal\fR, -\fInot installed\fR, or -\fIreplaced\fR. -.TP -\fB--triggers, --triggerscripts\fR -Display the trigger scripts, if any, which are contained in -the package. - -.SH "SEE ALSO" - -.nf -\fBpopt\fR(3), -\fBrpm\fR(8), -\fBrpmdb\fR(8), -\fBrpmkeys\fR(8), -\fBrpmsign\fR(8), -\fBrpmquery\fR(8), -\fBrpmverify\fR(8), -\fBrpm2cpio\fR(8), -\fBrpmbuild\fR(8), -\fBrpmspec\fR(8), -.fi - -\fBrpmquery --help\fR - as rpm supports customizing the options via popt aliases -it's impossible to guarantee that what's described in the manual matches -what's available. - - -\fBhttp://www.rpm.org/ -\fR -.SH "AUTHORS" - -.nf -Marc Ewing -Jeff Johnson -Erik Troan -Panu Matilainen -.fi diff --git a/doc/rpmsign.8 b/doc/rpmsign.8 index fada0f2..53f2d70 100644 --- a/doc/rpmsign.8 +++ b/doc/rpmsign.8 @@ -59,8 +59,6 @@ for per-user configuration. Typically it's sufficient to set just %_gpg_name. \fBrpm\fR(8), \fBrpmdb\fR(8), \fBrpmkeys\fR(8), -\fBrpmquery\fR(8), -\fBrpmverify\fR(8), \fBrpm2cpio\fR(8), \fBrpmbuild\fR(8), \fBrpmspec\fR(8), diff --git a/doc/rpmspec.8 b/doc/rpmspec.8 index 237ec55..a391237 100644 --- a/doc/rpmspec.8 +++ b/doc/rpmspec.8 @@ -33,9 +33,16 @@ printed in. To do this, you use the \fB--qf|--queryformat\fR \fB\fIQUERYFMT\fB\fR option, followed by the \fIQUERYFMT\fR format string. -See \fBrpmquery(8)\fR for details. +See \fBrpm(8)\fR for details. .PP +.SS "SELECT OPTIONS" +.PP + \fB--rpms\fR +Operate on the binary package header(s). + \fB--srpm\fR +Operate on the source package header(s). + .SH "SEE ALSO" .nf \fBpopt\fR(3), @@ -43,8 +50,6 @@ See \fBrpmquery(8)\fR for details. \fBrpmdb\fR(8), \fBrpmkeys\fR(8), \fBrpmsign\fR(8), -\fBrpmquery\fR(8), -\fBrpmverify\fR(8), \fBrpm2cpio\fR(8), \fBrpmbuild\fR(8), .fi diff --git a/doc/rpmverify.8 b/doc/rpmverify.8 deleted file mode 100644 index f8eb9ac..0000000 --- a/doc/rpmverify.8 +++ /dev/null @@ -1,142 +0,0 @@ -.TH "RPMVERIFY" "8" "29 Octover 2010" "Red Hat, Inc" -.SH NAME -rpmverify \- RPM Verification Tool -.SH SYNOPSIS -.SS "VERIFYING PACKAGES:" -.PP - -\fBrpm\fR {\fB-V|--verify\fR} [\fBselect-options\fR] [\fBverify-options\fR] - -.SS "select-options" -.PP - - - [\fB\fIPACKAGE_NAME\fB\fR] [\fB-a,--all\fR] [\fB-f,--file \fIFILE\fB\fR] - [\fB-g,--group \fIGROUP\fB\fR] {\fB-p,--package \fIPACKAGE_FILE\fB\fR] - [\fB--hdrid \fISHA1\fB\fR] [\fB--pkgid \fIMD5\fB\fR] [\fB--tid \fITID\fB\fR] - [\fB--querybynumber \fIHDRNUM\fB\fR] [\fB--triggeredby \fIPACKAGE_NAME\fB\fR] - [\fB--whatprovides \fICAPABILITY\fB\fR] [\fB--whatrequires \fICAPABILITY\fB\fR] - -.SS "verify-options" -.PP - - - [\fB--nodeps\fR] [\fB--nofiles\fR] [\fB--noscripts\fR] - [\fB--nodigest\fR] [\fB--nosignature\fR] - [\fB--nolinkto\fR] [\fB--nofiledigest\fR] [\fB--nosize\fR] [\fB--nouser\fR] - [\fB--nogroup\fR] [\fB--nomtime\fR] [\fB--nomode\fR] [\fB--nordev\fR] - [\fB--nocaps\fR] - -.SH "DESCRIPTION" - -.PP -Verifying a package compares information about the installed files in -the package with information about the files taken from the package -metadata stored in the rpm database. Among other things, verifying -compares the size, MD5 sum, permissions, type, owner and group of -each file. Any discrepancies are displayed. -Files that were not installed from the package, for example, -documentation files excluded on installation using the -"\fB--excludedocs\fR" option, -will be silently ignored. -.PP -The package selection options are the same as for package -querying (including package manifest files as arguments). -Other options unique to verify mode are: -.TP -\fB--nodeps\fR -Don't verify dependencies of packages. -.TP -\fB--nodigest\fR -Don't verify package or header digests when reading. -.TP -\fB--nofiles\fR -Don't verify any attributes of package files. -.TP -\fB--noscripts\fR -Don't execute the \fB%verifyscript\fR scriptlet (if any). -.TP -\fB--nosignature\fR -Don't verify package or header signatures when reading. -.TP -\fB--nolinkto\fR -.TP -\fB--nofiledigest\fR (formerly \fB--nomd5\fR) -.TP -\fB--nosize\fR -.TP -\fB--nouser\fR -.TP -\fB--nogroup\fR -.TP -\fB--nomtime\fR -.TP -\fB--nomode\fR -.TP -\fB--nordev\fR -Don't verify the corresponding file attribute. -.PP -The format of the output is a string of 8 characters, a possible -attribute marker: - -.nf -\fBc\fR \fB%config\fR configuration file. -\fBd\fR \fB%doc\fR documentation file. -\fBg\fR \fB%ghost\fR file (i.e. the file contents are not included in the package payload). -\fBl\fR \fB%license\fR license file. -\fBr\fR \fB%readme\fR readme file. -.fi - -from the package header, followed by the file name. -Each of the 8 characters denotes the result of a comparison of -attribute(s) of the file to the value of those attribute(s) recorded -in the database. A single -"\fB.\fR" (period) -means the test passed, while a single -"\fB?\fR" (question mark) -indicates the test could not be performed (e.g. file permissions -prevent reading). Otherwise, the (mnemonically -em\fBB\fRoldened) character denotes failure of -the corresponding \fB--verify\fR test: - -.nf -\fBS\fR file \fBS\fRize differs -\fBM\fR \fBM\fRode differs (includes permissions and file type) -\fB5\fR MD\fB5\fR sum differs -\fBD\fR \fBD\fRevice major/minor number mismatch -\fBL\fR read\fBL\fRink(2) path mismatch -\fBU\fR \fBU\fRser ownership differs -\fBG\fR \fBG\fRroup ownership differs -\fBT\fR m\fBT\fRime differs -\fBP\fR ca\fBP\fRabilities differ -.fi - -.SH "SEE ALSO" - -.nf -\fBpopt\fR(3), -\fBrpm\fR(8), -\fBrpmdb\fR(8), -\fBrpmkeys\fR(8), -\fBrpmsign\fR(8), -\fBrpmquery\fR(8), -\fBrpm2cpio\fR(8), -\fBrpmbuild\fR(8), -\fBrpmspec\fR(8), -.fi - -\fBrpmverify --help\fR - as rpm supports customizing the options via popt aliases -it's impossible to guarantee that what's described in the manual matches -what's available. - - -\fBhttp://www.rpm.org/ -\fR -.SH "AUTHORS" - -.nf -Marc Ewing -Jeff Johnson -Erik Troan -Panu Matilainen -.fi -- 2.7.4