diff options
-rw-r--r-- | AUTHORS | 51 | ||||
-rw-r--r-- | Documentation/00-about-docs.txt | 7 | ||||
-rw-r--r-- | Documentation/TODO (renamed from TODO) | 0 | ||||
-rw-r--r-- | Documentation/blkid.txt (renamed from libblkid/README.blkid) | 0 | ||||
-rw-r--r-- | Documentation/cal.txt (renamed from misc-utils/README.cal) | 0 | ||||
-rw-r--r-- | Documentation/cfdisk.txt (renamed from fdisk/README.cfdisk) | 10 | ||||
-rw-r--r-- | Documentation/col.txt (renamed from text-utils/README.col) | 7 | ||||
-rw-r--r-- | Documentation/ddate.txt (renamed from misc-utils/README.ddate) | 0 | ||||
-rw-r--r-- | Documentation/deprecated.txt (renamed from DEPRECATED) | 0 | ||||
-rw-r--r-- | Documentation/example.files/filesystems (renamed from example.files/filesystems) | 0 | ||||
-rw-r--r-- | Documentation/example.files/fstab (renamed from example.files/fstab) | 0 | ||||
-rw-r--r-- | Documentation/example.files/motd (renamed from example.files/motd) | 0 | ||||
-rw-r--r-- | Documentation/example.files/securetty (renamed from example.files/securetty) | 0 | ||||
-rw-r--r-- | Documentation/example.files/shells (renamed from example.files/shells) | 0 | ||||
-rw-r--r-- | Documentation/example.files/udev-raw.rules (renamed from example.files/udev-raw.rules) | 0 | ||||
-rw-r--r-- | Documentation/fdisk.txt (renamed from fdisk/README.fdisk) | 16 | ||||
-rw-r--r-- | Documentation/getopt.txt | 31 | ||||
-rw-r--r-- | Documentation/getopt_changelog.txt (renamed from getopt/Changelog) | 0 | ||||
-rw-r--r-- | Documentation/howto-compilation.txt | 64 | ||||
-rw-r--r-- | Documentation/howto-contribute.txt | 100 | ||||
-rw-r--r-- | Documentation/howto-debug.txt | 71 | ||||
-rw-r--r-- | Documentation/howto-man-page.txt | 161 | ||||
-rw-r--r-- | Documentation/howto-tests.txt (renamed from tests/README) | 0 | ||||
-rw-r--r-- | Documentation/howto-usage-function.txt | 147 | ||||
-rw-r--r-- | Documentation/hwclock.txt | 3 | ||||
-rw-r--r-- | Documentation/licenses/COPYING.BSD-3 (renamed from libuuid/COPYING.libuuid) | 0 | ||||
-rw-r--r-- | Documentation/licenses/COPYING.GPLv2 (renamed from getopt/COPYING) | 0 | ||||
-rw-r--r-- | Documentation/licenses/COPYING.GPLv2.1 (renamed from libblkid/COPYING.libblkid) | 0 | ||||
-rw-r--r-- | Documentation/licenses/COPYING.UCB (renamed from licenses/COPYING.UCB) | 0 | ||||
-rw-r--r-- | Documentation/licenses/COPYING.getopt | 5 | ||||
-rw-r--r-- | Documentation/modems-with-agetty.txt (renamed from term-utils/README.modems-with-agetty) | 0 | ||||
-rw-r--r-- | Documentation/mount.txt (renamed from mount/README.mount) | 0 | ||||
-rw-r--r-- | Documentation/pg.txt (renamed from text-utils/README.pg) | 10 | ||||
-rw-r--r-- | Documentation/poeigl.txt (renamed from login-utils/README.poeigl) | 80 | ||||
-rw-r--r-- | Documentation/release-schedule.txt | 39 | ||||
-rw-r--r-- | Documentation/releases/v2.13-ReleaseNotes (renamed from docs/v2.13-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/releases/v2.14-ReleaseNotes (renamed from docs/v2.14-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/releases/v2.15-ReleaseNotes (renamed from docs/v2.15-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/releases/v2.16-ReleaseNotes (renamed from docs/v2.16-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/releases/v2.17-ReleaseNotes (renamed from docs/v2.17-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/releases/v2.18-ReleaseNotes (renamed from docs/v2.18-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/releases/v2.19-ReleaseNotes (renamed from docs/v2.19-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/releases/v2.20-ReleaseNotes (renamed from docs/v2.20-ReleaseNotes) | 0 | ||||
-rw-r--r-- | Documentation/sfdisk.txt (renamed from fdisk/sfdisk.examples) | 0 | ||||
-rw-r--r-- | Documentation/source-code-management.txt | 29 | ||||
-rw-r--r-- | Makefile.am | 7 | ||||
-rw-r--r-- | NEWS | 52 | ||||
-rw-r--r-- | README | 49 | ||||
-rw-r--r-- | README.devel | 121 | ||||
-rw-r--r-- | fdisk/Makefile.am | 2 | ||||
-rw-r--r-- | getopt/Makefile.am | 3 | ||||
-rw-r--r-- | getopt/README | 81 | ||||
-rw-r--r-- | hwclock/Makefile.am | 2 | ||||
-rw-r--r-- | hwclock/README.hwclock | 17 | ||||
-rw-r--r-- | hwclock/hwclock.8 | 14 | ||||
-rw-r--r-- | include/c.h | 13 | ||||
-rw-r--r-- | libblkid/COPYING | 8 | ||||
-rw-r--r-- | libblkid/Makefile.am | 2 | ||||
-rw-r--r-- | libmount/COPYING | 8 | ||||
-rw-r--r-- | libmount/COPYING.libmount | 508 | ||||
-rw-r--r-- | libmount/Makefile.am | 2 | ||||
-rw-r--r-- | libuuid/COPYING | 5 | ||||
-rw-r--r-- | libuuid/Makefile.am | 2 | ||||
-rw-r--r-- | licenses/COPYING.GPL | 339 | ||||
-rw-r--r-- | login-utils/Makefile.am | 2 | ||||
-rw-r--r-- | misc-utils/Makefile.am | 2 | ||||
-rw-r--r-- | mount/Makefile.am | 2 | ||||
-rw-r--r-- | sys-utils/arch.c | 62 | ||||
-rw-r--r-- | term-utils/Makefile.am | 4 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | text-utils/LICENSE.pg | 28 | ||||
-rw-r--r-- | text-utils/Makefile.am | 4 | ||||
-rw-r--r-- | text-utils/README.clear | 7 |
73 files changed, 847 insertions, 1331 deletions
@@ -53,11 +53,13 @@ CONTRIBUTORS: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Alain Guibert <alguibert+ulng@free.fr> Alan Curry <pacman@TheWorld.com> + Alan Wendt <alan@ezlink.com> Alexander Shishkin <virtuoso@slind.org> Alexandre Peixoto Ferreira <alexandref75@gmail.com> Alexey Gladkov <gladkov.alexey@gmail.com> Alexey Gladkov <legion@altlinux.ru> Alon Bar-Lev <alon.barlev@gmail.com> + Alvaro M. Echevarria Américo Wang <xiyou.wangcong@gmail.com> Andrea Galbusera <gizero@gmail.com> Andreas Dilger <adilger@sun.com> @@ -65,6 +67,7 @@ CONTRIBUTORS: Andrew McGill <list2008@lunch.za.net> Andrew Nayenko <resver@gmail.com> Andrzej Krzysztofowicz <ankry@mif.pg.gda.pl> + Anthony Rumble <arumble@extro.ucc.su.OZ.AU> Anton V. Boyarshinov <boyarsh@altlinux.org> Arif E. Nugroho <arif_endro@yahoo.com> Arkadiusz Miskiewicz <arekm@maven.pl> @@ -77,12 +80,16 @@ CONTRIBUTORS: Bernardo Innocenti <bernie@codewiz.org> Bernhard Voelker <mail@bernhard-voelker.de> Bernhard Walle <bwalle@suse.de> + Bill Reynolds <bill@goshawk.lanl.gov> + Bob Proulx <rwp@hprwp.fc.hp.com> Bryn M. Reeves <bmr@errorists.org> Cai Qian <qcai@redhat.com> Chow Loong Jin <hyperair@ubuntu.com> Chris Frost <chris@frostnet.net> + Christian von Roques <roques@juliet.ka.sub.org> Christophe Blaess <Christophe@Blaess.fr> Christoph Hellwig <hch@infradead.org> + Christoph Lameter <clameter@miriam.fuller.edu> Chris Webb <chris@arachsys.com> Claus Hindsgaul <claus_h@image.dk> Cliff Wickman <cpw@sgi.com> @@ -94,8 +101,11 @@ CONTRIBUTORS: Daniel Drake <dsd@laptop.org> Daniel Mierswa <impulze@impulze.org> Daniel Nylander <po@danielnylander.se> + Daniel Quinlan <quinlan@yggdrasil.com> + Daniel Thumim <dthumim@mit.edu> Dave Reisner <d@falconindy.com> David Brownell <david-b@pacbell.net> + David Holland <dholland@hcs.harvard.edu> Davidlohr Bueso <dave@gnu.org> David Miller <davem@davemloft.net> David Prévot <david@tilapin.org> @@ -105,7 +115,12 @@ CONTRIBUTORS: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com> Dima Kogan <dkogan@cds.caltech.edu> Dmitry V. Levin <ldv@altlinux.org> + Douglas E. Quale + Doug Quale <quale@saavik.cs.wisc.edu> + Ed Carp + Eric Rasmussen <ear@usfirst.org> Eric Sandeen <sandeen@redhat.com> + Erik Troan Fabian Groffen <grobian@gentoo.org> Flávio Leitner <fleitner@redhat.com> Florentin Duneau <fduneau@gmail.com> @@ -118,20 +133,26 @@ CONTRIBUTORS: Gabor Kelemen <kelemeng@gnome.hu> Gabriel Barazer <gabriel@oxeva.fr> Gabriel Burt <gburt@novell.com> + Gabriel M. Schuyler <schuyler@easiest.com> + Gerhard Schneider <gs@ilfb.tuwien.ac.at> Gerrit Renker <gerrit@erg.abdn.ac.uk> Giulio Orsero <giulioo@gmail.com> Guan Xin <guanx.bac@gmail.com> Guillem Jover <guillem@hadrons.org> + Gunnar Ritter <g-r@bigfoot.de> Hajime Taira <htaira@redhat.com> Hamish Coleman <hamish@zot.org> Hayden James <hayden.james@gmail.com> Heiko Carstens <heiko.carstens@de.ibm.com> Hendrik Lönngren <wikibugs@googlemail.com> Henne Vogelsang <hvogel@opensuse.org> + H.J. Lu <hlu@eecs.wsu.edu> H. Peter Anvin <hpa@zytor.com> Hugh Dickins <hughd@google.com> + Humberto Zuazaga Igor Bazhitov <igor.bazhitov@gmail.com> Imre Kaloz <kaloz@openwrt.org> + Jaakko Hyvätti <HYVATTI@cc.helsinki.fi> Jakob Unterwurzacher <jakobunt@gmail.com> Jakub Bogusz <qboosh@pld-linux.org> James Youngman <jay@gnu.org> @@ -142,7 +163,9 @@ CONTRIBUTORS: Jason Vas Dias <jvdias@redhat.com> Jeff Mahoney <jeffm@suse.com> Jens Kristian Søgaard <jens@mermaidconsulting.dk> + Jeremy Fitzhardinge <jeremy@suite.sw.oz.au> Jeroen Oortwijn <oortwijn@gmail.com> + Jesse Thilo <jesse.thilo@pobox.com> Jim Meyering <jim@meyering.net> Jim Meyering <meyering@redhat.com> Jindrich Makovicka <makovick@gmail.com> @@ -150,21 +173,26 @@ CONTRIBUTORS: Joe Hansen <joedalton2@yahoo.dk> John Keeping <john.keeping@lineone.net> John Lindgren <john.lindgren@tds.net> + John Paul Morrison <jmorriso@rflab.ee.ubc.ca> Jon Grant <jg@jguk.org> Jon Ringle <jon@ringle.org> Josep Puigdemont <josep.puigdemont@gmail.com> Josiah Worcester <josiahw@gmail.com> + Juha Laiho <jlaiho@ichaos.nullnet.fi> + Jun Hamano <junio@shadow.twinsun.com> Justin B Rye <jbr@edlug.org.uk> KaiGai Kohei <kaigai@kaigai.gr.jp> Kalev Soikonen <ksop@hot.ee> Kay Sievers <kay.sievers@vrfy.org> Kees Cook <kees.cook@canonical.com> Ken Kopin <kenkopin@gmail.com> + Kevin E. Martin <martin@cs.unc.edu> kevin.granade@gmail.com <kevin.granade@gmail.com> Kirill Elagin <kirelagin@gmail.com> Kunihiko IMAI <kimai@iodata.jp> LaMont Jones <lamont@debian.org> LaMont Jones <lamont@mmjgroup.com> + Lars Wirzenius Lauri Nurmi <lanurmi@iki.fi> Lawrence Rust <lawrence@softsystem.co.uk> Linus Torvalds <torvalds@linux-foundation.org> @@ -177,6 +205,7 @@ CONTRIBUTORS: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> Marco Colombo <m.colombo@ed.ac.uk> Marco d'Itri <md@Linux.IT> + Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl> Marek Otahal <markotahal@gmail.com> Marek Polacek <mmpolacek@gmail.com> Mark McLoughlin <markmc@redhat.com> @@ -193,6 +222,7 @@ CONTRIBUTORS: Maxim Levitsky <maximlevitsky@gmail.com> Maxim V. Dziumanenko <mvd@mylinux.com.ua> Meelis Roos <mroos@linux.ee> + Michael Glad <glad@daimi.aau.dk> Michael Piefel <piefel@informatik.hu-berlin.de> Michel Robitaille <robitail@IRO.UMontreal.CA> Mike Frysinger <vapier@gentoo.org> @@ -204,9 +234,12 @@ CONTRIBUTORS: Miklos Szeredi <mszeredi@suse.cz> Milan Bouchet-Valat <nalimilan@club.fr> Milan Broz <mbroz@redhat.com> + Miquel van Smoorenburg <miquels@maestro.htsa.aha.nl> + Mitchum DSouza Moritz Muehlenhoff <jmm@inutil.org> M.S.Colclough <m.s.colclough@bham.ac.uk> Nick Holloway <Nick.Holloway@pyrites.org.uk> + Nicolai Langfeldt <janl@math.uio.no> Nicolas Provost <nprovost@quadriv.com> Nilgün Belma Bugüner <nilgun@buguner.name.tr> Norbert Buchmuller <norbi@nix.hu> @@ -224,6 +257,8 @@ CONTRIBUTORS: Peter Breitenlohner <peb@mppmu.mpg.de> Peter De Wachter <pdewacht@gmail.com> Peter Jones <pjones@redhat.com> + Peter Orbaek <poe@daimi.aau.dk> + Peter Tobias <tobias@server.et-inf.fho-emden.de> Peter Tyser <ptyser@xes-inc.com> Peter Volkov <pva@gentoo.org> Petr PÃsaÅ™ <petr.pisar@atlas.cz> @@ -232,22 +267,30 @@ CONTRIBUTORS: Philipp Thomas <pth@suse.de> Phillip Susi <psusi@cfl.rr.com> Pierre Hauweele <antegallya@gmail.com> + Pietro Castelli Po-Yu Chuang <ratbert@faraday-tech.com> Rajeev V. Pillai <rajeevvp@gmail.com> Ram Pai <linuxram@us.ibm.com> + Randolph Bentson <bentson@grieg.seaslug.org> Randy Dunlap <randy.dunlap@oracle.com> Ray Wang <wanglei1123@gmail.com> Richard W.M. Jones <rjones@redhat.com> + Rickard Faith <faith@cs.unc.edu> + Rick Sladkey <jrs@world.std.com> Robert Förster <Dessa@gmake.de> Robert Millan <rmh@aybabtu.com> Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br> + Ron Sommeling <sommel@sci.kun.nl> + Ross Biro <biro@yggdrasil.com> Roy Peled <the.roy.peled@gmail.com> Sami Kerola <kerolasa@iki.fi> Samuel Thibault <samuel.thibault@ens-lyon.org> Sam Varshavchik <mrsam@courier-mta.com> + Sander van Malssen <svm@kozmix.ow.nl> Santiago Vila Doncel <sanvila@unex.es> Sascha Sommer <ssommer@suse.de> Scott James Remnant <scott@ubuntu.com> + Scott Telford <st@epcc.ed.ac.uk> Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Sergey Gusarov <laborer2008@gmail.com> Shachar Shemesh <shachar@debian.org> @@ -255,8 +298,12 @@ CONTRIBUTORS: Stefan Krah <stefan@bytereef.org> Stepan Kasal <skasal@redhat.com> Stephan Maka <stephan@spaceboyz.net> + Stephen Gallimore Stephen Hemminger <shemminger@vyatta.com> + Stephen Tweedie <sct@dcs.ed.ac.uk> Steve Grubb <sgrubb@redhat.com> + Steven S. Dick <ssd@nevets.oau.org> + Steve Philp Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Sven Eckelmann <sven.eckelmann@gmx.de> Sven Jost <sven.jost@googlemail.com> @@ -268,15 +315,19 @@ CONTRIBUTORS: Timo Juhani Lindfors <timo.lindfors@iki.fi> Timo Warns <Warns@Pre-Sense.DE> Tobias Klauser <tklauser@distanz.ch> + Tommy Thorn Tom Prince <tom.prince@ualberta.net> Valerie Aurora <vaurora@redhat.com> Ville Skyttä <ville.skytta@iki.fi> Vincent Deffontaines <vincent@gryzor.com> Vladimir Brednikov <vbrednikov@gmail.com> + Volker Kuhlmann <v.kuhlmann@elec.canterbury.ac.nz> Volker Schatz <oss@volkerschatz.com> Wei-Lun Chao <chaoweilun@gmail.com> + Werner Almesberger <almesber@bernina.ethz.ch> Werner Fink <werner@suse.de> WUEBBELS, Josef <Josef.WUEBBELS@mtu.de> + W.Z. Venema Yann Droneaud <yann@droneaud.fr> Yoshihiro Takahashi <ytakahashi@miraclelinux.com> Yu Zhiguo <yuzg@cn.fujitsu.com> diff --git a/Documentation/00-about-docs.txt b/Documentation/00-about-docs.txt new file mode 100644 index 000000000..650e420ef --- /dev/null +++ b/Documentation/00-about-docs.txt @@ -0,0 +1,7 @@ +What is here +------------ + +The util-linux contains suplementary textual material, such as +readme files, release notes, licenses and so on. Common to these +files is that they contain information for contributors but +should not end up to end user installation. diff --git a/TODO b/Documentation/TODO index cab1ff786..cab1ff786 100644 --- a/TODO +++ b/Documentation/TODO diff --git a/libblkid/README.blkid b/Documentation/blkid.txt index 4fa9be1f7..4fa9be1f7 100644 --- a/libblkid/README.blkid +++ b/Documentation/blkid.txt diff --git a/misc-utils/README.cal b/Documentation/cal.txt index 638ac9dff..638ac9dff 100644 --- a/misc-utils/README.cal +++ b/Documentation/cal.txt diff --git a/fdisk/README.cfdisk b/Documentation/cfdisk.txt index 5241ad136..cb8d86526 100644 --- a/fdisk/README.cfdisk +++ b/Documentation/cfdisk.txt @@ -12,16 +12,6 @@ installation process easier. If you write a bad partition table to disk, it may destroy data and partitions. - -You can FTP cfdisk from ftp.cs.unc.edu in the /pub/martin/linux -directory. - -I would also like comments (good and bad) on the user interface, logic -and ease of use. If you have any suggestions for improvements, I -would be happy to hear them. - -My e-mail address is martin@cs.unc.edu. - ------------------------------------------------------------------- Copyright (C) 1994 Kevin E. Martin (martin@cs.unc.edu) diff --git a/text-utils/README.col b/Documentation/col.txt index 2a7dd6ca4..1098b44c5 100644 --- a/text-utils/README.col +++ b/Documentation/col.txt @@ -2,13 +2,6 @@ col - filter out reverse line feeds. -Options are: - -b do not print any backspaces (last character written is printed) - -f allow half line feeds in output, by default characters between - lines are pushed to the line below - -x do not compress spaces into tabs. - -l num keep (at least) num lines in memory, 128 are kept by default - In the 32V source code to col(1) the default behavior was to NOT compress spaces into tabs. There was a -h option which caused it to compress spaces into tabs. There was no -x flag. diff --git a/misc-utils/README.ddate b/Documentation/ddate.txt index 87d0fb8bb..87d0fb8bb 100644 --- a/misc-utils/README.ddate +++ b/Documentation/ddate.txt diff --git a/DEPRECATED b/Documentation/deprecated.txt index 7c6b0d326..7c6b0d326 100644 --- a/DEPRECATED +++ b/Documentation/deprecated.txt diff --git a/example.files/filesystems b/Documentation/example.files/filesystems index cd56ee724..cd56ee724 100644 --- a/example.files/filesystems +++ b/Documentation/example.files/filesystems diff --git a/example.files/fstab b/Documentation/example.files/fstab index 8cffa6460..8cffa6460 100644 --- a/example.files/fstab +++ b/Documentation/example.files/fstab diff --git a/example.files/motd b/Documentation/example.files/motd index 842a6f3bc..842a6f3bc 100644 --- a/example.files/motd +++ b/Documentation/example.files/motd diff --git a/example.files/securetty b/Documentation/example.files/securetty index d874765d2..d874765d2 100644 --- a/example.files/securetty +++ b/Documentation/example.files/securetty diff --git a/example.files/shells b/Documentation/example.files/shells index 14b99f1aa..14b99f1aa 100644 --- a/example.files/shells +++ b/Documentation/example.files/shells diff --git a/example.files/udev-raw.rules b/Documentation/example.files/udev-raw.rules index 3f0e8cb70..3f0e8cb70 100644 --- a/example.files/udev-raw.rules +++ b/Documentation/example.files/udev-raw.rules diff --git a/fdisk/README.fdisk b/Documentation/fdisk.txt index 69cfff67c..3ea4d44d3 100644 --- a/fdisk/README.fdisk +++ b/Documentation/fdisk.txt @@ -143,13 +143,13 @@ You can have up to 64 partitions on a single IDE disk, or up to 16 partitions on a single SCSI disk, at least as far as Linux is concerned; in practice you will rarely want so many. The maximum size of a Linux file system on a single partition depends on the type of -file system you use. Minix file systems are limited to 64 megabytes. -You may have all of your Linux files in a single partition, or you may -have two, three, or more Linux file systems. Similarly you may have -one or more DOS partitions. If you have several small partitions, you -run much less risk of losing all your files if your disk gets -corrupted. On the other hand, you may run out of space on a small -partition more easily. +file system you use. Minix file systems (version 1) are limited to 64 +megabytes. You may have all of your Linux files in a single partition, +or you may have two, three, or more Linux file systems. Similarly you +may have one or more DOS partitions. If you have several small +partitions, you run much less risk of losing all your files if your +disk gets corrupted. On the other hand, you may run out of space on a +small partition more easily. Under DOS, you must refer to each partition by a separate drive letter, but all partitions are automatically accessible. Under Linux @@ -171,8 +171,6 @@ space in a file, but you need a partition big enough to hold it, and this will probably be less efficient than having a partition devoted to swap. -The disk space you need for Linux is discussed in README.prepare. - Are you going to boot Linux from the hard disk, or will you boot from a floppy? Some boot programs place severe restrictions on where the boot partition can be. LILO is more relaxed about this, but does diff --git a/Documentation/getopt.txt b/Documentation/getopt.txt new file mode 100644 index 000000000..8258e886d --- /dev/null +++ b/Documentation/getopt.txt @@ -0,0 +1,31 @@ +This package contains a reimplementation of getopt(1). + +PREFACE + +Getopt(1) is a program to help shell scripts parse command-line parameters. + +HIGHLIGHTS + +It can do anything that the GNU getopt(3) routines can do. + +It can cope with spaces and shell metacharacters within arguments. + +It can parse long parameters. + +It can shuffle parameters, so you can mix options and other parameters on +the command-line. + +It can be easily identified as an enhanced getopt(1) from within shell scripts. + +It can report parse errors as coming from the shell script. + +It is fully compatible with other getopt(1) implementations. + +COPYING + +This program comes under the GNU general public licence version 2. See the +file COPYING included in this package. Note that though you may freely +copy it, it is copyright (c) 1997-2005 by Frodo Looijaard +<frodo@frodo.looijaard.name>. +Files in the gnu directory are from glibc-2.0.4: copyright (C) 1987, 88, +89, 90, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. diff --git a/getopt/Changelog b/Documentation/getopt_changelog.txt index ee2796550..ee2796550 100644 --- a/getopt/Changelog +++ b/Documentation/getopt_changelog.txt diff --git a/Documentation/howto-compilation.txt b/Documentation/howto-compilation.txt new file mode 100644 index 000000000..3617b34c7 --- /dev/null +++ b/Documentation/howto-compilation.txt @@ -0,0 +1,64 @@ +The common case + + ./autogen.sh && ./configure && make + + If something fails read the last lines. Typical reason to + fail is a missing dependency, such as libtool or gettext. + +Autotools + + `./autogen.sh' generates all files needed to compile + and install the code (run it after checkout from git) + + `make distclean' removes all unnecessary files, but the + code can still be recompiled with "./configure; make" + + `make dist-gzip' (or -bzip2) creates a tarball that can + be configured and compiled without running `./autogen.sh' + +Compiling + + Use SUID_CFLAGS and SUID_LDFLAGS when you want to define + special compiler options for typical suid programs, for + example: + + ./configure SUID_CFLAGS="-fpie" SUID_LDFLAGS="-pie" + + The SUID_* feature is currently supported for chfn, chsh, + newgrp, write, mount, and umount. + + Preferred compilation options for developers, when + using gcc, are: + + export CFLAGS="-Wmissing-parameter-type -Wsign-compare + -Wtype-limits -Wuninitialized -Wunused-parameter + -Wunused-but-set-parameter -fno-common" + + FIXME: add notes about klib and uClib. + +Static linking + + Use --enable-static-programs[=LIST] configure option when + you want to use statically linked programs. + + Note, mount(8) uses get{pw,gr}nam() and getpwuid() + functions for translation from username and groupname to + UID and GID. These functions could be implemented by + dynamically loaded independent modules (NSS) in your libc + (e.g. glibc). These modules are not statically linked to + mount(8) and mount.static is still using dlopen() like + dynamically linked version. + + The translation won't work in environment where NSS + modules are not installed. + + For example normal system (NSS modules are available): + + # ./mount.static -v -f -n -ouid=kzak /mnt/foo + LABEL=/mnt/foo on /mnt/foo type vfat (rw,uid=500) + ^^^^^^^ + and without NSS modules: + + # chroot . ./mount.static -v -f -n -ouid=kzak /mnt/win + LABEL=/mnt/win on /mnt/win type vfat (rw,uid=kzak) + ^^^^^^^^ diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt new file mode 100644 index 000000000..e70467bbd --- /dev/null +++ b/Documentation/howto-contribute.txt @@ -0,0 +1,100 @@ +Patches + + * send your patches to the mailing list or to the upstream maintainer + (see the AUTHORS and README files) + + * diff -u + + * don't include generated (autotools) stuff to your patches (hint: + use git clean -Xd) + + * neutrality; The stuff in util-linux should be rather + distribution-neutral. No RPMs/DEBs/... are provided - get yours + from your distributor. + + * patches are delivered via email only. Downloading them from + internet servers is a pain. + + * one patch per email, with the changelog in the body of the email. + + * many small patches are favoured over one big. Break down is done on + basis of logical functionality; for example #endif mark ups, + compiler warning and exit codes fixes all should be individual + small patches. + + * Subject: [PATCH] subsystem: description + + * if someone else wrote the patch, they should be credited (and + blamed) for it. To communicate this, add a line: + + From: John Doe <jdoe@wherever.com> + + * add a Signed-off-by line (hint: use "git commit -s") + + The sign-off is a simple line at the end of the explanation for the + patch, which certifies that you wrote it or otherwise have the + right to pass it on as a open-source patch. The rules are pretty + simple: if you can certify the below: + + By making a contribution to this project, I certify that: + + (a) The contribution was created in whole or in part by me and I + have the right to submit it under the open source license + indicated in the file; or + + (b) The contribution is based upon previous work that, to the best + of my knowledge, is covered under an appropriate open source + license and I have the right under that license to submit that + work with modifications, whether created in whole or in part + by me, under the same open source license (unless I am + permitted to submit under a different license), as indicated + in the file; or + + (c) The contribution was provided directly to me by some other + person who certified (a), (b) or (c) and I have not modified + it. + + (d) I understand and agree that this project and the contribution + are public and that a record of the contribution (including + all personal information I submit with it, including my + sign-off) is maintained indefinitely and may be redistributed + consistent with this project or the open source license(s) + involved. + + then you just add a line saying + + Signed-off-by: Random J Developer <random@developer.example.org> + + using your real name (sorry, no pseudonyms or anonymous + contributions.) + + * for more details see: The perfect patch + http://userweb.kernel.org/~akpm/stuff/tpp.txt + +Before sending a patch + + * make sure that after patching source files will compile without + errors. + + * test that previously existed program behaviour is not + unintentionally alterred. If you alter the behaviour tell about in + commit message. + +Coding style + + * the preferred coding style is based on the linux kernel + Documentation/CodingStyle. For more details see: + + http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/CodingStyle + + * Use `FIXME:' and a good description if want to inform others + something is not quite right, and you are unwilling to fix the + issue. + +Various notes + + * The util-linux does not use kernel headers for file system super + blocks structures. + + * Patches relying on features that are not in Linus' tree + are not accepted. diff --git a/Documentation/howto-debug.txt b/Documentation/howto-debug.txt new file mode 100644 index 000000000..28c6e2252 --- /dev/null +++ b/Documentation/howto-debug.txt @@ -0,0 +1,71 @@ +Debugging util-linux programs +============================= + +How to deal libtool +------------------- + +There are considerations to be made when profiling or debugging some programs +found in the util-linux package. Because wrapper scripts are used for the +binaries to make sure all library dependencies are met, you cannot use tools +such as gdb or valgrind directly with them. + +Let's take for example the mount command: + + $> cd /path/to/util-linux + $> file mount/mount + mount/mount: Bourne-Again shell script text executable + +The binary itself is located in the mount/.libs/ directory: + + $> file mount/.libs/mount + mount/.libs/mount: ELF 64-bit LSB executable, x86-64, version 1 \ + (SYSV), dynamically linked (uses shared libs) [...] + +When this command is run, there's a library dependency error: + + $> mount/.libs/mount + mount/.libs/mount: /lib/libblkid.so.1: version `BLKID_2.20' not found \ + (required by mount/.libs/mount) + +To overcome this we need set the LD_LIBRARY_PATH variable to read the path of +the shared lib found in the sources, and not system-wide: + + $> export LD_LIBRARY_PATH=$PWD/libblkid/src/.libs/:$LD_LIBRARY_PATH + +Now external debugging tools can be run on the binary. + +Happy hacking! +Davidlohr Bueso, August 2011 + + +The libmount & libblkid +----------------------- + +Both of the libraries can be debugged by setting an environment variable +consistig a number. The number will be used as a bit mask, so the more 1 the +greater the debugging level. Seach for `DEBUG' from files + + libblkid/src/blkidP.h + libmount/src/mountP.h + +to see what the different bit mean. At the time of writing this the following +enabled full debug. + + export LIBBLKID_DEBUG=0xffff + export LIBMOUNT_DEBUG=0xffff + +The libblkid reads by default /etc/blkid.conf which can be overriden by the +environment variable BLKID_CONF. See manual libblkid/libblkid.3 for details +about the configuration file. + +Block device information is normally kept in a cache file /etc/blkid.tab that +can be overridden by the environment variable BLKID_FILE. + +To libmount uses three paths, which can be override by using environment +variables. Notice that these environment variables are ignored for non-root +users + + env variable if not set defaults to + LIBMOUNT_FSTAB /etc/fstab + LIBMOUNT_MTAB /etc/mtab + LIBMOUNT_UTAB /run/mount/utab or /dev/.mount/utab diff --git a/Documentation/howto-man-page.txt b/Documentation/howto-man-page.txt new file mode 100644 index 000000000..db25c3d4c --- /dev/null +++ b/Documentation/howto-man-page.txt @@ -0,0 +1,161 @@ +.\" This is an util-linux manual page example in troff format. +.\" +.\" .TH macro is expecting following arguments: +.\" title section date footer header +.\" The title is usually command name. +.\" The section must match with file name extension. +.\" The date tells month and year when last update happen. +.\" The footer is fixed to "util-linux". +.\" The header is textual string of section +.\" 1 "User Commands" +.\" 2 "System calls" +.\" 3 "Programmer's Manual" +.\" 4 "Special Files" +.\" 5 "File Formats" +.\" 6 "Games" +.\" 7 "Miscellanea" +.\" 8 "System Administration" +.\" +.\" Please read `man 7 groff_man' howto use various macros. +.\" +.TH EXAMPLE "1" "August 2011" "util-linux" "User Commands" +.SH NAME +example \- an util-linux man page howto +.SH SYNOPSIS +.B example +[options] +.I argument +.SH DESCRIPTION +All manual pages need some sort of description. Write such here. +.SH OPTIONS +.TP +\fB\-n\fR, \fB\-\-no\-argument\fR +This option does not use argument. +.TP +\fB\-o\fR, \fB\-\-optional\fR [\fIargument\fR] +Tell in description an +.I argument +is optional, and what happens when is or is not given. Notice that +.I argument +is not abreviated, like in usage function. Assuming usage function would +define argument to be +.IR num , +the manual page should say +.IR number . +.TP +\fB\-r\fR, \fB\-\-required\fR \fIargument\fR +Tell in description option +.I argument +is required. +.TP +\fB\-V\fR, \fB\-\-version\fR +Display version information and exit. +.TP +\fB\-h\fR, \fB\-\-help\fR +Display help and exit. +.SH NOTES +Tell details what users might need to know. For example kernel feature or +version requirements. +.PP +The man page groff input lines should not exceed 80 characters length. +.PP +Do not leave empty lines to groff input. If you need break or paragraph use +appropriate groff macros. See +.BR groff_man (7) +how to use man page macros. +.PP +Use of +.I italic +which is underlined in terminal, and +.B bold +are not strictly defined. As some sort of convention +.I arguments +use italic, and the +.B other highlights +are bold. +.\" +.\" The manual page comments are undervalued way of adding clarifications +.\" quite not belong to the manual, questions, TODO items etc. Feel free +.\" to use them. +.\" +.PP +When in the source a new sentence begins somewhere midline, it should use a +double space before its initial letter. This is done because groff uses double +spaces last sentence ends to end of line, and next begins from new line. +Unless double spaces are used in middle of of line the spacing style is +inconsistant. +.SH ENVIRONMENT +Tell which environment variables affect, and how, to execution of the command. +.TP +.B EXAMPLE_PATH +Configuratio file path. Notice that a well-known environment variables such as +.B HOME +does not need explanation. +.SH FILES +Tell which file(s) command uses. +.TP +.B $EXAMPLE_PATH +.TQ +.B $HOME/.example.conf +.TQ +.B /etc/example.conf +What are these files, which order and will the evaluation end or continue if a +file is found. In case the explanation is not simple write separated Special +Files manual page that tells about syntax, meaning of key-value settings etc. +The file manual page needs to be referred in +.B SEE ALSO +section. +.TP +.B /var/log/example.log +Another file. +.SH EXAMPLES +Write typical and/or clever use examples here. The bellow examples are stupid, +and you should never write them to real man page. +.TP +.B example -h +Output help screen. +.TP +.B example -V +Output version information. +.SH "EXIT STATUS" +This section can be removed if command has only two return values, +.B 0 +for success and +.B 1 +for failure. Use of +.B sysexits.h +return values must be mentioned, but does not need to be explained. +.PP +.RS +.PD 0 +.TP +.B 0 +success +.TP +.B 1 +failure +.TP +.B 2 +tell why this could happen +.TP +.B 3 +etc +.PD +.RE +.SH AUTHORS +.UR rjh@\:example.org +Random J. Hacker +.UE +.br +.UR fred@\:example.com +Fred Foobar +.UE +.SH "SEE ALSO" +.BR groff_man (7), +.BR foo (1), +.BR bar (8) +.SH AVAILABILITY +The example command is part of the util-linux package and is available from +.UR ftp://\:ftp.kernel.org\:/pub\:/linux\:/utils\:/util-linux/ +Linux Kernel Archive +.UE . diff --git a/tests/README b/Documentation/howto-tests.txt index c812a3929..c812a3929 100644 --- a/tests/README +++ b/Documentation/howto-tests.txt diff --git a/Documentation/howto-usage-function.txt b/Documentation/howto-usage-function.txt new file mode 100644 index 000000000..f717293d9 --- /dev/null +++ b/Documentation/howto-usage-function.txt @@ -0,0 +1,147 @@ +Well-known options +------------------ + +Following options are well-known, and they should not be used to any +other purpose. + + -h, --help display usage and exit + -V, --version display version and exit + +Rule of thumb with other options is that once they exist you may not +change how they work, or remove them. + +Notice that `-?' is not expected to be synonym of --help, but an unknown +options resulting to a usage print out due getopt failure. + + +How usage is supposed to look +----------------------------- + +The usage output begins with empty followed by `Usage:', and on next line +there synopsis begins. Synopsis, and all other lines which vary, are +intended by one space (0x40). + +The synopsis line tells how to execute the command. Some times you may +need multiple synopsis lines, this documented separately under Synopsis +title. + +Notations; Diamond brackets markup an argument. Anything optional is +marked with square brackets, such as optional command arguments, or +optional option arguments. In the later case `=' character in front of +the option argument, because one has to use it. Square brackets with +three dots inside mean unlimited repetition of previous. + +Short option is always wrote first followed by long option. Options are +separated with comma and one space. Lonely short or long option does not +affect where writing of the option begins. + +Bellow, in between snips, is an example of how the usage output should +look like. + +-- snip + +Usage: + program [options] <file> [...] + +Options: + + -n, --no-argument option does not use argument + -o, --optional[=<arg>] option argument is optional + -r, --required <arg> option requires an argument + -z no long option + --xyzzy a long option only + -e, --extremely-long-long-option + use next line for description when needed + -l, --long-explanation an example of very verbose, and chatty option + description on two, or multiple lines, where the + consecutive lines are intended by two spaces + -f, --foobar next option description resets indent + -h, --help display this help and exit + -V, --version output version information and exit + +For more details see program(1). +-- snip + +Notice that there are usage function definitions in c.h include file +which you must use. Location of example is mentioned at the end of this +file. + + +Option description +------------------ + +Option description should not exceed width of 80 characters. If you need +longer description use multiple lines and indentation. + +The description begins from the point of longest option plus two spaces. +In case adding a new option will would cause a description re-indentation +need it either has to be done, or the new option should begin description +from next line. Usually the later is better. The --help and --version +will not follow this rule, since they are defined as constants to ease +translation work. + +The argument, e.g. `arg', can be better. For example if an option is +expecting number as argument a `num' is suitable argument description. + +Order of the options has no special meaning. It is good idea to write +options that are somehow related next to each other. Usually --help and +--version, in this order, are last options in print out. + +Last line of the usage print out is either empty, or a message informing +about manual page. For example: `For more details see example(1).' In +between man page message and options there is empty line. + + +Usage function +-------------- + +Standard usage function takes either stderr or stdout as an argument. The +argument will determine whether the program will exit with error or +success. Usage function will never return. + +In the code all strings with options have to start at the same position. See +bellow what that means. + + fprintf(out, _(" -x[=<foo>] default foo is %s"), x); + fputs( _(" -y some text"), out); + +The usage output should be split to manageable chunks, in practice one or +few lines. + + +Synopsis +-------- + +You may need to use multiple synopsis lines to tell that a command does +fundamentally different things depending on options and/or arguments. For +example ionice either changes priority of a running command, or executes +a program with a defined priority. Therefore it is reasonable to have two +synopsis lines. + + ionice [options] -p <pid> [...] + ionice [options] <command> [<args>] [...] + +Notice that the synopsis not meant to be repetition of options segment. +The fundamental difference in execution is a bit difficult to define +other than usually command author, package maintainer or patch submitter +will know when it should be done that way. + + +Legacy options +-------------- + +Some commands use peculiar options and arguments. These are supported, +but such will not be accepted in future. See list bellow for a hint what +are meant this. + +- Other than `-' used to define an option. See `+' for `more' or `ddate' + commands. +- Option string used as an option argument. See `more' command and `-num'. +- Short long option. See `setterm'. + + +Example +------- + +Command sys-utils/arch.c is a minimal example how to do write usage +function, setup option parsing, version printing and so on. diff --git a/Documentation/hwclock.txt b/Documentation/hwclock.txt new file mode 100644 index 000000000..e76762334 --- /dev/null +++ b/Documentation/hwclock.txt @@ -0,0 +1,3 @@ +Hwclock is a program that runs under Linux and sets and queries the +Hardware Clock, which is often called the Real Time Clock, RTC, or +CMOS clock. diff --git a/libuuid/COPYING.libuuid b/Documentation/licenses/COPYING.BSD-3 index 2f1706836..2f1706836 100644 --- a/libuuid/COPYING.libuuid +++ b/Documentation/licenses/COPYING.BSD-3 diff --git a/getopt/COPYING b/Documentation/licenses/COPYING.GPLv2 index a43ea2126..a43ea2126 100644 --- a/getopt/COPYING +++ b/Documentation/licenses/COPYING.GPLv2 diff --git a/libblkid/COPYING.libblkid b/Documentation/licenses/COPYING.GPLv2.1 index cf9b6b997..cf9b6b997 100644 --- a/libblkid/COPYING.libblkid +++ b/Documentation/licenses/COPYING.GPLv2.1 diff --git a/licenses/COPYING.UCB b/Documentation/licenses/COPYING.UCB index 9abbf2410..9abbf2410 100644 --- a/licenses/COPYING.UCB +++ b/Documentation/licenses/COPYING.UCB diff --git a/Documentation/licenses/COPYING.getopt b/Documentation/licenses/COPYING.getopt new file mode 100644 index 000000000..be70cdee4 --- /dev/null +++ b/Documentation/licenses/COPYING.getopt @@ -0,0 +1,5 @@ +The getopt is explicitly licensed under GNU General Public License, +version 2 terms. + +The complete text of the license is available at the +Documentation/licenses/COPYING.GPLv2 file. diff --git a/term-utils/README.modems-with-agetty b/Documentation/modems-with-agetty.txt index 44a611e2a..44a611e2a 100644 --- a/term-utils/README.modems-with-agetty +++ b/Documentation/modems-with-agetty.txt diff --git a/mount/README.mount b/Documentation/mount.txt index f75a6e25a..f75a6e25a 100644 --- a/mount/README.mount +++ b/Documentation/mount.txt diff --git a/text-utils/README.pg b/Documentation/pg.txt index df92b85fd..7a974cb5b 100644 --- a/text-utils/README.pg +++ b/Documentation/pg.txt @@ -8,16 +8,6 @@ Contrasting to the System V implementation, this one filters backspace formatting sequences while searching, so you can comfortably search in nroff output like manual pages. -This code uses routines as defined by SUSv2, so a glibc version of 2.1 or -higher is required on Linux. A curses implementation (like ncurses) must -be present as well. - -If large files > 2GB are supported by the kernel and the C library, pg is -able to handle them. - -Please send comments, bug-reports and especially bug-fixes to -<g-r@bigfoot.de> . - Gunnar Ritter Freiburg i. Br. Germany diff --git a/login-utils/README.poeigl b/Documentation/poeigl.txt index 5d30ec581..00eaa7101 100644 --- a/login-utils/README.poeigl +++ b/Documentation/poeigl.txt @@ -7,16 +7,6 @@ domainname, hostid, cage and mesg. Most of this software has been contributed by others, I basically just ported the things to Linux. -About installation: See the bottom of this file. Check the Makefile! -Be sure you know what you are doing! You may well be able to lock -yourself out from your machine. Especially: The init provided here -(simpleinit) is NOT a SYSV compatible init and the inittab format -is different. - -If you are uncertain whether you got the latest version, check out - - ftp://ftp.daimi.aau.dk/pub/linux/poe/ - Version 1.49 (20-Jun-97) Small patches for new util-linux distribution and glibc compat. PAM support in login.c by Erik Troan. @@ -484,32 +474,9 @@ login.c The login program. This is a portation of BSD login, first to HP-UX 8.0 by Michael Glad (glad@daimi.aau.dk), and to Linux (initially to 0.12) by me. -who.c A simple who(1) util. to list utmp. Done by me. - You may prefer the GNU who util. with more options - and features. - -hostname.c A hostname(1) command to get and set the hostname. I did - this too. - -domainname.c Like hostname, only reads out or sets the domainname. - agetty.c The getty program. From comp.sources.misc, by W.Z. Venema. Hacked a bit by me. -simpleinit.c A simple init program, written by me. Uses /etc/inittab - - A "kill -HUP" to init makes it re-read /etc/inittab. - A "kill -TSTP" to init makes it stop spawning gettys on the - ttys. A second "kill -TSTP" starts it again. - A kill -INT to init makes it attempt a reboot of the machine. - this works in connection with kernel support for softboot - when Ctrl-Alt-Del is pressed. - - Init will start up in singleuser mode if /etc/singleboot - exists at boottime, or if it is given an argument of "single" - via eg. LILO. If /etc/securesingle exists it will ask for the - root password before starting single user. - write.c A write(1) command, used to pass messages between users at different terminals. This code doubles as code for a wall(1) command. Make a symlink: /usr/bin/wall -> @@ -518,56 +485,9 @@ write.c A write(1) command, used to pass messages between users mesg A tiny shellscript, so you can avoid that other people write to your shell. -users Another script that uses awk(1) and tr(1) to process the - output from who(1) into a one-liner. - If you don't have awk, but have Perl, this does the same: - - who | perl -ane 'print "$F[0] "'; echo "" - pathnames.h: Header. -param.h - Header, extended with getdtablesize() macro, should go - in /usr/include/sys - -Building. ---------- -A "make all" should do. At least it does for me. - -Installation: -------------- - -login should go in /bin, if you don't like this change - pathnames.h and recompile at least agetty. - -getty, init Put them in SBINDIR - -who, hostname, write, wall, mesg, users: - /usr/bin - -securetty login needs this in /etc, defines which ttys that root - can login on. This should *never* include ttys{1,2} - -inittab the simpleinit code needs this in /etc. Note that the syntax - of /etc/inittab has little to do with the syntax of a real - SysV inittab. Edit this one for your local setup. - -shells The chsh program will use this if it's placed in /etc. It - defines the valid shell-programs. Have one abs. path on - each line. - -You can also do a "make install" as root, but don't just do it because I -say so, check the Makefile first. - -"Make install" will install only the new binaries, and not motd, inittab, -securetty and issue. To install these configuration files, do a -"make Install". - -Getty requires a /dev/console to write errors to. I just made it a symlink -to /dev/tty1. Because of a bug in the tty driver this errorlogging may -cause the shell on tty1 to logout. - Getty will print the contents of /etc/issue if it's present before asking for username. Login will print the contents of /etc/motd after successful login. Login doesn't print /etc/motd, and doesn't check for mail if diff --git a/Documentation/release-schedule.txt b/Documentation/release-schedule.txt new file mode 100644 index 000000000..7e069db28 --- /dev/null +++ b/Documentation/release-schedule.txt @@ -0,0 +1,39 @@ +Release schedule +---------------- + +The util-linux uses <major>.<minor>.<maint> version numbering. +Since the major version is pretty much fixed the release means an +upgrade of minor number. Minor version is update roughly twice +per year. Easiet way to estimate when next version will occur is +to see time stamp of previous release. + +Before a release there are few release candidates, which will be +collectively tested. During test period changes to code base are +restricted. Usually there are two release candidates. + + what lenght what will be accepted to upstream + ------------------------------------------------------- + rc1 1-2 weeks bug fixes only + rc2 1-2 weeks translations, fatal/trivial bug fixes + +The lengty time, usually about five months, after the release can +be considered as merge window. + +Release criteria +---------------- + +For all releases is required: + + - make checkincludes pass + - make checkconfig pass + - make distcheck pass + - cd tests && ./run.sh pass + - out-of-tree build works + cd .. && mkdir build && cd build && ../util-linux/configure && make + + - ideally: build with uClibc, --with-slang + +See also +-------- + +Documentation/source-code-management.txt diff --git a/docs/v2.13-ReleaseNotes b/Documentation/releases/v2.13-ReleaseNotes index efd5d6854..efd5d6854 100644 --- a/docs/v2.13-ReleaseNotes +++ b/Documentation/releases/v2.13-ReleaseNotes diff --git a/docs/v2.14-ReleaseNotes b/Documentation/releases/v2.14-ReleaseNotes index 1c92a82b5..1c92a82b5 100644 --- a/docs/v2.14-ReleaseNotes +++ b/Documentation/releases/v2.14-ReleaseNotes diff --git a/docs/v2.15-ReleaseNotes b/Documentation/releases/v2.15-ReleaseNotes index 56b10b654..56b10b654 100644 --- a/docs/v2.15-ReleaseNotes +++ b/Documentation/releases/v2.15-ReleaseNotes diff --git a/docs/v2.16-ReleaseNotes b/Documentation/releases/v2.16-ReleaseNotes index b204c643a..b204c643a 100644 --- a/docs/v2.16-ReleaseNotes +++ b/Documentation/releases/v2.16-ReleaseNotes diff --git a/docs/v2.17-ReleaseNotes b/Documentation/releases/v2.17-ReleaseNotes index 874622b88..874622b88 100644 --- a/docs/v2.17-ReleaseNotes +++ b/Documentation/releases/v2.17-ReleaseNotes diff --git a/docs/v2.18-ReleaseNotes b/Documentation/releases/v2.18-ReleaseNotes index 47f590ee5..47f590ee5 100644 --- a/docs/v2.18-ReleaseNotes +++ b/Documentation/releases/v2.18-ReleaseNotes diff --git a/docs/v2.19-ReleaseNotes b/Documentation/releases/v2.19-ReleaseNotes index 4c6c1a000..4c6c1a000 100644 --- a/docs/v2.19-ReleaseNotes +++ b/Documentation/releases/v2.19-ReleaseNotes diff --git a/docs/v2.20-ReleaseNotes b/Documentation/releases/v2.20-ReleaseNotes index 4d0bd3675..4d0bd3675 100644 --- a/docs/v2.20-ReleaseNotes +++ b/Documentation/releases/v2.20-ReleaseNotes diff --git a/fdisk/sfdisk.examples b/Documentation/sfdisk.txt index 13e671d48..13e671d48 100644 --- a/fdisk/sfdisk.examples +++ b/Documentation/sfdisk.txt diff --git a/Documentation/source-code-management.txt b/Documentation/source-code-management.txt new file mode 100644 index 000000000..cb192c732 --- /dev/null +++ b/Documentation/source-code-management.txt @@ -0,0 +1,29 @@ +SCM (source code management): + + git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git util-linux + +Branches: + + * maintenance (stable) branch + - created for every <major>.<minor> release + - branch name: stable/v<major>.<minor> + + * bugfix branch + - created for <major>.<minor>.<maint> release for + critical/security bugs only + - this branch is optional + - branch name: stable/v<major>.<minor>.<maint> + + * master branch + - the status of this branch is: "it works for me". It + means useful but not well tested patches. + - it's source for occasional snapshots + - for long-term development or invasive changes should be + an active development forked into a separate branch + (topic branches) from the tip of "master". + + * A new tag object is created for: + - every release, tag name: v<version> + + * KNOWN BUGS: + - tag v2.13.1 is typo. Please, ignore this tag. diff --git a/Makefile.am b/Makefile.am index b016bbdf5..b944d4570 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,14 +62,9 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ .version \ autogen.sh \ - README.devel \ README.licensing \ - DEPRECATED \ - licenses \ - example.files \ po/update-potfiles \ - tools \ - docs + Documentation # Arrange so that .tarball-version appears only in the distribution # tarball, and never in a checked-out repository. @@ -7,111 +7,111 @@ util-linux 2.20-rc2: Aug 17 2011 ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-rc2-ChangeLog util-linux 2.20-rc1: Jul 29 2011 -* see docs/v2.20-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.20-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/v2.20-rc1-ChangeLog util-linux 2.19: Feb 10 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-ChangeLog util-linux 2.19-rc3: Jan 25 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc3-ChangeLog util-linux 2.19-rc2: Jan 25 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc2-ChangeLog util-linux 2.19-rc1: Jan 05 2011 -* see docs/v2.19-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.19-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.19/v2.19-rc1-ChangeLog util-linux-ng 2.18: Jun 30 2010 -* see docs/v2.18-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-ChangeLog util-linux-ng 2.18-rc2: Jun 18 2010 -* see docs/v2.18-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc2-ChangeLog util-linux-ng 2.18-rc1: Jun 7 2010 -* see docs/v2.18-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.18-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.18/v2.18-rc1-ChangeLog util-linux-ng 2.17: Jan 8 2010 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-ChangeLog util-linux-ng 2.17-rc3: Dec 10 2009 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc3-ChangeLog util-linux-ng 2.17-rc2: Dec 9 2009 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc2-ChangeLog util-linux-ng 2.17-rc1: Nov 20 2009 -* see docs/v2.17-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.17-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.17/v2.17-rc1-ChangeLog util-linux-ng 2.16: Jul 2009 -* see docs/v2.16-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-ChangeLog util-linux-ng 2.16-rc2: Jul 2 2009 -* see docs/v2.16-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc2-ChangeLog util-linux-ng 2.16-rc1: Jun 28 2009 -* see docs/v2.16-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.16-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.16/v2.16-rc1-ChangeLog util-linux-ng 2.15: May 5 2009 -* see docs/v2.15-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-ChangeLog util-linux-ng 2.15-rc2: Apr 17 2009 -* see docs/v2.15-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-rc2-ChangeLog util-linux-ng 2.15-rc1: Mar 18 2009 -* see docs/v2.15-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.15-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.15/v2.15-rc1-ChangeLog util-linux-ng 2.14: Jun 9 2008 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-ChangeLog util-linux-ng 2.14-rc3 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc3-ChangeLog util-linux-ng 2.14-rc2 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc2-ChangeLog util-linux-ng 2.14-rc1 -* see docs/v2.14-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.14-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.14/v2.14-rc1-ChangeLog util-linux-ng 2.13 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-ChangeLog util-linux-ng 2.13-rc3 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc3-ChangeLog util-linux-ng 2.13-rc2 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc2-ChangeLog util-linux-ng 2.13-rc1 -* see docs/v2.13-ReleaseNotes or complete changelog at +* see Documentation/releases/v2.13-ReleaseNotes or complete changelog at ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/v2.13/v2.13-rc1-ChangeLog util-linux 2.13-pre7 @@ -28,16 +28,12 @@ SOURCE CODE: Checkout: git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git util-linux + NLS (PO TRANSLATIONS): PO files are maintained by: http://translationproject.org/domain/util-linux-ng.html -NEUTRALITY: - - The stuff in util-linux should be rather distribution-neutral. - No RPMs/DEBs/... are provided - get yours from your distributor. - VERSION SCHEMA: @@ -53,46 +49,3 @@ VERSION SCHEMA: Development releases: <major>.<minor>-rc<N> - - -COMPILATION: - - See the INSTALL file for more details. - - Notes: - * use SUID_CFLAGS and SUID_LDFLAGS when you want to define special - compiler options for typical suid programs, for example: - - ./configure SUID_CFLAGS="-fpie" SUID_LDFLAGS="-pie" - - This feature is currently supported for chfn, chsh, newgrp, - write, mount, and umount. - - -STATIC LINKING: - - Use --enable-static-programs[=LIST] configure option when you want to use - statically linked programs. - - Note, mount(8) uses get{pw,gr}nam() and getpwuid() functions for - translation from username and groupname to UID and GID. These functions - could be implemented by dynamically loaded independent modules (NSS) in - your libc (e.g. glibc). These modules are not statically linked to - mount(8) and mount.static is still using dlopen() like dynamically - linked version. - - The translation won't work in environment where NSS modules are - not installed. - - For example normal system (NSS modules are available): - - # ./mount.static -v -f -n -ouid=kzak /mnt/foo - LABEL=/mnt/foo on /mnt/foo type vfat (rw,uid=500) - ^^^^^^^ - and without NSS modules: - - # chroot . ./mount.static -v -f -n -ouid=kzak /mnt/win - LABEL=/mnt/win on /mnt/win type vfat (rw,uid=kzak) - ^^^^^^^^ - - diff --git a/README.devel b/README.devel deleted file mode 100644 index d76baafa5..000000000 --- a/README.devel +++ /dev/null @@ -1,121 +0,0 @@ - - Notes for util-linux developers - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -AUTOTOOLS: - - * "./autogen.sh" generates all files needed to compile and install the code - (run it after checkout from git) - - * "make distclean" removes all unnecessary files, but the code can still be - recompiled with "./configure; make" - - * "make dist-gzip" (or -bzip2) creates a tarball that can be configured and - compiled without running "./autogen.sh" - - -PATCHES: - - * send your patches to the mailing list or to the upstream maintainer - (see the AUTHORS and README files) - - * diff -u - - * don't include generated (autotools) stuff to your patches - (hint: use git-clean [-X]) - - * patches are delivered via email only. Downloading them from internet - servers is a pain. - - * one patch per email, with the changelog in the body of the email. - - * many small patches are favoured over one big. Break down is done on - basis of logical functionality; for example #endif mark ups, compiler - warning and exit codes fixes all should be individual small patches. - - * Subject: [PATCH] subsystem: description - - * if someone else wrote the patch, they should be credited (and blamed) - for it. To communicate this, add a line: - - From: John Doe <jdoe@wherever.com> - - * add a Signed-off-by line (hint: use "git commit -s") - - The sign-off is a simple line at the end of the explanation for the - patch, which certifies that you wrote it or otherwise have the right to - pass it on as a open-source patch. The rules are pretty simple: if you - can certify the below: - - By making a contribution to this project, I certify that: - - (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - - (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - - (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified it. - - (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. - - then you just add a line saying - - Signed-off-by: Random J Developer <random@developer.example.org> - - using your real name (sorry, no pseudonyms or anonymous contributions.) - - - * for more details see: - - The perfect patch - http://userweb.kernel.org/~akpm/stuff/tpp.txt - -CODING STYLE: - - * the preferred coding style is based on the linux kernel Documentation/CodingStyle. - For more details see: - - http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=blob_plain;f=Documentation/CodingStyle - - -SCM (source code management): - - git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git util-linux - - - * maintenance (stable) branch - - created for every <major>.<minor> release - - branch name: stable/v<major>.<minor> - - * bugfix branch - - created for <major>.<minor>.<maint> release for critical/security bugs only - - this branch is optional - - branch name: stable/v<major>.<minor>.<maint> - - * master branch - - the status of this branch is: "it works for me". It means useful - but not well tested patches. - - it's source for occasional snapshots - - for long-term development or invasive changes should be an active - development forked into a separate branch (topic branches) from the - tip of "master". - - * A new tag object is created for: - - every release, tag name: v<version> - - - * KNOWN BUGS: - - tag v2.13.1 is typo. Please, ignore this tag. - diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 4409db55c..cae5ea1f7 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.fdisk README.cfdisk sfdisk.examples partitiontype.c +EXTRA_DIST = partitiontype.c fdisk_common = i386_sys_types.c common.h gpt.c gpt.h \ $(top_srcdir)/lib/blkdev.c $(top_srcdir)/lib/wholedisk.c \ diff --git a/getopt/Makefile.am b/getopt/Makefile.am index 7c1b66b2c..f0602b462 100644 --- a/getopt/Makefile.am +++ b/getopt/Makefile.am @@ -5,6 +5,3 @@ dist_man_MANS = getopt.1 exampledir = $(datadir)/getopt/ dist_example_SCRIPTS = getopt-parse.bash getopt-parse.tcsh - -EXTRA_DIST = README Changelog COPYING - diff --git a/getopt/README b/getopt/README deleted file mode 100644 index dbf7bb018..000000000 --- a/getopt/README +++ /dev/null @@ -1,81 +0,0 @@ -This package contains a reimplementation of getopt(1). - -PREFACE - -Getopt(1) is a program to help shell scripts parse command-line parameters. -It is for example included in the util-linux distribution (upto version -2.7.1). But, there are some problems with that getopt(1) implementation, -as listed in the 'BUGS' section of its man-page: - ->BUGS -> Whatever getopt(3) has. -> -> Arguments containing white space or imbedded shell metacharacters gener- -> ally will not survive intact; this looks easy to fix but isn't. -> -> The error message for an invalid option is identified as coming from -> getopt rather than from the shell procedure containing the invocation of -> getopt; this again is hard to fix. -> -> The precise best way to use the set command to set the arguments without -> disrupting the value(s) of shell options varies from one shell version to -> another. - -This implementation of getopt(1) is written to solve some of these problems, -while still staying (for all practical purposes) completely compatible with -other getopt(1) implementations. - - -INSTALLATION - -Installation should be very easy. Just type 'make' to compile the sources. -It should compile cleanly, without any warnings, but even if it does not -you probably don't have to worry. You must use GNU Make and gcc, or you -will have to edit the Makefile. - -Type 'make install' to install the binary and the manual page. It installs -by default in /usr/local/bin and /usr/local/man/man1, to install in /usr/bin -and /usr/man/man1 try 'make install prefix=/usr'. - -The example files can be installed in /usr/local/lib/getopt by calling -'make install_doc'. - -If you do not trust the getopt(3) in your libc, or if you do not use a libc -with the GNU getopt(3) routines, you can use the gnu sources as provided -in the gnu directory. Try 'make LIBCGETOPT=0'. Ignore any compile warnings. - -You can check whether the new implementation of getopt is found first -in your path by calling 'bash test.bash'. - - -HIGHLIGHTS - -It can do anything that the GNU getopt(3) routines can do. - -It can cope with spaces and shell metacharacters within arguments. - -It can parse long parameters. - -It can shuffle parameters, so you can mix options and other parameters on -the command-line. - -It can be easily identified as an enhanced getopt(1) from within shell scripts. - -It can report parse errors as coming from the shell script. - -It is fully compatible with other getopt(1) implementations. - -COPYING - -This program comes under the GNU general public licence version 2. See the -file COPYING included in this package. Note that though you may freely -copy it, it is copyright (c) 1997-2005 by Frodo Looijaard -<frodo@frodo.looijaard.name>. -Files in the gnu directory are from glibc-2.0.4: copyright (C) 1987, 88, -89, 90, 91, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. - - -DOWNLOADING - -You can find the latest version of this program at: - http://software.frodo.looijaard.name/getopt/ diff --git a/hwclock/Makefile.am b/hwclock/Makefile.am index c7d95f29b..8fef5b7f9 100644 --- a/hwclock/Makefile.am +++ b/hwclock/Makefile.am @@ -14,5 +14,3 @@ endif if HAVE_AUDIT hwclock_LDADD += -laudit endif - -EXTRA_DIST = README.hwclock diff --git a/hwclock/README.hwclock b/hwclock/README.hwclock deleted file mode 100644 index 5c364212c..000000000 --- a/hwclock/README.hwclock +++ /dev/null @@ -1,17 +0,0 @@ -Hwclock is a program that runs under Linux and sets and queries the -Hardware Clock, which is often called the Real Time Clock, RTC, or -CMOS clock. - -Sometimes, you need to install hwclock setuid root. If you want users -other than the superuser to be able to display the clock value using the -direct ISA I/O method, install it setuid root. If you have the /dev/rtc -interface on your system or are on a non-ISA system, there's probably -no need for users to use the direct ISA I/O method, so don't bother. - -To install setuid root, do something like this: - - chmod a=rx,u=s /sbin/hwclock - -In any case, hwclock will not allow you to set anything unless you have -the superuser _real_ uid. (This is restriction is not necessary if you -haven't installed setuid root, but it's there for now). diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8 index 4d6ab0a77..07d9fc024 100644 --- a/hwclock/hwclock.8 +++ b/hwclock/hwclock.8 @@ -402,6 +402,20 @@ This second field is not used under Linux and is always zero. (See also .BR settimeofday (2).) +.SH Users access and setuid +.PP +Sometimes, you need to install +.B hwclock +setuid root. If you want users other than the superuser to be able to +display the clock value using the direct ISA I/O method, install it setuid +root. If you have the /dev/rtc interface on your system or are on a non-ISA +system, there's probably no need for users to use the direct ISA I/O method, +so don't bother. + +In any case, hwclock will not allow you to set anything unless you have the +superuser real uid. (This is restriction is not necessary if you haven't +installed setuid root, but it's there for now). + .SH How hwclock Accesses the Hardware Clock .PP .B hwclock diff --git a/include/c.h b/include/c.h index a9cd1f3f5..975cc1bf4 100644 --- a/include/c.h +++ b/include/c.h @@ -210,4 +210,17 @@ static inline int dirfd(DIR *d) #define IUTF8 0040000 #endif +/* + * Constant strings for usage() functions. For more info see + * Documentation/howto-usage-function.txt and sys-utils/arch.c + */ +#define USAGE_HEADER _("\nUsage:\n") +#define USAGE_OPTIONS _("\nOptions:\n") +#define USAGE_HELP _(" -h, --help display this help and exit\n") +#define USAGE_VERSION _(" -V, --version output version information and exit\n") +#define USAGE_BEGIN_TAIL _("\n") +#define USAGE_MAN_TAIL _("For more details see %s.\n") + +#define UTIL_LINUX_VERSION _("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING + #endif /* UTIL_LINUX_C_H */ diff --git a/libblkid/COPYING b/libblkid/COPYING new file mode 100644 index 000000000..0d8690333 --- /dev/null +++ b/libblkid/COPYING @@ -0,0 +1,8 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later +version. + +The complete text of the license is available at the +Documentation/licenses/COPYING.GPLv2.1 file. diff --git a/libblkid/Makefile.am b/libblkid/Makefile.am index 59362cfe5..27f1033f8 100644 --- a/libblkid/Makefile.am +++ b/libblkid/Makefile.am @@ -12,5 +12,5 @@ pkgconfig_DATA = blkid.pc dist_man_MANS = libblkid.3 -EXTRA_DIST = COPYING.libblkid README.blkid blkid.pc.in libblkid.3 +EXTRA_DIST = blkid.pc.in libblkid.3 diff --git a/libmount/COPYING b/libmount/COPYING new file mode 100644 index 000000000..0d8690333 --- /dev/null +++ b/libmount/COPYING @@ -0,0 +1,8 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2.1 of the License, or (at your option) any later +version. + +The complete text of the license is available at the +Documentation/licenses/COPYING.GPLv2.1 file. diff --git a/libmount/COPYING.libmount b/libmount/COPYING.libmount deleted file mode 100644 index 89d4489ce..000000000 --- a/libmount/COPYING.libmount +++ /dev/null @@ -1,508 +0,0 @@ - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. -^L - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. -^L - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. -^L - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. -^L - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. -^L - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. -^L - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. -^L - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS -^L - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. - - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/libmount/Makefile.am b/libmount/Makefile.am index 26111c662..dbe131789 100644 --- a/libmount/Makefile.am +++ b/libmount/Makefile.am @@ -10,4 +10,4 @@ endif pkgconfigdir = $(usrlib_execdir)/pkgconfig pkgconfig_DATA = mount.pc -EXTRA_DIST = COPYING.libmount mount.pc.in +EXTRA_DIST = mount.pc.in diff --git a/libuuid/COPYING b/libuuid/COPYING new file mode 100644 index 000000000..6935c2889 --- /dev/null +++ b/libuuid/COPYING @@ -0,0 +1,5 @@ +This library is free software; you can redistribute it and/or +modify it under the terms of the Modified BSD License. + +The complete text of the license is available at the +Documentation/licenses/COPYING.BSD-3 file. diff --git a/libuuid/Makefile.am b/libuuid/Makefile.am index 66fe69098..2bdef3343 100644 --- a/libuuid/Makefile.am +++ b/libuuid/Makefile.am @@ -6,5 +6,5 @@ SUBDIRS = src man pkgconfigdir = $(usrlib_execdir)/pkgconfig pkgconfig_DATA = uuid.pc -EXTRA_DIST = COPYING.libuuid uuid.pc.in +EXTRA_DIST = uuid.pc.in diff --git a/licenses/COPYING.GPL b/licenses/COPYING.GPL deleted file mode 100644 index a43ea2126..000000000 --- a/licenses/COPYING.GPL +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am index 0bedc0632..f009f2d09 100644 --- a/login-utils/Makefile.am +++ b/login-utils/Makefile.am @@ -6,8 +6,6 @@ sbin_PROGRAMS = usrsbin_exec_PROGRAMS = dist_man_MANS = -EXTRA_DIST = README.poeigl - if BUILD_LAST usrbin_exec_PROGRAMS += last dist_man_MANS += last.1 diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 28bcca173..300dab46e 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -8,8 +8,6 @@ usrsbin_exec_PROGRAMS = usrbin_exec_PROGRAMS = cal logger look mcookie namei whereis -EXTRA_DIST += README.cal README.ddate - logger_SOURCES = logger.c $(top_srcdir)/lib/strutils.c mcookie_SOURCES = mcookie.c $(top_srcdir)/lib/md5.c diff --git a/mount/Makefile.am b/mount/Makefile.am index b82464fe3..7aebfff66 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.mount - bin_PROGRAMS = mount umount sbin_PROGRAMS = losetup swapon dist_man_MANS = fstab.5 mount.8 swapoff.8 swapon.8 umount.8 losetup.8 diff --git a/sys-utils/arch.c b/sys-utils/arch.c index 33dff304b..47aad7c97 100644 --- a/sys-utils/arch.c +++ b/sys-utils/arch.c @@ -2,34 +2,74 @@ * Created: Mon Dec 20 12:27:15 1993 by faith@cs.unc.edu * Revised: Mon Dec 20 12:29:23 1993 by faith@cs.unc.edu * Copyright 1993 Rickard E. Faith (faith@cs.unc.edu) - + * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the * Free Software Foundation; either version 2, or (at your option) any * later version. - + * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * General Public License for more details. - + * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <err.h> +#include <errno.h> +#include <getopt.h> #include <stdio.h> #include <sys/utsname.h> -int main (void) +#include "c.h" +#include "nls.h" + +static void __attribute__ ((__noreturn__)) usage(FILE * out) { - struct utsname utsbuf; + fprintf(out, USAGE_HEADER); + /* Synopsis */ + fprintf(out, " %s\n", program_invocation_short_name); + fprintf(out, USAGE_OPTIONS); + /* Additional options to here. */ + fprintf(out, USAGE_HELP); + fprintf(out, USAGE_VERSION); + fprintf(out, USAGE_BEGIN_TAIL); + /* Remove USAGE_MAN_TAIL line when man page does not exist. */ + fprintf(out, USAGE_MAN_TAIL, "arch(1)"); + exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); +} + +int main(int argc, char **argv) +{ + struct utsname utsbuf; + int ch; + static const struct option longopts[] = { + {"version", no_argument, NULL, 'V'}, + {"help", no_argument, NULL, 'h'}, + {NULL, 0, NULL, 0} + }; + + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1) + switch (ch) { + case 'V': + printf(UTIL_LINUX_VERSION); + return EXIT_SUCCESS; + case 'h': + usage(stdout); + default: + usage(stderr); + } - if (uname( &utsbuf )) { - perror( "arch" ); - return 1; - } + if (uname(&utsbuf)) + err(EXIT_FAILURE, _("uname failed")); - printf( "%s\n", utsbuf.machine ); + printf("%s\n", utsbuf.machine); - return 0; + return EXIT_SUCCESS; } diff --git a/term-utils/Makefile.am b/term-utils/Makefile.am index b423bbde1..49ad5ff2f 100644 --- a/term-utils/Makefile.am +++ b/term-utils/Makefile.am @@ -7,8 +7,6 @@ usrsbin_exec_PROGRAMS = dist_man_MANS = script.1 scriptreplay.1 -EXTRA_DIST = README.modems-with-agetty - script_LDADD = if HAVE_UTIL @@ -44,7 +42,7 @@ if BUILD_RESET dist_usrbin_exec_SCRIPTS = reset dist_man_MANS += reset.1 endif -EXTRA_DIST += reset.033c +EXTRA_DIST = reset.033c if BUILD_MESG usrbin_exec_PROGRAMS += mesg diff --git a/tests/Makefile.am b/tests/Makefile.am index 1d4fa1095..2c7231879 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,7 +5,6 @@ SUBDIRS = helpers EXTRA_DIST = expected \ ts \ functions.sh \ - README \ run.sh clean-local: diff --git a/text-utils/LICENSE.pg b/text-utils/LICENSE.pg deleted file mode 100644 index e805a3158..000000000 --- a/text-utils/LICENSE.pg +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) 2000-2001 Gunnar Ritter. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. [deleted] - * 4. Neither the name of Gunnar Ritter nor the names of his contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY GUNNAR RITTER AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL GUNNAR RITTER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am index 7e770c913..b715aafa6 100644 --- a/text-utils/Makefile.am +++ b/text-utils/Makefile.am @@ -1,7 +1,5 @@ include $(top_srcdir)/config/include-Makefile.am -EXTRA_DIST = README.clear README.col - usrbin_exec_PROGRAMS = col colcrt colrm column hexdump rev tailf column_SOURCES = column.c $(top_srcdir)/lib/strutils.c @@ -42,5 +40,3 @@ more_LDADD = -ltermcap dist_man_MANS += more.1 endif endif - -EXTRA_DIST += README.pg LICENSE.pg diff --git a/text-utils/README.clear b/text-utils/README.clear deleted file mode 100644 index 7684132de..000000000 --- a/text-utils/README.clear +++ /dev/null @@ -1,7 +0,0 @@ -RedHat and SuSE take the program clear from ncurses. - A 20KB program equivalent to "tput clear". - -Slackware uses the script. - -So, both versions will behave identically, and -Slackware saves 20 KB. |