From 50f248d160a34cd83363d97a1a5f0ff8beb83299 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Thu, 8 Apr 2010 14:54:23 -0700 Subject: [PATCH] Update Debian packaging files The Debian packaging files in the tree were ancient. Update to the packaging files from the just-uploaded 1.5.73.3-1 version, which should build and correctly install the current development source. The current packaging files no longer use a hard-coded version in debian/rules, so remove the configure machinery for creating it. The correct way of handling the version number is to generate a new changelog entry. That work will come in a subsequent patch. Change-Id: I187fe7cc3f4ca38de6165d58274841d300b6cdf1 Reviewed-on: http://gerrit.openafs.org/1713 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- configure.in | 1 - src/packaging/Debian/.gitignore | 5 - src/packaging/Debian/CellServDB | 232 ++- src/packaging/Debian/README.Debian | 49 +- src/packaging/Debian/README.modules | 55 +- src/packaging/Debian/README.source | 136 ++ src/packaging/Debian/afs-newcell | 8 +- src/packaging/Debian/afs-rootvol | 0 src/packaging/Debian/changelog | 580 ++++++ src/packaging/Debian/clean | 11 + src/packaging/Debian/compat | 2 +- src/packaging/Debian/control | 102 +- src/packaging/Debian/copyright | 68 +- src/packaging/Debian/import-upstream | 46 + src/packaging/Debian/libkopenafs1.install | 1 + src/packaging/Debian/libkopenafs1.symbols | 6 + src/packaging/Debian/libopenafs-dev.install | 1 + src/packaging/Debian/module/control | 11 +- src/packaging/Debian/module/control.in | 14 +- src/packaging/Debian/module/kernel-version | 0 src/packaging/Debian/module/prep-modules | 0 src/packaging/Debian/module/rules | 51 +- src/packaging/Debian/module/sysname | 11 +- src/packaging/Debian/openafs-client.NEWS | 27 + src/packaging/Debian/openafs-client.config | 66 +- src/packaging/Debian/openafs-client.init | 44 +- src/packaging/Debian/openafs-client.install | 41 +- src/packaging/Debian/openafs-client.lintian | 2 - .../Debian/openafs-client.lintian-overrides | 3 + src/packaging/Debian/openafs-client.postinst | 72 +- src/packaging/Debian/openafs-client.prerm | 33 +- src/packaging/Debian/openafs-client.templates | 2 +- src/packaging/Debian/openafs-dbserver.NEWS | 20 + src/packaging/Debian/openafs-dbserver.install | 2 + src/packaging/Debian/openafs-dbserver.lintian | 1 - .../Debian/openafs-dbserver.lintian-overrides | 3 + .../Debian/openafs-doc.doc-base.openafs-admin | 7 +- .../Debian/openafs-doc.doc-base.openafs-quick | 7 +- .../Debian/openafs-doc.doc-base.openafs-user | 7 +- src/packaging/Debian/openafs-doc.docs | 6 +- src/packaging/Debian/openafs-fileserver.NEWS | 42 + src/packaging/Debian/openafs-fileserver.config | 43 +- src/packaging/Debian/openafs-fileserver.install | 66 +- src/packaging/Debian/openafs-fileserver.lintian | 1 - .../Debian/openafs-fileserver.lintian-overrides | 5 + src/packaging/Debian/openafs-fileserver.postinst | 13 +- src/packaging/Debian/openafs-fileserver.templates | 12 - src/packaging/Debian/openafs-krb5.NEWS | 14 + src/packaging/Debian/openafs-krb5.install | 2 + src/packaging/Debian/openafs-krb5.postinst | 14 + src/packaging/Debian/openafs-krb5.prerm | 11 + src/packaging/Debian/openafs-modules-dkms.dkms | 16 + src/packaging/Debian/openafs-modules-dkms.docs | 1 + src/packaging/Debian/openafs-modules-source.docs | 2 - src/packaging/Debian/patches/afs-man-name | 1888 -------------------- src/packaging/Debian/patches/alloc-vnode | 34 - src/packaging/Debian/patches/bos-permissions | 24 - src/packaging/Debian/patches/compiler-flags | 213 --- src/packaging/Debian/patches/dfsg | 73 - src/packaging/Debian/patches/find-core-files | 70 - src/packaging/Debian/patches/fstrace-paths | 27 - src/packaging/Debian/patches/ktc-prototypes | 24 - src/packaging/Debian/patches/linux-2.6.24 | 421 ----- src/packaging/Debian/patches/module-name | 66 - src/packaging/Debian/patches/multiple-local-realms | 578 ------ src/packaging/Debian/patches/no-admin-reference | 13 - src/packaging/Debian/patches/pam-build | 88 - src/packaging/Debian/patches/paths | 16 - src/packaging/Debian/patches/series | 11 - src/packaging/Debian/patches/ucontext-everywhere | 59 - src/packaging/Debian/po/cs.po | 73 +- src/packaging/Debian/po/de.po | 114 +- src/packaging/Debian/po/es.po | 279 +++ src/packaging/Debian/po/fr.po | 82 +- src/packaging/Debian/po/gl.po | 247 +++ src/packaging/Debian/po/ja.po | 266 +++ src/packaging/Debian/po/nl.po | 186 +- src/packaging/Debian/po/pt.po | 104 +- src/packaging/Debian/po/pt_BR.po | 89 +- src/packaging/Debian/po/ru.po | 253 +++ src/packaging/Debian/po/sv.po | 246 +++ src/packaging/Debian/po/templates.pot | 64 +- src/packaging/Debian/po/vi.po | 232 ++- src/packaging/Debian/po/zh_CN.po | 33 +- src/packaging/Debian/rules | 235 +++ src/packaging/Debian/rules.in | 235 --- src/packaging/Debian/source/format | 1 + src/packaging/Debian/sysname | 11 +- src/packaging/Debian/watch | 8 +- 89 files changed, 3547 insertions(+), 4791 deletions(-) delete mode 100644 src/packaging/Debian/.gitignore create mode 100644 src/packaging/Debian/README.source mode change 100644 => 100755 src/packaging/Debian/afs-newcell mode change 100644 => 100755 src/packaging/Debian/afs-rootvol create mode 100644 src/packaging/Debian/clean create mode 100755 src/packaging/Debian/import-upstream create mode 100644 src/packaging/Debian/libkopenafs1.install create mode 100644 src/packaging/Debian/libkopenafs1.symbols mode change 100644 => 100755 src/packaging/Debian/module/kernel-version mode change 100644 => 100755 src/packaging/Debian/module/prep-modules mode change 100644 => 100755 src/packaging/Debian/module/rules mode change 100644 => 100755 src/packaging/Debian/module/sysname mode change 100644 => 100755 src/packaging/Debian/openafs-client.init delete mode 100644 src/packaging/Debian/openafs-client.lintian create mode 100644 src/packaging/Debian/openafs-client.lintian-overrides create mode 100644 src/packaging/Debian/openafs-dbserver.NEWS delete mode 100644 src/packaging/Debian/openafs-dbserver.lintian create mode 100644 src/packaging/Debian/openafs-dbserver.lintian-overrides delete mode 100644 src/packaging/Debian/openafs-fileserver.lintian create mode 100644 src/packaging/Debian/openafs-fileserver.lintian-overrides create mode 100644 src/packaging/Debian/openafs-krb5.NEWS create mode 100644 src/packaging/Debian/openafs-krb5.postinst create mode 100644 src/packaging/Debian/openafs-krb5.prerm create mode 100644 src/packaging/Debian/openafs-modules-dkms.dkms create mode 100644 src/packaging/Debian/openafs-modules-dkms.docs delete mode 100644 src/packaging/Debian/patches/afs-man-name delete mode 100644 src/packaging/Debian/patches/alloc-vnode delete mode 100644 src/packaging/Debian/patches/bos-permissions delete mode 100644 src/packaging/Debian/patches/compiler-flags delete mode 100644 src/packaging/Debian/patches/dfsg delete mode 100644 src/packaging/Debian/patches/find-core-files delete mode 100644 src/packaging/Debian/patches/fstrace-paths delete mode 100644 src/packaging/Debian/patches/ktc-prototypes delete mode 100644 src/packaging/Debian/patches/linux-2.6.24 delete mode 100644 src/packaging/Debian/patches/module-name delete mode 100644 src/packaging/Debian/patches/multiple-local-realms delete mode 100644 src/packaging/Debian/patches/no-admin-reference delete mode 100644 src/packaging/Debian/patches/pam-build delete mode 100644 src/packaging/Debian/patches/paths delete mode 100644 src/packaging/Debian/patches/series delete mode 100644 src/packaging/Debian/patches/ucontext-everywhere create mode 100644 src/packaging/Debian/po/es.po create mode 100644 src/packaging/Debian/po/gl.po create mode 100644 src/packaging/Debian/po/ja.po create mode 100644 src/packaging/Debian/po/ru.po create mode 100644 src/packaging/Debian/po/sv.po create mode 100755 src/packaging/Debian/rules delete mode 100644 src/packaging/Debian/rules.in create mode 100644 src/packaging/Debian/source/format diff --git a/configure.in b/configure.in index 93e4b8c..3ae36aa 100644 --- a/configure.in +++ b/configure.in @@ -107,7 +107,6 @@ src/log/Makefile \ src/log/test/Makefile \ src/lwp/Makefile \ src/lwp/test/Makefile \ -src/packaging/Debian/rules \ src/packaging/MacOS/OpenAFS-debug.Description.plist \ src/packaging/MacOS/OpenAFS-debug.Info.plist \ src/packaging/MacOS/OpenAFS.Description.plist \ diff --git a/src/packaging/Debian/.gitignore b/src/packaging/Debian/.gitignore deleted file mode 100644 index 8a8112e..0000000 --- a/src/packaging/Debian/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# After changing this file, please run -# git ls-files -i --exclude-standard -# to check that you haven't inadvertently ignored any tracked files. - -/rules diff --git a/src/packaging/Debian/CellServDB b/src/packaging/Debian/CellServDB index 79a2c23..2be7edc 100644 --- a/src/packaging/Debian/CellServDB +++ b/src/packaging/Debian/CellServDB @@ -1,5 +1,5 @@ ->grand.central.org #GCO Public CellServDB 25 Oct 2007 -18.92.0.108 #grand-opening.mit.edu +>grand.central.org #GCO Public CellServDB 28 Feb 2010 +18.9.48.14 #grand.mit.edu 128.2.203.61 #penn.central.org 130.237.48.87 #andrew.e.kth.se >wu-wien.ac.at #University of Economics, Vienna, Austria @@ -11,9 +11,9 @@ 193.170.243.12 #baloo.oeaw.ac.at 193.170.243.14 #akela.oeaw.ac.at >cgv.tugraz.at #CGV cell -129.27.224.133 #phobos.cgv.tugraz.at -129.27.224.134 #deimos.cgv.tugraz.at -129.27.224.210 #trinculo.cgv.tugraz.at +129.27.218.30 #phobos.cgv.tugraz.at +129.27.218.31 #deimos.cgv.tugraz.at +129.27.218.32 #trinculo.cgv.tugraz.at >itp.tugraz.at #Institute of Theoretical and Computational Physics, TU Graz, Aus 129.27.161.7 #faepafs1.tu-graz.ac.at 129.27.161.15 #faepafs2.tu-graz.ac.at @@ -33,28 +33,39 @@ 128.178.109.112 #kd2.epfl.ch 128.178.109.113 #kd3.epfl.ch >ethz.ch #Swiss Federal Inst. of Tech. - Zurich, Switzerland -129.132.97.19 #amalthea.ethz.ch -129.132.97.27 #nethzafs-001.ethz.ch -129.132.115.3 #himalia.ethz.ch -129.132.115.37 #nethzafs-005.ethz.ch -129.132.115.38 #nethzafs-006.ethz.ch +82.130.118.32 #afs-db-1.ethz.ch >psi.ch #Paul Scherrer Institut - Villigen, Switzerland 129.129.190.140 #afs00.psi.ch 129.129.190.141 #afs01.psi.ch 129.129.190.142 #afs02.psi.ch >extundo.com #Simon Josefsson's cell 195.42.214.241 #slipsten.extundo.com +>freedaemon.com #Free Daemon Consulting, Oklahoma City, OK, USA +66.210.104.254 #afs0.freedaemon.com >membrain.com #membrain.com 66.93.118.125 #stormy 130.85.24.11 #weasel 130.85.24.13 #straykitten >setfilepointer.com #SetFilePointer.com -63.224.10.2 #hamlet.SetFilePointer.com -63.224.10.4 #troilus.SetFilePointer.com +69.164.193.174 #alpha.setfilepointer.com +174.143.159.53 #beta.setfilepointer.com >sodre.cx #Sodre.cx 128.8.140.165 #greed.sodre.cx +>ruk.cuni.cz #Charles University Computer Centre, Prague, CR +195.113.0.36 #asterix.ruk.cuni.cz +195.113.0.37 #obelix.ruk.cuni.cz +195.113.0.40 #sal.ruk.cuni.cz +>ics.muni.cz #Masaryk university +147.251.3.11 #grond.ics.muni.cz +147.251.3.15 #nimloth.ics.muni.cz +147.251.3.19 #sirion.ics.muni.cz +>zcu.cz #University of West Bohemia, Czech Republic +147.228.10.18 #sauron.zcu.cz +147.228.52.10 #oknos.zcu.cz +147.228.52.17 #nic.zcu.cz >desy.de #Deutsches Elektronen-Synchrotron -131.169.40.62 #vayu.desy.de +131.169.2.19 #afsdb2.desy.de +131.169.2.20 #afsdb3.desy.de 131.169.244.60 #solar00.desy.de >gppc.de #GPP Chemnitz mbH 213.187.92.33 #gpp1.gppc.de @@ -68,19 +79,26 @@ 141.34.22.10 #romulus.ifh.de 141.34.22.11 #remus.ifh.de 141.34.22.29 #hekate.ifh.de +>integra-ev.de #INTEGRA e.V. +134.155.48.8 #afsdb2.integra-ev.de +134.155.48.63 #afsdb1.integra-ev.de >lrz-muenchen.de #Leibniz Computing Centre, Germany 129.187.10.36 #afs1.lrz-muenchen.de 129.187.10.56 #afs3.lrz-muenchen.de 129.187.10.57 #afs2.lrz-muenchen.de >ipp-garching.mpg.de #Institut fuer Plasmaphysik 130.183.9.5 #afs-db1.rzg.mpg.de +130.183.14.14 #afs-db3.bc.rzg.mpg.de 130.183.100.10 #afs-db2.aug.ipp-garching.mpg.de -130.183.100.23 #afs-db3.aug.ipp-garching.mpg.de >mpe.mpg.de #MPE cell 130.183.130.7 #irafs1.mpe-garching.mpg.de 130.183.134.20 #irafs2.mpe-garching.mpg.de +>nicsys.de #NICsys GbR +213.187.80.3 #attila.nicsys.de >i1.informatik.rwth-aachen.de #Informatik I, RWTH Aachen 137.226.244.79 #remus.informatik.rwth-aachen.de +>combi.tfh-wildau.de #Philips Research Lab +194.95.50.106 #joda13.combi.tfh-wildau.de >tu-bs.de #Technical University of Braunschweig, Germany 134.169.1.1 #rzafs1.rz.tu-bs.de 134.169.1.5 #rzafs2.rz.tu-bs.de @@ -91,22 +109,27 @@ 134.109.200.7 #aetius.hrz.tu-chemnitz.de >e18.ph.tum.de #Experimental Physics, TU Munich, Germany 129.187.154.223 #hamlet.e18.physik.tu-muenchen.de ->uni-bonn.de #University of Bonn, Computing Center -131.220.14.198 #work15-eth.rhrz.uni-bonn.de -131.220.14.205 #node05.rhrz.uni-bonn.de -131.220.15.197 #afs-db1.rhrz.uni-bonn.de >atlass01.physik.uni-bonn.de #Bonn ATLAS 131.220.165.43 #atlass01.physik.uni-bonn.de >uni-freiburg.de #Albert-Ludwigs-Universitat Freiburg -132.230.6.235 #sv6.ruf.uni-freiburg.de -132.230.6.236 #sv7.ruf.uni-freiburg.de 132.230.6.237 #sv8.ruf.uni-freiburg.de ->physik.uni-freiburg.de #institute of physics, university Freiburg, Germany +132.230.6.239 #sv10.ruf.uni-freiburg.de +>physik.uni-freiburg.de #Institute of Physics, University Freiburg, Germany +132.230.6.234 #afs1.ruf.uni-freiburg.de +132.230.6.235 #afs2.ruf.uni-freiburg.de 132.230.77.16 #hepafs.physik.uni-freiburg.de +>physnet.uni-hamburg.de #PHYSnet-Rechenzentrum university of hamburg +134.100.106.44 #afs-core.physnet.uni-hamburg.de +134.100.106.45 #afs-core2.physnet.uni-hamburg.de +134.100.106.47 #afs-core3.physnet.uni-hamburg.de +>mathi.uni-heidelberg.de #Uni Heidelberg (Mathematisches Institut) +129.206.26.241 #hactar.mathi.uni-heidelberg.de >urz.uni-heidelberg.de #Uni Heidelberg (Rechenzentrum) 129.206.119.10 #afsdb.urz.uni-heidelberg.de 129.206.119.16 #afsdb1.urz.uni-heidelberg.de 129.206.119.17 #afsdb2.urz.uni-heidelberg.de +>ziti.uni-heidelberg.de #Institute of Computer Science at the University of Heidelberg +147.142.42.246 #mp-sun.ziti.uni-heidelberg.de >uni-hohenheim.de #University of Hohenheim 144.41.2.2 #rs13.serv.uni-hohenheim.de 144.41.2.3 #rs14.serv.uni-hohenheim.de @@ -122,9 +145,10 @@ 134.95.144.24 #afs2.meteo.uni-koeln.de >rrz.uni-koeln.de #University of Cologne - Reg Comp Center 134.95.19.3 #afsdb1.rrz.uni-koeln.de +134.95.19.4 #afsdb2.rrz.uni-koeln.de 134.95.19.10 #lyra.rrz.uni-koeln.de 134.95.67.97 #afs.thp.uni-koeln.de -134.95.141.243 #agrippina.rrz.uni-koeln.de +134.95.112.8 #ladon.rrz.uni-koeln.de >physik.uni-mainz.de #institute of physics, university Mainz, Germany 134.93.130.93 #hardy.physik.uni-mainz.de >uni-mannheim.de #Uni Mannheim (Rechenzentrum) @@ -149,22 +173,31 @@ 129.219.10.70 #authen1.asu.edu 129.219.10.72 #authen3.asu.edu 129.219.100.16 #authen4.asu.edu +>mars.asu.edu #Mars Space Flight Facility - ASU Mars Research +149.169.146.57 #kdc1.mars.asu.edu +149.169.146.58 #kdc2.mars.asu.edu +149.169.146.59 #kdc3.mars.asu.edu >eecs.berkeley.edu #University of California, Berkeley - EECS Dept. 128.32.139.34 #greed.eecs.berkeley.edu 128.32.139.35 #gluttony.eecs.berkeley.edu 169.229.60.112 #envy.eecs.berkeley.edu >hep.caltech.edu #Caltech High Energy Physics 131.215.116.20 #afs.hep.caltech.edu +>ugcs.caltech.edu #Caltech UGCS lab +131.215.176.65 #afs-c.ugcs.caltech.edu +131.215.176.67 #afs-a.ugcs.caltech.edu +131.215.176.68 #afs-b.ugcs.caltech.edu >clarkson.edu #Clarkson University, Potsdam, New York USA 128.153.1.111 #arthur.clarkson.edu 128.153.9.111 #lancelot.clarkson.edu 128.153.17.111 #uther.clarkson.edu >andrew.cmu.edu #Carnegie Mellon University - Computing Services Cell -128.2.10.2 #vice2.fs.andrew.cmu.edu -128.2.10.7 #vice7.fs.andrew.cmu.edu -128.2.10.11 #vice11.fs.andrew.cmu.edu -128.2.10.28 #vice28.fs.andrew.cmu.edu -128.2.32.44 #new-vice12.fs.andrew.cmu.edu +128.2.10.2 #afsdb-01.andrew.cmu.edu +128.2.10.7 #afsdb-02.andrew.cmu.edu +128.2.10.11 #afsdb-03.andrew.cmu.edu +>mw.andrew.cmu.edu #Carnegie Mellon University - Middleware Test Cell +128.2.234.24 #null.andrew.cmu.edu +128.2.234.170 #mw-mgr.andrew.cmu.edu >club.cc.cmu.edu #Carnegie Mellon University Computer Club 128.2.204.149 #barium.club.cc.cmu.edu 128.237.157.11 #sodium.club.cc.cmu.edu @@ -173,7 +206,10 @@ 128.2.40.134 #afs.chem.cmu.edu 128.2.40.140 #afs2.chem.cmu.edu >cs.cmu.edu #Carnegie Mellon University - School of Comp. Sci. +128.2.172.58 #date.srv.cs.cmu.edu +128.2.172.60 #fig.srv.cs.cmu.edu 128.2.184.215 #pumpkin.srv.cs.cmu.edu +128.2.200.97 #watermelon.srv.cs.cmu.edu 128.2.201.46 #strawberry.srv.cs.cmu.edu 128.2.201.48 #cherry.srv.cs.cmu.edu >ece.cmu.edu #Carnegie Mellon University - Elec. Comp. Eng. Dept. @@ -191,6 +227,11 @@ >cnf.cornell.edu #CNF 128.253.198.9 #hole.cnf.cornell.edu 128.253.198.27 #smoke.cnf.cornell.edu +128.253.198.231 #mist.cnf.cornell.edu +>math.cornell.edu #Cornell Math Dept +128.84.234.12 #pooh.math.cornell.edu +128.84.234.16 #bernoulli.math.cornell.edu +128.84.234.162 #dyno.math.cornell.edu >msc.cornell.edu #Cornell University Materials Science Center 128.84.231.242 #miranda.ccmr.cornell.edu 128.84.241.35 #co.ccmr.cornell.edu @@ -201,9 +242,9 @@ 129.170.30.145 #dbicafs3.dartmouth.edu >northstar.dartmouth.edu #Dartmouth College Research Computing 129.170.16.22 #halley.dartmouth.edu -129.170.16.42 #oort.dartmouth.edu +129.170.16.26 #andromeda.dartmouth.edu 129.170.16.43 #cygnusx1.dartmouth.edu ->cs.fhm.edu #Department Computer Science Munich University Of Applied Science +>cs.hm.edu #Department Computer Science Munich University Of Applied Science 129.187.208.2 #srv1.informatik.fh-muenchen.de >eecs.harvard.edu #Harvard - EECS 140.247.60.64 #lefkada.eecs.harvard.edu @@ -214,29 +255,35 @@ 129.186.142.243 #afsdb-3.iastate.edu >athena.mit.edu #MIT/Athena cell 18.7.1.66 #paris.mit.edu. -18.7.1.74 #chimera.mit.edu. -18.158.0.37 #prill.mit.edu. +18.9.48.11 #castor.mit.edu +18.9.48.12 #pollux.mit.edu. >dev.mit.edu #MIT/IS Development cell -18.7.1.70 #wham.mit.edu. -18.92.1.219 #click.mit.edu. -18.92.1.220 #whirr.mit.edu. +18.9.48.13 #saw.mit.edu. +18.9.60.110 #hammer.mit.edu. +18.9.60.111 #screw.mit.edu. >net.mit.edu #MIT/Network Group cell 18.7.7.73 #gracie.mit.edu 18.7.21.95 #george.mit.edu +>numenor.mit.edu #Project Numenor +18.243.2.49 #numenor.mit.edu >sipb.mit.edu #MIT/SIPB cell -18.181.0.19 #reynelda.mit.edu. -18.181.0.22 #rosebud.mit.edu. -18.181.0.23 #ronald-ann.mit.edu. +18.181.0.19 #reynelda.mit.edu +18.181.0.22 #rosebud.mit.edu +18.181.0.23 #ronald-ann.mit.edu >soap.mit.edu #MIT School Of Architecture & Planning 18.89.1.204 #crypt.mit.edu -18.89.1.209 #grotto.mit.edu -18.89.2.156 #ac.mit.edu +18.89.3.46 #soap.mit.edu +18.89.4.9 #arch.mit.edu >msu.edu #Michigan State University Main Cell 35.9.7.10 #afsdb0.cl.msu.edu >nd.edu #University of Notre Dame 129.74.223.17 #john.helios.nd.edu 129.74.223.33 #lizardo.helios.nd.edu 129.74.223.65 #buckaroo.helios.nd.edu +>crc.nd.edu #University of Notre Dame - Center for Research Computing +129.74.85.34 #afsdb1.crc.nd.edu +129.74.85.35 #afsdb2.crc.nd.edu +129.74.85.36 #afsdb3.crc.nd.edu >pitt.edu #University of Pittsburgh 136.142.8.15 #afs09.srv.cis.pitt.edu 136.142.8.20 #afs10.srv.cis.pitt.edu @@ -280,14 +327,6 @@ 134.79.18.25 #afsdb1.slac.stanford.edu 134.79.18.26 #afsdb2.slac.stanford.edu 134.79.18.27 #afsdb3.slac.stanford.edu ->ucdavis.edu #University of California at Davis -169.237.104.100 #afs1.ucdavis.edu -169.237.235.176 #afs2.ucdavis.edu -169.237.247.91 #afs3.ucdavis.edu ->home.ucdavis.edu #University of California at Davis home directories -169.237.105.91 #home1.ucdavis.edu -169.237.105.92 #home2.ucdavis.edu -169.237.105.93 #home3.ucdavis.edu >physics.ucsb.edu #UC Santa Barbara, Physics Dept 128.111.18.161 #ledzeppelin.physics.ucsb.edu >cats.ucsc.edu #UC Santa Cruz, Comp and Tech Services, California U.S.A @@ -326,12 +365,8 @@ 141.211.43.102 #linat02.grid.umich.edu 141.211.43.103 #linat03.grid.umich.edu 141.211.43.104 #linat04.grid.umich.edu ->citi.umich.edu #Center for Information Technology Integration -141.211.133.5 #babylon.citi.umich.edu ->lsa.umich.edu #University of Michigan - College of LS&A -141.211.211.53 #gerow.lsa.umich.edu -141.211.211.72 #collines.lsa.umich.edu -141.211.211.153 #hodges.lsa.umich.edu +>citi.umich.edu #University of Michigan - Center for Information Technology Integ +141.212.112.5 #babylon.citi.umich.edu >sph.umich.edu #University of Michigan -- School of Public Health 141.211.51.137 #afssph7.sph.umich.edu 141.211.51.139 #afssph0.sph.umich.edu @@ -363,6 +398,8 @@ 144.92.13.16 #moe.cae.wisc.edu >hep.wisc.edu #University of Wisconsin -- High Energy Physics 128.104.28.219 #anise.hep.wisc.edu +144.92.180.7 #rosemary.hep.wisc.edu +144.92.180.30 #fennel.hep.wisc.edu >physics.wisc.edu #Univ. of Wisconsin-Madison, Physics Department 128.104.160.13 #kendra.physics.wisc.edu 128.104.160.14 #fray.physics.wisc.edu @@ -381,9 +418,9 @@ >dapnia.saclay.cea.fr #CEA DAPNIA 132.166.32.7 #dphrsg.saclay.cea.fr 132.166.32.12 #dphrsl.saclay.cea.fr ->grif.fr #GRIF cell -192.54.208.18 #node03.datagrid.cea.fr >in2p3.fr #IN2P3 production cell +134.158.104.11 #ccafsdb01.in2p3.fr +134.158.104.12 #ccafsdb02.in2p3.fr 134.158.232.11 #ccafsdb1.in2p3.fr 134.158.232.12 #ccafsdb2.in2p3.fr 134.158.232.13 #ccafsdb3.in2p3.fr @@ -417,6 +454,8 @@ 128.55.128.250 #mars.nersc.gov 128.55.128.252 #alfred.nersc.gov 128.55.128.254 #lurch.nersc.gov +>doe.atomki.hu #Institute of Nuclear Research (MTA ATOMKI), Debrecen, Hungary +193.6.179.31 #afs.doe.atomki.hu >bme.hu #Budapest University of Technology and Economics 152.66.241.6 #afs.iit.bme.hu >kfki.hu #Research Institute for Nuclear and Particle Physics - Budapest,H @@ -429,15 +468,15 @@ 192.107.54.5 #aixfs.frascati.enea.it 192.107.54.11 #rs2ced.frascati.enea.it 192.107.54.12 #43p.frascati.enea.it -192.107.61.235 #serverinfo02.bologna.enea.it -192.107.71.6 #glauco.casaccia.enea.it -192.107.96.233 #riscdb.trisaia.enea.it >fusione.it #Assoz. FUSIONE/Euratom, ENEA, Frascati-Italy 192.107.90.2 #fusafs1.frascati.enea.it 192.107.90.3 #fusafs2.frascati.enea.it 192.107.90.4 #fusafs3.frascati.enea.it >icemb.it #ICEMB, Universita' La Sapienza - Rome - Italy 193.204.6.130 #icembfs.caspur.it +>ictp.it #The Abdus Salam International Centre for Theoretical Physics (IC +140.105.34.7 #afsdb1.ictp.it +140.105.34.8 #afsdb2.ictp.it >infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia 131.154.1.7 #afscnaf.infn.it 141.108.26.75 #afsrm1.roma1.infn.it @@ -458,15 +497,15 @@ >lngs.infn.it #INFN, Laboratori Nazionali di Gran Sasso 192.84.135.21 #rsgs05.lngs.infn.it >pi.infn.it #INFN, Sezione di Pisa -131.114.134.26 #unknownhost.pi.infn.it 192.84.133.50 #aix1.pi.infn.it +212.189.152.6 #afs1.pi.infn.it +212.189.152.7 #afs2.pi.infn.it +>roma3.infn.it #Istituto Nazionale di Fisica Nucleare (INFN), Italia +193.205.159.17 #afsrm3.roma3.infn.it >psm.it #Progetto San Marco, Universita' di Roma-1 151.100.1.65 #atlante.psm.uniroma1.it >tgrid.it #CASPUR-CILEA-CINECA Grid Cell 193.204.5.33 #cccgrid.caspur.it ->ictp.trieste.it #The Abdus Salam International Centre for Theoretical Physics (IC -140.105.16.8 #fs1.ictp.trieste.it -140.105.16.9 #fs2.ictp.trieste.it >math.unifi.it #math.unifi.it 150.217.34.182 #xeno.math.unifi.it >ing.uniroma1.it #Universita' La Sapienza, Fac. Ingeneria @@ -480,14 +519,17 @@ 193.204.161.138 #gamma.dia.uniroma3.it >italia #Italian public AFS cell 193.204.5.9 #afs.caspur.it ->cmf.nrl.navy.mil #Naval Research Lab - CCS -134.207.10.68 #picard.cmf.nrl.navy.mil -134.207.10.69 #riker.cmf.nrl.navy.mil -134.207.10.70 #kirk.cmf.nrl.navy.mil +>cmf.nrl.navy.mil #Naval Research Laboratory - Center for Computational Science +134.207.12.68 #picard.cmf.nrl.navy.mil +134.207.12.69 #riker.cmf.nrl.navy.mil +134.207.12.70 #kirk.cmf.nrl.navy.mil >lcp.nrl.navy.mil #Naval Research Lab - Lab for Computational Physics 132.250.114.2 #afs1.lcp.nrl.navy.mil 132.250.114.4 #afs2.lcp.nrl.navy.mil 132.250.114.6 #afs3.lcp.nrl.navy.mil +>epitech.net #EPITECH, France +163.5.255.41 #afs-db-1.epitech.net +163.5.255.42 #afs-db-2.epitech.net >es.net #Energy Sciences Net 198.128.3.21 #fs1.es.net 198.128.3.22 #fs2.es.net @@ -500,61 +542,67 @@ >slackers.net #The Slackers' Network 199.4.150.159 #alexandria.slackers.net >tproa.net #The People's Republic of Ames -72.13.4.23 #service-3.tproa.net -72.13.4.24 #service-4.tproa.net -72.13.4.25 #service-5.tproa.net +204.11.35.83 #service-3.tproa.net +204.11.35.84 #service-4.tproa.net +204.11.35.85 #service-5.tproa.net +>interdose.net #Interdose Ltd. & Co. KG, Germany +80.190.171.42 #bfd9000.tow5.interdose.net +80.190.171.43 #bfd9001.tow5.interdose.net >nikhef.nl #The Dutch National Institute for High Energy Physics 192.16.185.26 #afs1.nikhef.nl 192.16.185.27 #afs2.nikhef.nl >1ts.org #1TS.ORG, Cambridge, MA -69.25.196.51 #pancake.1ts.org +69.25.196.126 #neuromancer.1ts.org >acm-csuf.org #California State Univerisity Fullerton ACM 137.151.29.193 #afs1.acm-csuf.org +>adrake.org #adrake.org +128.2.98.241 #afs.adrake.org >bazquux.org #Baz Quux Organization 66.207.142.196 #baxquux.org >coed.org #Adam Pennington's Cell 66.93.61.184 #vice1.coed.org 128.237.157.35 #vice3.coed.org >dementia.org #Dementia Unlimited -128.2.12.45 #alycia.dementia.org -128.2.120.216 #meredith.dementia.org ->dsrw.org #The DSRW -65.103.82.83 #straylight.dsrw.org -65.103.82.84 #chiba.dsrw.org -65.103.82.85 #freeside.dsrw.org ->hackish.org #Hackish.org -24.167.65.213 #avatar.sys.hackish.org -128.2.120.138 #kurma.sys.hackish.org +128.2.13.209 #dedlock.dementia.org +128.2.235.26 #meredith.dementia.org >idahofuturetruck.org #University of Idaho hybrid vehicle development 12.18.238.210 #dsle210.fsr.net ->nimlabs.org #Nimlabs, Ink. Cell. -18.238.1.103 #olfin.nimlabs.org -18.238.1.105 #caerbanog.nimlabs.org +>jeaton.org #jeaton.org (Jeffrey Eaton, jeaton@jeaton.org) +128.2.234.89 #jeaton-org-01.jeaton.org +128.2.234.92 #jeaton-org-02.jeaton.org +>mrow.org #MROW.ORG and RITLUG Cell +88.198.46.111 #mrow.org +129.21.205.119 #mirror.rit.edu +>mrph.org #Mrph +66.207.133.1 #sanber.mrph.org +128.2.99.209 #hernandarias.mrph.org +>mstacm.org #Missouri Science & Technology - ACM +131.151.249.193 #acm.mst.edu >nomh.org #nomh.org 204.29.154.12 #iota.nomh.org 204.29.154.32 #adversity.xi.nomh.org >oc7.org #The OC7 Project 128.2.122.140 #knife.oc7.org 207.22.77.170 #spoon.oc7.org +>pfriedma.org #pfriedma.org +72.95.215.18 #vice.pfriedma.org +>riscpkg.org #The RISC OS Packaging Project +83.104.175.10 #delenn.riscpkg.org >kth.se #Royal Institute of Technology, Stockholm, Sweden 130.237.32.145 #sonen.e.kth.se 130.237.48.7 #anden.e.kth.se 130.237.48.244 #fadern.e.kth.se ->hallf.kth.se #Royal Institute of Technology, HALLF -130.237.24.11 #afs1.hallf.kth.se -130.237.24.104 #afs2.hallf.kth.se >isk.kth.se #Royal Institute of Technology, ISK -130.237.202.3 #afsdb1.isk.kth.se 130.237.209.5 #afsdb2.isk.kth.se -130.237.209.9 #afsdb3.isk.kth.se +130.237.216.17 #afsdb1.isk.kth.se >it.kth.se #Royal Institute of Technology, IT 130.237.212.15 #ptah.it.kth.se 130.237.212.16 #toth.it.kth.se 130.237.215.7 #isis.it.kth.se >md.kth.se #Royal Institute of Technology, MMK +130.237.57.21 #euler.md.kth.se 130.237.57.68 #trinity.md.kth.se 130.237.57.72 #morpheus.md.kth.se -130.237.67.230 #neo.speech.kth.se >mech.kth.se #Royal Institute of Technology, MECH 130.237.233.142 #matterhorn.mech.kth.se 130.237.233.143 #castor.mech.kth.se @@ -590,8 +638,8 @@ 193.2.120.2 #solkan.p-ng.si >hep-ex.physics.metu.edu.tr #METU Department of Physics, Experimental HEP group, Ankara/Turke 144.122.31.131 #neutrino.physics.metu.edu.tr ->phy.bris.ac.uk #Bristol University - phyics -137.222.58.9 #afs1.phy.bris.ac.uk +>phy.bris.ac.uk #Bristol University - physics +137.222.74.18 #zen.phy.bris.ac.uk >inf.ed.ac.uk #School of Informatics, University of Edinburgh 129.215.64.16 #afsdb0.inf.ed.ac.uk 129.215.64.17 #afsdb1.inf.ed.ac.uk @@ -604,4 +652,6 @@ 194.36.2.4 #afs2.hep.man.ac.uk 194.36.2.5 #afs3.hep.man.ac.uk >rl.ac.uk #Rutherford Appleton Lab, England -130.246.183.164 #wallace.cc.rl.ac.uk +130.246.183.203 #afs1.gridpp.rl.ac.uk +130.246.183.204 #afs2.gridpp.rl.ac.uk +130.246.183.205 #afs3.gridpp.rl.ac.uk diff --git a/src/packaging/Debian/README.Debian b/src/packaging/Debian/README.Debian index f7b69a9..2f43531 100644 --- a/src/packaging/Debian/README.Debian +++ b/src/packaging/Debian/README.Debian @@ -10,16 +10,6 @@ Introduction cache, but you may want to tune it further. There are also other options configured in that file you may want to consider. - The AFS client cache must be on an ext2 or ext3 partition. Other file - systems often do not support the semantics required by the AFS kernel - module and will cause afsd to abort (to avoid kernel panics). In - particular, XFS, ReiserFS, and tmpfs will NOT work. If you are using - one of those file systems and don't have a spare partition for a - separate file system for the cache, you need to use the -memcache option - to afsd (although this is not always stable) or create a large file with - dd, create an ext2 file system in it with mkfs, and then mount it with - mount -o loop for use as a cache partition. - FAM does not work correctly with AFS except for directories that are world-readable since it does not run in the user's security context and therefore doesn't have the user's AFS tokens. If you are using FAM, @@ -47,6 +37,13 @@ Documentation Build Options + The OpenAFS file server has been built with --enable-demand-attach-fs, + which enables a new method of handling volume attachment. Volumes will + be attached only when needed, and the file server will persist state to + disk when shutting down for faster restarts. This file server mode is + experimental and should not yet be used for production data. Please + report any bugs you encounter. + The OpenAFS servers have been built with --enable-supergroups, which permits nesting of PTS groups. Be aware that the PT database created by these packages is not compatible with servers not built with @@ -54,11 +51,11 @@ Build Options you need the openafs-dbserver package to interoperate with ptservers that aren't built with this option, don't use this capability. - bosserver is built with --enable-bos-new-config. If - /etc/openafs/BosConfig.new exists when bosserver starts, it will be - renamed to /etc/openafs/BosConfig before the configuration file is - read. This allows queuing of changes to the configuration that will - take effect at the next restart. + The OpenAFS client and kernel module have been built with + --enable-disconnected, which enables experimental support for + disconnected operations. This support is still experimental and known + to have problems, but should not interfere with normal use of AFS. If + you want to experiment with it, see fs help discon. Changes Relative to Stock OpenAFS @@ -75,14 +72,6 @@ Changes Relative to Stock OpenAFS To distinguish between an SMP and a non-SMP kernel module package, use --append_to_version; see README.modules for more information. - The OpenAFS servers have been patched to support listing up to four - realms in /etc/openafs/server/krb.conf. Any realms listed in that file - (all on one line, space-separated) will be treated as local for - authorization decisions (in other words, the relam will be stripped off - and the unqualified principal name checked against AFS ACLs, UserList, - PTS groups, and so forth). The default OpenAFS server only supports - listing one realm in this file. - The AFS up utility is installed as afs-up, since the standard name is rather generic. @@ -94,9 +83,6 @@ Changes Relative to Stock OpenAFS kaserver is not included. New AFS cells should use Kerberos v5 rather than the old K4-based kaserver KDC. - The OpenAFS PAM modules have been built with pthreads rather than the - standard LWP AFS libraries for compatibility with a threaded sshd. - Debugging and Bug Reporting The current OpenAFS installation process installs fileserver and @@ -109,8 +95,7 @@ Debugging and Bug Reporting information automatically. Eventually the openafs-dbg package will contain debugging information - for all OpenAFS binaries. This is pending upstream changes to the stock - OpenAFS installation rules. + for all OpenAFS binaries. When reporting a bug in the OpenAFS client, please include your exact kernel version and architecture (reportbug will do this for you). Also, @@ -138,17 +123,17 @@ PAM Authentication Any new OpenAFS cell is strongly encouraged to use Kerberos v5 for authentication. If you want PAM to automatically obtain AFS credentials and you are using Kerberos v5, you will want to install the libpam-krb5 - and libpam-openafs-session packages and then put something like the + and libpam-afs-session packages and then put something like the following in /etc/pam.d/common-auth: auth [success=ok default=1] pam_krb5.so ignore_root - auth [default=done] pam_openafs_session.so + auth [default=done] pam_afs_session.so auth required pam_unix.so nullok_secure try_first_pass and something like the following in /etc/pam.d/common-session: session optional pam_krb5.so ignore_root - session optional pam_openafs_session.so + session optional pam_afs_session.so session required pam_unix.so You'll probably also want the following in /etc/pam.d/common-account: @@ -182,4 +167,4 @@ PAM Authentication the openafs-kpasswd package to get the administrative utilities for managing those Kerberos accounts. - -- Russ Allbery , Mon, 17 Dec 2007 18:29:42 -0800 + -- Russ Allbery , Tue, 6 Apr 2010 15:04:42 -0700 diff --git a/src/packaging/Debian/README.modules b/src/packaging/Debian/README.modules index 63f2c35..d71a8b9 100644 --- a/src/packaging/Debian/README.modules +++ b/src/packaging/Debian/README.modules @@ -3,38 +3,57 @@ Introduction The easiest way to get AFS modules is to install prebuilt modules. For - example, if you are running kernel 2.4.27-2-686-smp, you might try: + example, if you are running kernel 2.6.26-2-686, you might try: - apt-get install openafs-modules-2.4.27-2-686-smp + apt-get install openafs-modules-2.6.26-2-686 Pre-built modules are not provided with Debian (building and maintaining them in Debian proper poses too many problems), but many organizations that use OpenAFS build their own and provide them locally. If this doesn't work, you will need to build your own modules. There - are two methods for doing this. + are three methods for doing this. - When following either method, be aware that the Debian package creates a - module named openafs, not libafs as is used by upstream. It also - prefers not to add the .mp extension for modules built for SMP kernels; - the indication of whether the module is for an SMP kernel should go into - the package name via something like --append_to_version, not into the - file name of the module. + When following any of these methods, be aware that the Debian package + creates a module named openafs, not libafs as is used by upstream. It + also prefers not to add the .mp extension for modules built for SMP + kernels; the indication of whether the module is for an SMP kernel + should go into the package name via something like --append_to_version, + not into the file name of the module. + +DKMS + + DKMS is relatively new and untested compared to the other mechanisms for + building kernel modules, but if it works for you, it's the easiest. + DKMS stands for Dynamic Kernel Module Support. It provides + infrastructure that will automatically rebuild kernel modules when the + source package or the kernel has been upgraded. + + To build OpenAFS kernel modules via DKMS, just install the + openafs-modules-dkms package. This depends on DKMS and will install it + as well. The OpenAFS kernel modules should then be built automatically + and will be installed under updates/dkms in the module tree for your + kernel. module-assistant - This method is the best one to use when using the kernels that come with - Debian, since module-assistant knows how to get the right header files - to build modules for your currently running kernel. + This method is the best method for manually building kernel modules for + kernels that come with Debian, since module-assistant knows how to get + the right header files to build modules for your currently running + kernel. Generally, all you should have to do is: + + apt-get install module-assistant + module-assistant auto-install openafs - First, install module-assistant and then prepare the kernel headers and - install openafs-modules-source: + This combines all of the following steps, taking the defaults. If you + want to do it more step-by-step, first prepare the kernel headers and + install openafs-modules-source with: apt-get install module-assistant module-assistant prepare openafs-modules - (If you want to build modules for a different kernel than your currently - running one, pass the -l flag to module-assistant. See the man page.) + If you want to build modules for a different kernel than your currently + running one, pass the -l flag to module-assistant. See the man page. module-assistant may be able to find the right packages itself or it may tell you to install particular packages. Once you've finished with that, build the module with: @@ -51,8 +70,8 @@ module-assistant make-kpkg - This method works well when you're also building your own kernel, rather - than using the pre-packaged Debian one. + This method may work better than module-assistant if you're also + building your own kernel rather than using the pre-packaged Debian one. Install a kernel source package and untar it in /usr/src. Then, install openafs-modules-source. diff --git a/src/packaging/Debian/README.source b/src/packaging/Debian/README.source new file mode 100644 index 0000000..c026348 --- /dev/null +++ b/src/packaging/Debian/README.source @@ -0,0 +1,136 @@ +General Maintenance + + This package is maintained in Git via the Alioth pkg-k5-afs project. + Alioth is used only for repository access control and not for any of + its other features. + + Since we often pull up many upstream fixes from the upstream stable + branch due to slow upstream release frequencies, we use Git to handle + merging and patch pullups and do not attempt to export the Git + repository state as a patch set. Accordingly, this package uses + source format 1.0, since 3.0 (quilt) doesn't offer many additional + features. + + Ideally, any changes that are not strictly Debian packaging changes + should be submitted upstream first. Upstream uses Gerrit for patch + review, which makes it very easy for anyone who wishes to submit + patches for review using Git. See: + + http://www.dementia.org/twiki/bin/view/AFSLore/GitDevelopers + + for information on how to submit patches upstream. There are some + Debian-specific patches to the upstream source in the 1.4 versions of + the Debian packages, but in the 1.5 experimental branch there are no + Debian changes outside of the debian/* directory. We want to keep it + that way if at all possible. + +Importing a New Upstream Release + + We want to be able to use Git to cherry-pick fixes from upstream, but + we want to base the Debian packages on the upstream tarball releases. + We also need to strip some non-DFSG files from the upstream tarball + releases and imported code, and want to drop the WINNT directory to + save some space. This means we follow a slightly complicated method + for importing a new upstream release. + + Follow the following procedure to import a new upstream release: + + 1. Update the package version in debian/changelog to match the new + upstream version. If the new upstream version is a release + candidate, don't forget to add "~" before "rc" so that the versions + will sort property. + + 2. Double-check the TAG setting in debian/rules to be sure it's going + to retrieve the correct Git tag. + + 3. Run debian/rules get-orig-source. This will generate a tarball + from the upstream Git tag using git archive, remove the WINNT + directory, and create a file named openafs_.orig.tar.gz in + the current directory. + + 4. Ensure that you have the OpenAFS upstream Git repository available + as a remote in the Git repository where you're doing the packaging + work and it's up to date: + + git remote add openafs git://git.openafs.org/openafs.git + git fetch openafs + + This will be required to locate the tag for the new upstream + release. + + 5. Determine the release tag corresponding to this tarball. At the + time of this writing, upstream uses tags in the form: + + openafs-stable- + openafs-devel- + + for stable and development releases respectively. is the + version number with periods replaced by underscores. This + convention may change, so double-check with git tag. + + 6. Import the upstream source from the tarball with: + + debian/import-upstream + + where is the tarball created by get-orig-source above, + is the corresponding tag from the upstream Git + repository, and is of the form upstream/ where + is the non-Debian portion of the package version number. + (In other words, including any tildes, but not the dash and the + Debian revision.) + + 7. Commit the tarball to the repository with pristine-tar, using the + new local tag as the reference: + + pristine-tar commit + + 8. Merge the new upstream source into the master branch: + + git checkout master + git merge + + where is the tag you used above. You can also just + merge with the upstream branch; either is equivalent. + + 9. Flesh out the changelog entry for the new version with a summary of + what changed in that release, and continue as normal with Debian + packaging. + +Pulling Upstream Changes + + Upstream releases, particularly stable releases, are relatively + infrequent, so it's often desirable to pull upstream changes from the + stable branch into the Debian package. This should always be done + using git cherry-pick -x so that we can use git cherry to see which + changes on the stable branch have not been picked up. + + The procedure is therefore: + + 1. Identify the hash of the commit that you want to pull up using git + log or other information. + + 2. git cherry-pick -x . If the cherry-pick fails and you have + to manually do a merge, follow the instructions to use -c to keep + the original commit message as a starting point, but *also* + manually add a line like: + + (cherry picked from commit ) + + to the changelog entry where is the full hash of the + upstream commit. Note that the upstream commits on the stable + branch will generally already have a line like this from upstream's + cherry-pick. This will be a second line. + + 3. Add a changelog entry and commit it separately. Use the following + convention for changelog entries for cherry-picks: + + * Apply upstream deltas: + - [] + - ... + + where <hash> is the first eight characters of the upstream commit + hash and <title> is the first line of the upstream commit message, + edited as necessary to keep the length of the changelog lines + down. + + -- Russ Allbery <rra@debian.org>, Tue, 6 Apr 2010 14:27:11 -0700 diff --git a/src/packaging/Debian/afs-newcell b/src/packaging/Debian/afs-newcell old mode 100644 new mode 100755 index 3aee647..218dd25 --- a/src/packaging/Debian/afs-newcell +++ b/src/packaging/Debian/afs-newcell @@ -228,12 +228,16 @@ run("bos create $server vlserver simple /usr/lib/openafs/vlserver -localauth"); unwind("bos delete $server vlserver -localauth"); # Create a file server as well. -run("bos create $server fs fs" +run("bos create $server dafs dafs" . " -cmd '/usr/lib/openafs/fileserver $fs_options'" . " -cmd /usr/lib/openafs/volserver" - . " -cmd /usr/lib/openafs/salvager -localauth"); + . " -cmd /usr/lib/openafs/salvageserver" + . " -cmd /usr/lib/openafs/salvager"); unwind("bos delete $server fs -localauth"); +# Make sure that there is no scheduled general restart time; it's not needed. +run("bos setrestart $server -time never -general -localauth"); + # Pause for a while for ubik to catch up. print "Waiting for database elections: "; sleep(30); diff --git a/src/packaging/Debian/afs-rootvol b/src/packaging/Debian/afs-rootvol old mode 100644 new mode 100755 diff --git a/src/packaging/Debian/changelog b/src/packaging/Debian/changelog index bbfa5e4..ddd325c 100644 --- a/src/packaging/Debian/changelog +++ b/src/packaging/Debian/changelog @@ -1,3 +1,583 @@ +openafs (1.5.73.3-1) experimental; urgency=low + + * New upstream testing release. + - New demand-attach file server support for greatly improved file + server restart times. + - Support for split readonly/read-write client caches. + - Better client handling of file server meltdowns. + - Experimental read-only client disconnected mode. + - NFS translator clients now work properly on Linux. + - Client cache readahead. + - Network performance improvements. + - New libkopenafs library providing a kernel PAG manipulation + interface (a subset of the API provided by Heimdal's libkafs). + * Apply upstream deltas: + - [7d395f17] Improve demand-attach fileserver bos documentation + - [a763edc3] Make src/rx/rx.c not executable + - [8d41bc24] Reallocate memory in aklog for the AFS ID string + - [be449999] Fix typo in bos_create manpage + - [fdb9429e] Linux: kmap() not page_address() + * Build OpenAFS with demand-attach enabled for the file server, bos + restricted mode enabled for bosserver, and disconnected mode enabled + for the client. Except for demand-attach, these options don't change + the default behavior, just make new capabilities available. + * The openafs-modules package now provides openafs-modules3 and + conflicts on pre-1.5.61 openafs-client packages since the interface + between afsd and the module has changed. openafs-client now conflicts + with openafs-modules2 and recommends openafs-modules3. + * Change the default permissions of /etc/openafs/server to 0755 to match + upstream defaults, but do not change permissions on upgrade. The only + file in that directory that needs to be protected is KeyFile, which + should be mode 0600 anyway. Drop the patch to bosserver to allow more + restrictive permissions. bosserver will complain about directory + permissions after upgrade until the directory is manually changed. + * Upstream now installs afszcm.cat and finds it in /usr/share/openafs/C, + so use the version installed via make install and install it in the + same location. + * Upstream builds specific files with -fno-strict-aliasing where needed, + so we no longer need to build the whole source with that flag. + * Upstream no longer includes files covered by the Apple Public Source + License, so we no longer have to repackage the upstream source to + remove those files. Drop Debian patches to the build system that were + compensating for the removal of those files. + * Switch to generating upstream tarballs from the upstream Git tag + rather than from tarball releases. There's no reason to include all + the generated files when we're going to regenerate them anyway, and + this saves effort combining the doc and src tarballs. + + -- Russ Allbery <rra@debian.org> Thu, 08 Apr 2010 13:20:50 -0700 + +openafs (1.4.12+dfsg-3) unstable; urgency=low + + * Apply upstream deltas: + - [135e196b] Create missing root directory when ORPH_ATTACH + - [190ef2cb] volmonitor keep vtrans lock + - [812dcc2c] Increase the maximum number of sysnames + - [a123d4ab] Print rxdebug statistics as unsigned values + * If the user configures openafs-client to use AFSDB records for VLDB + server location, don't prompt the user for VLDB servers for the local + cell even if they're not present in CellServDB and don't try to add an + entry for the local cell to CellServDB. (Closes: #575299) + + -- Russ Allbery <rra@debian.org> Fri, 26 Mar 2010 16:05:30 -0700 + +openafs (1.4.12+dfsg-2) unstable; urgency=low + + * Apply upstream deltas: + - [4ca7b6fc] Remove lih_r + - [f3899ac3] Allow GetSomeSpace_r to select an optimal host + - [94a43966] h_TossStuff_r: check held-ness after lock + - [b78eeb0c] h_TossStuff_r: make sure host does not go away + - [0583af32] volmonitor copy link before calling free + - [eb799d07] Move non-executable stack assembly code to end of file + * Build with -fno-strict-aliasing. The upstream development branch has + a better fix that selectively enables this for specific files with + known problems, but be conservative for the stable release. + + -- Russ Allbery <rra@debian.org> Mon, 22 Mar 2010 15:53:48 -0700 + +openafs (1.4.12+dfsg-1) unstable; urgency=low + + * New upstream release. + - Enable weak encryption types in aklog and klog.krb5. + - Build support for Linux 2.6.33. + - Improvements to host tracking safety in the file server. + - Fall back to current kernel credentials if we can't use stored ones. + - Fix truncation handling in some large file situations. + - Further fixes to mmap handling. + - Avoid double-free in some FetchData64 error situations. + - Stop warning about system call hooks when keyrings are in use. + - Flush vcaches when a mount fails to avoid inconsistent data. + - New dump tag and length standard for vos dump. + - Fix stack executability for programs containing assembly code. + - Various salvager robustness fixes. + * Use dh_dkms from the DKMS package to handle creation of the maintainer + scripts for openafs-modules-dkms rather than rolling our own. + (LP: #497149) + * Update init script to require $remote_fs be started first and stopped + after OpenAFS. This won't be the case in the long run, but for now + some important boot-time options need /usr/bin/fs to set them. + * List $syslog in Should-Start for the openafs-client init script, since + otherwise if loading the module causes a kernel panic, it won't be + logged to disk. + * Update CellServDB to the 2010-02-28 version. + * Add README.source explaining maintenance procedures and a + debian/import-upstream script to do a Git-aware merge of a new + upstream release that will allow us to cherry-pick upstream patches + and do proper merges. + * Stop linking the openafs-fileserver doc directory to openafs-client so + that we can provide a separate NEWS.Debian. + * Update standards version to 3.8.4 (no changes required). + + -- Russ Allbery <rra@debian.org> Mon, 08 Mar 2010 16:32:49 -0800 + +openafs (1.4.11+dfsg-6) unstable; urgency=low + + * Apply upstream deltas: + - [c12ec354] Fix write_begin configure test for recent RHEL kernels + - [b7198421] Fix memory allocation warnings at shutdown + - [7183c113] Do not check *aoutSize in PGetPAG + - [c0323c49] cm: address race condition in afs_QueueVCB + - [ad6dabdc] Clean up console message + - [c9f7fe37] Make ktc_curpag also detect ONEGROUP PAG gids + - [2f87c43e] volser transaction object race conditions + - [2d6c0390] Add array bounds checking in h_Enumerate + - [70f6a328] Check for (hostFlags & HOSTDELETED) after h_Lock_r + - [c7a59397] Avoid IHandle leak when failing to attach volume + * Remove incorrect return call in shutdown_icl() introduced by b7198421. + * Do not attempt to build the kernel module with DKMS if the appropriate + Linux headers aren't installed. Based on code from the common DKMS + postinst script (which we'll just use once it's reliably available). + Thanks, Anders Kaseorg. (LP: #487535) + * Fix configure flags used for enabling or disabling LWP and kernel + debugging flags and always pass --disable-strip-binaries. + * Fix the openafs-dbg dependencies and package description to reflect + its inclusion of debugging symbols for all server binaries in + openafs-fileserver and openafs-dbserver, but not the legacy PAM + modules. + * In anticipation of a change in dpkg-source's defaults, force source + package format 1.0. The package is maintained using Git and + generating a proper quilt series is complex and relatively pointless + work, so the additional complexity of the 3.0 format is currently not + that useful. + * Change section of openafs-modules-dkms to kernel to match override. + + -- Russ Allbery <rra@debian.org> Mon, 30 Nov 2009 16:54:08 -0800 + +openafs (1.4.11+dfsg-5) unstable; urgency=low + + * Apply upstream deltas: + - [7833e472] Make afsd.pod reflect reality + - [c9974c7a] Avoid prematurely destroying callback_rxcon + - [9b37972e] Linux: 2.6.32 - Adapt to writeback changes + - [abdf72bc] Linux: Avoid deadlock in readdir - release GLOCK for + filldir + - [bdb4f98a] Protect rx_call iovq from simultaneous attempts to empty + it + - [c08609ae] Avoid using released hosts + - [a410b7fd] Linux - Fix disk cache access for selinux/AppArmor + constrained processes (LP: #415766) + - [49094ccf] Add automatic sysname detection for ARM Linux + - [525b594a] Make ktc_curpag generally available (LP: #446521) + * In the postinst of openafs-modules-dkms, if the openafs module is + already added in DKMS, try to remove it first before adding it. This + should more correctly handle the case of a user installing this + package without the correct kernel headers, having it fail in + postinst, and then installing the correct headers and having dpkg + attempt to configure the package again. Thanks, Philipp Kaluza. + (Closes: #553542) + + -- Russ Allbery <rra@debian.org> Tue, 03 Nov 2009 20:57:21 -0800 + +openafs (1.4.11+dfsg-4) unstable; urgency=low + + * When changing the name of the source package built by + openafs-modules-source, we need to change the package name in the + changelog as well or dpkg-gencontrol explodes. Thanks, Aaron M. + Ucko. (Closes: #549140) + + -- Russ Allbery <rra@debian.org> Wed, 30 Sep 2009 18:04:44 -0700 + +openafs (1.4.11+dfsg-3) unstable; urgency=low + + * Apply upstream deltas: + - openafs-stable-1_4_x/fileserver-no-negative-fetchdata-20090926: + never return a negative data length from client reads past the end + of a file. + - openafs-stable-1_4_x/fileserver-gethost-r-cleanup-fixes-20090925: + fix memory leak and possible double-free in error handling cases in + fileserver. + - openafs-stable-1_4_x/fileserver-retry-registeraddrs-20090810: retry + VL_RegisterAddrs in the file server on failure. + - openafs-stable-1_4_x/kernel-init-vrequest-structure-20090914: + properly initialize vrequest structure in the kernel. + * Change the permissions of /var/lib/openafs/local to 0700 to match + upstream defaults. This directory contains the fssync.sock file used + for coordination between the fileserver and the volserver, and + commands sent to that socket are not authenticated. Linux protects + the socket from unprivileged writes by default, but other operating + systems do not. Upstream therefore wants this directory to be 0700 + and bosserver will complain by default if it's not. Changing the + permissions let us drop a patch to bosserver. + * Fix the second module control file for the standards version, section, + and maintainer update. + * Change the source package name of the stripped package generated by + openafs-modules-source so that, should someone build a Debian source + package from it, it won't have the same name as the main openafs + source package. + + -- Russ Allbery <rra@debian.org> Tue, 29 Sep 2009 15:34:58 -0700 + +openafs (1.4.11+dfsg-2) unstable; urgency=low + + * Add armv5tel to debian/sysname, mapping it to arm_linux26. Patch from + Daniel Bayer. Also make the similar change for the module source + package. (Closes: #542315) + * Also install restorevol in the openafs-client package. + * Swap maintainer and uploaders in the packaging files for the module + source package, matching the main package. + * Update standards version to 3.8.3. + - Change section of packages generated by openafs-modules-source to + kernel. + - Add Homepage to packages generated by openafs-modules-source. + + -- Russ Allbery <rra@debian.org> Fri, 21 Aug 2009 19:20:03 -0700 + +openafs (1.4.11+dfsg-1) unstable; urgency=low + + * New upstream release. + + -- Russ Allbery <rra@debian.org> Fri, 10 Jul 2009 13:57:55 -0700 + +openafs (1.4.11~pre3+dfsg-1) unstable; urgency=low + + * New upstream release candidate. + - Further fixes for rcu_read_lock dependencies in some kernels. + - Clean up return values of Linux vnode operations. + - Call inode's setattr operation correctly. + * Ignore failures to remove an existing DKMS tree in the prerm of the + openafs-modules-dkms package. In the possible cases where the tree + may not be present to be removed, failing package removal doesn't + make sense. (Further addresses LP #368471.) + * Don't install man pages for fs command variants that are only + available on Windows. + * Bring src/config/linux-version closer to upstream since upstream now + handles unversioned source directories. There is one remaining change + required to search for UTS_RELEASE in the correct header path. + * Update CellServDB to 2009-06-29 version. + * Translation updates: + - Russian, thanks Yuri Kozlov. (Closes: #534807) + + -- Russ Allbery <rra@debian.org> Sat, 04 Jul 2009 15:20:06 -0700 + +openafs (1.4.11~pre1+dfsg1-1) unstable; urgency=low + + * New upstream release candidate. + - New getpag pioctl to discover a PAG from userspace portably. + - Allow disabling of syscall probing in the kernel module. + - New -maxmtu override switch in afsd to accommodate some VPNs. + - pts client encryption support. + - Further fixes to address/UUID tracking in the file server. + - New DocBook-based manuals replacing the old HTML manuals. + - New Doxygen-based protocol reference replacing the old PDF files. + - Man pages for remaining AFS subcommands. + * Update standards version to 3.8.2 (no changes required). + + -- Russ Allbery <rra@debian.org> Wed, 17 Jun 2009 13:32:31 -0700 + +openafs (1.4.10+dfsg1-2) unstable; urgency=low + + * Apply upstream CVS deltas: + - STABLE14-dprintf-rename-20090427: rename AFS's dprintf to avoid + conflicts with one in the kernel. + - STABLE14-linux26-defer-cred-changing-20090511: defer changing groups + when the real and effective credentials of a process differ to avoid + running afoul of checks in newer Linux kernels that cause oops. + (Closes: #528785) + - STABLE14-linux-mmap-antirecursion-fix-20090512 and + STABLE14-linux-mmap-antirecursion-avoid-spurious-eio-20090526: + improvements in flag setting and locking around recursive mmap + protection. + - STABLE14-memcache-write-on-laststore-20090512: write back dirty + pages on last store with memcache to avoid losing changes. + - STABLE14-background-fsync-consistency-issues-20090522: file + descriptor handling fixes for the file server. + - STABLE14-man-page-vos-dump-flags-20090526: document the -clone and + -omitdirs flags to vos dump. (Closes: #502571) + * Provide an openafs-modules-dkms package that uses DKMS to dynamically + build kernel modules for the local kernel and document this option in + README.modules. This is an alternative to installing + openafs-modules-source and building kernel modules for each new kernel + with module-assistant or make-kpkg. (Closes: #168852, #525131) + (LP: #52786, #368471, #369875) + * Have openafs-client recommend at least the current source version of + openafs-modules-source or openafs-modules-dkms instead of any old + version. While the API probably hasn't changed, it's best practice to + keep a relatively close match between the userspace andn the kernel + module version. (LP: #369875) + * Dynamically determine the Debian and upstream versions for dkms.conf + and get-orig-source from debian/changelog. Thanks, Anders Kaseorg. + (LP: #364426) + * Build-depend on cpio (used for generating openafs-modules-source). + + -- Russ Allbery <rra@debian.org> Tue, 26 May 2009 21:18:54 -0700 + +openafs (1.4.10+dfsg1-1) unstable; urgency=high + + * New upstream release. + - OPENAFS-SA-2009-001: Avoid a potential kernel memory overrun if more + items than requested are returned from an InlineBulk or BulkStatus + message. (CVE-2009-1251) + - OPENAFS-SA-2009-002: Avoid converting negative errors into invalid + kernel memory pointers. (CVE-2009-1250) + - Preliminary support for 2.6.30 kernels. + - Dynamic vcache allocation support to deal with inotify vcache + pinning. + - Do appropriate locking for CellServDB in /proc. + - Use +dfsg instead of .dfsg for saner version sorting. + * Debian's 2.6.29 packages no longer include symlinks from the + architecture-specific header tree to the common header tree and + instead overlay both header trees using kbuild. Change the Autoconf + probes to always use kbuild and generate stub headers in the paths + that OpenAFS expects that include the linux headers. Patch from Aaron + M. Ucko. (Closes: #521745) + * Build PIC versions of libafsauthent and libafsrpc and install them in + libopenafs-dev for use when AFS code should be embedded into shared + libraries. Patch from Garrett Wollman. + * Update CellServDB to 2008-11-07 version. (Closes: #522451) + * Update debian/watch for +dfsg naming instead of .dfsg. + * Update standards version to 3.8.1 (no changes required). + * Translation updates: + - Japanese, thanks Hideki Yamane. (Closes: #521518) + + -- Russ Allbery <rra@debian.org> Mon, 06 Apr 2009 15:49:34 -0700 + +openafs (1.4.8.dfsg1-3) unstable; urgency=low + + * Apply upstream CVS deltas: + - STABLE14-cbr-free-what-you-alloc-20090325: dequeue items in the same + way they were allocated. + - STABLE14-shutdown-vcache-avoid-null-deref-20090324: avoid oops on + shutdown. (LP: #333197) + - STABLE14-uphys-invalidate-returns-void-20081130: fix apparent Ubik + synchronization errors due to incorrect use of a void return value. + * Update package sections for the new archive organization. + + -- Russ Allbery <rra@debian.org> Fri, 27 Mar 2009 08:08:49 -0700 + +openafs (1.4.8.dfsg1-2) unstable; urgency=low + + * Make openafs-modules-source architecture-specific (arch: any instead + of arch: all). The new method for generating the kernel source tree + only generates correct build machinery for the architecture on which + it was built, making the package architecture-specific. The generated + tree is so much smaller that this still only uses about 1MB of archive + space more than the old method and makes each openafs-modules-source + package much smaller. This is a workaround until we can fix + libafs_tree to include enough build machinery to handle all Linux + architectures from one source tree. (Closes: #516023) + * Explicitly remove *-stamp files in the clean target of the module + build until the module build is upgraded to debhelper 7. + + -- Russ Allbery <rra@debian.org> Wed, 18 Feb 2009 13:48:17 -0800 + +openafs (1.4.8.dfsg1-1) unstable; urgency=low + + * New upstream release. (Closes: #511535) + - Support 2.6.28 kernels. (LP: #303112) + - Check at compile time that the kernel has keyring support rather + than building non-functional modules. (Closes: #500850) + - Include vos clone man page. (LP: #324449) + * Apply upstream CVS deltas: + - STABLE14-libuafs-updates-20081229: prerequisite for other deltas. + - STABLE14-linux-truncate-race-20090109: avoid race condition during + truncation. + - STABLE14-linux-i-size-20090112: further fix for truncation race. + - STABLE14-linux-truncate-cleanup-20090113: further truncation fix. + - STABLE14-osi-probe-check-result-cope-with-enoent-20090115: fix for + syscall probing. + - STABLE14-linux-2629-20090115: support for 2.6.29 kernels. + (Closes: #513680) + - STABLE14-rx-idledead-only-ignore-keepalives-20081222: rx bug fix to + not ignore other ping packets. + - STABLE14-rx-rdwr-writeproc-race-20081228: fix rx race condition that + could result in reuse of freed memory. + - STABLE14-rx-do-not-race-current-packet-20090105: fix rx race + condition. + * Use make libafs_tree to generate the tree for the kernel module + compile rather than copying the entire source tree. + * Compress the source in openafs-modules-source with bzip2 instead of + gzip to reduce the package size. + * Make dynroot the default for new installations. It works much better + with systems that don't bring up their network until late in the boot + process, such as wireless laptops. (LP: #249240, #318605) + * Mention libpam-afs-session instead of libpam-openafs-session in the + description of libpam-openafs-kaserver, and mention libpam-krb5 by + name. Thanks, Philipp Kaluza. (Closes: #501308) + * Suggest module-assistant auto-install in README.modules and be clearer + that building one's own kernel is not required. Thanks, Anders + Kaseorg and Lutz Goehring for suggestions. (LP: #295897) + * Allow time-daemon to satisfy the openafs-fileserver recommends in + addition to ntp, allowing for openntpd. (Closes: #508258) + * General improvements to debconf configuration handling. + - Do not abort the config script if we have no default realm and + dnsdomainname fails. (LP: #274886, #318132) + - Do not abort postinst if we can't resolve any host name for the + cell. Just continue in that case, omitting any configuration for + the local cell. (LP: #322054) + - Correctly set the default for AFS_CRYPT from the existing config. + - The cache size is high, not critical, since we have a default. + - Don't create the client ThisCell if no local cell was specified. + - Improve the leading comment in afs.conf.client. Users can edit it, + but any changes other than the setting values will be lost. + - Remove the openafs-fileserver/bosconfig_moved template, which would + only be shown on upgrades from pre-1.2.0 versions. + - Standardize coding style and always quote strings. + * Update to debhelper compatibility level V7. + - Use dh where possible in debian/rules. + - Use dh_lintian to install Lintian overrides. + - Eliminate the configure target and do all the work in build. + - Do more in the install target and less in binary, matching the + default command stacks in dh. + - Use a debian/clean configuration file to let dh clean do more of the + work rather than using rm commands in debian/rules. + * Abort the config script rather than exiting successfully if the + debconf shell module is not available. The config script should never + be run in the absence of debconf, so if this fails, something deeper + is wrong and we shouldn't blindly continue. + * Add ${misc:Depends} to all dependencies. + * Add explanations for the Lintian overrides. + * Use set -e instead of #!/bin/sh -e in maintainer scripts. + * Remove server documentation from openafs-modules-source. + * Translation updates: + - Spanish, thanks Francisco Javier Cuadrado. (Closes: #514452) + + -- Russ Allbery <rra@debian.org> Mon, 06 Oct 2008 11:10:14 -0700 + +openafs (1.4.7.dfsg1-6) unstable; urgency=low + + * Apply upstream patch to free /proc entries in the correct order. + Thanks, Marc Dionne. (Closes: #493914) + * Apply upstream deltas to support 2.6.27 kernels and to stop using + COMMON_KERN_CFLAGS for all 2.6 kernels uniformly, which fixes + problems on amd64 with newer kernels. Thanks, Björn Torkelsson. + (LP: #267504) + * Translation updates: + - Swedish, thanks Martin Bagge. (Closes: #493120) + + -- Russ Allbery <rra@debian.org> Mon, 22 Sep 2008 19:07:02 -0700 + +openafs (1.4.7.dfsg1-5) unstable; urgency=low + + * Drop support for hppa. We only have a param file for a 2.4 kernel, + we were building with UCONTEXT which is stubbed out in glibc for hppa, + and builds without UCONTEXT fail. The binaries we were building + before didn't work and no one reported a bug, indicating no one was + attempting to use OpenAFS on hppa. + * When building the kernel module, use the setting of the ARCH + environment or make variable, if present, in preference to uname -m to + allow cross-compiles. Thanks, Jose Calhariz. (Closes: #492232) + * Add Jason Edgecomb's copyright and license for man pages to + debian/copyright. + + -- Russ Allbery <rra@debian.org> Thu, 24 Jul 2008 10:14:42 -0700 + +openafs (1.4.7.dfsg1-4) unstable; urgency=low + + * Undo the move of up.pod to afs-up.pod in debian/rules clean rather + than just deleting the file and causing the second build to fail. + Thanks, Dominic Hargreaves. (Closes: #490752) + * Don't use UCONTEXT on hppa; its glibc doesn't provide those + functions. It's possible that OpenAFS isn't working properly on hppa + these days, but as yet there have been no reports. + * Suggest openafs-krb5 in openafs-client and mention it in the long + description. + + -- Russ Allbery <rra@debian.org> Sun, 13 Jul 2008 19:03:58 -0700 + +openafs (1.4.7.dfsg1-3) unstable; urgency=low + + * Apply upstream delta for Linux 2.6.26 support. + * Enable support for arm and armel, added upstream in 1.4.7. + * Enable support for lpia by making it synonymous with i386. This means + that lpia systems will get a sysname of i386_linux26, which isn't + ideal but should at least work. + * When clearing the restart time while installing a new cell, pass + -localauth to avoid an authentication failure. Thanks, Davor Ocelic. + (Closes: #488152) + * If the openafs module isn't listed in modules.dep, exit with a zero + status from the init script even if modprobe fails. Otherwise, if a + module package and openafs-client are installed at the same time and + openafs-client is set up before the module package, the init script + can find the module, fail the modprobe (because the dependency map + hasn't yet been updated), and fail the whole installation. Exiting + with a zero status still doesn't get OpenAFS started, but at least it + doesn't leave the system in a partly installed state. Thanks to Durk + Strooisma for the analysis. (Closes: #486816) + * Don't include debug symbols for /sbin, /usr/bin, and /usr/sbin + binaries or PAM modules in openafs-dbg, just the servers in + /usr/lib/openafs, since those are the most likely cases where + backtraces are important and a 10MB debug symbol package seems like + overkill. + * Stop using quilt to manage patches and pre-apply them to the source + package now that the package is maintained with Git. + * Add Vcs-Git and Vcs-Browser control fields. + * Reflect current responsibilities more accurately by listing myself as + maintainer and Sam as uploader. + * Update standards version to 3.8.0 (no changes required). + * Drop unused postinst-uses-db-input override; Lintian has been fixed. + * Translation updates: + - Galician, thanks Jacobo Tarrio. (Closes: #481675) + + -- Russ Allbery <rra@debian.org> Sat, 28 Jun 2008 12:35:43 -0700 + +openafs (1.4.7.dfsg1-2) unstable; urgency=high + + * Bumping urgency for the conflict fix, which fixes a latent RC bug, and + for the news entry for openafs-dbserver. + * Add a missing conflict on older versions of openafs-client to + openafs-krb5 to ensure that the klog transition to alternatives is + smooth. + * When configuring a new cell, clear the general restart time. + * Add a NEWS file for openafs-dbserver warning of the serious Ubik bug + fixed in the previous release and suggesting restarting database + servers one at a time. + * Update to 2008-04-23 CellServDB. + + -- Russ Allbery <rra@debian.org> Fri, 09 May 2008 10:45:06 -0700 + +openafs (1.4.7.dfsg1-1) unstable; urgency=low + + * New upstream release. + - Work around GPLing of RCU locks. (Closes: #476628) + * Include a Kerberos v5 klog, klog.krb5, in openafs-krb5. + * klog is now managed via alternatives. openafs-client provides + klog.afs and openafs-krb5 provides klog.krb5. If both packages are + installed, klog.krb5 is the default. + * Don't remove and reinstall the pagsh alternative on every upgrade. + * Add many new upstream man pages for fs, vos, and pts sub-commands and + the CellAlias config file. + * Add read_tape to openafs-dbserver. + * Add bos_util and a UserList man page to openafs-fileserver. + * Run dh_install with --fail-missing to catch new upstream additions. + + -- Russ Allbery <rra@debian.org> Thu, 01 May 2008 08:13:56 -0700 + +openafs (1.4.7~pre3.dfsg1-1) unstable; urgency=low + + * New upstream release candidate: + - Better support for 2.6.25 kernels. + - Fixes for flushing in the cache manager. + + -- Russ Allbery <rra@debian.org> Thu, 10 Apr 2008 20:54:36 -0700 + +openafs (1.4.7~pre1.dfsg1-1) unstable; urgency=low + + * New upstream release candidate: + - Initial support for 2.6.25 kernels. + - Better 2.6.24 kernel support. (Closes: #463962) + - Better cleanup on module unload. (Closes: #417917) + - Potential deadlock fixed in the fileserver. + - Better fileserver host tracking. + - Ubik fixes preventing database truncation on unreliable links. + * Add upstream delta to fix oops on startup with pre-2.6.25 kernels. + * Install the up man page as afs-up, matching our renaming, and update + its text accordingly. (Closes: #459635) + * Move openafs-client later in the shutdown sequence on new + installations so that it stops after autofs and add an X-Stop-After + LSB header to achieve the same more reliably with dependency-based + boots. (Closes: #472545) + * Update doc-base control file sections for the new categorization. + * debian/rules and debian/module/rules improvements: + - Remove all modified generated files on debian/rules clean. + - Depend on $(QUILT_STAMPFN) instead of patch. + - Use touch $@ to create stamp files. + - Use a stamp file for the module's install target. + * Uncomment and fix the watch rules for pre-releases and always scan for + both regular releases and prereleases. + + -- Russ Allbery <rra@debian.org> Wed, 26 Mar 2008 19:21:24 -0700 + openafs (1.4.6.dfsg1-3) unstable; urgency=low * Fix FTBFS caused by a change in dh_strip behavior. It no longer diff --git a/src/packaging/Debian/clean b/src/packaging/Debian/clean new file mode 100644 index 0000000..454dc12 --- /dev/null +++ b/src/packaging/Debian/clean @@ -0,0 +1,11 @@ +aclocal.m4 +configure +configure-libafs +doc/man-pages/man1/*.1 +doc/man-pages/man5/*.5 +doc/man-pages/man8/*.8 +doc/xml/*/Makefile +doc/xml/*/version.xml +src/config/Makefile.version-CML +src/kauth/ka-forwarder +src/packaging/RedHat/openafs.spec diff --git a/src/packaging/Debian/compat b/src/packaging/Debian/compat index 7ed6ff8..7f8f011 100644 --- a/src/packaging/Debian/compat +++ b/src/packaging/Debian/compat @@ -1 +1 @@ -5 +7 diff --git a/src/packaging/Debian/control b/src/packaging/Debian/control index d72177d..d2bcdbf 100644 --- a/src/packaging/Debian/control +++ b/src/packaging/Debian/control @@ -1,31 +1,37 @@ Source: openafs Section: net Priority: optional -Maintainer: Sam Hartman <hartmans@debian.org> -Uploaders: Russ Allbery <rra@debian.org> -Build-Depends: debhelper (>= 5), libncurses5-dev, libpam0g-dev, bison, - flex, perl, comerr-dev, libkrb5-dev, autoconf, automake, quilt (>= 0.40) -Standards-Version: 3.7.3 +Maintainer: Russ Allbery <rra@debian.org> +Uploaders: Sam Hartman <hartmans@debian.org> +Build-Depends: debhelper (>= 7), autoconf, automake, bison, comerr-dev, + cpio, dblatex, dkms (>= 2.1.1.1), docbook-xsl, doxygen, flex, + libkrb5-dev, libncurses5-dev, libpam0g-dev, libxml2-utils, perl, xsltproc +Standards-Version: 3.8.4 Homepage: http://www.openafs.org/ +Vcs-Git: git://git.debian.org/git/pkg-k5-afs/openafs.git +Vcs-Browser: http://git.debian.org/?p=pkg-k5-afs/openafs.git Package: openafs-client -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: openafs-modules-source (>= 1.2.9) | openafs-modules2, lsof -Suggests: openafs-doc -Conflicts: arla, openafs-modules1 +Recommends: lsof, openafs-modules-dkms (>= ${source:Version}) + | openafs-modules-source (>= ${source:Version}) + | openafs-modules3 +Suggests: openafs-doc, openafs-krb5 +Conflicts: arla, openafs-modules1, openafs-modules2 Description: AFS distributed filesystem client support AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access control, authentication, backup and administrative management. . This package provides basic client support to mount and manipulate - AFS. + AFS. If your site uses Kerberos v5 authentication for AFS, you will also + want to install openafs-krb5. Package: openafs-kpasswd Priority: extra -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x -Depends: ${shlibs:Depends}, openafs-client +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients Description: AFS distributed filesystem old password changing AFS is a distributed filesystem allowing cross-platform sharing of @@ -38,9 +44,9 @@ Description: AFS distributed filesystem old password changing package for new cells or for cells using Kerberos v5. Package: openafs-fileserver -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client, lsb-base -Recommends: ntp +Recommends: ntp | time-daemon Suggests: openafs-doc Description: AFS distributed filesystem file server AFS is a distributed filesystem allowing cross-platform sharing of @@ -51,8 +57,9 @@ Description: AFS distributed filesystem file server installed on any machine that will export files into AFS. Package: openafs-dbserver -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x -Depends: ${shlibs:Depends}, ${perl:Depends}, openafs-fileserver, openafs-client +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, + openafs-fileserver, openafs-client Suggests: openafs-doc Conflicts: openafs-ptutil Replaces: openafs-ptutil @@ -69,6 +76,7 @@ Description: AFS distributed filesystem database server Package: openafs-doc Section: doc Architecture: all +Depends: ${misc:Depends} Description: AFS distributed filesystem documentation AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access control, @@ -78,8 +86,9 @@ Description: AFS distributed filesystem documentation protocol documentation, and other OpenAFS documentation. Package: openafs-krb5 -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x -Depends: ${shlibs:Depends} +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: openafs-client (<< 1.4.7.dfsg1-1) Description: AFS distributed filesystem Kerberos 5 integration AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access control, @@ -90,11 +99,24 @@ Description: AFS distributed filesystem Kerberos 5 integration from a Kerberos keytab, and ka-forwarder, a utility to forward kaserver requests to a KDC using fakeka. +Package: libkopenafs1 +Section: libs +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: AFS distributed file system runtime library (PAGs) + AFS is a distributed filesystem allowing cross-platform sharing of + files among multiple computers. Facilities are provided for access + control, authentication, backup and administrative management. + . + This package provides the shared library implementing an interface to + manipulating AFS process authentication groups (PAGs). It provides the + a subset of the interface provided by the Heimdal libkafs library. + Package: libopenafs-dev Section: libdevel -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc Priority: extra -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: openafs-doc Conflicts: arla-dev, liblwp-dev Description: AFS distributed filesystem development libraries @@ -106,20 +128,37 @@ Description: AFS distributed filesystem development libraries needed to compile AFS applications. Package: openafs-modules-source +Section: kernel Priority: extra -Depends: bison, flex, debhelper (>= 5), kernel-package | module-assistant -Architecture: all +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${misc:Depends}, bison, flex, debhelper (>= 5), + module-assistant | kernel-package Description: AFS distributed filesystem kernel module source AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access control, authentication, backup and administrative management. . - This package provides source to the AFS kernel modules. + This package provides the source to the AFS kernel module in a form + suitable for use by module-assistant or kernel-package. + +Package: openafs-modules-dkms +Section: kernel +Priority: extra +Depends: ${misc:Depends}, dkms, bison, flex +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Description: AFS distributed filesystem kernel module DKMS source + AFS is a distributed filesystem allowing cross-platform sharing of + files among multiple computers. Facilities are provided for access + control, authentication, backup and administrative management. + . + This package contains the source for the AFS kernel module, packaged with + approriate configuration for DKMS to build new modules dynamically. Package: libpam-openafs-kaserver +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Section: admin Priority: extra -Depends: ${shlibs:Depends}, openafs-client -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x +Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client Description: AFS distributed filesystem kaserver PAM module AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -127,18 +166,19 @@ Description: AFS distributed filesystem kaserver PAM module . This package provides a PAM module for existing sites using the AFS kaserver for authentication. New sites should use a Kerberos v5 - implementation, a Kerberos v5 PAM module, and libpam-openafs-session. + implementation, a Kerberos v5 PAM module such as libpam-krb5, and + libpam-afs-session. Package: openafs-dbg +Section: debug Priority: extra -Depends: openafs-fileserver (= ${binary:Version}) - | libpam-openafs-kaserver (= ${binary:Version}) -Architecture: i386 powerpc sparc alpha s390 ia64 hppa amd64 ppc64 s390x -Section: libdevel +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${misc:Depends}, openafs-fileserver (= ${binary:Version}) + | openafs-dbserver (= ${binary:Version}) Description: AFS distributed filesystem debugging information AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access control, authentication, backup and administrative management. . This package contains the debugging information for the OpenAFS - fileserver and volserver and for libpam-openafs-kaserver. + server binaries (the openafs-fileserver and openafs-dbserver packages). diff --git a/src/packaging/Debian/copyright b/src/packaging/Debian/copyright index ee56891..402a9da 100644 --- a/src/packaging/Debian/copyright +++ b/src/packaging/Debian/copyright @@ -1,30 +1,22 @@ This package was debianized by Sam Hartman <hartmans@debian.org> on Fri, 3 Nov 2000 23:41:41 -0500. -It was downloaded from either: +It was downloaded via Git from: - http://www.openafs.org/release/ - /afs/grand.central.org/software/openafs/ + git://git.openafs.org/openafs.git Upstream Maintainers: openafs-gatekeepers@openafs.org -The upstream source has been repackaged to remove the src/packaging/MacOS -and src/platform/DARWIN directories and the files src/afs/sysctl.h and -src/util/fstab.c. These directories and files are only used for building -on MacOS X and contained content covered by the Apple Public Source -License 2.0. This license is not considered DFSG-free. Since the -repackaging was needed anyway, the WINNT directory was also dropped, -reducing the size of the upstream tarball by 8MB. +The upstream source is generated from a Git tag for the corresponding +upstream release, but with the WINNT directory removed to reduces the size +of the upstream tarball by about 8MB. -The upstream openafs-src and openafs-doc tarballs have been combined into -one source tarball. - -The openafs-doc package contains the OpenAFS documentation as distributed -by the OpenAFS project, which does not include the original source. These -documents were originally created using TeX internally by Transarc, the -original authors of AFS. By the time that AFS was released as free +The source package contains the OpenAFS documentation as distributed by +the OpenAFS project, some of which does not include the original source. +These documents were originally created using TeX internally by Transarc, +the original authors of AFS. By the time that AFS was released as free software by IBM after acquiring Transarc, the original source could no longer be found. It has apparently been lost over the years. @@ -38,6 +30,12 @@ accompanied by the original TeX source and build tools under DFSG#2, but under the circumstances, these files essentially are the source, as they're all that anyone has. +These documents are being replaced by revised versions in DocBook and +Doxygen, with suitable source, and once that process is complete, the old +sourceless HTML and PDF documents will be removed. The documentation +installed in the openafs-doc package already includes only material built +from the new maintainable source. + Copyright: Copyright 2000, International Business Machines Corporation and others. @@ -397,3 +395,39 @@ license: src/afs/LINUX/osi_flush.s included code under IBM Public License with permission of the author, Paul MacKerras. + +Personal contributions made by Jason Edgecombe +<jason@rampaginggeek.com> that refer to the "BSD license" are subject +to the following license: + + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above + copyright notice, this list of conditions and the following + disclaimer. + + * 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. + + * Neither the name of OpenAFS nor the names of its + contributors may be used to endorse or promote products + derived from this software without specific prior written + permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 THE COPYRIGHT + OWNER 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/src/packaging/Debian/import-upstream b/src/packaging/Debian/import-upstream new file mode 100755 index 0000000..62a361a --- /dev/null +++ b/src/packaging/Debian/import-upstream @@ -0,0 +1,46 @@ +#!/bin/sh +# +# This script is used rather than git-import-orig to import a new upstream +# tarball. It does essentially the same work as git-import-orig -- take the +# contents of the tarball and commit it to the upstream branch and then tag it +# with a new upstream/* tag -- but it records that commit as a merge commit +# between the upstream branch and another tag. +# +# The purpose of this procedure is to have the imported tarball look to Git +# like a merge between upstream's tagged Git tree corresponding to that +# tarball and our upstream branch. This lets things like git cherry-pick work +# properly against upstream's release branch. +# +# This script assumes that the upstream tarball has already had non-DFSG +# material removed. +# +# Written by Sam Hartman <hartmans@debian.org> for krb5 +# Adopted for openafs by Russ Allbery <rra@debian.org> + +set -e + +if [ $# -ne 3 ] ; then + echo "Usage: import-upstream <tarball> <upstream-tag> <local-tag>" >&2 + exit 2 +fi +tarball="$1" +upstream="$2" +tag="$3" + +# Unpack the tarball. +dir=$(basename $(tar tzf "$tarball" | head -1)) +tar xzf "$tarball" + +# Add the tarball to the current index and then use that to create a tree +# object corresponding to the contents of that directory. Then, use +# commit-tree to commit that to the repository. +git add -f "$dir" +tree=$(git write-tree --prefix="$dir"/) +commit=$(echo "Imported upstream tag $upstream via tarball" | \ + git commit-tree "$tree" -p upstream-1.5 -p $(git rev-list -n1 "$upstream")) + +# Now that we have a commit, repoint upstream at that commit, tag it, and then +# remove the unpacked upstream tarball from our index. +git branch -f upstream-1.5 "$commit" +git tag "$tag" "$commit" +git rm -q -r -f "$dir" diff --git a/src/packaging/Debian/libkopenafs1.install b/src/packaging/Debian/libkopenafs1.install new file mode 100644 index 0000000..10cebe0 --- /dev/null +++ b/src/packaging/Debian/libkopenafs1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libkopenafs.so.* diff --git a/src/packaging/Debian/libkopenafs1.symbols b/src/packaging/Debian/libkopenafs1.symbols new file mode 100644 index 0000000..1179d65 --- /dev/null +++ b/src/packaging/Debian/libkopenafs1.symbols @@ -0,0 +1,6 @@ +libkopenafs.so.1 libkopenafs1 #MINVER# + KOPENAFS_1.0@KOPENAFS_1.0 1.5.69 + k_hasafs@KOPENAFS_1.0 1.5.69 + k_pioctl@KOPENAFS_1.0 1.5.69 + k_setpag@KOPENAFS_1.0 1.5.69 + k_unlog@KOPENAFS_1.0 1.5.69 diff --git a/src/packaging/Debian/libopenafs-dev.install b/src/packaging/Debian/libopenafs-dev.install index 80b2528..214e8fb 100644 --- a/src/packaging/Debian/libopenafs-dev.install +++ b/src/packaging/Debian/libopenafs-dev.install @@ -3,6 +3,7 @@ debian/tmp/usr/bin/rxgen usr/bin debian/tmp/usr/include usr debian/tmp/usr/lib/*.a usr/lib +debian/tmp/usr/lib/*.so usr/lib debian/tmp/usr/lib/afs usr/lib debian/tmp/usr/share/man/man1/rxgen.1 usr/share/man/man1 diff --git a/src/packaging/Debian/module/control b/src/packaging/Debian/module/control index f1394bb..a16b7e8 100644 --- a/src/packaging/Debian/module/control +++ b/src/packaging/Debian/module/control @@ -1,7 +1,8 @@ -Source: openafs -Section: net +Source: openafs-modules +Section: kernel Priority: optional -Maintainer: Sam Hartman <hartmans@debian.org> -Uploaders: Russ Allbery <rra@debian.org> +Maintainer: Russ Allbery <rra@debian.org> +Uploaders: Sam Hartman <hartmans@debian.org> Build-Depends: debhelper (>= 5), flex, bison -Standards-Version: 3.7.2 +Standards-Version: 3.8.3 +Homepage: http://www.openafs.org/ diff --git a/src/packaging/Debian/module/control.in b/src/packaging/Debian/module/control.in index 31c8aab..260b195 100644 --- a/src/packaging/Debian/module/control.in +++ b/src/packaging/Debian/module/control.in @@ -1,14 +1,14 @@ -Source: openafs -Section: net +Source: openafs-modules +Section: kernel Priority: optional -Maintainer: Sam Hartman <hartmans@debian.org> -Uploaders: Russ Allbery <rra@debian.org> +Maintainer: Russ Allbery <rra@debian.org> +Uploaders: Sam Hartman <hartmans@debian.org> Build-Depends: debhelper (>= 5), flex, bison -Standards-Version: 3.7.2 +Standards-Version: 3.8.3 Package: openafs-modules-=KVERS -Conflicts: openafs-client (<< 1.2.9) -Provides: openafs-modules2 +Conflicts: openafs-client (<< 1.5.61) +Provides: openafs-modules3 Architecture: any Recommends: =IMG-=KVERS Description: AFS distributed filesystem kernel module diff --git a/src/packaging/Debian/module/kernel-version b/src/packaging/Debian/module/kernel-version old mode 100644 new mode 100755 diff --git a/src/packaging/Debian/module/prep-modules b/src/packaging/Debian/module/prep-modules old mode 100644 new mode 100755 diff --git a/src/packaging/Debian/module/rules b/src/packaging/Debian/module/rules old mode 100644 new mode 100755 index 620210d..9b48eff --- a/src/packaging/Debian/module/rules +++ b/src/packaging/Debian/module/rules @@ -22,8 +22,8 @@ endif # Determine whether we're building with optimization. This doesn't really # work at the moment due to upstream problems. ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - DEBIAN_OPT_FLAGS = --disable-optimize --disable-lwp-optimize - DEBIAN_KERN_FLAGS = --disable-kernel-optimize + DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp + DEBIAN_KERN_FLAGS = --disable-optimize-kernel else DEBIAN_OPT_FLAGS = DEBIAN_KERN_FLAGS = @@ -41,7 +41,8 @@ export KSRC export KVERS export KPKG_DEST_DIR -SYS_NAME := $(shell KSRC="$(KSRC)" KVERS="$(KVERS)" sh debian/sysname) +SYS_NAME := $(shell KSRC="$(KSRC)" KVERS="$(KVERS)" ARCH="$(ARCH)" \ + sh debian/sysname) package = openafs modulepkg := openafs-modules-$(KVERS)${INT_SUBARCH} @@ -57,42 +58,44 @@ configure-stamp: sh debian/prep-modules $(KSRC) sh configure --with-afs-sysname=$(SYS_NAME) \ --with-linux-kernel-headers=$(KSRC) --prefix=`pwd`/debian/tmp \ - --enable-debug --enable-lwp-debug --enable-kernel-debug \ + --with-linux-kernel-packaging --enable-disconnected \ + --enable-debug --enable-debug-lwp --enable-debug-kernel \ $(DEBIAN_OPT_FLAGS) $(DEBIAN_KERN_FLAGS) - touch configure-stamp + touch $@ build: build-arch build-indep -build-arch: build-arch-stamp +build-arch: build-stamp build-indep: -build-arch-stamp: configure-stamp - make only_libafs - touch build-arch-stamp +build-stamp: configure-stamp + $(MAKE) + touch $@ clean: dh_testdir dh_testroot - rm -f build-arch-stamp configure-stamp - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean - -install: build-arch-stamp + rm -rf src/libafs/MODLOAD-* *-stamp + dh_clean Makefile config.log config.status src/libafs/Makefile \ + src/libafs/Makefile.common src/libafs/asm src/libafs/asm-generic \ + src/libafs/h src/libafs/linux src/libafs/net src/libafs/netinet \ + src/libafs/rpc src/libafs/sys + +install: install-stamp +install-stamp: build-stamp dh_testdir dh_testroot dh_clean -k - cd src/libafs && make install + cd src/libafs && make install DESTDIR=$(CURDIR)/debian/tmp install -d -g root -o root -m 755 $(moduledir) - install -g root -o root -m 755 debian/tmp/lib/openafs/*o $(moduledir)/ - if test -f $(moduledir)/openafs.o \ - -a ! -f $(moduledir)/openafs.mp.o ; then \ - ln $(moduledir)/openafs.o $(moduledir)/openafs.mp.o || exit 1 ; \ - fi + install -g root -o root -m 644 \ + debian/tmp/lib/modules/*/extra/openafs/*o $(moduledir)/ + touch $@ binary: binary-arch binary-indep binary-indep: -binary-arch: install +binary-arch: install-stamp dh_testdir dh_testroot - dh_installchangelogs NEWS + dh_installchangelogs dh_installdocs dh_installmodules dh_strip @@ -108,11 +111,11 @@ binary-arch: install kdist_configure: configure-stamp -kdist_image: build-arch-stamp +kdist_image: build-stamp $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary-arch $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules clean -kdist: build-arch-stamp +kdist: build-stamp $(ROOT_CMD) $(MAKE) $(MFLAGS) -f debian/rules binary-arch KSRC="$(KSRC)" KMAINT="$(KMAINT)" KEMAIL="$(KEMAIL)" \ sh -v debian/genchanges diff --git a/src/packaging/Debian/module/sysname b/src/packaging/Debian/module/sysname old mode 100644 new mode 100755 index d551c89..9a75e80 --- a/src/packaging/Debian/module/sysname +++ b/src/packaging/Debian/module/sysname @@ -7,7 +7,7 @@ if [ x"$KVERS" = x ] ; then exit 1 fi -case `uname -m` in +case ${ARCH:-`uname -m`} in alpha) case $KVERS in 2.2*) @@ -21,14 +21,17 @@ alpha) ;; esac ;; -hppa) +arm|armel|armv5tel) case $KVERS in 2.4*) - echo parisc_linux24 + echo arm_linux24 + ;; + 2.6*) + echo arm_linux26 ;; esac ;; -i[3456]86) +i[3456]86|lpia) case $KVERS in 2.2*) echo i386_linux22 diff --git a/src/packaging/Debian/openafs-client.NEWS b/src/packaging/Debian/openafs-client.NEWS index a78507f..d9d9433 100644 --- a/src/packaging/Debian/openafs-client.NEWS +++ b/src/packaging/Debian/openafs-client.NEWS @@ -1,3 +1,30 @@ +openafs (1.5.73.3-1) experimental; urgency=low + + This version of the OpenAFS client is built with experimental + disconnected support. This support should not change the normal + operation of the client unless it is used. If you wish to use it, + please be aware that it is an experimental feature, may not work + correctly, and may lose data. Disconnected mode is configured through + the fs discon command, which is not yet documented. + + The communication protocol between afsd (in openafs-client) and the + OpenAFS kernel module has changed in 1.5. You must upgrade your kernel + module to a 1.5.x kernel module when using this or newer versions of + openafs-client, or OpenAFS will not start correctly. + + -- Russ Allbery <rra@debian.org> Tue, 06 Apr 2010 14:51:38 -0700 + +openafs (1.4.10+dfsg1-1) unstable; urgency=high + + This release of OpenAFS contains security fixes in the kernel module. + Be sure to also upgrade openafs-modules-source, build a new kernel + module for your system following the instructions in + /usr/share/doc/openafs-client/README.modules.gz, and then either stop + and restart openafs-client or reboot the system to reload the kernel + module. + + -- Russ Allbery <rra@debian.org> Mon, 06 Apr 2009 15:51:14 -0700 + openafs (1.4.2-6) unstable; urgency=medium As of this release of the OpenAFS kernel module, all cells, including diff --git a/src/packaging/Debian/openafs-client.config b/src/packaging/Debian/openafs-client.config index 0781a7e..c5db27e 100644 --- a/src/packaging/Debian/openafs-client.config +++ b/src/packaging/Debian/openafs-client.config @@ -1,42 +1,58 @@ -#!/bin/sh -e +#!/bin/sh +set -e -. /usr/share/debconf/confmodule || exit +. /usr/share/debconf/confmodule db_version 2.0 + +# Configure the client cell. Default to the current ThisCell file and, +# failing that, the lowercased local domain name, if available. Ignore errors +# on read, since it may fail if there's no newline in the file. if [ -r /etc/openafs/ThisCell ] ; then - read cell </etc/openafs/ThisCell - db_set openafs-client/thiscell $cell - fi + read cell < /etc/openafs/ThisCell + db_set openafs-client/thiscell "$cell" +fi db_get openafs-client/thiscell || true if [ "x$RET" = "x" ] ; then - db_set openafs-client/thiscell `dnsdomainname | tr 'A-Z' 'a-z'` - fi -if [ -r /etc/openafs/cacheinfo ] ; then - IFS=: read mountpoint cachedir cachesize </etc/openafs/cacheinfo - db_set openafs-client/cachesize $cachesize + domain=`dnsdomainname 2>/dev/null || true` + if [ -n "$domain" ] ; then + db_set openafs-client/thiscell `echo "$domain" | tr 'A-Z' 'a-z'` fi -db_input high openafs-client/thiscell ||true -db_input critical openafs-client/cachesize ||true +fi +db_input high openafs-client/thiscell || true + +# Configure the cache size. Default to the current value in the cacheinfo +# configuration file. +if [ -r /etc/openafs/cacheinfo ] ; then + IFS=: read mountpoint cachedir cachesize < /etc/openafs/cacheinfo + db_set openafs-client/cachesize "$cachesize" +fi +db_input high openafs-client/cachesize || true db_go -test -f /etc/openafs/afs.conf &&. /etc/openafs/afs.conf + +# Configure the AFS client parameters set in /etc/openafs/afs.conf, taking +# defaults from the current file. +test -f /etc/openafs/afs.conf && . /etc/openafs/afs.conf if [ "x$AFS_CLIENT" != "x" ] ; then - db_set openafs-client/run-client $AFS_CLIENT - fi + db_set openafs-client/run-client "$AFS_CLIENT" +fi db_input low openafs-client/run-client || true -if [ "x$AFS_AFSDB" != "x" ] ;then - db_set openafs-client/afsdb $AFS_AFSDB - fi +if [ "x$AFS_AFSDB" != "x" ] ; then + db_set openafs-client/afsdb "$AFS_AFSDB" +fi +if [ "x$AFS_CRYPT" != "x" ] ; then + db_set openafs-client/crypt "$AFS_CRYPT" +fi if [ "x$AFS_DYNROOT" != "x" ] ; then - db_set openafs-client/dynroot $AFS_DYNROOT - fi -if [ x$AFS_FAKESTAT != "x" ] ; then - db_set openafs-client/fakestat $AFS_FAKESTAT + db_set openafs-client/dynroot "$AFS_DYNROOT" +fi +if [ "x$AFS_FAKESTAT" != "x" ] ; then + db_set openafs-client/fakestat "$AFS_FAKESTAT" fi - db_beginblock -db_input low openafs-client/afsdb ||true +db_input low openafs-client/afsdb || true db_input low openafs-client/crypt || true db_input medium openafs-client/dynroot || true -db_input low openafs-client/fakestat ||true +db_input low openafs-client/fakestat || true db_endblock db_go diff --git a/src/packaging/Debian/openafs-client.init b/src/packaging/Debian/openafs-client.init old mode 100644 new mode 100755 index 81e5b5d..329cfca --- a/src/packaging/Debian/openafs-client.init +++ b/src/packaging/Debian/openafs-client.init @@ -1,9 +1,10 @@ #! /bin/sh ### BEGIN INIT INFO # Provides: openafs-client -# Required-Start: $network $time -# Required-Stop: $local_fs $remote_fs $network -# Should-Start: $local_fs $remote_fs +# Required-Start: $remote_fs $network $time +# Required-Stop: $remote_fs $network +# Should-Start: $syslog +# X-Stop-After: autofs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: OpenAFS client @@ -27,7 +28,9 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin CACHEINFO=${CACHEINFO:-/etc/openafs/cacheinfo} -MODULEDIR=${MODULEDIR:-/lib/modules/`uname -r`/fs} +MODULEROOT=${MODULEROOT:-/lib/modules/`uname -r`} +MODULEDIR=${MODULEDIR:-$MODULEROOT/fs} +DKMSDIR=${DKMSDIR:-$MODULEROOT/updates/dkms} exec 3>/dev/null exec </dev/null @@ -63,7 +66,12 @@ choose_client() { # exists and this is an SMP system, use it; otherwise, use the default # value. Unset $MP if not using it so that we can use it later in the # call to modprobe. - if [ -n "$MP" -a -f "$MODULEDIR/openafs${MP}.o" ] ; then + # + # Assume that if we're using DKMS, we won't have a .mp and we'll always + # have a *.ko module name. + if [ -f "$DKMSDIR/openafs.ko" ] ; then + LIBAFS=openafs.ko + elif [ -n "$MP" -a -f "$MODULEDIR/openafs${MP}.o" ] ; then LIBAFS=openafs${MP}.o elif [ -n "$MP" -a -f "$MODULEDIR/openafs${MP}.ko" ] ; then LIBAFS=openafs${MP}.ko @@ -77,12 +85,14 @@ choose_client() { } # Load the AFS client module if it's not already loaded. Set $MODULEDIR and -# $LIBAFS to override the default location and module name. +# $LIBAFS to override the default location and module name. Also check before +# loading whether the module is listed in the module dependencies so that we +# can exit with a 0 status in that case. load_client() { if [ -z "$LIBAFS" ] ; then choose_client fi - if [ ! -f "$MODULEDIR/$LIBAFS" ] ; then + if [ ! -f "$MODULEDIR/$LIBAFS" -a ! -f "$DKMSDIR/$LIBAFS" ] ; then echo "" cat <<EOF >&2 AFS module $MODULEDIR/$LIBAFS does not exist. @@ -93,6 +103,10 @@ EOF # installation unless a module is installed. exit 0 fi + sawdep=0 + if grep -q openafs "$MODULEROOT/modules.dep" ; then + sawdep=1 + fi LOADED=`/sbin/lsmod | fgrep openafs` if [ -z "$LOADED" ] ; then modprobe openafs @@ -100,7 +114,16 @@ EOF if [ $status = 0 ] ; then echo -n " openafs" fi - return $status + + # We must exit successfully here if the openafs module just isn't + # listed in the dependency information for modprobe, which can happen + # if openafs-client and the module package are installed at the same + # time and the module hasn't been set up yet. + if [ $sawdep = 0 ] ; then + return 0 + else + return $status + fi fi return 0 } @@ -151,8 +174,7 @@ start_client() { } # Kill all processes that are accessing AFS. Not enabled by default, and -# normally called via kill_all_afs. Warns and does nothing if lsof is not -# installed. +# normally called via kill_all_afs. kill_afs() { signal=$1 pids=`/usr/bin/lsof -Fp /afs | sed 's/p//'` @@ -165,6 +187,8 @@ kill_afs() { # Repeatedly call kill_afs for a series of signals to give AFS-using processes # a hope of shutting down cleanly if the system is shutting down. Not enabled # by default. Enable this in /etc/openafs/afs.conf. +# +# Warns and does nothing if lsof is not installed. kill_all_afs() { runlevel=`runlevel | sed 's/^. //'` if [ "$runlevel" -eq 0 ] || [ "$runlevel" -eq 6 ] ; then diff --git a/src/packaging/Debian/openafs-client.install b/src/packaging/Debian/openafs-client.install index 4d4a068..d8860c2 100644 --- a/src/packaging/Debian/openafs-client.install +++ b/src/packaging/Debian/openafs-client.install @@ -5,9 +5,11 @@ debian/tmp/usr/bin/bos usr/bin debian/tmp/usr/bin/cmdebug usr/bin debian/tmp/usr/bin/fs usr/bin debian/tmp/usr/bin/klog usr/bin +debian/tmp/usr/bin/knfs usr/bin debian/tmp/usr/bin/livesys usr/bin debian/tmp/usr/bin/pagsh usr/bin debian/tmp/usr/bin/pts usr/bin +debian/tmp/usr/bin/restorevol usr/bin debian/tmp/usr/bin/scout usr/bin debian/tmp/usr/bin/sys usr/bin debian/tmp/usr/bin/tokens usr/bin @@ -25,14 +27,15 @@ debian/tmp/usr/sbin/backup usr/sbin debian/tmp/usr/sbin/butc usr/sbin debian/tmp/usr/sbin/fms usr/sbin debian/tmp/usr/sbin/fstrace usr/sbin +debian/tmp/usr/sbin/rmtsysd usr/sbin debian/tmp/usr/sbin/afsd sbin -src/afs/afszcm.cat usr/share/openafs - -debian/CellServDB usr/share/openafs +debian/CellServDB usr/share/openafs +debian/tmp/usr/share/openafs/C/afszcm.cat usr/share/openafs/C debian/tmp/usr/share/man/man1/afs.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/afs-up.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/afsmonitor.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/cmdebug.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs.1 usr/share/man/man1 @@ -47,33 +50,45 @@ debian/tmp/usr/share/man/man1/fs_exportafs.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_flush.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_flushmount.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_flushvolume.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_getcalleraccess.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_getcacheparms.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_getcellstatus.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_getfid.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_getclientaddrs.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_getcrypt.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_getserverprefs.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_help.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_listacl.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_listaliases.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_listcells.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_listquota.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_lsmount.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_messages.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_mkmount.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_monitor.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_newalias.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_newcell.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_quota.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_rmmount.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_rxstatpeer.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_rxstatproc.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_setacl.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_setcachesize.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_setcbaddr.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_setcell.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_setclientaddrs.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_setcrypt.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_setquota.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_setserverprefs.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_setvol.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_storebehind.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_sysname.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/fs_uuid.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_whereis.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_whichcell.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/fs_wscell.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/klog.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/knfs.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/livesys.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pagsh.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts.1 usr/share/man/man1 @@ -85,14 +100,19 @@ debian/tmp/usr/share/man/man1/pts_createuser.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_delete.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_examine.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_help.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/pts_interactive.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_listentries.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_listmax.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_listowned.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_membership.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/pts_quit.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_removeuser.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_rename.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_setfields.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/pts_setmax.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/pts_sleep.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/pts_source.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/restorevol.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/rxdebug.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/scout.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/sys.1 usr/share/man/man1 @@ -100,16 +120,20 @@ debian/tmp/usr/share/man/man1/tokens.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/translate_et.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/udebug.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/unlog.1 usr/share/man/man1 -debian/tmp/usr/share/man/man1/up.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_addsite.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_apropos.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_backup.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_backupsys.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_changeaddr.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_changeloc.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_clone.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_convertROtoRW.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_copy.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_create.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_delentry.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_dump.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_endtrans.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_examine.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_help.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_listaddrs.1 usr/share/man/man1 @@ -117,6 +141,8 @@ debian/tmp/usr/share/man/man1/vos_listpart.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_listvldb.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_listvol.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_lock.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_offline.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_online.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_move.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_partinfo.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_release.1 usr/share/man/man1 @@ -124,6 +150,9 @@ debian/tmp/usr/share/man/man1/vos_remove.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_remsite.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_rename.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_restore.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_setfields.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_shadow.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/vos_size.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_status.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_syncserv.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/vos_syncvldb.1 usr/share/man/man1 @@ -133,6 +162,7 @@ debian/tmp/usr/share/man/man1/vos_zap.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/xstat_cm_test.1 usr/share/man/man1 debian/tmp/usr/share/man/man1/xstat_fs_test.1 usr/share/man/man1 +debian/tmp/usr/share/man/man5/CellAlias.5 usr/share/man/man5 debian/tmp/usr/share/man/man5/CellServDB.5 usr/share/man/man5 debian/tmp/usr/share/man/man5/NetInfo.5 usr/share/man/man5 debian/tmp/usr/share/man/man5/NetRestrict.5 usr/share/man/man5 @@ -191,6 +221,7 @@ debian/tmp/usr/share/man/man8/bos_exec.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_getdate.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_getlog.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_getrestart.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bos_getrestricted.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_help.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_install.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_listhosts.8 usr/share/man/man8 @@ -205,6 +236,7 @@ debian/tmp/usr/share/man/man8/bos_salvage.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_setauth.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_setcellname.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_setrestart.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bos_setrestricted.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_shutdown.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_start.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/bos_startup.8 usr/share/man/man8 @@ -222,3 +254,4 @@ debian/tmp/usr/share/man/man8/fstrace_lslog.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/fstrace_lsset.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/fstrace_setlog.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/fstrace_setset.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/rmtsysd.8 usr/share/man/man8 diff --git a/src/packaging/Debian/openafs-client.lintian b/src/packaging/Debian/openafs-client.lintian deleted file mode 100644 index 62b6d1c..0000000 --- a/src/packaging/Debian/openafs-client.lintian +++ /dev/null @@ -1,2 +0,0 @@ -openafs-client: non-standard-dir-perm -openafs-client: postinst-uses-db-input diff --git a/src/packaging/Debian/openafs-client.lintian-overrides b/src/packaging/Debian/openafs-client.lintian-overrides new file mode 100644 index 0000000..2eb27a3 --- /dev/null +++ b/src/packaging/Debian/openafs-client.lintian-overrides @@ -0,0 +1,3 @@ +# The AFS client cache should not be world-readable, since it may contain +# files only readable by some of the local users based on their tokens. +openafs-client: non-standard-dir-perm var/cache/openafs/ 0700 != 0755 diff --git a/src/packaging/Debian/openafs-client.postinst b/src/packaging/Debian/openafs-client.postinst index 7ead85c..f299168 100644 --- a/src/packaging/Debian/openafs-client.postinst +++ b/src/packaging/Debian/openafs-client.postinst @@ -2,12 +2,15 @@ set -e -case "$1" in -configure|reconfigure) +if [ "$1" = configure ] || [ "$1" = reconfigure ] ; then update-alternatives --install /usr/bin/pagsh pagsh \ /usr/bin/pagsh.openafs 100 \ --slave /usr/share/man/man1/pagsh.1.gz pagsh.1.gz \ /usr/share/man/man1/pagsh.openafs.1.gz + update-alternatives --install /usr/bin/klog klog \ + /usr/bin/klog.afs 10 \ + --slave /usr/share/man/man1/klog.1.gz klog.1.gz \ + /usr/share/man/man1/klog.afs.1.gz test -d /afs || mkdir /afs @@ -15,29 +18,33 @@ configure|reconfigure) db_version 2.0 db_get openafs-client/thiscell - echo $RET >/etc/openafs/ThisCell - THISCELL=$RET + THISCELL="$RET" + if [ -n "$THISCELL" ] ; then + echo "$THISCELL" > /etc/openafs/ThisCell + fi - if test -f /etc/openafs/CellServDB ; then - : - else + if [ ! -f /etc/openafs/CellServDB ] ; then cp /usr/share/openafs/CellServDB /etc/openafs fi # If ThisCell is not in CellServDB, we have to prompt the user for the # VLDB servers. Unfortunately, we can't do this in config because we - # need the CellServDB file, which is part of the package. We have to - # override a lintian warning for this since prompts at installation time - # are frowned upon. - if grep -q -F "$RET" /etc/openafs/CellServDB && [ "x$RET" != "x" ] ; then + # need the CellServDB file, which is part of the package. + # + # If the user is using afsdb for cell location, don't worry about + # prompting them for cells for their local system. + db_get openafs-client/afsdb + afsdb="$RET" + if grep -q -F "$THISCELL" /etc/openafs/CellServDB \ + && [ "x$THISCELL" != "x" ] ; then : - else + elif [ x"$afsdb" != xtrue ] ; then db_input critical openafs-client/cell-info || true db_input high openafs-client/run-client || true db_go db_get openafs-client/cell-info if [ "x$RET" != "x" ] ; then - echo \>$THISCELL > /etc/openafs/CellServDB.new + echo ">$THISCELL" > /etc/openafs/CellServDB.new perl -MSocket -e 'foreach (@ARGV) {' \ -e '@a=gethostbyname($_) and ' \ -e 'printf("%s\t\t# %s\n",inet_ntoa($a[4]),$a[0]) }' $RET \ @@ -45,12 +52,13 @@ configure|reconfigure) if [ `wc -l </etc/openafs/CellServDB.new` -eq 1 ] ; then echo None of the hostnames resolved to an address 2>&1 db_reset openafs-client/cell-info || true - exit 1 + rm /etc/openafs/CellServDB.new + else + cat /etc/openafs/CellServDB.new /etc/openafs/CellServDB \ + > /etc/openafs/CellServDB.tmp + mv /etc/openafs/CellServDB.tmp /etc/openafs/CellServDB + rm /etc/openafs/CellServDB.new fi - cat /etc/openafs/CellServDB.new /etc/openafs/CellServDB \ - >/etc/openafs/CellServDB.tmp - mv /etc/openafs/CellServDB.tmp /etc/openafs/CellServDB - rm /etc/openafs/CellServDB.new fi fi @@ -58,31 +66,23 @@ configure|reconfigure) echo /afs:/var/cache/openafs:$RET >/etc/openafs/cacheinfo echo <<'EOF' > /etc/openafs/afs.conf.client -# This file is managed by debconf. Do not edit directly. To modify these -# settings, run dpkg-reconfigure openafs-client. +# This file is managed by debconf. You may change the parameters set below, +# but any additional lines or comments will be lost when the package is +# upgraded or reconfigured. Local modifications other than setting the +# following parameters should be made in /etc/openafs/afs.conf instead. EOF db_get openafs-client/run-client - echo AFS_CLIENT=$RET >/etc/openafs/afs.conf.client - db_get openafs-client/afsdb - echo AFS_AFSDB=$RET >>/etc/openafs/afs.conf.client + echo AFS_CLIENT="$RET" > /etc/openafs/afs.conf.client + echo AFS_AFSDB="$afsdb" >> /etc/openafs/afs.conf.client db_get openafs-client/crypt - echo AFS_CRYPT=$RET >>/etc/openafs/afs.conf.client + echo AFS_CRYPT="$RET" >> /etc/openafs/afs.conf.client db_get openafs-client/dynroot - echo AFS_DYNROOT=$RET >>/etc/openafs/afs.conf.client + echo AFS_DYNROOT="$RET" >> /etc/openafs/afs.conf.client db_get openafs-client/fakestat - echo AFS_FAKESTAT=$RET >>/etc/openafs/afs.conf.client - ;; - -abort-upgrade|abort-remove|abort-deconfigure) - ;; - -*) - echo "postinst called with unknown argument '$1'" >&2 - exit 0 - ;; -esac + echo AFS_FAKESTAT="$RET" >> /etc/openafs/afs.conf.client +fi #DEBHELPER# diff --git a/src/packaging/Debian/openafs-client.prerm b/src/packaging/Debian/openafs-client.prerm index 0c9a913..02a1beb 100644 --- a/src/packaging/Debian/openafs-client.prerm +++ b/src/packaging/Debian/openafs-client.prerm @@ -1,29 +1,12 @@ -#!/bin/sh -e +#!/bin/sh +set -e -# summary of how this script can be called: -# * <prerm> `remove' -# * <old-prerm> `upgrade' <new-version> -# * <new-prerm> `failed-upgrade' <old-version> -# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version> -# * <deconfigured's-prerm> `deconfigure' `in-favour' -# <package-being-installed> <version> `removing' -# <conflicting-package> <version> -# for details, see /usr/share/doc/packaging-manual/ - -case "$1" in - remove|upgrade|deconfigure) - update-alternatives --remove pagsh /usr/bin/pagsh.openafs - ;; - failed-upgrade) - ;; - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. +if [ "$1" = remove ] || [ "$1" = deconfigure ] ; then + update-alternatives --remove pagsh /usr/bin/pagsh.openafs + update-alternatives --remove klog /usr/bin/klog.afs +fi #DEBHELPER# + +exit 0 diff --git a/src/packaging/Debian/openafs-client.templates b/src/packaging/Debian/openafs-client.templates index 8b8172b..06d0cdd 100644 --- a/src/packaging/Debian/openafs-client.templates +++ b/src/packaging/Debian/openafs-client.templates @@ -61,7 +61,7 @@ _Description: Encrypt authenticated traffic with AFS fileserver? Template: openafs-client/dynroot Type: boolean -Default: false +Default: true _Description: Dynamically generate the contents of /afs? /afs generally contains an entry for each cell that a client can talk to. Traditionally, these entries were generated by servers in the client's diff --git a/src/packaging/Debian/openafs-dbserver.NEWS b/src/packaging/Debian/openafs-dbserver.NEWS new file mode 100644 index 0000000..a8b5f96 --- /dev/null +++ b/src/packaging/Debian/openafs-dbserver.NEWS @@ -0,0 +1,20 @@ +openafs-dbserver (1.4.7.dfsg1-1) unstable; urgency=low + + If you are upgrading from one of the 1.4.7 pre-releases, be aware that + there was a serious bug in those versions that could cause Ubik database + entries to be lost if all database servers were restarted at the same + time. You should restart each database server in turn, one at a time, + to pick up the new 1.4.7 binaries before the next nightly restart. + + Only 1.4.7 pre-releases were affected by this problem. If you are + upgrading from an older version, you should not have to take special + precautions. + + You may also want to turn off any general restart for your servers with: + + bos setrestart -server <server> -time never -general + + This was an old defense against memory leaks and is no longer needed. + + -- Russ Allbery <rra@debian.org> Fri, 09 May 2008 10:24:48 -0700 + diff --git a/src/packaging/Debian/openafs-dbserver.install b/src/packaging/Debian/openafs-dbserver.install index dc1a856..922aa30 100644 --- a/src/packaging/Debian/openafs-dbserver.install +++ b/src/packaging/Debian/openafs-dbserver.install @@ -1,5 +1,6 @@ debian/tmp/usr/sbin/prdb_check usr/sbin debian/tmp/usr/sbin/pt_util usr/sbin +debian/tmp/usr/sbin/read_tape usr/sbin debian/tmp/usr/sbin/vldb_check usr/sbin debian/afs-rootvol usr/sbin @@ -21,5 +22,6 @@ debian/tmp/usr/share/man/man8/buserver.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/prdb_check.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/pt_util.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/ptserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/read_tape.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/vldb_check.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/vlserver.8 usr/share/man/man8 diff --git a/src/packaging/Debian/openafs-dbserver.lintian b/src/packaging/Debian/openafs-dbserver.lintian deleted file mode 100644 index 2afb85f..0000000 --- a/src/packaging/Debian/openafs-dbserver.lintian +++ /dev/null @@ -1 +0,0 @@ -openafs-dbserver: non-standard-dir-perm diff --git a/src/packaging/Debian/openafs-dbserver.lintian-overrides b/src/packaging/Debian/openafs-dbserver.lintian-overrides new file mode 100644 index 0000000..cf65ecb --- /dev/null +++ b/src/packaging/Debian/openafs-dbserver.lintian-overrides @@ -0,0 +1,3 @@ +# The database directory should be kept locked down to prevent reading +# database information that may not be accessible without authentication. +openafs-dbserver: non-standard-dir-perm var/lib/openafs/db/ 0700 != 0755 diff --git a/src/packaging/Debian/openafs-doc.doc-base.openafs-admin b/src/packaging/Debian/openafs-doc.doc-base.openafs-admin index 92ae212..8f33c78 100644 --- a/src/packaging/Debian/openafs-doc.doc-base.openafs-admin +++ b/src/packaging/Debian/openafs-doc.doc-base.openafs-admin @@ -4,8 +4,11 @@ Author: IBM Abstract: Describes concepts and procedures for an AFS cell administrator. This is a somewhat outdated guide to configuring and administering an AFS cell and an introduction to AFS for those considering running it. -Section: Apps/Net +Section: File Management Format: HTML -Index: /usr/share/doc/openafs-doc/html/AdminGuide/auagd000.htm +Index: /usr/share/doc/openafs-doc/html/AdminGuide/index.html Files: /usr/share/doc/openafs-doc/html/AdminGuide/* + +Format: PDF +Files: /usr/share/doc/openafs-doc/auagd000.pdf.gz diff --git a/src/packaging/Debian/openafs-doc.doc-base.openafs-quick b/src/packaging/Debian/openafs-doc.doc-base.openafs-quick index 1973f16..1d29ba6 100644 --- a/src/packaging/Debian/openafs-doc.doc-base.openafs-quick +++ b/src/packaging/Debian/openafs-doc.doc-base.openafs-quick @@ -4,8 +4,11 @@ Author: IBM Abstract: Initial setup and configuration documentation for AFS on Unix platforms. Debian users can ignore most of the installation information, but the configuration information is still useful. -Section: Apps/Net +Section: File Management Format: HTML -Index: /usr/share/doc/openafs-doc/html/QuickStartUnix/auqbg000.htm +Index: /usr/share/doc/openafs-doc/html/QuickStartUnix/index.html Files: /usr/share/doc/openafs-doc/html/QuickStartUnix/* + +Format: PDF +Files: /usr/share/doc/openafs-doc/auqbg000.pdf.gz diff --git a/src/packaging/Debian/openafs-doc.doc-base.openafs-user b/src/packaging/Debian/openafs-doc.doc-base.openafs-user index 2108ed8..2e5f5e7 100644 --- a/src/packaging/Debian/openafs-doc.doc-base.openafs-user +++ b/src/packaging/Debian/openafs-doc.doc-base.openafs-user @@ -3,8 +3,11 @@ Title: AFS User's Guide Author: IBM Abstract: Introduction and documentation of AFS for the end-user. This is the best document for people who will be using but not administering AFS. -Section: Apps/Net +Section: File Management Format: HTML -Index: /usr/share/doc/openafs-doc/html/UserGuide/auusg000.htm +Index: /usr/share/doc/openafs-doc/html/UserGuide/index.html Files: /usr/share/doc/openafs-doc/html/UserGuide/* + +Format: PDF +Files: /usr/share/doc/openafs-doc/auusg000.pdf.gz diff --git a/src/packaging/Debian/openafs-doc.docs b/src/packaging/Debian/openafs-doc.docs index a02509e..d62b148 100644 --- a/src/packaging/Debian/openafs-doc.docs +++ b/src/packaging/Debian/openafs-doc.docs @@ -1,3 +1,3 @@ -doc/html -doc/pdf -doc/txt +doc/arch/dafs-overview.txt +doc/arch/fssync.txt +doc/txt/ka2heim.txt diff --git a/src/packaging/Debian/openafs-fileserver.NEWS b/src/packaging/Debian/openafs-fileserver.NEWS index f552366..f5feb8c 100644 --- a/src/packaging/Debian/openafs-fileserver.NEWS +++ b/src/packaging/Debian/openafs-fileserver.NEWS @@ -1,3 +1,45 @@ +openafs (1.5.73.3-1) experimental; urgency=low + + This version of the OpenAFS file server is built with demand-attach. + Demand-attach completely changes how the file server shuts down and + starts up. Instead of detaching all volumes on shutdown and reattaching + them on startup, the file server saves state to disk and restores state + when starting, enabling it to start far faster. Volumes are only + attached when used and are detached again if they go unused for an + extended period. Volumes can also be salvaged on demand. + + Demand-attach is experimental. Please only use this file server for + testing. It is not yet ready to run in a production environment. + + This change REQUIRES changes to your BosConfig file so that the file + server will start properly. After installing the new openafs-fileserver + package, run: + + bos status localhost -instance fs -long + + and take note of the flags that you're using with the fileserver and + volserver. Then, run: + + bos stop localhost fs -localauth + bos delete localhost fs -localauth + bos create localhost dafs dafs \ + "/usr/lib/openafs/fileserver <fileserver-flags>" \ + "/usr/lib/openafs/volserver <volserver-flags>" \ + /usr/lib/openafs/salvageserver /usr/lib/openafs/salvager + + to create the correct new BosConfig entry for demand-attach AFS. + + As of this release, the default permissions for /etc/openafs/server are + now 0755, matching upstream. The only file in that directory that needs + to be kept secure is KeyFile, which is created with 0600 permissions. + The directory permissions won't be changed on upgrade, so bosserver will + complain now that it is no longer patched to permit restrictive + permissions. Once you're certain the per-file permissions of all files + in that directory are safe, chmod 755 /etc/openafs/server to make + bosserver happy. + + -- Russ Allbery <rra@debian.org> Tue, 06 Apr 2010 14:51:52 -0700 + openafs (1.4.4.dfsg1-4) unstable; urgency=low The files previously located in /etc/openafs/server-local have been diff --git a/src/packaging/Debian/openafs-fileserver.config b/src/packaging/Debian/openafs-fileserver.config index 524c4c3..c333f47 100644 --- a/src/packaging/Debian/openafs-fileserver.config +++ b/src/packaging/Debian/openafs-fileserver.config @@ -1,38 +1,27 @@ -#!/bin/sh -e +#!/bin/sh +set -e -. /usr/share/debconf/confmodule || exit +. /usr/share/debconf/confmodule db_version 2.0 +# Warn anyone who's trying to run the file server on alpha. arch=`dpkg --print-installation-architecture` -case $arch in - alpha) - db_input high openafs-fileserver/alpha-broken ||true -;; -esac +if [ "$arch" = "alpha" ] ; then + db_input high openafs-fileserver/alpha-broken || true +fi +# Configure the local cell. Ignore errors on read since it may fail if +# there's no newline in the file. Default to the server ThisCell file and, if +# that fails, the configured client cell. if [ -r /etc/openafs/server/ThisCell ] ; then - read cell </etc/openafs/server/ThisCell || true # error if no newline is ignore - db_set openafs-fileserver/thiscell $cell - fi - + read cell < /etc/openafs/server/ThisCell || true + db_set openafs-fileserver/thiscell "$cell" +fi db_get openafs-fileserver/thiscell || true if [ "x$RET" = "x" ] ; then - db_get openafs-client/thiscell ||true - db_set openafs-fileserver/thiscell "$RET" - fi - -db_input low openafs-fileserver/thiscell || true -if [ "x$2" != "x" ] ; then - if dpkg --compare-versions $2 lt 1.2.0-1 ; then - db_input high openafs-fileserver/bosconfig_moved ||true - fi + db_get openafs-client/thiscell || true + db_set openafs-fileserver/thiscell "$RET" fi - +db_input low openafs-fileserver/thiscell || true db_go - -db_get openafs-fileserver/bosconfig_moved -if [ $RET = "false" ] ; then - db_reset openafs-fileserver/bosconfig_moved - exit 2 -fi diff --git a/src/packaging/Debian/openafs-fileserver.install b/src/packaging/Debian/openafs-fileserver.install index 3fe61b9..37ef493 100644 --- a/src/packaging/Debian/openafs-fileserver.install +++ b/src/packaging/Debian/openafs-fileserver.install @@ -1,31 +1,41 @@ -debian/tmp/usr/sbin/bosserver usr/sbin -debian/tmp/usr/sbin/voldump usr/sbin -debian/tmp/usr/sbin/volinfo usr/sbin +debian/tmp/usr/sbin/bos_util usr/sbin +debian/tmp/usr/sbin/bosserver usr/sbin +debian/tmp/usr/sbin/fssync-debug usr/sbin +debian/tmp/usr/sbin/salvsync-debug usr/sbin +debian/tmp/usr/sbin/state_analyzer usr/sbin +debian/tmp/usr/sbin/voldump usr/sbin +debian/tmp/usr/sbin/volinfo usr/sbin -debian/tmp/usr/lib/openafs/fileserver usr/lib/openafs -debian/tmp/usr/lib/openafs/salvager usr/lib/openafs -debian/tmp/usr/lib/openafs/upclient usr/lib/openafs -debian/tmp/usr/lib/openafs/upserver usr/lib/openafs -debian/tmp/usr/lib/openafs/volserver usr/lib/openafs +debian/tmp/usr/lib/openafs/fileserver usr/lib/openafs +debian/tmp/usr/lib/openafs/salvager usr/lib/openafs +debian/tmp/usr/lib/openafs/salvageserver usr/lib/openafs +debian/tmp/usr/lib/openafs/upclient usr/lib/openafs +debian/tmp/usr/lib/openafs/upserver usr/lib/openafs +debian/tmp/usr/lib/openafs/volserver usr/lib/openafs -debian/tmp/usr/share/man/man5/BosConfig.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/BosLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/FORCESALVAGE.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/FileLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/KeyFile.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/NoAuth.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/SALVAGE.fs.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/SalvageLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/VolserLog.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/afs_volume_header.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/salvage.lock.5 usr/share/man/man5 -debian/tmp/usr/share/man/man5/sysid.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/BosConfig.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/BosLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/FORCESALVAGE.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/FileLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/KeyFile.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/NoAuth.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/SALVAGE.fs.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/SalvageLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/UserList.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/VolserLog.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/afs_volume_header.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/krb.conf.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/salvage.lock.5 usr/share/man/man5 +debian/tmp/usr/share/man/man5/sysid.5 usr/share/man/man5 -debian/tmp/usr/share/man/man8/bosserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/fileserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/salvager.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/upclient.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/upserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/voldump.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/volinfo.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/volserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bos_util.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bosserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fileserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/salvager.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/salvageserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/state_analyzer.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/upclient.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/upserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/voldump.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/volinfo.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/volserver.8 usr/share/man/man8 diff --git a/src/packaging/Debian/openafs-fileserver.lintian b/src/packaging/Debian/openafs-fileserver.lintian deleted file mode 100644 index f2b3998..0000000 --- a/src/packaging/Debian/openafs-fileserver.lintian +++ /dev/null @@ -1 +0,0 @@ -openafs-fileserver: non-standard-dir-perm diff --git a/src/packaging/Debian/openafs-fileserver.lintian-overrides b/src/packaging/Debian/openafs-fileserver.lintian-overrides new file mode 100644 index 0000000..66c4ae7 --- /dev/null +++ b/src/packaging/Debian/openafs-fileserver.lintian-overrides @@ -0,0 +1,5 @@ +# /var/lib/openafs/local contains the fssync.sock file used to coordinate +# volume actions between the fileserver and the volserver so upstream +# wants it to be locked down. Probably doesn't matter on Linux, but if we +# diverge, we either have to patch bosserver or it complains. +openafs-fileserver: non-standard-dir-perm var/lib/openafs/local/ 0700 != 0755 diff --git a/src/packaging/Debian/openafs-fileserver.postinst b/src/packaging/Debian/openafs-fileserver.postinst index 8531915..8eb656c 100644 --- a/src/packaging/Debian/openafs-fileserver.postinst +++ b/src/packaging/Debian/openafs-fileserver.postinst @@ -17,6 +17,7 @@ configure) echo ">$RET" >/etc/openafs/server/CellServDB fi fi + db_stop # Move the contents of the old /etc/openafs/server-local directory into # /var/lib/openafs/local. Most of the files in this directory are @@ -24,7 +25,7 @@ configure) # # Change the paths to upserver and upclient in BosConfig from older # versions that had the binaries in /usr/sbin. - if [ "x$2" != "x" ] && dpkg --compare-versions $2 lt 1.4.4.dfsg1-4 ; then + if [ x"$2" != x ] && dpkg --compare-versions "$2" lt 1.4.4.dfsg1-4 ; then for f in sysid sysid.old NetInfo NetRestrict ; do if [ -e "/etc/openafs/server-local/$f" ] ; then cp "/etc/openafs/server-local/$f" "/var/lib/openafs/local/$f" @@ -36,7 +37,15 @@ configure) /etc/openafs/BosConfig fi fi - db_stop + + # Previous versions of the package set the permissions on + # /var/lib/openafs/local to 755, but upstream prefers 700 to protect the + # fssync.sock socket. Probably doesn't matter on Linux, but if we + # diverge, either bosserver complains or we have to patch it. dpkg won't + # change the permissions of existing directories. + if [ x"$2" != x ] && dpkg --compare-versions "$2" lt 1.4.11+dfsg-3 ; then + chmod 700 /var/lib/openafs/local + fi ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/src/packaging/Debian/openafs-fileserver.templates b/src/packaging/Debian/openafs-fileserver.templates index 46a10b9..0764eb7 100644 --- a/src/packaging/Debian/openafs-fileserver.templates +++ b/src/packaging/Debian/openafs-fileserver.templates @@ -5,18 +5,6 @@ _Description: Cell this server serves files for: Kerberos service and serve volumes into that cell. Normally, this cell is the same cell as the workstation's client belongs to. -Template: openafs-fileserver/bosconfig_moved -Type: boolean -Default: true -_Description: Upgrading will move files to new locations; continue? - Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, - files in /etc/openafs/server-local have been distributed to other - locations. The BosConfig file is now located in /etc/openafs and the - other files are located in /var/lib/openafs. If you continue with this - upgrade, these files will be moved. You should use the bos restart - command to reload your servers. Any configuration changes made before - you do so will be lost. - Template: openafs-fileserver/alpha-broken Type: note _Description: OpenAFS file server probably does not work! diff --git a/src/packaging/Debian/openafs-krb5.NEWS b/src/packaging/Debian/openafs-krb5.NEWS new file mode 100644 index 0000000..cdbb745 --- /dev/null +++ b/src/packaging/Debian/openafs-krb5.NEWS @@ -0,0 +1,14 @@ +openafs-krb5 (1.4.7.dfsg1-1) unstable; urgency=low + + This package now includes a Kerberos v5 version of klog, klog.krb5, + which authenticates via Kerberos v5 to obtain tokens. When this package + is installed, that version of klog becomes the default. This is correct + for any site that uses Kerberos v5 for AFS authentication + + klog is managed by alternatives. If your site still uses the AFS + kaserver or otherwise requires use of the old AFS protocol to obtain + tokens with klog, run update-alternatives --config /usr/bin/klog and + select klog.afs as the default instead of klog.krb5. + + -- Russ Allbery <rra@debian.org> Thu, 01 May 2008 16:44:12 -0700 + diff --git a/src/packaging/Debian/openafs-krb5.install b/src/packaging/Debian/openafs-krb5.install index 006e461..3636aed 100644 --- a/src/packaging/Debian/openafs-krb5.install +++ b/src/packaging/Debian/openafs-krb5.install @@ -1,9 +1,11 @@ debian/tmp/usr/bin/aklog usr/bin +debian/tmp/usr/bin/klog.krb5 usr/bin debian/tmp/usr/bin/asetkey usr/sbin debian/tmp/usr/sbin/ka-forwarder usr/sbin debian/tmp/usr/share/man/man1/aklog.1 usr/share/man/man1 +debian/tmp/usr/share/man/man1/klog.krb5.1 usr/share/man/man1 debian/tmp/usr/share/man/man8/asetkey.8 usr/share/man/man8 debian/tmp/usr/share/man/man8/ka-forwarder.8 usr/share/man/man8 diff --git a/src/packaging/Debian/openafs-krb5.postinst b/src/packaging/Debian/openafs-krb5.postinst new file mode 100644 index 0000000..2e48091 --- /dev/null +++ b/src/packaging/Debian/openafs-krb5.postinst @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +if [ "$1" = configure ] || [ "$1" = reconfigure ] ; then + update-alternatives --install /usr/bin/klog klog \ + /usr/bin/klog.krb5 20 \ + --slave /usr/share/man/man1/klog.1.gz klog.1.gz \ + /usr/share/man/man1/klog.krb5.1.gz +fi + +#DEBHELPER# + +exit 0 diff --git a/src/packaging/Debian/openafs-krb5.prerm b/src/packaging/Debian/openafs-krb5.prerm new file mode 100644 index 0000000..2a5b32c --- /dev/null +++ b/src/packaging/Debian/openafs-krb5.prerm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = remove ] || [ "$1" = deconfigure ] ; then + update-alternatives --remove klog /usr/bin/klog.krb5 +fi + +#DEBHELPER# + +exit 0 diff --git a/src/packaging/Debian/openafs-modules-dkms.dkms b/src/packaging/Debian/openafs-modules-dkms.dkms new file mode 100644 index 0000000..6071516 --- /dev/null +++ b/src/packaging/Debian/openafs-modules-dkms.dkms @@ -0,0 +1,16 @@ +# DKMS configuration for the OpenAFS kernel module. -*- sh -*- + +# The version is replaced at build time by dh_dkms invoked in debian/rules. +PACKAGE_NAME="openafs" +PACKAGE_VERSION="#MODULE_VERSION#" + +BUILT_MODULE_NAME[0]="$PACKAGE_NAME" +DEST_MODULE_LOCATION[0]="/updates/dkms/" +AUTOINSTALL=yes + +MAKE[0]="./configure --enable-disconnected \ + --with-linux-kernel-headers=${kernel_source_dir} \ + --with-linux-kernel-packaging + && make + && mv src/libafs/MODLOAD-*/openafs.ko ." +CLEAN="rm -f openafs.ko && make -C src/libafs clean" diff --git a/src/packaging/Debian/openafs-modules-dkms.docs b/src/packaging/Debian/openafs-modules-dkms.docs new file mode 100644 index 0000000..e845566 --- /dev/null +++ b/src/packaging/Debian/openafs-modules-dkms.docs @@ -0,0 +1 @@ +README diff --git a/src/packaging/Debian/openafs-modules-source.docs b/src/packaging/Debian/openafs-modules-source.docs index 3d959f9..6cbdf7c 100644 --- a/src/packaging/Debian/openafs-modules-source.docs +++ b/src/packaging/Debian/openafs-modules-source.docs @@ -1,4 +1,2 @@ README -debian/README.servers -debian/configuration-transcript.txt debian/README.modules diff --git a/src/packaging/Debian/patches/afs-man-name b/src/packaging/Debian/patches/afs-man-name deleted file mode 100644 index 88fc4c0..0000000 --- a/src/packaging/Debian/patches/afs-man-name +++ /dev/null @@ -1,1888 +0,0 @@ -Current groff can't deal with NAME sections with a space on the left -side of the -. This patch has also been applied upstream and will be -in the next release after 1.4.5. - ---- openafs.orig/doc/man-pages/README -+++ openafs/doc/man-pages/README -@@ -78,7 +78,10 @@ - documents common options, and discusses the general use of the suite. - Then, each operation code in the suite should have a separate man page, - named after the command with the space between the command suite and the -- operation code replaced with an underscore. -+ operation code replaced with an underscore. The NAME section of the -+ operation man page must also use an underscore (fs_listacl, not fs -+ listacl) for compatibility with some man programs. The SYNOPSIS section -+ should, of course, use a space, since that's what the user must type. - - All man pages must follow the standard layout for man page sections and - formatting. The best general reference is the pod2man man page, ---- openafs.orig/doc/man-pages/pod1/fs_checkservers.pod -+++ openafs/doc/man-pages/pod1/fs_checkservers.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs checkservers - Displays the status of server machines -+fs_checkservers - Displays the status of server machines - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_checkvolumes.pod -+++ openafs/doc/man-pages/pod1/fs_checkvolumes.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs checkvolumes - Forces the Cache Manager to update volume information -+fs_checkvolumes - Forces the Cache Manager to update volume information - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_cleanacl.pod -+++ openafs/doc/man-pages/pod1/fs_cleanacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs cleanacl - Remove obsolete entries from an ACL -+fs_cleanacl - Remove obsolete entries from an ACL - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_copyacl.pod -+++ openafs/doc/man-pages/pod1/fs_copyacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs copyacl - Copies an ACL from a directory to one or more other directories -+fs_copyacl - Copies an ACL from a directory to one or more other directories - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_diskfree.pod -+++ openafs/doc/man-pages/pod1/fs_diskfree.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs diskfree - Shows data about the partition housing a directory or file -+fs_diskfree - Shows data about the partition housing a directory or file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_examine.pod -+++ openafs/doc/man-pages/pod1/fs_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs examine - Shows data about the volume containing a directory or file -+fs_examine - Shows data about the volume containing a directory or file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_exportafs.pod -+++ openafs/doc/man-pages/pod1/fs_exportafs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs exportafs - Configures export of AFS to clients of other file systems -+fs_exportafs - Configures export of AFS to clients of other file systems - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flush.pod -+++ openafs/doc/man-pages/pod1/fs_flush.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flush - Forces the Cache Manager to discard a cached file or directory -+fs_flush - Forces the Cache Manager to discard a cached file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flushall.pod -+++ openafs/doc/man-pages/pod1/fs_flushall.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flushall - Force the AFS Cache Manager to discard all data -+fs_flushall - Force the AFS Cache Manager to discard all data - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flushmount.pod -+++ openafs/doc/man-pages/pod1/fs_flushmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flushmount - Forces the Cache Manager to discard a mount point -+fs_flushmount - Forces the Cache Manager to discard a mount point - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_flushvolume.pod -+++ openafs/doc/man-pages/pod1/fs_flushvolume.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs flushvolume - Forces the Cache Manager to discard cached data from a volume -+fs_flushvolume - Forces the Cache Manager to discard cached data from a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcacheparms.pod -+++ openafs/doc/man-pages/pod1/fs_getcacheparms.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcacheparms - Displays the current size and usage of the cache -+fs_getcacheparms - Displays the current size and usage of the cache - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcalleraccess.pod -+++ openafs/doc/man-pages/pod1/fs_getcalleraccess.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcalleraccess - Show the current user's access to a file or directory -+fs_getcalleraccess - Show the current user's access to a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcellstatus.pod -+++ openafs/doc/man-pages/pod1/fs_getcellstatus.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcellstatus - Reports whether setuid programs are honored in a cell -+fs_getcellstatus - Reports whether setuid programs are honored in a cell - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getclientaddrs.pod -+++ openafs/doc/man-pages/pod1/fs_getclientaddrs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getclientaddrs - Displays the client interfaces to register -+fs_getclientaddrs - Displays the client interfaces to register - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getcrypt.pod -+++ openafs/doc/man-pages/pod1/fs_getcrypt.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getcrypt - Displays the state of encryption for AFS file transfers -+fs_getcrypt - Displays the state of encryption for AFS file transfers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_getserverprefs.pod -+++ openafs/doc/man-pages/pod1/fs_getserverprefs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs getserverprefs - Displays preference ranks for file servers or VL servers -+fs_getserverprefs - Displays preference ranks for file servers or VL servers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_help.pod -+++ openafs/doc/man-pages/pod1/fs_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs help - Displays help for fs commands -+fs_help - Displays help for fs commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listacl.pod -+++ openafs/doc/man-pages/pod1/fs_listacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listacl - Displays ACLs -+fs_listacl - Displays ACLs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listaliases.pod -+++ openafs/doc/man-pages/pod1/fs_listaliases.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listaliases - Displays the current list of aliases for AFS cells -+fs_listaliases - Displays the current list of aliases for AFS cells - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listcells.pod -+++ openafs/doc/man-pages/pod1/fs_listcells.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listcells - Displays the database server machines known to the Cache Manager -+fs_listcells - Displays the database server machines known to the Cache Manager - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_listquota.pod -+++ openafs/doc/man-pages/pod1/fs_listquota.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs listquota - Displays quota information for a volume -+fs_listquota - Displays quota information for a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_lsmount.pod -+++ openafs/doc/man-pages/pod1/fs_lsmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs lsmount - Reports the volume for which a directory is the mount point. -+fs_lsmount - Reports the volume for which a directory is the mount point. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_messages.pod -+++ openafs/doc/man-pages/pod1/fs_messages.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs messages - Sets whether the Cache Manager writes log messages -+fs_messages - Sets whether the Cache Manager writes log messages - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_mkmount.pod -+++ openafs/doc/man-pages/pod1/fs_mkmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs mkmount - Creates a mount point for a volume -+fs_mkmount - Creates a mount point for a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_newalias.pod -+++ openafs/doc/man-pages/pod1/fs_newalias.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs newalias - Creates a new alias for a cell -+fs_newalias - Creates a new alias for a cell - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_newcell.pod -+++ openafs/doc/man-pages/pod1/fs_newcell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs newcell - Changes the kernel-resident list of a cell's database servers -+fs_newcell - Changes the kernel-resident list of a cell's database servers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_quota.pod -+++ openafs/doc/man-pages/pod1/fs_quota.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs quota - Displays the quota used in the volume containing a directory or file -+fs_quota - Displays the quota used in the volume containing a directory or file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_rmmount.pod -+++ openafs/doc/man-pages/pod1/fs_rmmount.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs rmmount - Removes a mount point -+fs_rmmount - Removes a mount point - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setacl.pod -+++ openafs/doc/man-pages/pod1/fs_setacl.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setacl - Sets the ACL for a directory -+fs_setacl - Sets the ACL for a directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setcachesize.pod -+++ openafs/doc/man-pages/pod1/fs_setcachesize.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setcachesize - Sets the size of the disk cache -+fs_setcachesize - Sets the size of the disk cache - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setcell.pod -+++ openafs/doc/man-pages/pod1/fs_setcell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setcell - Configures permissions for setuid programs from specified cells -+fs_setcell - Configures permissions for setuid programs from specified cells - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setclientaddrs.pod -+++ openafs/doc/man-pages/pod1/fs_setclientaddrs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setclientaddrs - Sets the client interfaces to register with the File Server -+fs_setclientaddrs - Sets the client interfaces to register with the File Server - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setcrypt.pod -+++ openafs/doc/man-pages/pod1/fs_setcrypt.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setcrypt - Enables of disables the encryption of AFS file transfers -+fs_setcrypt - Enables of disables the encryption of AFS file transfers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setquota.pod -+++ openafs/doc/man-pages/pod1/fs_setquota.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setquota - Sets the quota for the volume containing a file or directory -+fs_setquota - Sets the quota for the volume containing a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setserverprefs.pod -+++ openafs/doc/man-pages/pod1/fs_setserverprefs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setserverprefs - Sets the preference ranks for file servers or VL servers -+fs_setserverprefs - Sets the preference ranks for file servers or VL servers - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_setvol.pod -+++ openafs/doc/man-pages/pod1/fs_setvol.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs setvol - Set quota and messages for a volume containing a file or directory -+fs_setvol - Set quota and messages for a volume containing a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_storebehind.pod -+++ openafs/doc/man-pages/pod1/fs_storebehind.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs storebehind - Enables asynchronous writes to the file server -+fs_storebehind - Enables asynchronous writes to the file server - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_sysname.pod -+++ openafs/doc/man-pages/pod1/fs_sysname.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs sysname - Reports or sets the CPU/operating system type -+fs_sysname - Reports or sets the CPU/operating system type - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_uuid.pod -+++ openafs/doc/man-pages/pod1/fs_uuid.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs uuid - Prints the uuid of the client or generates a new one -+fs_uuid - Prints the uuid of the client or generates a new one - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_whereis.pod -+++ openafs/doc/man-pages/pod1/fs_whereis.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs whereis - Reports each file server housing a file or directory -+fs_whereis - Reports each file server housing a file or directory - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_whichcell.pod -+++ openafs/doc/man-pages/pod1/fs_whichcell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs whichcell - Returns the cell to which a file or directory belongs -+fs_whichcell - Returns the cell to which a file or directory belongs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_wscell.pod -+++ openafs/doc/man-pages/pod1/fs_wscell.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs wscell - Returns the name of the cell to which a machine belongs -+fs_wscell - Returns the name of the cell to which a machine belongs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_adduser.pod -+++ openafs/doc/man-pages/pod1/pts_adduser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts adduser - Adds a user or machine to a Protection Database group -+pts_adduser - Adds a user or machine to a Protection Database group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_apropos.pod -+++ openafs/doc/man-pages/pod1/pts_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts apropos - Displays each help entry containing a keyword string -+pts_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_chown.pod -+++ openafs/doc/man-pages/pod1/pts_chown.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts chown - Changes the owner of a Protection Database entry -+pts_chown - Changes the owner of a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_creategroup.pod -+++ openafs/doc/man-pages/pod1/pts_creategroup.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts creategroup - Creates an (empty) Protection Database group entry -+pts_creategroup - Creates an (empty) Protection Database group entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_createuser.pod -+++ openafs/doc/man-pages/pod1/pts_createuser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts createuser - Creates a user or machine entry in the Protection Database -+pts_createuser - Creates a user or machine entry in the Protection Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_delete.pod -+++ openafs/doc/man-pages/pod1/pts_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts delete - Deletes a Protection Database entry -+pts_delete - Deletes a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_examine.pod -+++ openafs/doc/man-pages/pod1/pts_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts examine - Displays a Protection Database entry -+pts_examine - Displays a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_help.pod -+++ openafs/doc/man-pages/pod1/pts_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts help - Displays help for pts commands -+pts_help - Displays help for pts commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_interactive.pod -+++ openafs/doc/man-pages/pod1/pts_interactive.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts interactive - Enters interactive mode -+pts_interactive - Enters interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_listentries.pod -+++ openafs/doc/man-pages/pod1/pts_listentries.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts listentries - Displays all users or groups in the Protection Database -+pts_listentries - Displays all users or groups in the Protection Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_listmax.pod -+++ openafs/doc/man-pages/pod1/pts_listmax.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts listmax - Displays the max user id and max group id counters -+pts_listmax - Displays the max user id and max group id counters - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_listowned.pod -+++ openafs/doc/man-pages/pod1/pts_listowned.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts listowned - Show the Protection Database groups owned by a user or group -+pts_listowned - Show the Protection Database groups owned by a user or group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_membership.pod -+++ openafs/doc/man-pages/pod1/pts_membership.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts membership - Displays the membership list for a user or group -+pts_membership - Displays the membership list for a user or group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_quit.pod -+++ openafs/doc/man-pages/pod1/pts_quit.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts quit - Exit from pts interactive mode -+pts_quit - Exit from pts interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_removeuser.pod -+++ openafs/doc/man-pages/pod1/pts_removeuser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts removeuser - Removes a user from a Protection Database group -+pts_removeuser - Removes a user from a Protection Database group - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_rename.pod -+++ openafs/doc/man-pages/pod1/pts_rename.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts rename - Changes the name of a Protection Database entry -+pts_rename - Changes the name of a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_setfields.pod -+++ openafs/doc/man-pages/pod1/pts_setfields.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts setfields - Sets privacy flags or quota for a Protection Database entry -+pts_setfields - Sets privacy flags or quota for a Protection Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_setmax.pod -+++ openafs/doc/man-pages/pod1/pts_setmax.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts setmax - Sets the value of the max group id or max user id counter -+pts_setmax - Sets the value of the max group id or max user id counter - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_sleep.pod -+++ openafs/doc/man-pages/pod1/pts_sleep.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts sleep - Pauses for a few seconds -+pts_sleep - Pauses for a few seconds - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/pts_source.pod -+++ openafs/doc/man-pages/pod1/pts_source.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --pts source - Read pts commands from a file -+pts_source - Read pts commands from a file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_addsite.pod -+++ openafs/doc/man-pages/pod1/vos_addsite.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos addsite - Adds a read-only site definition to a volume's VLDB entry -+vos_addsite - Adds a read-only site definition to a volume's VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_apropos.pod -+++ openafs/doc/man-pages/pod1/vos_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos apropos - Displays each help entry containing a keyword string -+vos_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_backup.pod -+++ openafs/doc/man-pages/pod1/vos_backup.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos backup - Creates a backup volume for a single read/write volume -+vos_backup - Creates a backup volume for a single read/write volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_backupsys.pod -+++ openafs/doc/man-pages/pod1/vos_backupsys.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos backupsys - Creates a backup volume for several read/write volumes -+vos_backupsys - Creates a backup volume for several read/write volumes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_changeaddr.pod -+++ openafs/doc/man-pages/pod1/vos_changeaddr.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos changeaddr - Changes or removes a file server machine's entry in the VLDB -+vos_changeaddr - Changes or removes a file server machine's entry in the VLDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_changeloc.pod -+++ openafs/doc/man-pages/pod1/vos_changeloc.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos changeloc - Change a volume's entry in the VLDB -+vos_changeloc - Change a volume's entry in the VLDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_create.pod -+++ openafs/doc/man-pages/pod1/vos_create.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos create - Creates a read/write volume and associated VLDB entry -+vos_create - Creates a read/write volume and associated VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_delentry.pod -+++ openafs/doc/man-pages/pod1/vos_delentry.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos delentry - Removes a volume entry from the VLDB. -+vos_delentry - Removes a volume entry from the VLDB. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_dump.pod -+++ openafs/doc/man-pages/pod1/vos_dump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos dump - Converts a volume into ASCII format and writes it to a file -+vos_dump - Converts a volume into ASCII format and writes it to a file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_examine.pod -+++ openafs/doc/man-pages/pod1/vos_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos examine - Shows volume header and VLDB entry information for a volume -+vos_examine - Shows volume header and VLDB entry information for a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_help.pod -+++ openafs/doc/man-pages/pod1/vos_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos help - Displays help for vos commands -+vos_help - Displays help for vos commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listaddrs.pod -+++ openafs/doc/man-pages/pod1/vos_listaddrs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listaddrs - Displays all VLDB server entries -+vos_listaddrs - Displays all VLDB server entries - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listpart.pod -+++ openafs/doc/man-pages/pod1/vos_listpart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listpart - Displays all AFS partitions on a file server machine -+vos_listpart - Displays all AFS partitions on a file server machine - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listvldb.pod -+++ openafs/doc/man-pages/pod1/vos_listvldb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listvldb - Displays a volume's VLDB entry -+vos_listvldb - Displays a volume's VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_listvol.pod -+++ openafs/doc/man-pages/pod1/vos_listvol.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos listvol - Displays information from a volume header -+vos_listvol - Displays information from a volume header - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_lock.pod -+++ openafs/doc/man-pages/pod1/vos_lock.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos lock - Locks a VLDB volume entry -+vos_lock - Locks a VLDB volume entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_move.pod -+++ openafs/doc/man-pages/pod1/vos_move.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos move - Moves a read/write volume to another site -+vos_move - Moves a read/write volume to another site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_offline.pod -+++ openafs/doc/man-pages/pod1/vos_offline.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos offline - Takes a volume offline -+vos_offline - Takes a volume offline - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_online.pod -+++ openafs/doc/man-pages/pod1/vos_online.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos online - Brings a volume online -+vos_online - Brings a volume online - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_partinfo.pod -+++ openafs/doc/man-pages/pod1/vos_partinfo.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos partinfo - Reports the available and total space on a partition -+vos_partinfo - Reports the available and total space on a partition - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_release.pod -+++ openafs/doc/man-pages/pod1/vos_release.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos release - Updates read-only volumes to match the read/write source volume -+vos_release - Updates read-only volumes to match the read/write source volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_remove.pod -+++ openafs/doc/man-pages/pod1/vos_remove.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos remove - Removes a volume from a site -+vos_remove - Removes a volume from a site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_remsite.pod -+++ openafs/doc/man-pages/pod1/vos_remsite.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos remsite - Removes a read-only site definition from a VLDB entry -+vos_remsite - Removes a read-only site definition from a VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_rename.pod -+++ openafs/doc/man-pages/pod1/vos_rename.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos rename - Renames a volume -+vos_rename - Renames a volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_restore.pod -+++ openafs/doc/man-pages/pod1/vos_restore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos restore - Converts an ASCII dump file into an AFS volume -+vos_restore - Converts an ASCII dump file into an AFS volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_size.pod -+++ openafs/doc/man-pages/pod1/vos_size.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos size - Computes the size of a volume dump -+vos_size - Computes the size of a volume dump - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_status.pod -+++ openafs/doc/man-pages/pod1/vos_status.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos status - Reports a Volume Server's status -+vos_status - Reports a Volume Server's status - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_syncserv.pod -+++ openafs/doc/man-pages/pod1/vos_syncserv.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos syncserv - Verifies VLDB entries that mention a specified site -+vos_syncserv - Verifies VLDB entries that mention a specified site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_syncvldb.pod -+++ openafs/doc/man-pages/pod1/vos_syncvldb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos syncvldb - Verifies VLDB entries for volumes residing at specified site -+vos_syncvldb - Verifies VLDB entries for volumes residing at specified site - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_unlock.pod -+++ openafs/doc/man-pages/pod1/vos_unlock.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos unlock - Unlocks a single VLDB entry -+vos_unlock - Unlocks a single VLDB entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_unlockvldb.pod -+++ openafs/doc/man-pages/pod1/vos_unlockvldb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos unlockvldb - Unlocks several locked VLDB entries -+vos_unlockvldb - Unlocks several locked VLDB entries - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/vos_zap.pod -+++ openafs/doc/man-pages/pod1/vos_zap.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --vos zap - Removes a volume from its site without writing to the VLDB -+vos_zap - Removes a volume from its site without writing to the VLDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_adddump.pod -+++ openafs/doc/man-pages/pod8/backup_adddump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup adddump - Defines a dump level in the dump hierarchy -+backup_adddump - Defines a dump level in the dump hierarchy - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_addhost.pod -+++ openafs/doc/man-pages/pod8/backup_addhost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup addhost - Adds a Tape Coordinator entry to the Backup Database -+backup_addhost - Adds a Tape Coordinator entry to the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_addvolentry.pod -+++ openafs/doc/man-pages/pod8/backup_addvolentry.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup addvolentry - Defines a volume entry in a volume set -+backup_addvolentry - Defines a volume entry in a volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_addvolset.pod -+++ openafs/doc/man-pages/pod8/backup_addvolset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup addvolset - Creates a new (empty) volume set -+backup_addvolset - Creates a new (empty) volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_apropos.pod -+++ openafs/doc/man-pages/pod8/backup_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup apropos - Displays each help entry containing a keyword string -+backup_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_dbverify.pod -+++ openafs/doc/man-pages/pod8/backup_dbverify.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup dbverify - Checks the integrity of the Backup Database -+backup_dbverify - Checks the integrity of the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_deldump.pod -+++ openafs/doc/man-pages/pod8/backup_deldump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup deldump - Deletes a dump level from the Backup Database -+backup_deldump - Deletes a dump level from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_deletedump.pod -+++ openafs/doc/man-pages/pod8/backup_deletedump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup deletedump - Deletes one or more dump records from the Backup Database -+backup_deletedump - Deletes one or more dump records from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_delhost.pod -+++ openafs/doc/man-pages/pod8/backup_delhost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup delhost - Deletes a Tape Coordinator entry from the Backup Database -+backup_delhost - Deletes a Tape Coordinator entry from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_delvolentry.pod -+++ openafs/doc/man-pages/pod8/backup_delvolentry.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup delvolentry - Deletes a volume entry from a volume set -+backup_delvolentry - Deletes a volume entry from a volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_delvolset.pod -+++ openafs/doc/man-pages/pod8/backup_delvolset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup delvolset - Deletes one or more volume sets from the Backup Database -+backup_delvolset - Deletes one or more volume sets from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_diskrestore.pod -+++ openafs/doc/man-pages/pod8/backup_diskrestore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup diskrestore - Restores the entire contents of a partition -+backup_diskrestore - Restores the entire contents of a partition - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_dump.pod -+++ openafs/doc/man-pages/pod8/backup_dump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup dump - Creates a dump (dumps a volume set at a particular dump level) -+backup_dump - Creates a dump (dumps a volume set at a particular dump level) - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_dumpinfo.pod -+++ openafs/doc/man-pages/pod8/backup_dumpinfo.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup dumpinfo - Displays a dump record from the Backup Database -+backup_dumpinfo - Displays a dump record from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_help.pod -+++ openafs/doc/man-pages/pod8/backup_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup help - Displays help for backup commands -+backup_help - Displays help for backup commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_interactive.pod -+++ openafs/doc/man-pages/pod8/backup_interactive.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup interactive - Enters interactive mode -+backup_interactive - Enters interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_jobs.pod -+++ openafs/doc/man-pages/pod8/backup_jobs.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup jobs - Lists pending and running operations in interactive mode -+backup_jobs - Lists pending and running operations in interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_kill.pod -+++ openafs/doc/man-pages/pod8/backup_kill.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup kill - Terminates a pending or running operation -+backup_kill - Terminates a pending or running operation - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_labeltape.pod -+++ openafs/doc/man-pages/pod8/backup_labeltape.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup labeltape - Creates the magnetic label on a tape -+backup_labeltape - Creates the magnetic label on a tape - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_listdumps.pod -+++ openafs/doc/man-pages/pod8/backup_listdumps.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup listdumps - Displays the dump hierarchy from the Backup Database -+backup_listdumps - Displays the dump hierarchy from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_listhosts.pod -+++ openafs/doc/man-pages/pod8/backup_listhosts.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup listhosts - Lists Tape Coordinators registered in the Backup Database -+backup_listhosts - Lists Tape Coordinators registered in the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_listvolsets.pod -+++ openafs/doc/man-pages/pod8/backup_listvolsets.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup listvolsets - Lists volume set entries from the Backup Database -+backup_listvolsets - Lists volume set entries from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_quit.pod -+++ openafs/doc/man-pages/pod8/backup_quit.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup quit - Leaves interactive mode -+backup_quit - Leaves interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_readlabel.pod -+++ openafs/doc/man-pages/pod8/backup_readlabel.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup readlabel - Reads and displays a tape's label -+backup_readlabel - Reads and displays a tape's label - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_restoredb.pod -+++ openafs/doc/man-pages/pod8/backup_restoredb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup restoredb - Restores a saved copy of the Backup Database -+backup_restoredb - Restores a saved copy of the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_savedb.pod -+++ openafs/doc/man-pages/pod8/backup_savedb.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup savedb - Creates a saved copy of the Backup Database -+backup_savedb - Creates a saved copy of the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_scantape.pod -+++ openafs/doc/man-pages/pod8/backup_scantape.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup scantape - Extracts dump information from a tape -+backup_scantape - Extracts dump information from a tape - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_setexp.pod -+++ openafs/doc/man-pages/pod8/backup_setexp.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup setexp - Sets the expiration date for existing dump levels. -+backup_setexp - Sets the expiration date for existing dump levels. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_status.pod -+++ openafs/doc/man-pages/pod8/backup_status.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup status - Reports a Tape Coordinator's status -+backup_status - Reports a Tape Coordinator's status - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_volinfo.pod -+++ openafs/doc/man-pages/pod8/backup_volinfo.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup volinfo - Displays a volume's dump history from the Backup Database -+backup_volinfo - Displays a volume's dump history from the Backup Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_volrestore.pod -+++ openafs/doc/man-pages/pod8/backup_volrestore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup volrestore - Restores one or more volumes -+backup_volrestore - Restores one or more volumes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/backup_volsetrestore.pod -+++ openafs/doc/man-pages/pod8/backup_volsetrestore.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --backup volsetrestore - Restores all volumes in a volume set -+backup_volsetrestore - Restores all volumes in a volume set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_addhost.pod -+++ openafs/doc/man-pages/pod8/bos_addhost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos addhost - Adds a database server machine to the CellServDB file -+bos_addhost - Adds a database server machine to the CellServDB file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_addkey.pod -+++ openafs/doc/man-pages/pod8/bos_addkey.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos addkey - Adds a new server encryption key to the KeyFile file -+bos_addkey - Adds a new server encryption key to the KeyFile file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_adduser.pod -+++ openafs/doc/man-pages/pod8/bos_adduser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos adduser - Adds a privileged user to the UserList file -+bos_adduser - Adds a privileged user to the UserList file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_apropos.pod -+++ openafs/doc/man-pages/pod8/bos_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos apropos - Displays each help entry containing a keyword string -+bos_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_create.pod -+++ openafs/doc/man-pages/pod8/bos_create.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos create - Defines a new process in the BosConfig file and starts it -+bos_create - Defines a new process in the BosConfig file and starts it - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_delete.pod -+++ openafs/doc/man-pages/pod8/bos_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos delete - Deletes a server process from the BosConfig file -+bos_delete - Deletes a server process from the BosConfig file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_exec.pod -+++ openafs/doc/man-pages/pod8/bos_exec.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos exec - Executes a command on a remote server machine -+bos_exec - Executes a command on a remote server machine - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_getdate.pod -+++ openafs/doc/man-pages/pod8/bos_getdate.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos getdate - Displays the time stamps on an AFS binary file -+bos_getdate - Displays the time stamps on an AFS binary file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_getlog.pod -+++ openafs/doc/man-pages/pod8/bos_getlog.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos getlog - Prints a server process's log file -+bos_getlog - Prints a server process's log file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_getrestart.pod -+++ openafs/doc/man-pages/pod8/bos_getrestart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos getrestart - Displays the automatic restart times for server processes -+bos_getrestart - Displays the automatic restart times for server processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_help.pod -+++ openafs/doc/man-pages/pod8/bos_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos help - Displays help for bos commands -+bos_help - Displays help for bos commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_install.pod -+++ openafs/doc/man-pages/pod8/bos_install.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos install - Installs a new version of a binary file -+bos_install - Installs a new version of a binary file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_listhosts.pod -+++ openafs/doc/man-pages/pod8/bos_listhosts.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos listhosts - Displays the contents of the CellServDB file -+bos_listhosts - Displays the contents of the CellServDB file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_listkeys.pod -+++ openafs/doc/man-pages/pod8/bos_listkeys.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos listkeys - Displays the server encryption keys from the KeyFile file -+bos_listkeys - Displays the server encryption keys from the KeyFile file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_listusers.pod -+++ openafs/doc/man-pages/pod8/bos_listusers.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos listusers - Lists the privileged users from the UserList file -+bos_listusers - Lists the privileged users from the UserList file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_prune.pod -+++ openafs/doc/man-pages/pod8/bos_prune.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos prune - Removes obsolete files from /usr/afs/bin and /usr/afs/logs -+bos_prune - Removes obsolete files from /usr/afs/bin and /usr/afs/logs - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_removehost.pod -+++ openafs/doc/man-pages/pod8/bos_removehost.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos removehost - Removes a database server machine from the CellServDB file -+bos_removehost - Removes a database server machine from the CellServDB file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_removekey.pod -+++ openafs/doc/man-pages/pod8/bos_removekey.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos removekey - Removes a server encryption key from the KeyFile file -+bos_removekey - Removes a server encryption key from the KeyFile file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_removeuser.pod -+++ openafs/doc/man-pages/pod8/bos_removeuser.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos removeuser - Removes a privileged user from the UserList file -+bos_removeuser - Removes a privileged user from the UserList file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_restart.pod -+++ openafs/doc/man-pages/pod8/bos_restart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos restart - Restarts a server process -+bos_restart - Restarts a server process - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_salvage.pod -+++ openafs/doc/man-pages/pod8/bos_salvage.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos salvage - Restores internal consistency to a file system or volume -+bos_salvage - Restores internal consistency to a file system or volume - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_setauth.pod -+++ openafs/doc/man-pages/pod8/bos_setauth.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos setauth - Sets authorization checking requirements for all server processes -+bos_setauth - Sets authorization checking requirements for all server processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_setcellname.pod -+++ openafs/doc/man-pages/pod8/bos_setcellname.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos setcellname - Sets the cell's name in ThisCell and CellServDB -+bos_setcellname - Sets the cell's name in ThisCell and CellServDB - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_setrestart.pod -+++ openafs/doc/man-pages/pod8/bos_setrestart.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos setrestart - Sets when the BOS Server restarts processes -+bos_setrestart - Sets when the BOS Server restarts processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_shutdown.pod -+++ openafs/doc/man-pages/pod8/bos_shutdown.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos shutdown - Stops a process without changing its status flag -+bos_shutdown - Stops a process without changing its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_start.pod -+++ openafs/doc/man-pages/pod8/bos_start.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos start - Starts a process after setting its status flag -+bos_start - Starts a process after setting its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_startup.pod -+++ openafs/doc/man-pages/pod8/bos_startup.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos startup - Starts a process without changing its status flag -+bos_startup - Starts a process without changing its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_status.pod -+++ openafs/doc/man-pages/pod8/bos_status.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos status - Displays the status of server processes -+bos_status - Displays the status of server processes - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_stop.pod -+++ openafs/doc/man-pages/pod8/bos_stop.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos stop - Stops a process after changing its status flag -+bos_stop - Stops a process after changing its status flag - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/bos_uninstall.pod -+++ openafs/doc/man-pages/pod8/bos_uninstall.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --bos uninstall - Reverts to the former version of a process's binary file -+bos_uninstall - Reverts to the former version of a process's binary file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_apropos.pod -+++ openafs/doc/man-pages/pod8/fstrace_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace apropos - Displays each help entry containing a keyword string -+fstrace_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_clear.pod -+++ openafs/doc/man-pages/pod8/fstrace_clear.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace clear - Clears the trace log -+fstrace_clear - Clears the trace log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_dump.pod -+++ openafs/doc/man-pages/pod8/fstrace_dump.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace dump - Dumps a trace log -+fstrace_dump - Dumps a trace log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_help.pod -+++ openafs/doc/man-pages/pod8/fstrace_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace help - Displays help for fstrace commands -+fstrace_help - Displays help for fstrace commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_lslog.pod -+++ openafs/doc/man-pages/pod8/fstrace_lslog.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace lslog - Displays information about a log -+fstrace_lslog - Displays information about a log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_lsset.pod -+++ openafs/doc/man-pages/pod8/fstrace_lsset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace lsset - Reports the status of an event set -+fstrace_lsset - Reports the status of an event set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_setlog.pod -+++ openafs/doc/man-pages/pod8/fstrace_setlog.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace setlog - Sets the size of a trace log -+fstrace_setlog - Sets the size of a trace log - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/fstrace_setset.pod -+++ openafs/doc/man-pages/pod8/fstrace_setset.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fstrace setset - Sets the status of an event set -+fstrace_setset - Sets the status of an event set - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_apropos.pod -+++ openafs/doc/man-pages/pod8/kas_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas apropos - Displays each help entry containing a keyword string -+kas_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_create.pod -+++ openafs/doc/man-pages/pod8/kas_create.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas create - Creates an entry in the Authentication Database -+kas_create - Creates an entry in the Authentication Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_delete.pod -+++ openafs/doc/man-pages/pod8/kas_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas delete - Deletes an entry from the Authentication Database -+kas_delete - Deletes an entry from the Authentication Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_examine.pod -+++ openafs/doc/man-pages/pod8/kas_examine.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas examine - Displays information from an Authentication Database entry -+kas_examine - Displays information from an Authentication Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_forgetticket.pod -+++ openafs/doc/man-pages/pod8/kas_forgetticket.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas forgetticket - Discards all tickets for the issuer -+kas_forgetticket - Discards all tickets for the issuer - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_help.pod -+++ openafs/doc/man-pages/pod8/kas_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas help - Displays help for kas commands -+kas_help - Displays help for kas commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_interactive.pod -+++ openafs/doc/man-pages/pod8/kas_interactive.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas interactive - Enters interactive mode -+kas_interactive - Enters interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_list.pod -+++ openafs/doc/man-pages/pod8/kas_list.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas list - Displays all entries in the Authentication Database -+kas_list - Displays all entries in the Authentication Database - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_listtickets.pod -+++ openafs/doc/man-pages/pod8/kas_listtickets.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas listtickets - Displays all of the issuer's tickets (tokens) -+kas_listtickets - Displays all of the issuer's tickets (tokens) - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_noauthentication.pod -+++ openafs/doc/man-pages/pod8/kas_noauthentication.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas noauthentication - Discards an authenticated identity in interactive mode -+kas_noauthentication - Discards an authenticated identity in interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_quit.pod -+++ openafs/doc/man-pages/pod8/kas_quit.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas quit - Leaves interactive mode -+kas_quit - Leaves interactive mode - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_setfields.pod -+++ openafs/doc/man-pages/pod8/kas_setfields.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas setfields - Sets fields in an Authentication Database entry -+kas_setfields - Sets fields in an Authentication Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_setpassword.pod -+++ openafs/doc/man-pages/pod8/kas_setpassword.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas setpassword - Changes the key field in an Authentication Database entry -+kas_setpassword - Changes the key field in an Authentication Database entry - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_statistics.pod -+++ openafs/doc/man-pages/pod8/kas_statistics.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas statistics - Displays statistics from an Authentication Server process -+kas_statistics - Displays statistics from an Authentication Server process - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_stringtokey.pod -+++ openafs/doc/man-pages/pod8/kas_stringtokey.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas stringtokey - Converts a character string into an octal key -+kas_stringtokey - Converts a character string into an octal key - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/kas_unlock.pod -+++ openafs/doc/man-pages/pod8/kas_unlock.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --kas unlock - Unlocks a locked user account -+kas_unlock - Unlocks a locked user account - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_add.pod -+++ openafs/doc/man-pages/pod8/uss_add.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss add - Creates a user account -+uss_add - Creates a user account - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_apropos.pod -+++ openafs/doc/man-pages/pod8/uss_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss apropos - Displays each help entry containing a keyword string. -+uss_apropos - Displays each help entry containing a keyword string. - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_bulk.pod -+++ openafs/doc/man-pages/pod8/uss_bulk.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss bulk - Executes multiple uss commands listed in a file -+uss_bulk - Executes multiple uss commands listed in a file - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_delete.pod -+++ openafs/doc/man-pages/pod8/uss_delete.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss delete - Deletes a user account -+uss_delete - Deletes a user account - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod8/uss_help.pod -+++ openafs/doc/man-pages/pod8/uss_help.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --uss help - Displays help for uss commands -+uss_help - Displays help for uss commands - - =head1 SYNOPSIS - ---- openafs.orig/doc/man-pages/pod1/fs_apropos.pod -+++ openafs/doc/man-pages/pod1/fs_apropos.pod -@@ -1,6 +1,6 @@ - =head1 NAME - --fs apropos - Displays each help entry containing a keyword string -+fs_apropos - Displays each help entry containing a keyword string - - =head1 SYNOPSIS - diff --git a/src/packaging/Debian/patches/alloc-vnode b/src/packaging/Debian/patches/alloc-vnode deleted file mode 100644 index e4e703c..0000000 --- a/src/packaging/Debian/patches/alloc-vnode +++ /dev/null @@ -1,34 +0,0 @@ -Allocate vnodes rather than using the stack, which fixes file server -problems on SPARC. Upstream delta: - -STABLE14-volprocs-alloc-vnode-instead-of-using-stack-20071126 - -Debian Bug#448380 - ---- openafs.orig/src/volser/volprocs.c -+++ openafs/src/volser/volprocs.c -@@ -210,14 +210,14 @@ - struct acl_accessList *ACL; - AFSFid did; - Inode inodeNumber, nearInode; -- char buf[SIZEOF_LARGEDISKVNODE]; -- struct VnodeDiskObject *vnode = (struct VnodeDiskObject *)buf; -+ struct VnodeDiskObject *vnode; - struct VnodeClassInfo *vcp = &VnodeClassInfo[vLarge]; - IHandle_t *h; - FdHandle_t *fdP; - int code; - afs_fsize_t length; - -+ vnode = (struct VnodeDiskObject *)malloc(SIZEOF_LARGEDISKVNODE); - memset(vnode, 0, SIZEOF_LARGEDISKVNODE); - - V_pref(vp, nearInode); -@@ -282,6 +282,7 @@ - VNDISK_GET_LEN(length, vnode); - V_diskused(vp) = nBlocks(length); - -+ free(vnode); - return 1; - } - diff --git a/src/packaging/Debian/patches/bos-permissions b/src/packaging/Debian/patches/bos-permissions deleted file mode 100644 index cae2297..0000000 --- a/src/packaging/Debian/patches/bos-permissions +++ /dev/null @@ -1,24 +0,0 @@ -Expect the server directory to be mode 0700 since that's where the AFS -KeyFile is stored. Allow the local directory to be mode 0755, since -there's no reason for it to be more restrictive. Allowing the server -directory to be mode 0700 causes problems upstream if people symlink the -client configuration to the server directory, which is recommended by -some documentation. - ---- openafs.orig/src/bozo/bosoprocs.c -+++ openafs/src/bozo/bosoprocs.c -@@ -1324,12 +1324,12 @@ - - struct bozo_bosEntryStats bozo_bosEntryStats[] = { - {NULL, 1, 1, 0755, 02}, /* AFSDIR_SERVER_AFS_DIRPATH */ -- {NULL, 1, 1, 0755, 02}, /* AFSDIR_SERVER_ETC_DIRPATH */ -+ {NULL, 1, 1, 0700, 02}, /* AFSDIR_SERVER_ETC_DIRPATH */ - {NULL, 1, 1, 0755, 02}, /* AFSDIR_SERVER_BIN_DIRPATH */ - {NULL, 1, 1, 0755, 02}, /* AFSDIR_SERVER_LOGS_DIRPATH */ - {NULL, 1, 0, 0700, 07}, /* AFSDIR_SERVER_BACKUP_DIRPATH */ - {NULL, 1, 1, 0700, 07}, /* AFSDIR_SERVER_DB_DIRPATH */ -- {NULL, 1, 1, 0700, 07}, /* AFSDIR_SERVER_LOCAL_DIRPATH */ -+ {NULL, 1, 1, 0700, 02}, /* AFSDIR_SERVER_LOCAL_DIRPATH */ - {NULL, 0, 1, 0600, 07}, /* AFSDIR_SERVER_KEY_FILEPATH */ - {NULL, 0, 1, 0600, 03} - }; /* AFSDIR_SERVER_ULIST_FILEPATH */ diff --git a/src/packaging/Debian/patches/compiler-flags b/src/packaging/Debian/patches/compiler-flags deleted file mode 100644 index eddf6d4..0000000 --- a/src/packaging/Debian/patches/compiler-flags +++ /dev/null @@ -1,213 +0,0 @@ -Use $CC for the compiler instead of forcing cc or gcc and add -fPIC in -a few more places. The latter should be committed upstream. The former -is waiting for upstream work to separate the kernel compiler from the -userspace compiler, since $CC should only be used for the latter on other -platforms. - -Also combines the sparc sysnames together, which is suitable upstream. - ---- openafs.orig/src/cf/osconf.m4 -+++ openafs/src/cf/osconf.m4 -@@ -4,9 +4,8 @@ - dnl defaults, override in case below as needed - XCFLAGS='${DBG} ${OPTMZ}' - SHLIB_SUFFIX="so" --CC="cc" --CCOBJ="cc" --MT_CC="cc" -+CCOBJ=$CC -+MT_CC=$CC - XLIBS="${LIB_AFSDB}" - - dnl debugging and optimization flag defaults -@@ -244,6 +243,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE -G0" -@@ -271,6 +271,7 @@ - MT_LIBS="-lpthread" - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" -+ SHLIB_CFLAGS="-fPIC" - TXLIBS="/usr/lib64/libncurses.so" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" - SHLIB_LINKER="${MT_CC} -shared" -@@ -291,14 +292,14 @@ - ;; - - i386_umlinux22) -- CC="gcc -pipe" -- CCOBJ="gcc -pipe" -- MT_CC="gcc -pipe" -+ CCOBJ="${CC} -pipe" -+ MT_CC="${CC} -pipe" - KERN_OPTMZ=-O2 - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" -@@ -307,9 +308,8 @@ - ;; - - i386_linux*) -- CC="gcc -pipe" -- CCOBJ="gcc -pipe" -- MT_CC="gcc -pipe" -+ CCOBJ="${CC} -pipe" -+ MT_CC="${CC} -pipe" - KERN_OPTMZ=-O2 - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' -@@ -320,6 +320,7 @@ - LWP_OPTMZ=-O2 - OPTMZ=-O2 - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" -@@ -327,9 +328,8 @@ - ;; - - i386_umlinux24) -- CC="gcc -pipe" -- CCOBJ="gcc -pipe" -- MT_CC="gcc -pipe" -+ CCOBJ="${CC} -pipe" -+ MT_CC="${CC} -pipe" - KERN_OPTMZ=-O2 - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' -@@ -340,6 +340,7 @@ - LWP_OPTMZ=-O2 - OPTMZ=-O2 - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" -@@ -347,9 +348,8 @@ - ;; - - i386_umlinux26) -- CC="gcc -pipe" -- CCOBJ="gcc -pipe" -- MT_CC="gcc -pipe" -+ CCOBJ="${CC} -pipe" -+ MT_CC="${CC} -pipe" - KERN_OPTMZ=-O2 - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' -@@ -360,6 +360,7 @@ - LWP_OPTMZ=-O2 - OPTMZ=-O2 - PAM_CFLAGS="-g -O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-g -O2 -D_LARGEFILE64_SOURCE" -@@ -385,6 +386,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" -@@ -557,8 +559,7 @@ - ;; - - s390_linux22) -- CC="gcc" -- CCOBJ="gcc" -+ CCOBJ="$CC" - LD="ld" - KERN_OPTMZ=-O2 - LEX="flex -l" -@@ -566,6 +567,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" -@@ -574,8 +576,7 @@ - ;; - - s390_linux24|s390_linux26) -- CC="gcc" -- CCOBJ="gcc" -+ CCOBJ="$CC" - LD="ld" - KERN_OPTMZ=-O2 - LEX="flex -l" -@@ -583,6 +584,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O -g -D_LARGEFILE64_SOURCE" -@@ -591,8 +593,7 @@ - ;; - - s390x_linux24|s390x_linux26) -- CC="gcc" -- CCOBJ="gcc -fPIC" -+ CCOBJ="$CC" - LD="ld" - KERN_OPTMZ=-O2 - LEX="flex -l" -@@ -600,6 +601,7 @@ - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x -Xlinker -Bsymbolic" - TXLIBS="-lncurses" - XCFLAGS="-O -g -D_LARGEFILE64_SOURCE -D__s390x__" -@@ -669,12 +671,13 @@ - SHLIB_LINKER="${CC} -shared" - ;; - -- sparc64_linux*) -+ sparc*_linux*) - KERN_OPTMZ=-O2 - LEX="flex -l" - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' - MT_LIBS="-lpthread" - PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" -+ SHLIB_CFLAGS="-fPIC" - SHLIB_LDFLAGS="-shared -Xlinker -x" - TXLIBS="-lncurses" - XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" -@@ -684,19 +687,6 @@ - SHLIB_LINKER="${MT_CC} -shared" - ;; - -- sparc_linux22) -- KERN_OPTMZ=-O2 -- LEX="flex -l" -- MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' -- MT_LIBS="-lpthread" -- PAM_CFLAGS="-O2 -Dlinux -DLINUX_PAM -fPIC" -- SHLIB_LDFLAGS="-shared -Xlinker -x" -- TXLIBS="-lncurses" -- XCFLAGS="-O2 -D_LARGEFILE64_SOURCE" -- YACC="bison -y" -- SHLIB_LINKER="${MT_CC} -shared" -- ;; -- - sun4_413) - CCXPG2="/usr/xpg2bin/cc" - CC="gcc" diff --git a/src/packaging/Debian/patches/dfsg b/src/packaging/Debian/patches/dfsg deleted file mode 100644 index 4604db1..0000000 --- a/src/packaging/Debian/patches/dfsg +++ /dev/null @@ -1,73 +0,0 @@ -Patch upstream Makefiles to remove references to files that had to be -removed from the source package for DFSG freeness reasons. Not suitable -upstream for obvious reasons. - ---- openafs.orig/src/afs/Makefile.in -+++ openafs/src/afs/Makefile.in -@@ -13,7 +13,7 @@ - all: depinstall - - depinstall: ${TOP_INCDIR}/afs/afs.h ${TOP_INCDIR}/afs/osi_inode.h ${TOP_INCDIR}/afs/afs_stats.h \ -- ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h ${TOP_INCDIR}/afs/sysctl.h -+ ${TOP_INCDIR}/afs/exporter.h ${TOP_INCDIR}/afs/nfsclient.h afszcm.cat AFS_component_version_number.c ${TOP_INCDIR}/afs/unified_afs.h - case ${SYS_NAME} in \ - pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${TOP_INCDIR}/afs ;; \ -@@ -43,7 +43,7 @@ - gencat afszcm.cat afs_trace.msf ;; \ - esac - --install: ${DESTDIR}${includedir}/afs/afs.h ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h ${DESTDIR}${includedir}/afs/sysctl.h -+install: ${DESTDIR}${includedir}/afs/afs.h ${DESTDIR}${includedir}/afs/osi_inode.h ${DESTDIR}${includedir}/afs/afs_stats.h ${DESTDIR}${includedir}/afs/exporter.h ${DESTDIR}${includedir}/afs/nfsclient.h ${DESTDIR}${includedir}/afs/unified_afs.h - case ${SYS_NAME} in \ - pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${DESTDIR}${includedir}/afs ;; \ -@@ -131,7 +131,7 @@ - ${INSTALL} $? $@ - - --dest: ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h ${DEST}/include/afs/sysctl.h -+dest: ${DEST}/include/afs/afs.h ${DEST}/include/afs/osi_inode.h ${DEST}/include/afs/afs_stats.h ${DEST}/include/afs/exporter.h ${DEST}/include/afs/nfsclient.h ${DEST}/include/afs/unified_afs.h - case ${SYS_NAME} in \ - pmax_ul43 | pmax_ul43a) \ - ${INSTALL} longc_procs.h ${DEST}/include/afs ;; \ ---- openafs.orig/src/tviced/Makefile.in -+++ openafs/src/tviced/Makefile.in -@@ -38,8 +38,7 @@ - DIROBJS=buffer.o dir.o salvage.o - - VOLOBJS= vnode.o volume.o vutil.o partition.o fssync.o purge.o \ -- clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o \ -- fstab.o -+ clone.o devname.o common.o ihandle.o listinodes.o namei_ops.o - - FSINTOBJS= afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o - ---- openafs.orig/src/util/Makefile.in -+++ openafs/src/util/Makefile.in -@@ -12,7 +12,7 @@ - - objects = assert.o base64.o casestrcpy.o ktime.o volparse.o hostparse.o \ - hputil.o kreltime.o isathing.o get_krbrlm.o uuid.o serverLog.o \ -- dirpath.o fileutil.o netutils.o flipbase64.o fstab.o \ -+ dirpath.o fileutil.o netutils.o flipbase64.o \ - afs_atomlist.o afs_lhash.o snprintf.o strlcat.o strlcpy.o \ - daemon.o rxkstats.o ${REGEX_OBJ} - -@@ -392,4 +392,4 @@ - assert.c base64.c casestrcpy.c ktime.c volparse.c hostparse.c \ - hputil.c kreltime.c isathing.c get_krbrlm.c uuid.c serverLog.c \ - dirpath.c fileutil.c netutils.c flipbase64.c \ -- afs_atomlist.c afs_lhash.c snprintf.c fstab.c -+ afs_atomlist.c afs_lhash.c snprintf.c ---- openafs.orig/configure.in -+++ openafs/configure.in -@@ -82,8 +82,6 @@ - src/mpp/Makefile \ - src/null/Makefile \ - src/package/Makefile \ --src/packaging/MacOS/OpenAFS.Info.plist \ --src/packaging/MacOS/OpenAFS.info \ - src/packaging/RedHat/openafs.spec \ - src/pam/Makefile \ - src/pinstall/Makefile \ diff --git a/src/packaging/Debian/patches/find-core-files b/src/packaging/Debian/patches/find-core-files deleted file mode 100644 index d8c292e..0000000 --- a/src/packaging/Debian/patches/find-core-files +++ /dev/null @@ -1,70 +0,0 @@ ---- openafs.orig/src/bozo/bnode.c -+++ openafs/src/bozo/bnode.c -@@ -28,6 +28,7 @@ - #include <time.h> - #endif - #include <sys/stat.h> -+#include <dirent.h> - - #ifdef HAVE_STRING_H - #include <string.h> -@@ -105,13 +106,45 @@ - char tbuffer[256]; - struct stat tstat; - register afs_int32 code; -+ char *corefile = NULL; - #ifdef BOZO_SAVE_CORES - struct timeval Start; - struct tm *TimeFields; - char FileName[256]; - #endif - -+ /* Linux always appends the PID to core dumps from threaded processes, so -+ * we have to scan the directory to find core files under another name. */ - code = stat(AFSDIR_SERVER_CORELOG_FILEPATH, &tstat); -+ if (code) { -+ DIR *logdir; -+ struct dirent *file; -+ char *p; -+ size_t length; -+ unsigned long pid; -+ -+ logdir = opendir(AFSDIR_LOGS_DIR); -+ if (logdir == NULL) -+ return; -+ while ((file = readdir(logdir)) != NULL) { -+ if (strncmp(file->d_name, "core.", 5) != 0) -+ continue; -+ pid = atol(file->d_name + 5); -+ if (pid == aproc->pid) { -+ length = strlen(AFSDIR_LOGS_DIR) + strlen(file->d_name) + 2; -+ corefile = malloc(length); -+ if (corefile == NULL) { -+ closedir(logdir); -+ return; -+ } -+ snprintf(corefile, length, "%s/%s", AFSDIR_LOGS_DIR, -+ file->d_name); -+ code = 0; -+ break; -+ } -+ } -+ closedir(logdir); -+ } - if (code) - return; - -@@ -124,7 +157,12 @@ - TimeFields->tm_hour, TimeFields->tm_min, TimeFields->tm_sec); - strcpy(tbuffer, FileName); - #endif -- code = renamefile(AFSDIR_SERVER_CORELOG_FILEPATH, tbuffer); -+ if (corefile == NULL) -+ code = renamefile(AFSDIR_SERVER_CORELOG_FILEPATH, tbuffer); -+ else { -+ code = renamefile(corefile, tbuffer); -+ free(corefile); -+ } - } - - int diff --git a/src/packaging/Debian/patches/fstrace-paths b/src/packaging/Debian/patches/fstrace-paths deleted file mode 100644 index bdc45ba..0000000 --- a/src/packaging/Debian/patches/fstrace-paths +++ /dev/null @@ -1,27 +0,0 @@ -fstrace uses the NLS functions to do message translation and needs a -message catalog installed. The default paths are rather broken. Patch -the source to look for it in /usr/share/openafs instead. Not suitable -upstream with the hard-coded paths, but something more sophisticated -would be appropriate. - ---- openafs.orig/src/venus/fstrace.c -+++ openafs/src/venus/fstrace.c -@@ -1471,7 +1471,7 @@ - */ - - #ifndef RPC_NLS_FORMAT --#define RPC_NLS_FORMAT "%s.cat" -+#define RPC_NLS_FORMAT "/usr/share/openafs/%s.cat" - #endif - - dce1_error_inq_text(status_to_convert, error_text, status) -@@ -1488,7 +1488,8 @@ - char component_name[4]; - char *facility_name; - char filename_prefix[7]; -- char nls_filename[11]; -+ /* strlen("/usr/share/openafs/") + 6 + strlen(".cat") + 1 */ -+ char nls_filename[19 + 6 + 4 + 1]; - char alt_filename[80]; - char *message; - #if defined(AFS_64BITPOINTER_ENV) diff --git a/src/packaging/Debian/patches/ktc-prototypes b/src/packaging/Debian/patches/ktc-prototypes deleted file mode 100644 index 5e59a45..0000000 --- a/src/packaging/Debian/patches/ktc-prototypes +++ /dev/null @@ -1,24 +0,0 @@ -Expose prototypes for the ktc_* functions on platforms other than Windows. -Fixed upstream in a different way, but only on the 1.5 branch. - -Debian Bug#449432 - ---- openafs.orig/src/auth/auth.p.h -+++ openafs/src/auth/auth.p.h -@@ -24,7 +24,6 @@ - char ticket[MAXKTCTICKETLEN]; - }; - --#ifdef AFS_NT40_ENV - extern int ktc_SetToken(struct ktc_principal *server, struct ktc_token *token, - struct ktc_principal *client, afs_int32 flags); - -@@ -38,6 +37,8 @@ - - extern int ktc_ForgetAllTokens(void); - -+#ifdef AFS_NT40_ENV -+ - /* Flags for the flag word sent along with a token */ - #define PIOCTL_LOGON 0x1 /* invoked from integrated logon */ - diff --git a/src/packaging/Debian/patches/linux-2.6.24 b/src/packaging/Debian/patches/linux-2.6.24 deleted file mode 100644 index 6b41e38..0000000 --- a/src/packaging/Debian/patches/linux-2.6.24 +++ /dev/null @@ -1,421 +0,0 @@ -Add support for Linux 2.6.24. This patch combines the upstream deltas: - -STABLE14-linux-afs-unlinked-file-dentry-flagging-20071031 -STABLE14-linux-nsec-timestamp-zero-20071106 -STABLE14-linux-splice-support-20071106 -STABLE14-linux-2624-20071123 -STABLE14-linux-try-kbuild-deal-with-old-modpost-20071127 -STABLE14-linux24-kernel-configure-test-20071208 - -Debian Bug#456258, Bug#458331 - ---- openafs.orig/acinclude.m4 -+++ openafs/acinclude.m4 -@@ -582,6 +582,9 @@ - ) - - LINUX_KERNEL_COMPILE_WORKS -+ LINUX_KBUILD_USES_EXTRA_CFLAGS -+ LINUX_HAVE_CURRENT_KERNEL_TIME -+ LINUX_KMEM_CACHE_INIT - LINUX_HAVE_KMEM_CACHE_T - LINUX_KMEM_CACHE_CREATE_TAKES_DTOR - LINUX_CONFIG_H_EXISTS -@@ -614,12 +617,14 @@ - LINUX_AOP_WRITEBACK_CONTROL - LINUX_FS_STRUCT_FOP_HAS_FLOCK - LINUX_FS_STRUCT_FOP_HAS_SENDFILE -+ LINUX_FS_STRUCT_FOP_HAS_SPLICE - LINUX_KERNEL_LINUX_SYSCALL_H - LINUX_KERNEL_LINUX_SEQ_FILE_H - LINUX_KERNEL_POSIX_LOCK_FILE_WAIT_ARG - LINUX_KERNEL_SELINUX - LINUX_KERNEL_SOCK_CREATE - LINUX_KERNEL_PAGE_FOLLOW_LINK -+ LINUX_KEY_TYPE_H_EXISTS - LINUX_NEED_RHCONFIG - LINUX_RECALC_SIGPENDING_ARG_TYPE - LINUX_SCHED_STRUCT_TASK_STRUCT_HAS_PARENT -@@ -647,6 +652,7 @@ - LINUX_GENERIC_FILE_AIO_READ - LINUX_INIT_WORK_HAS_DATA - LINUX_REGISTER_SYSCTL_TABLE_NOFLAG -+ LINUX_SYSCTL_TABLE_CHECKING - LINUX_EXPORTS_SYS_CHDIR - LINUX_EXPORTS_SYS_CLOSE - LINUX_EXPORTS_SYS_OPEN -@@ -720,6 +726,9 @@ - if test "x$ac_cv_linux_config_h_exists" = "xyes" ; then - AC_DEFINE(CONFIG_H_EXISTS, 1, [define if config.h exists]) - fi -+ if test "x$ac_cv_linux_key_type_h_exists" = "xyes" ; then -+ AC_DEFINE(KEY_TYPE_H_EXISTS, 1, [define if key-type.h exists]) -+ fi - if test "x$ac_cv_linux_defines_for_each_process" = "xyes" ; then - AC_DEFINE(DEFINED_FOR_EACH_PROCESS, 1, [define if for_each_process defined]) - fi -@@ -861,15 +870,27 @@ - if test "x$ac_cv_linux_fs_struct_fop_has_sendfile" = "xyes" ; then - AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_SENDFILE, 1, [define if your struct file_operations has sendfile]) - fi -+ if test "x$ac_cv_linux_fs_struct_fop_has_splice" = "xyes" ; then -+ AC_DEFINE(STRUCT_FILE_OPERATIONS_HAS_SPLICE, 1, [define if your struct file_operations has splice_write and splice_read]) -+ fi - if test "x$ac_cv_linux_register_sysctl_table_noflag" = "xyes" ; then - AC_DEFINE(REGISTER_SYSCTL_TABLE_NOFLAG, 1, [define if register_sysctl_table has no insert_at head flag]) - fi -+ if test "x$ac_cv_linux_sysctl_table_checking" = "xyes" ; then -+ AC_DEFINE(SYSCTL_TABLE_CHECKING, 1, [define if your kernel has sysctl table checking]) -+ fi - if test "x$ac_cv_linux_exports_tasklist_lock" = "xyes" ; then - AC_DEFINE(EXPORTED_TASKLIST_LOCK, 1, [define if tasklist_lock exported]) - fi - if test "x$ac_cv_linux_have_kmem_cache_t" = "xyes" ; then - AC_DEFINE(HAVE_KMEM_CACHE_T, 1, [define if kmem_cache_t exists]) - fi -+ if test "x$ac_cv_linux_kmem_cache_init" = "xyes" ; then -+ AC_DEFINE(KMEM_CACHE_INIT, 1, [define for new kmem_cache init function parameters]) -+ fi -+ if test "x$ac_cv_linux_have_current_kernel_time" = "xyes" ; then -+ AC_DEFINE(HAVE_CURRENT_KERNEL_TIME, 1, [define if current_kernel_time() exists]) -+ fi - if test "x$ac_cv_linux_have_kmem_cache_t" = "xyes" ; then - AC_DEFINE(KMEM_CACHE_TAKES_DTOR, 1, [define if kmem_cache_create takes a destructor argument]) - fi ---- openafs.orig/src/afs/LINUX/osi_machdep.h -+++ openafs/src/afs/LINUX/osi_machdep.h -@@ -76,7 +76,18 @@ - - #define afs_hz HZ - #include "h/sched.h" -+#if defined(HAVE_CURRENT_KERNEL_TIME) -+static inline time_t osi_Time(void) { -+ struct timespec xtime; -+ xtime = current_kernel_time(); -+ return xtime.tv_sec; -+} -+#else - #define osi_Time() (xtime.tv_sec) -+#endif -+ -+ -+ - #ifdef AFS_LINUX_64BIT_KERNEL - #define osi_GetTime(V) \ - do { \ ---- openafs.orig/src/afs/LINUX/osi_sysctl.c -+++ openafs/src/afs/LINUX/osi_sysctl.c -@@ -1,7 +1,7 @@ - /* - * osi_sysctl.c: Linux sysctl interface to OpenAFS - * -- * $Id$ -+ * $Id$ - * - * Written Jan 30, 2002 by Kris Van Hees (Sine Nomine Associates) - */ -@@ -28,7 +28,11 @@ - - static ctl_table afs_sysctl_table[] = { - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 1, -+#endif - .procname = "hm_retry_RO", - .data = &hm_retry_RO, - .maxlen = sizeof(afs_int32), -@@ -36,7 +40,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 2, -+#endif - .procname = "hm_retry_RW", - .data = &hm_retry_RW, - .maxlen = sizeof(afs_int32), -@@ -44,7 +52,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 3, -+#endif - .procname = "hm_retry_int", - .data = &hm_retry_int, - .maxlen = sizeof(afs_int32), -@@ -52,7 +64,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 4, -+#endif - .procname = "GCPAGs", - .data = &afs_gcpags, - .maxlen = sizeof(afs_int32), -@@ -60,7 +76,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 5, -+#endif - .procname = "rx_deadtime", - .data = &afs_rx_deadtime, - .maxlen = sizeof(afs_int32), -@@ -68,7 +88,11 @@ - .proc_handler = &proc_dointvec - }, - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 6, -+#endif - .procname = "bkVolPref", - .data = &afs_bkvolpref, - .maxlen = sizeof(afs_int32), -@@ -80,7 +104,11 @@ - - static ctl_table fs_sysctl_table[] = { - { -+#if defined(SYSCTL_TABLE_CHECKING) -+ .ctl_name = CTL_UNNUMBERED, -+#else - .ctl_name = 1, -+#endif - .procname = "afs", - .mode = 0555, - .child = afs_sysctl_table ---- openafs.orig/src/afs/LINUX/osi_vfsops.c -+++ openafs/src/afs/LINUX/osi_vfsops.c -@@ -16,7 +16,7 @@ - #include "afs/param.h" - - RCSID -- ("$Header$"); -+ ("$Header$"); - - #define __NO_VERSION__ /* don't define kernel_version in module.h */ - #include <linux/module.h> /* early to avoid printf->printk mapping */ -@@ -295,8 +295,12 @@ - #if defined(HAVE_KMEM_CACHE_T) - init_once(void * foo, kmem_cache_t * cachep, unsigned long flags) - #else -+#if defined(KMEM_CACHE_INIT) -+init_once(struct kmem_cache * cachep, void * foo) -+#else - init_once(void * foo, struct kmem_cache * cachep, unsigned long flags) - #endif -+#endif - { - struct vcache *vcp = (struct vcache *) foo; - -@@ -531,8 +535,11 @@ - ip->i_size = vp->va_size; - #if defined(AFS_LINUX26_ENV) - ip->i_atime.tv_sec = vp->va_atime.tv_sec; -+ ip->i_atime.tv_nsec = 0; - ip->i_mtime.tv_sec = vp->va_mtime.tv_sec; -+ ip->i_mtime.tv_nsec = 0; - ip->i_ctime.tv_sec = vp->va_ctime.tv_sec; -+ ip->i_ctime.tv_nsec = 0; - #else - ip->i_atime = vp->va_atime.tv_sec; - ip->i_mtime = vp->va_mtime.tv_sec; ---- openafs.orig/src/afs/LINUX/osi_vnodeops.c -+++ openafs/src/afs/LINUX/osi_vnodeops.c -@@ -22,7 +22,7 @@ - #include "afs/param.h" - - RCSID -- ("$Header$"); -+ ("$Header$"); - - #include "afs/sysincludes.h" - #include "afsincludes.h" -@@ -643,6 +643,10 @@ - #if defined(AFS_LINUX26_ENV) && defined(STRUCT_FILE_OPERATIONS_HAS_SENDFILE) - .sendfile = generic_file_sendfile, - #endif -+#if defined(AFS_LINUX26_ENV) && defined(STRUCT_FILE_OPERATIONS_HAS_SPLICE) -+ .splice_write = generic_file_splice_write, -+ .splice_read = generic_file_splice_read, -+#endif - .release = afs_linux_release, - .fsync = afs_linux_fsync, - .lock = afs_linux_lock, -@@ -878,6 +882,15 @@ - AFS_GLOCK(); - (void) afs_InactiveVCache(vcp, NULL); - AFS_GUNLOCK(); -+#ifdef DCACHE_NFSFS_RENAMED -+#ifdef AFS_LINUX26_ENV -+ spin_lock(&dp->d_lock); -+#endif -+ dp->d_flags &= ~DCACHE_NFSFS_RENAMED; -+#ifdef AFS_LINUX26_ENV -+ spin_unlock(&dp->d_lock); -+#endif -+#endif - - iput(ip); - } -@@ -1095,6 +1108,15 @@ - } - tvc->uncred = credp; - tvc->states |= CUnlinked; -+#ifdef DCACHE_NFSFS_RENAMED -+#ifdef AFS_LINUX26_ENV -+ spin_lock(&dp->d_lock); -+#endif -+ dp->d_flags |= DCACHE_NFSFS_RENAMED; -+#ifdef AFS_LINUX26_ENV -+ spin_unlock(&dp->d_lock); -+#endif -+#endif - } else { - osi_FreeSmallSpace(__name); - } ---- openafs.orig/src/afs/sysincludes.h -+++ openafs/src/afs/sysincludes.h -@@ -75,6 +75,9 @@ - #if defined(LINUX_KEYRING_SUPPORT) - #include <linux/rwsem.h> - #include <linux/key.h> -+#if defined(KEY_TYPE_H_EXISTS) -+#include <linux/key-type.h> -+#endif - #ifndef KEY_ALLOC_IN_QUOTA - #define KEY_ALLOC_IN_QUOTA 1 - #endif ---- openafs.orig/src/cf/linux-test1.m4 -+++ openafs/src/cf/linux-test1.m4 -@@ -2,9 +2,12 @@ - # [ACTION-IF-SUCCESS], [ACTION-IF-FAILURE]) - # - AC_DEFUN([AC_TRY_KBUILD26],[ rm -fr conftest.dir -+ if test "x$ac_linux_kbuild_requires_extra_cflags" = "xyes" ; then -+ CFLAGS_PREFIX='EXTRA_' -+ fi - if mkdir conftest.dir && - cat >conftest.dir/Makefile <<_ACEOF && --CFLAGS += $CPPFLAGS -+${CFLAGS_PREFIX}CFLAGS += $CPPFLAGS - - obj-m += conftest.o - _ACEOF -@@ -24,8 +27,9 @@ - - MODULE_LICENSE("http://www.openafs.org/dl/license10.html"); - _ACEOF -- echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD -- make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err -+ echo make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD && -+ make -C $LINUX_KERNEL_PATH M=$SRCDIR_PARENT/conftest.dir modules KBUILD_VERBOSE=1 >&AS_MESSAGE_LOG_FD 2>conftest.err && -+ ! grep "^WARNING: .* undefined!$" conftest.err >/dev/null 2>&1 - then [$3] - else - sed '/^ *+/d' conftest.err >&AS_MESSAGE_LOG_FD -@@ -42,8 +46,10 @@ - # - AC_DEFUN([AC_TRY_KBUILD24], [ - ac_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ $CPPFLAGS" -- AC_TRY_COMPILE([$1], [$2], [$3], [$4]) -+ CPPFLAGS="-I$LINUX_KERNEL_PATH/include -D__KERNEL__ -Werror-implicit-function-declaration $CPPFLAGS" -+ AC_TRY_COMPILE([ -+#include <linux/kernel.h> -+$1], [$2], [$3], [$4]) - CPPFLAGS="$ac_save_CPPFLAGS"]) - - -@@ -65,3 +71,16 @@ - [],:,AC_MSG_RESULT(no) - AC_MSG_FAILURE([Fix problem or use --disable-kernel-module...])) - AC_MSG_RESULT(yes)]) -+ -+AC_DEFUN([LINUX_KBUILD_USES_EXTRA_CFLAGS], [ -+ AC_MSG_CHECKING([if linux kbuild requires EXTRA_CFLAGS]) -+ save_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS=-Wall -+ AC_TRY_KBUILD( -+[#include <linux/sched.h> -+#include <linux/fs.h>], -+ [], -+ ac_linux_kbuild_requires_extra_cflags=no, -+ ac_linux_kbuild_requires_extra_cflags=yes) -+ CPPFLAGS="$save_CPPFLAGS" -+ AC_MSG_RESULT($ac_linux_kbuild_requires_extra_cflags)]) ---- openafs.orig/src/cf/linux-test4.m4 -+++ openafs/src/cf/linux-test4.m4 -@@ -894,3 +894,58 @@ - ac_cv_linux_fs_struct_fop_has_sendfile=no)]) - AC_MSG_RESULT($ac_cv_linux_fs_struct_fop_has_sendfile)]) - -+AC_DEFUN([LINUX_FS_STRUCT_FOP_HAS_SPLICE], [ -+ AC_MSG_CHECKING([for splice_write and splice_read in struct file_operations]) -+ AC_CACHE_VAL([ac_cv_linux_fs_struct_fop_has_splice], [ -+ AC_TRY_KBUILD( -+[#include <linux/fs.h>], -+[struct file_operations _fop; -+_fop.splice_write(NULL, NULL, NULL, 0, 0); -+_fop.splice_read(NULL, NULL, NULL, 0, 0);], -+ ac_cv_linux_fs_struct_fop_has_splice=yes, -+ ac_cv_linux_fs_struct_fop_has_splice=no)]) -+ AC_MSG_RESULT($ac_cv_linux_fs_struct_fop_has_splice)]) -+ -+AC_DEFUN([LINUX_KEY_TYPE_H_EXISTS], [ -+ AC_MSG_CHECKING([whether linux/key-type.h exists]) -+ AC_CACHE_VAL([ac_cv_linux_key_type_h_exists], [ -+ AC_TRY_KBUILD( -+[#include <linux/key-type.h>], -+[return;], -+ ac_cv_linux_key_type_h_exists=yes, -+ ac_cv_linux_key_type_h_exists=no)]) -+ AC_MSG_RESULT($ac_cv_linux_key_type_h_exists)]) -+ -+AC_DEFUN([LINUX_HAVE_CURRENT_KERNEL_TIME], [ -+ AC_MSG_CHECKING([for current_kernel_time()]) -+ AC_CACHE_VAL([ac_cv_linux_have_current_kernel_time], [ -+ AC_TRY_KBUILD( -+[#include <linux/time.h>], -+[struct timespec s = current_kernel_time();], -+ ac_cv_linux_have_current_kernel_time=yes, -+ ac_cv_linux_have_current_kernel_time=no)]) -+ AC_MSG_RESULT($ac_cv_linux_have_current_kernel_time)]) -+ -+AC_DEFUN([LINUX_KMEM_CACHE_INIT], [ -+ AC_MSG_CHECKING([for new kmem_cache init function parameters]) -+ AC_CACHE_VAL([ac_cv_linux_kmem_cache_init], [ -+ AC_TRY_KBUILD( -+[#include <linux/slab.h>], -+[extern struct kmem_cache *kmem_cache_create(const char *, size_t, size_t, -+ unsigned long, -+ void (*)(struct kmem_cache *, void *)); -+return;], -+ ac_cv_linux_kmem_cache_init=yes, -+ ac_cv_linux_kmem_cache_init=no)]) -+ AC_MSG_RESULT($ac_cv_linux_kmem_cache_init)]) -+ -+AC_DEFUN([LINUX_SYSCTL_TABLE_CHECKING], [ -+ AC_MSG_CHECKING([for sysctl table checking]) -+ AC_CACHE_VAL([ac_cv_linux_sysctl_table_checking], [ -+ AC_TRY_KBUILD( -+[#include <linux/sysctl.h>], -+[ sysctl_check_table(NULL);], -+ ac_cv_linux_sysctl_table_checking=yes, -+ ac_cv_linux_sysctl_table_checking=no)]) -+ AC_MSG_RESULT($ac_cv_linux_sysctl_table_checking)]) -+ diff --git a/src/packaging/Debian/patches/module-name b/src/packaging/Debian/patches/module-name deleted file mode 100644 index 8f13bcb..0000000 --- a/src/packaging/Debian/patches/module-name +++ /dev/null @@ -1,66 +0,0 @@ -Build the kernel module as openafs.ko instead of libafs.ko. This should -really be done upstream as well, but it poses backwards compatibility -problems and it's always been called libafs on other platforms, so it's -controversial. - ---- openafs.orig/src/config/linux-version -+++ openafs/src/config/linux-version -@@ -38,7 +38,7 @@ - CAN_BUILD="" - - for VERS in $LINUX_VERS ; do -- dir=$LINUX_SRCDIR$VERS -+ dir=$LINUX_SRCDIR - if [ ! -d $dir ] ; then - dir=$LINUX_SRCDIR - if [ ! -d $dir ] ; then -@@ -47,7 +47,7 @@ - continue - fi - fi -- header=$LINUX_SRCDIR$VERS/include/linux/version.h -+ header=$LINUX_SRCDIR/include/linux/version.h - if [ ! -f $header ] ; then - header=$LINUX_SRCDIR/include/linux/version.h - if [ ! -f $header ] ; then ---- openafs.orig/src/libafs/MakefileProto.LINUX.in -+++ openafs/src/libafs/MakefileProto.LINUX.in -@@ -222,8 +222,8 @@ - - # Below this line are targets when in the COMMON directory: - # For Linux there is no kernel NFS server. --LIBAFS = libafs-${CLIENT}.${LINUX_MODULE_EXT} --LIBAFS_MP = libafs-${CLIENT}.mp.${LINUX_MODULE_EXT} -+LIBAFS = openafs.${LINUX_MODULE_EXT} -+LIBAFS_MP = openafs.${LINUX_MODULE_EXT} - LIBAFS_EP = libafs-${CLIENT}.ep.${LINUX_MODULE_EXT} - LIBAFS_BM = libafs-${CLIENT}.bm.${LINUX_MODULE_EXT} - -@@ -232,10 +232,8 @@ - INST_LIBAFS_EP = ${DESTDIR}${afskerneldir}/${LIBAFS_EP} - INST_LIBAFS_BM = ${DESTDIR}${afskerneldir}/${LIBAFS_BM} - --DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS} --DEST_LIBAFS_MP = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_MP} --DEST_LIBAFS_EP = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_EP} --DEST_LIBAFS_BM = ${DEST}/root.client/usr/vice/etc/modload/${LIBAFS_BM} -+DEST_LIBAFS = ${DEST}/root.client/usr/vice/etc/modload/openafs.o -+DEST_LIBAFS_MP = ${DEST}/root.client/usr/vice/etc/modload/openafs.mp.o - - - libafs: $(LIBAFS) -@@ -251,11 +249,11 @@ - echo BM Build Complete - - <linux26 linux_26 umlinux26> --${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: libafs.ko -- cp libafs.ko $@ -+${LIBAFS} ${LIBAFS_MP} ${LIBAFS_EP} ${LIBAFS_BM}: openafs.ko -+ cp openafs.ko $@ - - .FORCE: --libafs.ko: .FORCE -+openafs.ko: .FORCE - env EXTRA_CFLAGS="${EXTRA_CFLAGS}" @TOP_SRCDIR@/libafs/make_kbuild_makefile.pl ${KDIR} $@ @TOP_OBJDIR@/src/config/Makefile.config Makefile.afs Makefile.common - env EXTRA_CFLAGS="${EXTRA_CFLAGS}" $(MAKE) -C ${LINUX_KERNEL_PATH} M=@TOP_OBJDIR@/src/libafs/${KDIR} modules - diff --git a/src/packaging/Debian/patches/multiple-local-realms b/src/packaging/Debian/patches/multiple-local-realms deleted file mode 100644 index c265561..0000000 --- a/src/packaging/Debian/patches/multiple-local-realms +++ /dev/null @@ -1,578 +0,0 @@ -Enable listing multiple realms in the server krb.conf file. Up to four -realms may be treated as local in that fashion for authorization -purposes (instead of the single realm supported without this patch). - -This upstream patch is in the 1.5 series but not in 1.4. However, it -has been working in production at Stanford University for some time. - ---- openafs.orig/src/audit/audit.c -+++ openafs/src/audit/audit.c -@@ -447,12 +447,43 @@ - } - if ((clen = strlen(tcell))) { - #if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV) -- static char local_realm[AFS_REALM_SZ] = ""; -- if (!local_realm[0]) { -- if (afs_krb_get_lrealm(local_realm, 0) != 0 /*KSUCCESS*/) -- strncpy(local_realm, "UNKNOWN.LOCAL.REALM", AFS_REALM_SZ); -+ static char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ]; -+ static int num_lrealms = -1; -+ int i, lrealm_match; -+ -+ if (num_lrealms == -1) { -+ for (i=0; i<AFS_NUM_LREALMS; i++) { -+ if (afs_krb_get_lrealm(local_realms[i], i) != 0 /*KSUCCESS*/) -+ break; -+ } -+ -+ if (i == 0) -+ strncpy(local_realms[0], "UNKNOWN.LOCAL.REALM", AFS_REALM_SZ); -+ num_lrealms = i; - } -- if (strcasecmp(local_realm, tcell)) { -+ -+ /* Check to see if the ticket cell matches one of the local realms */ -+ lrealm_match = 0; -+ for ( i=0;i<num_lrealms;i++ ) { -+ if (!strcasecmp(local_realms[i], tcell)) { -+ lrealm_match = 1; -+ break; -+ } -+ } -+ /* If yes, then make sure that the name is not present in -+ * an exclusion list */ -+ if (lrealm_match) { -+ char uname[256]; -+ if (inst[0]) -+ snprintf(uname,sizeof(uname),"%s.%s@%s",name,inst,tcell); -+ else -+ snprintf(uname,sizeof(uname),"%s@%s",name,tcell); -+ -+ if (afs_krb_exclusion(uname)) -+ lrealm_match = 0; -+ } -+ -+ if (!lrealm_match) { - if (strlen(vname) + 1 + clen >= sizeof(vname)) - goto done; - strcat(vname, "@"); ---- openafs.orig/src/auth/userok.c -+++ openafs/src/auth/userok.c -@@ -403,7 +403,9 @@ - - afs_uint32 exp; - static char lcell[MAXCELLCHARS] = ""; -- static char lrealm[AFS_REALM_SZ] = ""; -+ static char lrealms[AFS_NUM_LREALMS][AFS_REALM_SZ]; -+ static int num_lrealms = -1; -+ int lrealm_match = 0, i; - - /* get auth details from server connection */ - code = -@@ -440,11 +442,40 @@ - /* if running a krb environment, also get the local realm */ - /* note - this assumes AFS_REALM_SZ <= MAXCELLCHARS */ - /* just set it to lcell if it fails */ -- if (!lrealm[0]) { -- if (afs_krb_get_lrealm(lrealm, 0) != 0) /* KSUCCESS */ -- strncpy(lrealm, lcell, AFS_REALM_SZ); -+ if (num_lrealms == -1) { -+ for (i=0; i<AFS_NUM_LREALMS; i++) { -+ if (afs_krb_get_lrealm(lrealms[i], i) != 0 /*KSUCCESS*/) -+ break; -+ } -+ -+ if (i == 0) { -+ strncpy(lrealms[0], lcell, AFS_REALM_SZ); -+ num_lrealms = 1; -+ } else { -+ num_lrealms = i; -+ } - } - -+ /* See if the ticket cell matches one of the local realms */ -+ lrealm_match = 0; -+ for ( i=0;i<num_lrealms;i++ ) { -+ if (!strcasecmp(lrealms[i], tcell)) { -+ lrealm_match = 1; -+ break; -+ } -+ } -+ -+ /* If yes, then make sure that the name is not present in -+ * an exclusion list */ -+ if (lrealm_match) { -+ if (tinst[0]) -+ snprintf(uname,sizeof(uname),"%s.%s@%s",tname,tinst,tcell); -+ else -+ snprintf(uname,sizeof(uname),"%s@%s",tname,tcell); -+ -+ if (afs_krb_exclusion(uname)) -+ lrealm_match = 0; -+ } - - /* start with no uname and no authorization */ - strcpy(uname, ""); -@@ -456,8 +487,8 @@ - strcpy(uname, "<LocalAuth>"); - flag = 1; - -- /* cell of connection matches local cell or krb4 realm */ -- } else if (!strcasecmp(tcell, lcell) || !strcasecmp(tcell, lrealm)) { -+ /* cell of connection matches local cell or one of the realms */ -+ } else if (!strcasecmp(tcell, lcell) || lrealm_match) { - if ((tmp = CompFindUser(adir, tname, ".", tinst, NULL))) { - strcpy(uname, tmp); - flag = 1; -@@ -467,7 +498,6 @@ - flag = 1; - #endif - } -- - /* cell of conn doesn't match local cell or realm */ - } else { - if ((tmp = CompFindUser(adir, tname, ".", tinst, tcell))) { ---- openafs.orig/src/config/afs_sysnames.h -+++ openafs/src/config/afs_sysnames.h -@@ -286,4 +286,6 @@ - #ifdef AFS_KERBREALM_ENV - #define AFS_REALM_SZ 64 - #endif -+/* Specifies the number of equivalent local realm names */ -+#define AFS_NUM_LREALMS 4 - #endif /* __AFS_SYSNAMES_INCL_ENV_ */ ---- openafs.orig/src/ptserver/ptprocs.c -+++ openafs/src/ptserver/ptprocs.c -@@ -93,6 +93,7 @@ - extern afs_int32 Initdb(); - extern int pr_noAuth; - extern afs_int32 initd; -+extern char *pr_realmName; - afs_int32 iNewEntry(), newEntry(), whereIsIt(), dumpEntry(), addToGroup(), - nameToID(), Delete(), removeFromGroup(); - afs_int32 getCPS(), getCPS2(), getHostCPS(), listMax(), setMax(), listEntry(); -@@ -178,22 +179,9 @@ - if (exp < FT_ApproxTime()) - goto done; - #endif -- if (strlen(tcell)) { -- extern char *pr_realmName; --#if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV) -- static char local_realm[AFS_REALM_SZ] = ""; -- if (!local_realm[0]) { -- if (afs_krb_get_lrealm(local_realm, 0) != 0 /*KSUCCESS*/) -- strncpy(local_realm, pr_realmName, AFS_REALM_SZ); -- } --#endif -- if ( --#if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV) -- strcasecmp(local_realm, tcell) && --#endif -- strcasecmp(pr_realmName, tcell)) -- foreign = 1; -- } -+ if (tcell[0]) -+ foreign = afs_is_foreign_ticket_name(name,inst,tcell,pr_realmName); -+ - strncpy(vname, name, sizeof(vname)); - if (ilen = strlen(inst)) { - if (strlen(vname) + 1 + ilen >= sizeof(vname)) -@@ -640,7 +628,24 @@ - ABORT_WITH(tt, code); - - for (i = 0; i < aname->namelist_len; i++) { -- code = NameToID(tt, aname->namelist_val[i], &aid->idlist_val[i]); -+ char vname[256]; -+ char *nameinst, *cell; -+ -+ strncpy(vname, aname->namelist_val[i], sizeof(vname)); -+ vname[sizeof(vname)-1] ='\0'; -+ -+ nameinst = vname; -+ cell = strchr(vname, '@'); -+ if (cell) { -+ *cell = '\0'; -+ cell++; -+ } -+ -+ if (cell && afs_is_foreign_ticket_name(nameinst,NULL,cell,pr_realmName)) -+ code = NameToID(tt, aname->namelist_val[i], &aid->idlist_val[i]); -+ else -+ code = NameToID(tt, nameinst, &aid->idlist_val[i]); -+ - if (code != PRSUCCESS) - aid->idlist_val[i] = ANONYMOUSID; - osi_audit(PTS_NmToIdEvent, code, AUD_STR, -@@ -2281,7 +2286,6 @@ - } - #endif /* IP_WILDCARDS */ - -- - afs_int32 - WhoIsThisWithName(acall, at, aid, aname) - struct rx_call *acall; -@@ -2309,11 +2313,12 @@ - } else if (code == 2) { /* kad class */ - - int clen; -- extern char *pr_realmName; - - if ((code = rxkad_GetServerInfo(acall->conn, NULL, 0 /*was &exp */ , - name, inst, tcell, NULL))) - goto done; -+ -+ - strncpy(vname, name, sizeof(vname)); - if ((ilen = strlen(inst))) { - if (strlen(vname) + 1 + ilen >= sizeof(vname)) -@@ -2322,19 +2327,9 @@ - strcat(vname, inst); - } - if ((clen = strlen(tcell))) { -+ int foreign = afs_is_foreign_ticket_name(name,inst,tcell,pr_realmName); - --#if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV) -- static char local_realm[AFS_REALM_SZ] = ""; -- if (!local_realm[0]) { -- if (afs_krb_get_lrealm(local_realm, 0) != 0 /*KSUCCESS*/) -- strncpy(local_realm, pr_realmName, AFS_REALM_SZ); -- } --#endif -- if ( --#if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV) -- strcasecmp(local_realm, tcell) && --#endif -- strcasecmp(pr_realmName, tcell)) { -+ if (foreign) { - if (strlen(vname) + 1 + clen >= sizeof(vname)) - goto done; - strcat(vname, "@"); ---- openafs.orig/src/util/afsutil_prototypes.h -+++ openafs/src/util/afsutil_prototypes.h -@@ -74,7 +74,8 @@ - - /* get_krbrlm.c */ - extern int afs_krb_get_lrealm(char *r, int n); -- -+extern int afs_krb_exclusion(char *name); -+extern int afs_is_foreign_ticket_name(char *tname, char *tinst, char * tcell, char *localrealm); - /* hostparse.c */ - extern struct hostent *hostutil_GetHostByName(register char *ahost); - extern char *hostutil_GetNameByINet(afs_uint32 addr); ---- openafs.orig/src/util/dirpath.c -+++ openafs/src/util/dirpath.c -@@ -365,6 +365,8 @@ - pathp = dirPathArray[AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID]; - AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_MIGR_DIR, AFSDIR_MIGRATE_LOGNAME); - -+ pathp = dirPathArray[AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID]; -+ AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_SERVER_ETC_DIR, AFSDIR_KRB_EXCL_FILE); - - /* client file paths */ - #ifdef AFS_NT40_ENV ---- openafs.orig/src/util/dirpath.hin -+++ openafs/src/util/dirpath.hin -@@ -144,6 +144,7 @@ - #define AFSDIR_BOSVR_FILE "bosserver" - #define AFSDIR_VOLSERLOG_FILE "VolserLog" - #define AFSDIR_AUDIT_FILE "Audit" -+#define AFSDIR_KRB_EXCL_FILE "krb.excl" - - #define AFSDIR_ROOTVOL_FILE "RootVolume" - #define AFSDIR_HOSTDUMP_FILE "hosts.dump" -@@ -262,6 +263,7 @@ - AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID, - AFSDIR_SERVER_BIN_FILE_DIRPATH_ID, - AFSDIR_CLIENT_CELLALIAS_FILEPATH_ID, -+ AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID, - AFSDIR_PATHSTRING_MAX } afsdir_id_t; - - /* getDirPath() returns a pointer to a string from an internal array of path strings -@@ -329,6 +331,7 @@ - #define AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID) - #define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID) - #define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID) -+#define AFSDIR_SERVER_KRB_EXCL_FILEPATH getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID) - - /* client file paths */ - #define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID) ---- openafs.orig/src/util/dirpath_nt.h -+++ openafs/src/util/dirpath_nt.h -@@ -135,6 +135,7 @@ - #define AFSDIR_BOSVR_FILE "bosserver" - #define AFSDIR_VOLSERLOG_FILE "VolserLog" - #define AFSDIR_AUDIT_FILE "Audit" -+#define AFSDIR_KRB_EXCL_FILE "krb.excl" - - #define AFSDIR_ROOTVOL_FILE "RootVolume" - #define AFSDIR_HOSTDUMP_FILE "hosts.dump" -@@ -257,6 +258,7 @@ - AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID, - AFSDIR_SERVER_BIN_FILE_DIRPATH_ID, - AFSDIR_CLIENT_CELLALIAS_FILEPATH_ID, -+ AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID, - AFSDIR_PATHSTRING_MAX - } afsdir_id_t; - -@@ -325,6 +327,7 @@ - #define AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID) - #define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID) - #define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID) -+#define AFSDIR_SERVER_KRB_EXCL_FILEPATH getDirPath(AFSDIR_SERVER_KRB_EXCL_FILEPATH_ID) - - /* client file paths */ - #define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID) ---- openafs.orig/src/util/get_krbrlm.c -+++ openafs/src/util/get_krbrlm.c -@@ -26,21 +26,148 @@ - #define KSUCCESS 0 - #define KFAILURE (-1) - -+static char * -+parse_str(char *buffer, char *result, int size) -+{ -+ int n=0; -+ -+ if (!buffer) -+ goto cleanup; -+ -+ while (*buffer && isspace(*buffer)) -+ buffer++; -+ while (*buffer && !isspace(*buffer)) { -+ if (n < size - 1) { -+ *result++=*buffer++; -+ n++; -+ } else { -+ buffer++; -+ } -+ } -+ -+ cleanup: -+ *result='\0'; -+ return buffer; -+} -+ -+ - int - afs_krb_get_lrealm(char *r, int n) - { -+ char linebuf[2048]; -+ char tr[AFS_REALM_SZ] = ""; -+ char *p; - FILE *cnffile/*, *fopen()*/; -+ int i; -+ int rv = KFAILURE; - -- if (n > 1) -- return (KFAILURE); /* Temporary restriction */ -+ *r = '\0'; - - if ((cnffile = fopen(AFSDIR_SERVER_KCONF_FILEPATH, "r")) == NULL) { - return (KFAILURE); - } -- if (fscanf(cnffile, "%s", r) != 1) { -- (void)fclose(cnffile); -- return (KFAILURE); -+ if (fgets(linebuf, sizeof(linebuf)-1, cnffile) == NULL) { -+ goto cleanup; -+ } -+ linebuf[sizeof(linebuf)-1] = '\0'; -+ for (i=0, p=linebuf; i<=n && *p; i++) { -+ p = parse_str(p, tr, AFS_REALM_SZ); -+ } -+ -+ if (*tr) { -+ strcpy(r,tr); -+ rv = KSUCCESS; -+ } -+ -+ cleanup: -+ (void)fclose(cnffile); -+ return rv; -+} -+ -+int -+afs_krb_exclusion(char * name) -+{ -+ char linebuf[2048]; -+ char excl_name[256] = ""; -+ FILE *cnffile/*, *fopen()*/; -+ int exclude = 0; -+ -+ if ((cnffile = fopen(AFSDIR_SERVER_KRB_EXCL_FILEPATH, "r")) == NULL) -+ return exclude; -+ -+ for (;;) { -+ if (fgets(linebuf, sizeof(linebuf)-1, cnffile) == NULL) { -+ goto cleanup; -+ } -+ linebuf[sizeof(linebuf)-1] = '\0'; -+ parse_str(linebuf, excl_name, sizeof(excl_name)); -+ -+ if (!strcmp(name,excl_name)) { -+ exclude = 1; -+ break; -+ } - } -+ -+ cleanup: - (void)fclose(cnffile); -- return (KSUCCESS); -+ return exclude; -+} -+ -+int -+afs_is_foreign_ticket_name(char *tname, char *tinst, char * tcell, char *localrealm) -+{ -+ int foreign = 0; -+ -+ if (localrealm && strcasecmp(localrealm, tcell)) -+ foreign = 1; -+ -+#if defined(AFS_ATHENA_STDENV) || defined(AFS_KERBREALM_ENV) -+ if (foreign) { -+ static char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ]; -+ static int num_lrealms = -1; -+ int lrealm_match, i; -+ char uname[256]; -+ -+ if (num_lrealms == -1) { -+ for (i=0; i<AFS_NUM_LREALMS; i++) { -+ if (afs_krb_get_lrealm(local_realms[i], i) != 0 /*KSUCCESS*/) -+ break; -+ } -+ -+ if (i==0 && localrealm) { -+ strncpy(local_realms[0], localrealm, AFS_REALM_SZ); -+ num_lrealms = 1; -+ } else { -+ num_lrealms = i; -+ } -+ } -+ -+ /* See if the ticket cell matches one of the local realms */ -+ lrealm_match = 0; -+ for ( i=0;i<num_lrealms;i++ ) { -+ if (!strcasecmp(local_realms[i], tcell)) { -+ lrealm_match = 1; -+ break; -+ } -+ } -+ -+ /* If yes, then make sure that the name is not present in -+ * an exclusion list */ -+ if (lrealm_match) { -+ if (tinst && tinst[0]) -+ snprintf(uname,sizeof(uname),"%s.%s@%s",tname,tinst,tcell); -+ else -+ snprintf(uname,sizeof(uname),"%s@%s",tname,tcell); -+ -+ if (afs_krb_exclusion(uname)) -+ lrealm_match = 0; -+ } -+ -+ foreign = !lrealm_match; -+ } -+#endif -+ return foreign; - } -+ -+ -+ ---- openafs.orig/src/util/test/dirpath_test.c -+++ openafs/src/util/test/dirpath_test.c -@@ -124,6 +124,8 @@ - AFSDIR_SERVER_FILELOG_FILEPATH); - printf("AFSDIR_SERVER_AUDIT_FILEPATH = %s\n", - AFSDIR_SERVER_AUDIT_FILEPATH); -+ printf("AFSDIR_SERVER_KRB_EXCL_FILEPATH = %s\n", -+ AFSDIR_SERVER_KRB_EXCL_FILEPATH); - printf("\n"); - printf("\n"); - printf("AFSDIR_CLIENT_THISCELL_FILEPATH = %s\n", ---- openafs.orig/src/viced/host.c -+++ openafs/src/viced/host.c -@@ -1793,7 +1793,8 @@ - - - static char localcellname[PR_MAXNAMELEN + 1]; --char local_realm[AFS_REALM_SZ] = ""; -+char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ]; -+int num_lrealms = -1; - - /* not reentrant */ - void -@@ -1801,13 +1802,26 @@ - { - memset(&nulluuid, 0, sizeof(afsUUID)); - afsconf_GetLocalCell(confDir, localcellname, PR_MAXNAMELEN); -- if (!local_realm[0]) { -- if (afs_krb_get_lrealm(local_realm, 0) != 0 /*KSUCCESS*/) { -+ if (num_lrealms == -1) { -+ int i; -+ for (i=0; i<AFS_NUM_LREALMS; i++) { -+ if (afs_krb_get_lrealm(local_realms[i], i) != 0 /*KSUCCESS*/) -+ break; -+ } -+ -+ if (i == 0) { - ViceLog(0, - ("afs_krb_get_lrealm failed, using %s.\n", - localcellname)); -- strcpy(local_realm, localcellname); -+ strncpy(local_realms[0], localcellname, AFS_REALM_SZ); -+ num_lrealms = i =1; -+ } else { -+ num_lrealms = i; - } -+ -+ /* initialize the rest of the local realms to nullstring for debugging */ -+ for (; i<AFS_NUM_LREALMS; i++) -+ local_realms[i][0] = '\0'; - } - rxcon_ident_key = rx_KeyCreate((rx_destructor_t) free); - rxcon_client_key = rx_KeyCreate((rx_destructor_t) 0); -@@ -1837,11 +1851,10 @@ - - cnamelen = strlen(acell); - if (cnamelen) { -- if (strcasecmp(local_realm, acell) -- && strcasecmp(localcellname, acell)) { -+ if (afs_is_foreign_ticket_name(aname, NULL, acell, localcellname)) { - ViceLog(2, -- ("MapName: cell is foreign. cell=%s, localcell=%s, localrealm=%s\n", -- acell, localcellname, local_realm)); -+ ("MapName: cell is foreign. cell=%s, localcell=%s, localrealms={%s,%s,%s,%s}\n", -+ acell, localcellname, local_realms[0],local_realms[1],local_realms[2],local_realms[3])); - if ((anamelen + cnamelen + 1) >= PR_MAXNAMELEN) { - ViceLog(2, - ("MapName: Name too long, using AnonymousID for %s@%s\n", ---- openafs.orig/src/viced/viced.c -+++ openafs/src/viced/viced.c -@@ -1077,7 +1077,8 @@ - return -1; - } - } else if (!strcmp(argv[i], "-realm")) { -- extern char local_realm[AFS_REALM_SZ]; -+ extern char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ]; -+ extern int num_lrealms; - if ((i + 1) >= argc) { - fprintf(stderr, "missing argument for -realm\n"); - return -1; -@@ -1088,7 +1089,15 @@ - AFS_REALM_SZ); - return -1; - } -- strncpy(local_realm, argv[i], AFS_REALM_SZ); -+ if (num_lrealms == -1) -+ num_lrealms = 0; -+ if (num_lrealms >= AFS_NUM_LREALMS) { -+ printf -+ ("a maximum of %d -realm arguments can be specified.\n", -+ AFS_NUM_LREALMS); -+ return -1; -+ } -+ strncpy(local_realms[num_lrealms++], argv[i], AFS_REALM_SZ); - } else if (!strcmp(argv[i], "-udpsize")) { - if ((i + 1) >= argc) { - printf("You have to specify -udpsize <integer value>\n"); diff --git a/src/packaging/Debian/patches/no-admin-reference b/src/packaging/Debian/patches/no-admin-reference deleted file mode 100644 index 5a3df4b..0000000 --- a/src/packaging/Debian/patches/no-admin-reference +++ /dev/null @@ -1,13 +0,0 @@ -The Admin Reference has now been completely replaced by the man pages, so -don't refer to it since we'll no longer bother to install it. - ---- openafs.orig/doc/html/index.htm -+++ openafs/doc/html/index.htm -@@ -24,7 +24,6 @@ - <P>Included: - <DL COMPACT> - <DD><A HREF="AdminGuide/auagd000.htm">AFS Administrator's Guide</A> --<DD><A HREF="AdminReference/auarf000.htm">AFS Administration Reference</A> - <DD><A HREF="QuickStartUnix/auqbg000.htm">AFS Quick Start Guide for UNIX</A> - <DD><A HREF="QuickStartWindows/awqbg000.htm">AFS Quick Start Guide for Windows NT/2000</A> - <DD><A HREF="UserGuide/auusg000.htm">AFS User's Guide</A> diff --git a/src/packaging/Debian/patches/pam-build b/src/packaging/Debian/patches/pam-build deleted file mode 100644 index 9000aab..0000000 --- a/src/packaging/Debian/patches/pam-build +++ /dev/null @@ -1,88 +0,0 @@ -Apply an incredibly ugly hack to build the PAM modules against the shared -objects generated for the shared libraries. Not suitable upstream in its -current form. The right upstream solution is to standardize the shared -library ABI and install it with a real SONAME, and then link the PAM -modules against it. - ---- openafs.orig/Makefile.in -+++ openafs/Makefile.in -@@ -515,8 +515,6 @@ - # pthread based user space RX library - shlibafsrpc: rx rxkad des - case ${SYS_NAME} in \ -- amd64_linux24) \ -- echo Skipping shlibafsrpc for amd64_linux24 ;; \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ - ${COMPILE_PART1} shlibafsrpc ${COMPILE_PART2} ;; \ - *) \ -@@ -525,8 +523,6 @@ - - shlibafsauthent: ubik auth kauth shlibafsrpc - case ${SYS_NAME} in \ -- amd64_linux24) \ -- echo Skipping shlibafsauthent for amd64_linux24 ;; \ - alpha_dux*|sgi_*|sun4x_*|sunx86_*|rs_aix*|*linux*|hp_ux11*|ia64_hpux*) \ - ${COMPILE_PART1} shlibafsauthent ${COMPILE_PART2} ;; \ - *) \ ---- openafs.orig/src/pam/Makefile.in -+++ openafs/src/pam/Makefile.in -@@ -25,7 +25,17 @@ - afs_pam_msg.o afs_message.o AFS_component_version_number.o - OBJS = $(SHOBJS) test_pam.o - INCLUDES=-I${TOP_OBJDIR}/src/config -I${TOP_INCDIR} --CFLAGS = ${DEBUG} ${INCLUDES} ${PAM_CFLAGS} -+CFLAGS = ${DEBUG} ${INCLUDES} ${PAM_CFLAGS} ${MT_CFLAGS} -+ -+# For Debian, we link directly with the object files that would have gone -+# into the libafsrpc and libafsauthent shared libraries. The shared libraries -+# themselves cannot be used because the interface isn't stable and they have -+# no SONAME, but this is the easiest way of getting PIC objects built with the -+# pthread API. -+SHLIB_OBJS := `ls ../shlibafsauthent/*.o | grep -v version_num` \ -+ `ls ../shlibafsrpc/*.o | grep -v version_num` -+KRB_SHLIB_OBJS := `ls ../shlibafsauthent/*.o | egrep -v 'version_num|ktc.o'` \ -+ `ls ../shlibafsrpc/*.o | grep -v version_num` - - all: test_pam ${TOP_LIBDIR}/pam_afs.so.1 ${TOP_LIBDIR}/pam_afs.krb.so.1 - -@@ -47,6 +57,9 @@ - afs_util_krb.o: afs_util.c afs_pam_msg.h afs_message.h afs_util.h - ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/afs_util.c -o afs_util_krb.o - -+ktc.o: ${srcdir}/../auth/ktc.c -+ ${CC} ${CFLAGS} -DAFS_KERBEROS_ENV -c ${srcdir}/../auth/ktc.c -+ - pam_afs.so.1: $(SHOBJS) afs_setcred.o afs_auth.o afs_util.o - set -x; \ - case "$(SYS_NAME)" in \ -@@ -59,8 +72,9 @@ - afs_setcred.o afs_auth.o afs_util.o \ - $(SHOBJS) $(LIBS) ;; \ - *linux*) \ -- $(CC) $(LDFLAGS) -o $@ afs_setcred.o \ -- afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\ -+ $(CC) $(LDFLAGS) $(PAM_CFLAGS) -o $@ afs_setcred.o \ -+ afs_auth.o afs_util.o $(SHOBJS) $(SHLIB_OBJS) \ -+ $(MT_LIBS) -lpam -lresolv;;\ - *fbsd*| *nbsd*) \ - $(CC) $(LDFLAGS) -o $@ afs_setcred.o \ - afs_auth.o afs_util.o $(SHOBJS) $(LIBS) ;;\ -@@ -68,7 +82,7 @@ - echo No link line for system $(SYS_NAME). ;; \ - esac - --pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o -+pam_afs.krb.so.1: $(SHOBJS) afs_setcred_krb.o afs_auth_krb.o afs_util_krb.o ktc.o - set -x; \ - case "$(SYS_NAME)" in \ - hp_ux* | ia64_hpux*) \ -@@ -81,7 +95,8 @@ - $(SHOBJS) $(LDFLAGS) $(KLIBS) ;; \ - *linux*) \ - $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o \ -- afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\ -+ afs_auth_krb.o afs_util_krb.o ktc.o $(SHOBJS) \ -+ $(KRB_SHLIB_OBJS) $(MT_LIBS) -lpam -lresolv;;\ - *fbsd*| *nbsd*) \ - $(CC) $(LDFLAGS) -o $@ afs_setcred_krb.o \ - afs_auth_krb.o afs_util_krb.o $(SHOBJS) $(KLIBS) ;;\ diff --git a/src/packaging/Debian/patches/paths b/src/packaging/Debian/patches/paths deleted file mode 100644 index 4d9a27c..0000000 --- a/src/packaging/Debian/patches/paths +++ /dev/null @@ -1,16 +0,0 @@ -Patch pt_util to use the correct Debian patch for the Protection Server -database. Not suitable upstream in its current form, but will be -obsolete if upstream uses the standard functions to figure out the -database path. - ---- openafs.orig/src/ptserver/pt_util.c -+++ openafs/src/ptserver/pt_util.c -@@ -136,7 +136,7 @@ - struct prentry uentry, gentry; - struct ubik_hdr *uh; - char *dfile = 0; -- char *pfile = "/usr/afs/db/prdb.DB0"; -+ char *pfile = "/var/lib/openafs/db/prdb.DB0"; - struct cmd_parmdesc *tparm; - - tparm = a_as->parms; diff --git a/src/packaging/Debian/patches/series b/src/packaging/Debian/patches/series deleted file mode 100644 index 24b452d..0000000 --- a/src/packaging/Debian/patches/series +++ /dev/null @@ -1,11 +0,0 @@ -dfsg -paths -fstrace-paths -module-name -pam-build -bos-permissions -compiler-flags -no-admin-reference -find-core-files -ktc-prototypes -multiple-local-realms diff --git a/src/packaging/Debian/patches/ucontext-everywhere b/src/packaging/Debian/patches/ucontext-everywhere deleted file mode 100644 index 5e1e53f..0000000 --- a/src/packaging/Debian/patches/ucontext-everywhere +++ /dev/null @@ -1,59 +0,0 @@ -Build with UCONTEXT everywhere for current glibc. Patch pulled from -upstream stable branch, will be in 1.4.5. - ---- openafs.orig/src/config/param.alpha_linux_26.h -+++ openafs/src/config/param.alpha_linux_26.h -@@ -81,6 +81,11 @@ - #define SYS_NAME_ID SYS_NAME_ID_alpha_linux_26 - - -+#ifdef __GLIBC__ -+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) -+#define USE_UCONTEXT -+#endif -+#endif - #endif /* AFS_PARAM_H */ - - #else /* !defined(UKERNEL) */ ---- openafs.orig/src/config/param.parisc_linux24.h -+++ openafs/src/config/param.parisc_linux24.h -@@ -70,6 +70,11 @@ - #endif - #endif /* KERNEL */ - -+#ifdef __GLIBC__ -+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) -+#define USE_UCONTEXT -+#endif -+#endif - #endif /* AFS_PARAM_H */ - - #else /* !defined(UKERNEL) */ ---- openafs.orig/src/config/param.s390_linux26.h -+++ openafs/src/config/param.s390_linux26.h -@@ -86,6 +86,11 @@ - #endif - #endif /* KERNEL */ - -+#ifdef __GLIBC__ -+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) -+#define USE_UCONTEXT -+#endif -+#endif - #endif /* AFS_PARAM_H */ - - #else /* !defined(UKERNEL) */ ---- openafs.orig/src/config/param.s390x_linux26.h -+++ openafs/src/config/param.s390x_linux26.h -@@ -89,6 +89,11 @@ - #endif - #endif /* KERNEL */ - -+#ifdef __GLIBC__ -+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 3) -+#define USE_UCONTEXT -+#endif -+#endif - #endif /* AFS_PARAM_H */ - - #else /* !defined(UKERNEL) */ diff --git a/src/packaging/Debian/po/cs.po b/src/packaging/Debian/po/cs.po index 88a481c..27fc4f2 100644 --- a/src/packaging/Debian/po/cs.po +++ b/src/packaging/Debian/po/cs.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: openafs 1.4.1-3\n" -"Report-Msgid-Bugs-To: hartmans@debian.org\n" -"POT-Creation-Date: 2006-06-07 12:06-0700\n" -"PO-Revision-Date: 2006-06-07 21:47+0200\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:23-0800\n" "Last-Translator: Martin Sin <martin.sin@seznam.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -25,13 +25,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "DB server host names for your home cell:" msgstr "Jména počítačů s DB serverem vaší domovské buňky:" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "" "AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " "should be contacted to find parts of a cell. The cell you claim this " @@ -55,13 +55,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "AFS cell this workstation belongs to:" msgstr "Buňka AFS, ke které náleží tento počítač:" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "" "AFS filespace is organized into cells or administrative domains. Each " "workstation belongs to one cell. Usually the cell is the DNS domain name of " @@ -73,13 +73,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "Size of AFS cache in kB:" msgstr "Velikost cache AFS v kB:" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "" "AFS uses an area of the disk to cache remote files for faster access. This " "cache will be mounted on /var/cache/openafs. It is important that the cache " @@ -93,13 +93,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "Run Openafs client now and at boot?" msgstr "Spustit klienta Openafs nyní a při zavádění počítače?" #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "" "Normally, most users who install the openafs-client package expect AFS to be " "mounted automatically at boot. However, if you are planning on setting up a " @@ -115,13 +115,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "Look up AFS cells in DNS?" msgstr "Hledat buňky AFS v DNS?" #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "" "In order to contact an AFS cell, you need the IP addresses of the cell's " "database servers. Normally, this information is read from /etc/openafs/" @@ -135,13 +135,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "Encrypt authenticated traffic with AFS fileserver?" msgstr "Å ifrovat autentikovaný provoz se souborovým serverem AFS?" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "" "AFS provides a weak form of encryption that can optionally be used between a " "client and the fileservers. While this encryption is weaker than DES and " @@ -156,13 +156,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "Dynamically generate the contents of /afs?" msgstr "Vygenerovat obsah /afs dynamicky?" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "/afs generally contains an entry for each cell that a client can talk to. " "Traditionally, these entries were generated by servers in the client's home " @@ -176,7 +176,7 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "If you generate /afs dynamically, you may need to create /etc/openafs/" "CellAlias to include aliases for common cells. (The syntax of this file is " @@ -190,13 +190,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "Use fakestat to avoid hangs when listing /afs?" msgstr "Použít fakestat pro obejití zatuhnutí při výpisu /afs?" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "" "Because AFS is a global file space, operations on the /afs directory can " "generate significant network traffic. If some AFS cells are unavailable " @@ -214,13 +214,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "Cell this server serves files for:" msgstr "Buňka, které bude tento server poskytovat soubory:" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "" "AFS fileservers belong to a cell. They have the key for that cell's " "Kerberos service and serve volumes into that cell. Normally, this cell is " @@ -230,40 +230,15 @@ msgstr "" "dané buňky a v rámci buňky nabízejí souborové svazky. Tato buňka je obvykle " "shodná s buňkou, ke které patří klient na pracovní stanici." -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "Upgrading will move files to new locations; continue?" -msgstr "Upgradování přesune soubory do nového umístění; pokračovat?" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "" -"Verze Openafs 1.1 a Openafs 1.2 mají přesunuty některé soubory. Přesněji " -"řečeno: soubory z /etc/openafs/server-local byly přesunuty jinam. " -"Konfigurační soubor BosConfig je nyní umístěn v /etc/openafs, ostatní " -"soubory jsou uloženy v adresáři /var/lib/openafs. Pokud budete pokračovat v " -"aktualizaci, budou tyto soubory přesunuty. K opětovnému načtení vaÅ¡ich " -"serverů můžete použít přikaz bos, který provede restart. Jakákoliv změna " -"konfigurace provedená před tímto restartem bude ztracena." - #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "Souborový server OpenAFS pravděpodobně nepracuje!" #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " diff --git a/src/packaging/Debian/po/de.po b/src/packaging/Debian/po/de.po index 1f4cb44..db3998f 100644 --- a/src/packaging/Debian/po/de.po +++ b/src/packaging/Debian/po/de.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: openafs 1.4.2-3\n" -"Report-Msgid-Bugs-To: openafs@bugs.debian.org\n" -"POT-Creation-Date: 2006-11-22 08:17+0100\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" "PO-Revision-Date: 2006-11-24 22:34+0200\n" "Last-Translator: Henrik Kroeger <henrik_kroeger@arcor.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" @@ -51,9 +51,9 @@ msgstr "" "Computer der Datenbank-Server der Zelle sein soll, geben Sie nur den " "Hostnamen dieses Computers ein; fügen Sie andere Server erst später hinzu, " "sobald diese funktionieren. Außerdem sollten Sie den AFS-Client auf diesem " -"Server nicht beim Rechnerstart starten lassen, bevor diese Zelle konfiguriert ist. " -"Wenn Sie soweit sind, können Sie /etc/openafs/afs.conf.client editieren, um " -"den AFS-Client zu aktivieren." +"Server nicht beim Rechnerstart starten lassen, bevor diese Zelle " +"konfiguriert ist. Wenn Sie soweit sind, können Sie /etc/openafs/afs.conf." +"client editieren, um den AFS-Client zu aktivieren." #. Type: string #. Description @@ -70,9 +70,8 @@ msgid "" "the site." msgstr "" "Der AFS-Dateiraum ist in Zellen bzw. administrativen Domains organisiert. " -"Jede " -"Workstation gehört zu einer Zelle. Normalerweise ist eine Zelle gleich dem " -"DNS Domain-Namen." +"Jede Workstation gehört zu einer Zelle. Normalerweise ist eine Zelle gleich " +"dem DNS Domain-Namen." #. Type: string #. Description @@ -89,11 +88,11 @@ msgid "" "not overfill the partition it is located on. Often, people find it useful " "to dedicate a partition to their AFS cache." msgstr "" -"AFS benutzt einen Bereich der Festplatte, um Netzwerk-Dateien zum schnelleren " -"Zugriff zwischenzuspeichern. Dieser Cache wird unter /var/cache/openafs " -"eingehängt werden. Es ist wichtig, dass der Cache nicht die Partition " -"überfüllt, auf dem er sich befindet. Viele Leute finden es nützlich, eine " -"extra Partition für ihren AFS-Cache zu haben. " +"AFS benutzt einen Bereich der Festplatte, um Netzwerk-Dateien zum " +"schnelleren Zugriff zwischenzuspeichern. Dieser Cache wird unter /var/cache/" +"openafs eingehängt werden. Es ist wichtig, dass der Cache nicht die " +"Partition überfüllt, auf dem er sich befindet. Viele Leute finden es " +"nützlich, eine extra Partition für ihren AFS-Cache zu haben. " #. Type: boolean #. Description @@ -114,9 +113,9 @@ msgstr "" "Normalerweise erwarten Benutzer, die das Paket openafs-client installieren, " "dass AFS automatisch beim Boot eingehängt wird. Falls Sie aber eine neue " "Zelle erstellen wollen, oder einen Laptop benutzen, möchten Sie es " -"vielleicht nicht beim Boot gestartet haben. Wenn Sie sich dafür entscheiden, " -"AFS nicht beim Rechnerstart zu starten, können Sie /etc/init.d/openafs-client force-" -"start ausführen, um den AFS-Client zu starten. " +"vielleicht nicht beim Boot gestartet haben. Wenn Sie sich dafür " +"entscheiden, AFS nicht beim Rechnerstart zu starten, können Sie /etc/init.d/" +"openafs-client force-start ausführen, um den AFS-Client zu starten. " #. Type: boolean #. Description @@ -134,10 +133,10 @@ msgid "" "DNS to look for AFSDB records that contain the information." msgstr "" "Um eine AFS-Zelle zu kontaktieren, brauchen Sie die IP-Adressen der " -"Datenbank-Server der Zellen. Normalerweise werden diese Informationen aus der " -"Datei /etc/openafs/CellServDB gelesen. Falls Openafs aber keine Zelle in " -"dieser Datei finden kann, kann auch DNS benutzt werden, um nach AFSDB-" -"Einträgen zu suchen, die diese Information enthalten." +"Datenbank-Server der Zellen. Normalerweise werden diese Informationen aus " +"der Datei /etc/openafs/CellServDB gelesen. Falls Openafs aber keine Zelle in " +"dieser Datei finden kann, kann auch DNS benutzt werden, um nach AFSDB-EintrÃ" +"¤gen zu suchen, die diese Information enthalten." #. Type: boolean #. Description @@ -158,9 +157,9 @@ msgid "" msgstr "" "AFS bietet eine schwache Form der Verschlüsselung, die optional zwischen " "Client und Dateiserver benutzt werden kann. Obwohl diese Verschlüsselung " -"schwächer als DES und daher nicht ausreichend für sehr " -"vertrauliche Daten ist, macht es einem möglichen Angreifer die Arbeit dennoch " -"deutlich schwerer." +"schwächer als DES und daher nicht ausreichend für sehr vertrauliche Daten " +"ist, macht es einem möglichen Angreifer die Arbeit dennoch deutlich " +"schwerer." #. Type: boolean #. Description @@ -194,16 +193,16 @@ msgid "" msgstr "" "Wenn Sie /afs dynamisch erstellen lassen, werden Sie vielleicht /etc/openafs/" "CellAlias erstellen müssen, sodass die Datei Aliase für gebräuchliche " -"Zellen enthält. Die Syntax ist: Eine Zeile pro Aliase, mit Zellenname - Leerzeichen " -"- Alias." +"Zellen enthält. Die Syntax ist: Eine Zeile pro Aliase, mit Zellenname - " +"Leerzeichen - Alias." #. Type: boolean #. Description #: ../openafs-client.templates:8001 msgid "Use fakestat to avoid hangs when listing /afs?" msgstr "" -"Soll fakestat benutzt werden, um eine Verzögerung beim Auflisten von /afs zu " -"vermeiden?" +"Soll fakestat benutzt werden, um eine Verzögerung beim Auflisten von /afs " +"zu vermeiden?" #. Type: boolean #. Description @@ -217,8 +216,8 @@ msgid "" "circumstances." msgstr "" "Da AFS ein globaler Dateiraum ist, können Operationen im /afs-Verzeichnis " -"zu großen Netzverkehr führen. Wenn einige AFS-Zellen nicht erreichbar " -"sind, kann das Anschauen von /afs (mit ls oder einem Dateibrowser) zu " +"zu großen Netzverkehr führen. Wenn einige AFS-Zellen nicht erreichbar sind, " +"kann das Anschauen von /afs (mit ls oder einem Dateibrowser) zu " "minutenlangem Aufhängen führen. AFS kann aber Antworten zu solchen " "Operationen simulieren, um ein Aufhängen zu vermeiden. Die meisten Leute " "wollen das." @@ -237,44 +236,19 @@ msgid "" "Kerberos service and serve volumes into that cell. Normally, this cell is " "the same cell as the workstation's client belongs to." msgstr "" -"AFS-Dateiserver gehören zu einer Zelle. Die Server haben den Schlüssel für " -"den Kerberos-Service der Zelle und stellen Volumes für die Zelle bereit. " -"Normalerweise ist die Zelle identisch mit der des Clients." - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "Upgrading will move files to new locations; continue?" -msgstr "Upgraden wird Dateien an neue Orte verschieben; Fortfahren?" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "" -"Zwischen Openafs 1.1 und Openafs 1.2, wurden einige Dateien verschoben. " -"Besonders Dateien in /etc/openafs/server-local sind betroffen. Die " -"BosConfig-Datei ist nun unter /etc/openafs zu finden und alle anderen Dateien " -"sind unter /var/lib/openafs. Wenn Sie mit dem Upgrade fortfahren, werden " -"diese Dateien verschoben. Sie sollten den bos restart Befehl verwenden, um " -"Ihre Server neuzustarten. Jede Konfigurationsänderung, die Sie davor machen, " -"wird verloren gehen." +"AFS-Dateiserver gehören zu einer Zelle. Die Server haben den Schlüssel " +"für den Kerberos-Service der Zelle und stellen Volumes für die Zelle " +"bereit. Normalerweise ist die Zelle identisch mit der des Clients." #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "Der OpenAFS-Dateiserver wird wahrscheinlich nicht funktionieren!" #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " @@ -285,4 +259,24 @@ msgstr "" "funktioniert wahrscheinlich nicht; der DES-Code unter Alpha zusammen mit dem " "Dateiserver im Thread-Modus ist fehlerhaft. Wahrscheinlich wird der " "Dateiserver einfach nicht starten, aber wenn er gestartet wird, könnte " -"Datenverlust die Folge sein. Sie wurden gewarnt." \ No newline at end of file +"Datenverlust die Folge sein. Sie wurden gewarnt." + +#~ msgid "Upgrading will move files to new locations; continue?" +#~ msgstr "Upgraden wird Dateien an neue Orte verschieben; Fortfahren?" + +#~ msgid "" +#~ "Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " +#~ "files in /etc/openafs/server-local have been distributed to other " +#~ "locations. The BosConfig file is now located in /etc/openafs and the " +#~ "other files are located in /var/lib/openafs. If you continue with this " +#~ "upgrade, these files will be moved. You should use the bos restart " +#~ "command to reload your servers. Any configuration changes made before " +#~ "you do so will be lost." +#~ msgstr "" +#~ "Zwischen Openafs 1.1 und Openafs 1.2, wurden einige Dateien verschoben. " +#~ "Besonders Dateien in /etc/openafs/server-local sind betroffen. Die " +#~ "BosConfig-Datei ist nun unter /etc/openafs zu finden und alle anderen " +#~ "Dateien sind unter /var/lib/openafs. Wenn Sie mit dem Upgrade fortfahren, " +#~ "werden diese Dateien verschoben. Sie sollten den bos restart Befehl " +#~ "verwenden, um Ihre Server neuzustarten. Jede Konfigurationsänderung, die " +#~ "Sie davor machen, wird verloren gehen." diff --git a/src/packaging/Debian/po/es.po b/src/packaging/Debian/po/es.po new file mode 100644 index 0000000..db7b84b --- /dev/null +++ b/src/packaging/Debian/po/es.po @@ -0,0 +1,279 @@ +# openafs po-debconf translation to Spanish +# Copyright (C) 2007, 2009 Software in the Public Interest +# This file is distributed under the same license as the openafs package. +# +# Changes: +# - Initial translation +# Javier Ruano Ruano <adrakoa@es.gnu.org>, 2007 +# +# - Updates +# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +# +msgid "" +msgstr "" +"Project-Id-Version: openafs 1.4.7.dfsg1-6\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:23-0800\n" +"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" +"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "DB server host names for your home cell:" +msgstr "" +"Escriba para la celda de «home» los nombres de los servidores de la base de " +"datos:" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "" +"AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " +"should be contacted to find parts of a cell. The cell you claim this " +"workstation belongs to is not in that file. Enter the host names of the " +"database servers separated by spaces. IMPORTANT: If you are creating a new " +"cell and this machine is to be a database server in that cell, only enter " +"this machine's name; add the other servers later after they are functioning. " +"Also, do not enable the AFS client to start at boot on this server until the " +"cell is configured. When you are ready you can edit /etc/openafs/afs.conf." +"client to enable the client." +msgstr "" +"AFS utiliza el archivo «/etc/openafs/CellServDB» para mantener una lista de " +"los servidores a los que se consultará para encontrar la distintas partes de " +"una celda. La celda que solicita esta estación de trabajo no está incluida " +"en ese archivo. Introduzca los nombres de los servidores de la base de datos " +"separados por espacios. IMPORTANTE: Si está creando una nueva celda y esta " +"máquina es uno de los servidores de la base de datos en esa celda, " +"introduzca sólo el nombre de esta máquina; añada los demás servidores más " +"tarde cuando estén en funcionamiento. Además, no habilite en el arranque el " +"cliente AFS de ese servidor hasta que configure la celda. Cuando esté " +"preparado, edite el archivo «/etc/openafs/afs.conf.client»." + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "AFS cell this workstation belongs to:" +msgstr "La celda AFS de esta máquina pertenece a:" + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "" +"AFS filespace is organized into cells or administrative domains. Each " +"workstation belongs to one cell. Usually the cell is the DNS domain name of " +"the site." +msgstr "" +"El espacio de los archivos AFS se organizará en celdas o dominios " +"administrativos. Cada máquina pertenece a una celda. Generalmente la celda " +"es el servidor de nombres de dominio del sitio." + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "Size of AFS cache in kB:" +msgstr "Tamaño de la cache de AFS en kB:" + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "" +"AFS uses an area of the disk to cache remote files for faster access. This " +"cache will be mounted on /var/cache/openafs. It is important that the cache " +"not overfill the partition it is located on. Often, people find it useful " +"to dedicate a partition to their AFS cache." +msgstr "" +"Para mejorar la velocidad de acceso, AFS utiliza un espacio del disco para " +"la cache de archivos remotos. Esta cache se montará en «/var/cache/openafs». " +"Es importante que la cache no ocupe más que la partición en la que se ubica. " +"Frecuentemente, la gente encuentra útil dedicar una partición a la cache de " +"AFS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "Run Openafs client now and at boot?" +msgstr "¿Desea ejecutar ahora el cliente Openafs y en el arranque?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "" +"Normally, most users who install the openafs-client package expect AFS to be " +"mounted automatically at boot. However, if you are planning on setting up a " +"new cell or are on a laptop, you may not want it started at boot time. If " +"you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" +"start to start the client when you wish to run it." +msgstr "" +"Normalmente, la mayoría de los usuarios que instalan el paquete «openafs-" +"client» esperan que se monte automáticamente en el arranque. Sin embargo, si " +"tiene pensado configurar una nueva celda o utiliza un portátil, puede que " +"quiera iniciarlo en el arranque. Si elige no iniciar AFS en el arranque, " +"ejecute «/etc/init.d/openafs-client force-start» para iniciar el cliente " +"cuando lo desee." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "Look up AFS cells in DNS?" +msgstr "¿Desea buscar las celdas AFS en el DNS?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "" +"In order to contact an AFS cell, you need the IP addresses of the cell's " +"database servers. Normally, this information is read from /etc/openafs/" +"CellServDB. However, if Openafs cannot find a cell in that file, it can use " +"DNS to look for AFSDB records that contain the information." +msgstr "" +"Para conectar a una celda de AFS, necesita la dirección IP de la celda de " +"los servidores de la base de datos. Normalmente, esta información se " +"encuentra en el archivo «/etc/openafs/CellServDB». Sin embargo, si Openafs no " +"encuentra una celda en ese archivo, puede usar el DNS para buscar las copias " +"de los registros de AFSDB que contengan la información." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "Encrypt authenticated traffic with AFS fileserver?" +msgstr "" +"¿Desea cifrar el tráfico de autenticación con el servidor de archivos AFS? " + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "" +"AFS provides a weak form of encryption that can optionally be used between a " +"client and the fileservers. While this encryption is weaker than DES and " +"thus is not sufficient for highly confidential data, it does provide some " +"confidentiality and is likely to make the job of a casual attacker " +"significantly more difficult." +msgstr "" +"AFS proporciona un mecanismo de cifrado endeble que se puede utilizar " +"opcionalmente entre el cliente y los servidores de archivos. Aunque este " +"cifrado es más débil que DES y por ello no es suficiente para la mayor " +"confidencialidad de los datos, éste ofrece confidencialidad y hace que para " +"un atacante esporádico el trabajo sea sensiblemente más difícil." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "Dynamically generate the contents of /afs?" +msgstr "¿Desea crear dinámicamente los contenidos de «/afs»?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"/afs generally contains an entry for each cell that a client can talk to. " +"Traditionally, these entries were generated by servers in the client's home " +"cell. However, OpenAFS clients can generate the contents of /afs " +"dynamically based on the contents of /etc/openafs/CellServDB and DNS." +msgstr "" +"Normalmente «/afs» incluye una entrada por cada celda que un cliente " +"solicita. Tradicionalmente, estas entradas las generan los servidores en la " +"celda del «home» del cliente. Sin embargo, los clientes de OpenAFS pueden " +"generar los contenidos de «/afs» dinámicamente basándose en la información " +"del archivo «/etc/openafs/CellServDB» y del DNS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"If you generate /afs dynamically, you may need to create /etc/openafs/" +"CellAlias to include aliases for common cells. (The syntax of this file is " +"one line per alias, with the cell name, a space, and then the alias for that " +"cell.)" +msgstr "" +"Si genera dinámicamente «/afs», necesitará crear el archivo «/etc/openafs/" +"CellAlias» para incluir los seudónimos («alias») de las celdas comunes. (La " +"estructura del archivo es un seudónimo por línea, con el nombre de la celda, " +"un espacio, y después el seudónimo para esa celda)." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "Use fakestat to avoid hangs when listing /afs?" +msgstr "¿Desea utilizar «fakestat» para evitar que se bloquee al listar «/afs»?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "" +"Because AFS is a global file space, operations on the /afs directory can " +"generate significant network traffic. If some AFS cells are unavailable " +"then looking at /afs using ls or a graphical file browser may hang your " +"machine for minutes. AFS has an option to simulate answers to these " +"operations locally to avoid these hangs. You want this option under most " +"circumstances." +msgstr "" +"Debido a que AFS es un espacio global de archivos, las operaciones en el " +"directorio «/afs» pueden generar un tráfico de red significativo. Si algunas " +"de las celdas de AFS no están disponibles, al mirar «/afs» usando «ls» o un " +"navegador de archivos gráfico podría bloquear varios minutos la máquina. AFS " +"tiene una opción que simula localmente las respuesta a esas operaciones " +"evitando así estas paradas. Debería seleccionar esta opción en la mayoría de " +"los casos." + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "Cell this server serves files for:" +msgstr "Celda para los archivos de este servidor:" + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "" +"AFS fileservers belong to a cell. They have the key for that cell's " +"Kerberos service and serve volumes into that cell. Normally, this cell is " +"the same cell as the workstation's client belongs to." +msgstr "" +"Los servidores de archivos de AFS forman parte de una celda. Poseen una " +"clave para la celda del servicio Kerberos y proporciona la capacidad de las " +"celdas. Normalmente, esta celda es la misma que la celda a la que la máquina " +"cliente pertenece." + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "OpenAFS file server probably does not work!" +msgstr "¡Seguramente el servidor de archivos OpenAFS no funciona!" + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "" +"You are running the OpenAFS file server package on an alpha. This probably " +"doesn't work; the DES code is flaky on the alpha, along with the threaded " +"file server. Likely, the fileserver will simply fail to start, but if it " +"does load, data corruption may result. You have been warned." +msgstr "" +"Está ejecutando el paquete OpenAFS como servidor de archivos sobre la " +"arquitectura alpha. Es probable que no funcione, el código DES se ha hecho " +"añicos sobre alpha, junto a los hilos del servidor de archivos. De este " +"modo, el servidor de archivos simplemente fallará al iniciarlo, pero si " +"carga, puede producir datos corruptos. Ha sido advertido." diff --git a/src/packaging/Debian/po/fr.po b/src/packaging/Debian/po/fr.po index b105532..5d80543 100644 --- a/src/packaging/Debian/po/fr.po +++ b/src/packaging/Debian/po/fr.po @@ -16,9 +16,9 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" -"Report-Msgid-Bugs-To: hartmans@debian.org\n" -"POT-Creation-Date: 2006-06-07 12:06-0700\n" -"PO-Revision-Date: 2006-06-08 06:46+0200\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:23-0800\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -28,15 +28,14 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "DB server host names for your home cell:" msgstr "" -"Hôtes serveurs de bases de données pour votre cellule locale (« home " -"cell ») :" +"Hôtes serveurs de bases de données pour votre cellule locale (« home cell ») :" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "" "AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " "should be contacted to find parts of a cell. The cell you claim this " @@ -62,13 +61,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "AFS cell this workstation belongs to:" msgstr "Cellule AFS dont ce poste de travail fait partie :" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "" "AFS filespace is organized into cells or administrative domains. Each " "workstation belongs to one cell. Usually the cell is the DNS domain name of " @@ -80,13 +79,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "Size of AFS cache in kB:" msgstr "Taille du cache d'AFS (ko) :" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "" "AFS uses an area of the disk to cache remote files for faster access. This " "cache will be mounted on /var/cache/openafs. It is important that the cache " @@ -96,18 +95,18 @@ msgstr "" "AFS utilise une partie du disque pour mettre en cache des fichiers distants " "et accélérer les accès. Ce cache sera monté sur /var/cache/openafs. Il est " "important que le cache ne remplisse pas la partition sur laquelle il est " -"situé. De nombreux utilisateurs choisissent de dédier une partition au " -"cache d'AFS." +"situé. De nombreux utilisateurs choisissent de dédier une partition au cache " +"d'AFS." #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "Run Openafs client now and at boot?" msgstr "Lancer le client AFS maintenant, puis à chaque démarrage ?" #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "" "Normally, most users who install the openafs-client package expect AFS to be " "mounted automatically at boot. However, if you are planning on setting up a " @@ -124,13 +123,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "Look up AFS cells in DNS?" msgstr "Faut-il chercher les cellules AFS dans le DNS ?" #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "" "In order to contact an AFS cell, you need the IP addresses of the cell's " "database servers. Normally, this information is read from /etc/openafs/" @@ -145,14 +144,14 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "Encrypt authenticated traffic with AFS fileserver?" msgstr "" "Faut-il chiffrer le trafic authentifié avec le serveur de fichiers AFS ?" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "" "AFS provides a weak form of encryption that can optionally be used between a " "client and the fileservers. While this encryption is weaker than DES and " @@ -168,13 +167,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "Dynamically generate the contents of /afs?" msgstr "Faut-il gérer le contenu de /afs dynamiquement ?" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "/afs generally contains an entry for each cell that a client can talk to. " "Traditionally, these entries were generated by servers in the client's home " @@ -189,7 +188,7 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "If you generate /afs dynamically, you may need to create /etc/openafs/" "CellAlias to include aliases for common cells. (The syntax of this file is " @@ -203,14 +202,14 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "Use fakestat to avoid hangs when listing /afs?" msgstr "" "Utiliser fakestat pour éviter les erreurs à l'affichage du contenu de /afs ?" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "" "Because AFS is a global file space, operations on the /afs directory can " "generate significant network traffic. If some AFS cells are unavailable " @@ -228,13 +227,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "Cell this server serves files for:" msgstr "Cellule pour laquelle ce serveur est un serveur de fichiers :" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "" "AFS fileservers belong to a cell. They have the key for that cell's " "Kerberos service and serve volumes into that cell. Normally, this cell is " @@ -245,42 +244,15 @@ msgstr "" "volumes. Normalement, cette cellule est la même que celle à laquelle " "appartient le client." -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "Upgrading will move files to new locations; continue?" -msgstr "" -"Faut-il procéder au déplacement de fichiers requis pour la mise à jour ?" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "" -"Entre les versions 1.1 et 1.2 d'OpenAFS, de nombreux fichiers ont été " -"déplacés. Les fichiers de /etc/openafs/server-local ont notamment été " -"répartis sur d'autres emplacements. Le fichier BosConfig est désormais placé " -"dans /etc/openafs et les autres fichiers sont dans /var/lib/openafs. Si vous " -"poursuivez la mise à jour, ces fichiers seront déplacés. Vous devez utiliser " -"la commande « bos restart » pour redémarrer vos serveurs. Toutes les " -"modifications de configuration que vous ferez avant d'avoir effectué ces " -"opérations seront perdues." - #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "Le serveur de fichiers OpenAFS ne fonctionne probablement pas" #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " diff --git a/src/packaging/Debian/po/gl.po b/src/packaging/Debian/po/gl.po new file mode 100644 index 0000000..feea3b9 --- /dev/null +++ b/src/packaging/Debian/po/gl.po @@ -0,0 +1,247 @@ +# Galician translation of openafs's debconf templates +# This file is distributed under the same license as the openafs package. +# Jacobo Tarrio <jtarrio@debian.org>, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: openafs\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:23-0800\n" +"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n" +"Language-Team: Galician <proxecto@trasno.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "DB server host names for your home cell:" +msgstr "Nomes dos servidores de bases de datos para a cela inicial:" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "" +"AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " +"should be contacted to find parts of a cell. The cell you claim this " +"workstation belongs to is not in that file. Enter the host names of the " +"database servers separated by spaces. IMPORTANT: If you are creating a new " +"cell and this machine is to be a database server in that cell, only enter " +"this machine's name; add the other servers later after they are functioning. " +"Also, do not enable the AFS client to start at boot on this server until the " +"cell is configured. When you are ready you can edit /etc/openafs/afs.conf." +"client to enable the client." +msgstr "" +"AFS emprega o ficheiro /etc/openafs/CellServDB para manter a lista de " +"servidores cos que se hai que comunicar para atopar partes dunha cela. A " +"cela á que di que esta estación de traballo pertence non figura nese " +"ficheiro. Introduza os nomes dos servidores de bases de datos, separados por " +"espazos. IMPORTANTE: Se está a crear unha nova cela e esta máquina ha ser un " +"servidor de bases de datos desa cela, introduza só o nome desta máquina; " +"engada os nomes dos outros servidores despois, cando xa estean a funcionar. " +"Ademáis, non permita que o cliente AFS arrinque no inicio do ordenador ata " +"que a cela estea configurada. Cando estea preparado pode editar o ficheiro /" +"etc/openafs/afs.conf.client para activar o cliente." + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "AFS cell this workstation belongs to:" +msgstr "Cela AFS á que pertence esta estación de traballo:" + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "" +"AFS filespace is organized into cells or administrative domains. Each " +"workstation belongs to one cell. Usually the cell is the DNS domain name of " +"the site." +msgstr "" +"O espazo de ficheiros AFS está organizado en celas ou dominios " +"administrativos. Cada estación de traballo pertence a unha cela. Normalmente " +"a cela está no nome de dominio DNS do sitio." + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "Size of AFS cache in kB:" +msgstr "Tamaño da caché AFS en kB:" + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "" +"AFS uses an area of the disk to cache remote files for faster access. This " +"cache will be mounted on /var/cache/openafs. It is important that the cache " +"not overfill the partition it is located on. Often, people find it useful " +"to dedicate a partition to their AFS cache." +msgstr "" +"AFS emprega unha área do disco para facer unha caché dos ficheiros remotos " +"para un acceso máis rápido. Esta caché hase montar en /var/cache/openafs. É " +"importante que a caché non se faga máis grande que a partición na que está " +"situada. A miúdo é útil adicar unha partición á caché AFS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "Run Openafs client now and at boot?" +msgstr "¿Executar o cliente Openafs agora e no inicio?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "" +"Normally, most users who install the openafs-client package expect AFS to be " +"mounted automatically at boot. However, if you are planning on setting up a " +"new cell or are on a laptop, you may not want it started at boot time. If " +"you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" +"start to start the client when you wish to run it." +msgstr "" +"Normalmente, a maioría dos usuarios que instalan o paquete openafs-client " +"esperan que AFS se monte automaticamente ao arrincar o sistema. " +"Nembargantes, se pretende configurar unha nova cela ou emprega un ordenador " +"portátil, pode que non queira inicialo co sistema. Se prefire non iniciar " +"AFS co sistema, execute /etc/init.d/openafs-client force-start para iniciar " +"o cliente cando o queira executar." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "Look up AFS cells in DNS?" +msgstr "¿Buscar as celas AFS en DNS?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "" +"In order to contact an AFS cell, you need the IP addresses of the cell's " +"database servers. Normally, this information is read from /etc/openafs/" +"CellServDB. However, if Openafs cannot find a cell in that file, it can use " +"DNS to look for AFSDB records that contain the information." +msgstr "" +"Para se comunicar cunha cela AFS, precisa dos enderezos IP dos servidores de " +"base de datos da cela. Normalmente, esta información lese de /etc/openafs/" +"CellServDB. Nembargantes, se Openafs non pode atopar unha cela nese " +"ficheiro, pode empregar DNS para buscar rexistros AFSDB que conteñan a " +"información." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "Encrypt authenticated traffic with AFS fileserver?" +msgstr "¿Cifrar o tráfico autenticado co servidor de ficheiros AFS?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "" +"AFS provides a weak form of encryption that can optionally be used between a " +"client and the fileservers. While this encryption is weaker than DES and " +"thus is not sufficient for highly confidential data, it does provide some " +"confidentiality and is likely to make the job of a casual attacker " +"significantly more difficult." +msgstr "" +"AFS fornece unha forma feble de cifrado que se pode empregar, opcionalmente, " +"entre un cliente e os servidores de ficheiros. Aínda que este cifrado é máis " +"feble que DES, e polo tanto non é dabondo para datos altamente " +"confidenciais, si que fornece algunha confidencialidade e seguramente faga o " +"traballo dun potencial atacante significativamente máis complicado." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "Dynamically generate the contents of /afs?" +msgstr "¿Xerar o contido de /afs dinamicamente?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"/afs generally contains an entry for each cell that a client can talk to. " +"Traditionally, these entries were generated by servers in the client's home " +"cell. However, OpenAFS clients can generate the contents of /afs " +"dynamically based on the contents of /etc/openafs/CellServDB and DNS." +msgstr "" +"/afs adoita conter unha entrada por cada cela coa que un cliente se pode " +"comunicar. Tradicionalmente, esas entradas xerábanas os servidores da cela " +"inicial do cliente. Nembargantes, os clientes OpenAFS poden xerar o contido " +"de /afs dinamicamente baseándose no contido de /etc/openafs/CellServDB e DNS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"If you generate /afs dynamically, you may need to create /etc/openafs/" +"CellAlias to include aliases for common cells. (The syntax of this file is " +"one line per alias, with the cell name, a space, and then the alias for that " +"cell.)" +msgstr "" +"Se xera /afs dinamicamente, pode ter que crear /etc/openafs/CellAlias para " +"incluír os alias dalgunhas celas habituais. (A sintaxe deste ficheiro é unha " +"liña por alias, co nome da cela, un espazo, e despois o alias desa cela)." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "Use fakestat to avoid hangs when listing /afs?" +msgstr "¿Empregar fakestat para evitar esperas ao ver o listado de /afs?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "" +"Because AFS is a global file space, operations on the /afs directory can " +"generate significant network traffic. If some AFS cells are unavailable " +"then looking at /afs using ls or a graphical file browser may hang your " +"machine for minutes. AFS has an option to simulate answers to these " +"operations locally to avoid these hangs. You want this option under most " +"circumstances." +msgstr "" +"Como AFS é un espazo de ficheiros global, as operacións no directorio /afs " +"poden xerar unha cantidade significativa de tráfico na rede. Se algunhas " +"celas AFS non están dispoñibles, ver o contido de /afs empregando ls ou un " +"navegador gráfico de ficheiros pode facer que a máquina se deteña durante " +"varios minutos. AFS ten unha opción para simular respostas a esas operacións " +"de xeito local para evitar esas esperas. Na maioría dos casos emprégase esta " +"opción." + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "Cell this server serves files for:" +msgstr "Cela para a que este servidor serve ficheiros:" + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "" +"AFS fileservers belong to a cell. They have the key for that cell's " +"Kerberos service and serve volumes into that cell. Normally, this cell is " +"the same cell as the workstation's client belongs to." +msgstr "" +"Os servidores de ficheiros AFS pertencen a celas. Teñen a clave do servizo " +"Kerberos desa cela e serven volumes na cela. Normalmente, esta cela é a " +"mesma cela á que pertence o cliente da estación de traballo." + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "OpenAFS file server probably does not work!" +msgstr "O servidor de ficheiros OpenAFS probablemente non funcione" + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "" +"You are running the OpenAFS file server package on an alpha. This probably " +"doesn't work; the DES code is flaky on the alpha, along with the threaded " +"file server. Likely, the fileserver will simply fail to start, but if it " +"does load, data corruption may result. You have been warned." +msgstr "" +"Está a executar o paquete servidor de ficheiros OpenAFS nun Alpha. " +"Probablemente isto non funcione; o código DES ten fallos no Alpha, igual que " +"o servidor de ficheiros con fíos. O máis probable é que o servidor de " +"ficheiros non se inicie, pero se se inicia, pódese causar corrupción de " +"datos." diff --git a/src/packaging/Debian/po/ja.po b/src/packaging/Debian/po/ja.po new file mode 100644 index 0000000..9929327 --- /dev/null +++ b/src/packaging/Debian/po/ja.po @@ -0,0 +1,266 @@ +# Copyright (C) 2008-2009 Russ Allbery <rra@debian.org> +# This file is distributed under the same license as openafs package. +# Hideki Yamane (Debian-JP) <henrich@debian.or.jp>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: openafs 1.5.50.dfsg1\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-03-28 11:26+0900\n" +"Last-Translator: Hideki Yamane (Debian-JP) <henrich@debian.or.jp>\n" +"Language-Team: Japanese <debian-japanese@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "DB server host names for your home cell:" +msgstr "ホームセルの DB サーバホスト名:" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "" +"AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " +"should be contacted to find parts of a cell. The cell you claim this " +"workstation belongs to is not in that file. Enter the host names of the " +"database servers separated by spaces. IMPORTANT: If you are creating a new " +"cell and this machine is to be a database server in that cell, only enter " +"this machine's name; add the other servers later after they are functioning. " +"Also, do not enable the AFS client to start at boot on this server until the " +"cell is configured. When you are ready you can edit /etc/openafs/afs.conf." +"client to enable the client." +msgstr "" +"AFS はセルの各パートを検索するのに使用する確認先サーバのリストを保持するの" +"に /etc/openafs/CellServDB ファイルを使います。あなたがこのワークステーション" +"が属していると指定しているセルは、このファイル上にありません。データベース" +"サーバのホスト名を空白で区切って入力してください。「重要」：新しいセルを作っ" +"て、このマシンがそのセルでのデータベースサーバになった場合、このマシンの名前" +"のみを入力してください。他のサーバが動作するようになった後で、そのサーバを追" +"加してください。そして、セルが設定されるまで、このサーバでは AFS クライアント" +"を起動時に開始しないようにしてください。設定が完了して準備が整ったら /etc/" +"openafs/afs.conf.client を編集してクライアントを有効にしてください。" + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "AFS cell this workstation belongs to:" +msgstr "このワークステーションが所属する AFS セル:" + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "" +"AFS filespace is organized into cells or administrative domains. Each " +"workstation belongs to one cell. Usually the cell is the DNS domain name of " +"the site." +msgstr "" +"AFS ファイル空間はセルや管理ドメインから成ります。各ワークステーションは一つ" +"のセルに属します。通常セルはサイトの DNS ドメイン名です。" + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "Size of AFS cache in kB:" +msgstr "AFS キャッシュサイズ (kB):" + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "" +"AFS uses an area of the disk to cache remote files for faster access. This " +"cache will be mounted on /var/cache/openafs. It is important that the cache " +"not overfill the partition it is located on. Often, people find it useful " +"to dedicate a partition to their AFS cache." +msgstr "" +"AFS はより速いアクセスを行うために、ディスクの一部をリモートファイルのキャッ" +"シュとして使います。このキャッシュは /var/cache/openafs にマウントされます。" +"重要なのはキャッシュが置かれたパーティションを過度に圧迫しない事です。多くの" +"場合、AFS キャッシュを専用のパーティションに割り当てるのが適していることで" +"しょう。" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "Run Openafs client now and at boot?" +msgstr "Openafs クライアントを今すぐ、そして起動時に実行しますか?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "" +"Normally, most users who install the openafs-client package expect AFS to be " +"mounted automatically at boot. However, if you are planning on setting up a " +"new cell or are on a laptop, you may not want it started at boot time. If " +"you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" +"start to start the client when you wish to run it." +msgstr "" +"通常、openafs-client パッケージをインストールしたユーザの大半は起動時に自動的" +"に AFS をマウントすることを期待しています。しかし、新しいセルを設定しようとし" +"ている、あるいはノート PC で作業している場合は起動時に開始したくないかもしれ" +"ません。起動時に AFS を開始しないのを選んだ場合は、実行したくなったときに /" +"etc/init.d/openafs-client force-start を実行してクライアントを開始してくださ" +"い。" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "Look up AFS cells in DNS?" +msgstr "AFS セルの検索を DNS で行いますか?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "" +"In order to contact an AFS cell, you need the IP addresses of the cell's " +"database servers. Normally, this information is read from /etc/openafs/" +"CellServDB. However, if Openafs cannot find a cell in that file, it can use " +"DNS to look for AFSDB records that contain the information." +msgstr "" +"AFS セルに接続するためには、セルのデータベースサーバ群の IP アドレスが必要で" +"す。通常、この情報は /etc/openafs/CellServDB で参照できます。しかし、Openafs " +"がそのファイル中でセルを見つけられなかった場合、DNS を使ってその情報を含む " +"AFSDB レコードを検索することができます。" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "Encrypt authenticated traffic with AFS fileserver?" +msgstr "AFS ファイルサーバへの認証トラフィックを暗号化しますか?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "" +"AFS provides a weak form of encryption that can optionally be used between a " +"client and the fileservers. While this encryption is weaker than DES and " +"thus is not sufficient for highly confidential data, it does provide some " +"confidentiality and is likely to make the job of a casual attacker " +"significantly more difficult." +msgstr "" +"AFS はクライアントとファイルサーバ間で使うこともできる弱い暗号化形式を提供し" +"ています。この暗号化は DES よりも弱く、そのため非常に重要なデータを取り扱うに" +"は不十分ですが、ある程度の隠匿性は提供しており、技術力の低い攻撃者の作業をか" +"なり難しくするでしょう。" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "Dynamically generate the contents of /afs?" +msgstr "/afs の内容を動的に生成しますか?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"/afs generally contains an entry for each cell that a client can talk to. " +"Traditionally, these entries were generated by servers in the client's home " +"cell. However, OpenAFS clients can generate the contents of /afs " +"dynamically based on the contents of /etc/openafs/CellServDB and DNS." +msgstr "" +"/afs は通常クライアントが通信できる各セルのエントリを含んでいます。慣例上、こ" +"れらのエントリはクライアントのホームセル内にサーバによって生成されています。" +"しかし、OpenAFS クライアントは /afs の内容を /etc/openafs/CellServDB の内容" +"と DNS を元にして動的に生成することができます。" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"If you generate /afs dynamically, you may need to create /etc/openafs/" +"CellAlias to include aliases for common cells. (The syntax of this file is " +"one line per alias, with the cell name, a space, and then the alias for that " +"cell.)" +msgstr "" +"/afs を動的に生成する場合、共通のセルのエイリアスを含むために /etc/openafs/" +"CellAlias を作成する必要があります (このファイルのシンタックスはエイリアスご" +"とに 1 行で、セルの名前・空白・そしてセルのエイリアス、となります)。" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "Use fakestat to avoid hangs when listing /afs?" +msgstr "" +"/afs をリストアップする際にハングアップを避けるため、fakestat を使いますか?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "" +"Because AFS is a global file space, operations on the /afs directory can " +"generate significant network traffic. If some AFS cells are unavailable " +"then looking at /afs using ls or a graphical file browser may hang your " +"machine for minutes. AFS has an option to simulate answers to these " +"operations locally to avoid these hangs. You want this option under most " +"circumstances." +msgstr "" +"AFS は巨大なファイル空間であるため、/afs ディレクトリでの操作は膨大なネット" +"ワークトラフィックを生成することがあります。もし、いくつかの AFS セルが利用で" +"きなくなり、その際に /afs で ls やグラフィカルなファイルブラウザを実行して参" +"照すると、数分間はマシンがハングアップするでしょう。AFS はこのようなハング" +"アップを避けるため、これらの操作に対してローカルで答えをシミュレートするオプ" +"ションがあります。多くの場合、このオプションを有効にしておいた方が良いでしょ" +"う。" + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "Cell this server serves files for:" +msgstr "このサーバがファイルを提供するセル:" + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "" +"AFS fileservers belong to a cell. They have the key for that cell's " +"Kerberos service and serve volumes into that cell. Normally, this cell is " +"the same cell as the workstation's client belongs to." +msgstr "" +"AFS のファイルサーバ群は一つのセルに属しています。このファイルサーバ群は、セ" +"ルの Kerberos サービスについての鍵を持っており、ボリュームをこれらのセルに提" +"供します。通常、このセルはワークステーションのクライアントが属しているのと同" +"じセルです。" + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "OpenAFS file server probably does not work!" +msgstr "OpenAFS ファイルサーバは恐らく動作しません!" + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "" +"You are running the OpenAFS file server package on an alpha. This probably " +"doesn't work; the DES code is flaky on the alpha, along with the threaded " +"file server. Likely, the fileserver will simply fail to start, but if it " +"does load, data corruption may result. You have been warned." +msgstr "" +"OpenAFS ファイルサーバを alpha アーキテクチャ上で動作させています。これは恐ら" +"く動作しません。DES コードは alpha 上で、加えてスレッドで動作するファイルサー" +"バでは怪しげなものです。最もありえるのはファイルサーバは起動せず、もし動作し" +"たとしてもデータの損傷が起こるであろうということです。警告しました。" + +#~ msgid "Upgrading will move files to new locations; continue?" +#~ msgstr "" +#~ "アップグレードによってファイルは新しい場所に移動されます。続行しますか?" + +#~ msgid "" +#~ "Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " +#~ "files in /etc/openafs/server-local have been distributed to other " +#~ "locations. The BosConfig file is now located in /etc/openafs and the " +#~ "other files are located in /var/lib/openafs. If you continue with this " +#~ "upgrade, these files will be moved. You should use the bos restart " +#~ "command to reload your servers. Any configuration changes made before " +#~ "you do so will be lost." +#~ msgstr "" +#~ "Openafs 1.1 と Openafs 1.2 では、複数のファイルが移動しています。特に、/" +#~ "etc/openafs/server-local にあるファイルは他の位置へと移動されています。" +#~ "BosConfig ファイルは新たに /etc/openafs に移動し、他のファイルは /var/lib/" +#~ "openafs に位置することになります。このアップグレードを続行したい場合は、こ" +#~ "れらのファイルは移動されます。以前に行った設定の変更は、アップグレードに" +#~ "よって失われます。再起動コマンドをサーバを再ロードするのに bos を使う必要" +#~ "があります。この作業のため、設定に対して以前に加えられた変更は失われます。" diff --git a/src/packaging/Debian/po/nl.po b/src/packaging/Debian/po/nl.po index 42f37b0..bd3d121 100644 --- a/src/packaging/Debian/po/nl.po +++ b/src/packaging/Debian/po/nl.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: openafs\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-30 04:32+0100\n" -"PO-Revision-Date: 2007-02-28 02:09+0100\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:24-0800\n" "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -25,8 +25,29 @@ msgstr "Computernamen van de DB-servers voor uw thuiscel:" #. Type: string #. Description #: ../openafs-client.templates:1001 -msgid "AFS uses the file /etc/openafs/CellServDB to hold the list of servers that should be contacted to find parts of a cell. The cell you claim this workstation belongs to is not in that file. Enter the host names of the database servers separated by spaces. IMPORTANT: If you are creating a new cell and this machine is to be a database server in that cell, only enter this machine's name; add the other servers later after they are functioning. Also, do not enable the AFS client to start at boot on this server until the cell is configured. When you are ready you can edit /etc/openafs/afs.conf.client to enable the client." -msgstr "AFS houdt in het bestand '/etc/openafs/CellServDB een lijst bij van servers die gecontacteerd moeten worden bij het zoeken naar delen van een cel. De cel waartoe dit werkstation volgens wat u aangaf behoort, is niet terug te vinden in dit bestand. Gelieve dus de computernamen van de databaseservers op te geven, gescheiden met spaties. OPGELET: als bezig bent een nieuwe cel op te zetten en deze machine als databaseserver voor deze cel zal fungeren dient u hier enkel de naam van deze machine in te geven; u kunt verdere servers dan later toevoegen eens alles functioneert. Zorg er ook voor dat u het opstarten van de AFS-client tijdens het opstarten van de machine niet activeert voordat de cel geconfigureerd is, zodra u daarmee klaar bent kunt u /etc/openafs/afs.conf.client aanpassen om het automatisch opstarten van de client tijdens de machinestart te activeren." +msgid "" +"AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " +"should be contacted to find parts of a cell. The cell you claim this " +"workstation belongs to is not in that file. Enter the host names of the " +"database servers separated by spaces. IMPORTANT: If you are creating a new " +"cell and this machine is to be a database server in that cell, only enter " +"this machine's name; add the other servers later after they are functioning. " +"Also, do not enable the AFS client to start at boot on this server until the " +"cell is configured. When you are ready you can edit /etc/openafs/afs.conf." +"client to enable the client." +msgstr "" +"AFS houdt in het bestand '/etc/openafs/CellServDB een lijst bij van servers " +"die gecontacteerd moeten worden bij het zoeken naar delen van een cel. De " +"cel waartoe dit werkstation volgens wat u aangaf behoort, is niet terug te " +"vinden in dit bestand. Gelieve dus de computernamen van de databaseservers " +"op te geven, gescheiden met spaties. OPGELET: als bezig bent een nieuwe cel " +"op te zetten en deze machine als databaseserver voor deze cel zal fungeren " +"dient u hier enkel de naam van deze machine in te geven; u kunt verdere " +"servers dan later toevoegen eens alles functioneert. Zorg er ook voor dat u " +"het opstarten van de AFS-client tijdens het opstarten van de machine niet " +"activeert voordat de cel geconfigureerd is, zodra u daarmee klaar bent kunt " +"u /etc/openafs/afs.conf.client aanpassen om het automatisch opstarten van de " +"client tijdens de machinestart te activeren." #. Type: string #. Description @@ -37,8 +58,14 @@ msgstr "Tot welke AFS-cel behoort dit werkstation?" #. Type: string #. Description #: ../openafs-client.templates:2001 -msgid "AFS filespace is organized into cells or administrative domains. Each workstation belongs to one cell. Usually the cell is the DNS domain name of the site." -msgstr "Een AFS-bestandsruimte is georganiseerd in cellen of administratieve domeinen. Elk werkstation behoort tot 1 cel. Gewoonlijk is deze cel de DNS-domeinnaam van de site." +msgid "" +"AFS filespace is organized into cells or administrative domains. Each " +"workstation belongs to one cell. Usually the cell is the DNS domain name of " +"the site." +msgstr "" +"Een AFS-bestandsruimte is georganiseerd in cellen of administratieve " +"domeinen. Elk werkstation behoort tot 1 cel. Gewoonlijk is deze cel de DNS-" +"domeinnaam van de site." #. Type: string #. Description @@ -49,8 +76,17 @@ msgstr "Grootte van de AFS-cache in kB:" #. Type: string #. Description #: ../openafs-client.templates:3001 -msgid "AFS uses an area of the disk to cache remote files for faster access. This cache will be mounted on /var/cache/openafs. It is important that the cache not overfill the partition it is located on. Often, people find it useful to dedicate a partition to their AFS cache." -msgstr "AFS gebruikt ruimte op de schijf als cache, zodat toegang tot bestanden op andere systemen sneller werkt. Deze cache wordt aangekoppeld in /var/cache/openafs. Het is belangrijk dat de cache niet groter wordt dan de partitie waarop deze zich bevindt. Vaak is het handig om een partititie te hebben met enkel de AFS-cache." +msgid "" +"AFS uses an area of the disk to cache remote files for faster access. This " +"cache will be mounted on /var/cache/openafs. It is important that the cache " +"not overfill the partition it is located on. Often, people find it useful " +"to dedicate a partition to their AFS cache." +msgstr "" +"AFS gebruikt ruimte op de schijf als cache, zodat toegang tot bestanden op " +"andere systemen sneller werkt. Deze cache wordt aangekoppeld in /var/cache/" +"openafs. Het is belangrijk dat de cache niet groter wordt dan de partitie " +"waarop deze zich bevindt. Vaak is het handig om een partititie te hebben met " +"enkel de AFS-cache." #. Type: boolean #. Description @@ -61,8 +97,19 @@ msgstr "Wilt u de Openafs-client nu en tijdens het opstarten draaien?" #. Type: boolean #. Description #: ../openafs-client.templates:4001 -msgid "Normally, most users who install the openafs-client package expect AFS to be mounted automatically at boot. However, if you are planning on setting up a new cell or are on a laptop, you may not want it started at boot time. If you choose not to start AFS at boot, run /etc/init.d/openafs-client force-start to start the client when you wish to run it." -msgstr "Gebruikers die het 'openafs-client'-pakket installeren verwachten meestal dat AFS automatisch aangekoppeld wordt tijdens het opstarten. Als u echter van plan bent een nieuwe cel op te zetten, of als deze machine een laptop is, wilt u wellicht niet dat AFS tijdens het opstarten aangekoppeld wordt. U kunt AFS op elk moment starten met het commando '/etc/init.d/openafs-client force-start." +msgid "" +"Normally, most users who install the openafs-client package expect AFS to be " +"mounted automatically at boot. However, if you are planning on setting up a " +"new cell or are on a laptop, you may not want it started at boot time. If " +"you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" +"start to start the client when you wish to run it." +msgstr "" +"Gebruikers die het 'openafs-client'-pakket installeren verwachten meestal " +"dat AFS automatisch aangekoppeld wordt tijdens het opstarten. Als u echter " +"van plan bent een nieuwe cel op te zetten, of als deze machine een laptop " +"is, wilt u wellicht niet dat AFS tijdens het opstarten aangekoppeld wordt. U " +"kunt AFS op elk moment starten met het commando '/etc/init.d/openafs-client " +"force-start." #. Type: boolean #. Description @@ -73,20 +120,40 @@ msgstr "AFS-cellen opzoeken in DNS?" #. Type: boolean #. Description #: ../openafs-client.templates:5001 -msgid "In order to contact an AFS cell, you need the IP addresses of the cell's database servers. Normally, this information is read from /etc/openafs/CellServDB. However, if Openafs cannot find a cell in that file, it can use DNS to look for AFSDB records that contain the information." -msgstr "Om een AFS-cel te contacteren dient u het IP-adres van de databaseserver voor die cel te hebben. Normaal is deze informatie beschikbaar in /etc/openafs/CellServDB. Openafs biedt de mogelijkheid om de AFSDB-records op te zoeken via DNS wanneer dit bestand niet aanwezig is." +msgid "" +"In order to contact an AFS cell, you need the IP addresses of the cell's " +"database servers. Normally, this information is read from /etc/openafs/" +"CellServDB. However, if Openafs cannot find a cell in that file, it can use " +"DNS to look for AFSDB records that contain the information." +msgstr "" +"Om een AFS-cel te contacteren dient u het IP-adres van de databaseserver " +"voor die cel te hebben. Normaal is deze informatie beschikbaar in /etc/" +"openafs/CellServDB. Openafs biedt de mogelijkheid om de AFSDB-records op te " +"zoeken via DNS wanneer dit bestand niet aanwezig is." #. Type: boolean #. Description #: ../openafs-client.templates:6001 msgid "Encrypt authenticated traffic with AFS fileserver?" -msgstr "Wilt u dat geauthenticeerd verkeer met de AFS-bestandsserver versleuteld word?" +msgstr "" +"Wilt u dat geauthenticeerd verkeer met de AFS-bestandsserver versleuteld " +"word?" #. Type: boolean #. Description #: ../openafs-client.templates:6001 -msgid "AFS provides a weak form of encryption that can optionally be used between a client and the fileservers. While this encryption is weaker than DES and thus is not sufficient for highly confidential data, it does provide some confidentiality and is likely to make the job of a casual attacker significantly more difficult." -msgstr "AFS biedt een zwakke encryptievorm aan die optioneel kan gebruikt worden bij de communicatie tussen de client en bestandsservers. Hoewel deze encryptie zwakker is dan DES, en dus niet voldoende is voor hoogvertrouwelijke data, biedt het enige betrouwbaarheid daar het de taak van een niet-gerichte aanval significant moeilijker maakt. " +msgid "" +"AFS provides a weak form of encryption that can optionally be used between a " +"client and the fileservers. While this encryption is weaker than DES and " +"thus is not sufficient for highly confidential data, it does provide some " +"confidentiality and is likely to make the job of a casual attacker " +"significantly more difficult." +msgstr "" +"AFS biedt een zwakke encryptievorm aan die optioneel kan gebruikt worden bij " +"de communicatie tussen de client en bestandsservers. Hoewel deze encryptie " +"zwakker is dan DES, en dus niet voldoende is voor hoogvertrouwelijke data, " +"biedt het enige betrouwbaarheid daar het de taak van een niet-gerichte " +"aanval significant moeilijker maakt. " #. Type: boolean #. Description @@ -97,26 +164,58 @@ msgstr "Wilt u de inhoud van /afs dynamisch genereren?" #. Type: boolean #. Description #: ../openafs-client.templates:7001 -msgid "/afs generally contains an entry for each cell that a client can talk to. Traditionally, these entries were generated by servers in the client's home cell. However, OpenAFS clients can generate the contents of /afs dynamically based on the contents of /etc/openafs/CellServDB and DNS." -msgstr "/afs bevat een ingang voor elke cel waarmee een client kan communiceren. Traditioneel worden deze ingangen aangemaakt door de servers van de thuiscel van de client. OpenAFS-clients zijn echter in staat om de inhoud van /afs dynamisch te genereren, uitgaande van de data in /etc/openafs/CellServDB en DNS." +msgid "" +"/afs generally contains an entry for each cell that a client can talk to. " +"Traditionally, these entries were generated by servers in the client's home " +"cell. However, OpenAFS clients can generate the contents of /afs " +"dynamically based on the contents of /etc/openafs/CellServDB and DNS." +msgstr "" +"/afs bevat een ingang voor elke cel waarmee een client kan communiceren. " +"Traditioneel worden deze ingangen aangemaakt door de servers van de thuiscel " +"van de client. OpenAFS-clients zijn echter in staat om de inhoud van /afs " +"dynamisch te genereren, uitgaande van de data in /etc/openafs/CellServDB en " +"DNS." #. Type: boolean #. Description #: ../openafs-client.templates:7001 -msgid "If you generate /afs dynamically, you may need to create /etc/openafs/CellAlias to include aliases for common cells. (The syntax of this file is one line per alias, with the cell name, a space, and then the alias for that cell.)" -msgstr "Als u ervoor kiest om /afs dynamisch te genereren kan het noodzakelijk zijn om /etc/openafs/CellAlias aan te maken met daarin de aliases voor veelgebruikte cellen. (de syntax van dit bestand is 1 regel per alias, waarbij elke regel bestaat uit een celnaam gevolgd door een spatie en de alias voor die cel)" +msgid "" +"If you generate /afs dynamically, you may need to create /etc/openafs/" +"CellAlias to include aliases for common cells. (The syntax of this file is " +"one line per alias, with the cell name, a space, and then the alias for that " +"cell.)" +msgstr "" +"Als u ervoor kiest om /afs dynamisch te genereren kan het noodzakelijk zijn " +"om /etc/openafs/CellAlias aan te maken met daarin de aliases voor " +"veelgebruikte cellen. (de syntax van dit bestand is 1 regel per alias, " +"waarbij elke regel bestaat uit een celnaam gevolgd door een spatie en de " +"alias voor die cel)" #. Type: boolean #. Description #: ../openafs-client.templates:8001 msgid "Use fakestat to avoid hangs when listing /afs?" -msgstr "Wilt u fakestat gebruiken om vasthangen tijdens het weergeven van de inhoud van /afs tegen te gaan?" +msgstr "" +"Wilt u fakestat gebruiken om vasthangen tijdens het weergeven van de inhoud " +"van /afs tegen te gaan?" #. Type: boolean #. Description #: ../openafs-client.templates:8001 -msgid "Because AFS is a global file space, operations on the /afs directory can generate significant network traffic. If some AFS cells are unavailable then looking at /afs using ls or a graphical file browser may hang your machine for minutes. AFS has an option to simulate answers to these operations locally to avoid these hangs. You want this option under most circumstances." -msgstr "Omdat AFS een globale bestandsruimte is kunnen operaties op de '/afs'-map flink wat netwerkverkeer veroorzaken. Wanneer sommige AFS-cellen onbeschikbaar zijn kan het weergeven van /afs in een grafische browser uw machine enkele minuten vasthangen. AFS heeft een optie die antwoorden voor deze operaties lokaal simuleert en zo dit vasthangen vermijdt. Onder de meeste omstandigheden kunt u dit best activeren." +msgid "" +"Because AFS is a global file space, operations on the /afs directory can " +"generate significant network traffic. If some AFS cells are unavailable " +"then looking at /afs using ls or a graphical file browser may hang your " +"machine for minutes. AFS has an option to simulate answers to these " +"operations locally to avoid these hangs. You want this option under most " +"circumstances." +msgstr "" +"Omdat AFS een globale bestandsruimte is kunnen operaties op de '/afs'-map " +"flink wat netwerkverkeer veroorzaken. Wanneer sommige AFS-cellen " +"onbeschikbaar zijn kan het weergeven van /afs in een grafische browser uw " +"machine enkele minuten vasthangen. AFS heeft een optie die antwoorden voor " +"deze operaties lokaal simuleert en zo dit vasthangen vermijdt. Onder de " +"meeste omstandigheden kunt u dit best activeren." #. Type: string #. Description @@ -127,30 +226,33 @@ msgstr "Voor welke cellen biedt deze server bestanden aan?" #. Type: string #. Description #: ../openafs-fileserver.templates:1001 -msgid "AFS fileservers belong to a cell. They have the key for that cell's Kerberos service and serve volumes into that cell. Normally, this cell is the same cell as the workstation's client belongs to." -msgstr "AFS-bestandsservers maken deel uit van een cel. Ze beschikken over de sleutel voor de Kerberos-dienst van die cel, en ondersteunen volumes binnen die cel. Normaal is dit dezelfde cel als waartoe de client op het werkstation behoort." - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "Upgrading will move files to new locations; continue?" -msgstr "Opwaarderen verplaatst bestanden naar nieuwe locaties, wilt u doorgaan?" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, files in /etc/openafs/server-local have been distributed to other locations. The BosConfig file is now located in /etc/openafs and the other files are located in /var/lib/openafs. If you continue with this upgrade, these files will be moved. You should use the bos restart command to reload your servers. Any configuration changes made before you do so will be lost." -msgstr "Tijdens de overgang van Openafs 1.1 naar Openafs 1.2 zijn verschillende bestanden verplaatst. Meer precies zijn de bestanden uit /etc/openafs/server-local verplaatst naar andere locaties. Het bestand BosConfig bevindt zich nu in /etc/openafs en de andere bestanden vindt u terug in /var/lib/openafs. Als u doorgaat met deze opwaardering zullen deze bestanden verplaatst worden, u dient dan het bos herstart commando te gebruiken om uw servers te herladen. Als u configuratieaanpassingen doet voor dit gebeurd is gaan deze bij de volgende herstart verloren." +msgid "" +"AFS fileservers belong to a cell. They have the key for that cell's " +"Kerberos service and serve volumes into that cell. Normally, this cell is " +"the same cell as the workstation's client belongs to." +msgstr "" +"AFS-bestandsservers maken deel uit van een cel. Ze beschikken over de " +"sleutel voor de Kerberos-dienst van die cel, en ondersteunen volumes binnen " +"die cel. Normaal is dit dezelfde cel als waartoe de client op het " +"werkstation behoort." #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "De OpenAFS bestandsserver werkt waarschijnlijk niet!" #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 -msgid "You are running the OpenAFS file server package on an alpha. This probably doesn't work; the DES code is flaky on the alpha, along with the threaded file server. Likely, the fileserver will simply fail to start, but if it does load, data corruption may result. You have been warned." -msgstr "U draait het OpenAFS bestandsserver pakket op een alpha. Dit werkt waarschijnlijk niet; de DES-code, en de 'threaded' bestandsserver zijn onbetrouwbaar op alpha. In alle waarschijnlijkheid zal de bestandsserver weigeren op te starten, maar als deze toch start is data corruptie waarschijnlijk. U bent gewaarschuwd. " - +#: ../openafs-fileserver.templates:2001 +msgid "" +"You are running the OpenAFS file server package on an alpha. This probably " +"doesn't work; the DES code is flaky on the alpha, along with the threaded " +"file server. Likely, the fileserver will simply fail to start, but if it " +"does load, data corruption may result. You have been warned." +msgstr "" +"U draait het OpenAFS bestandsserver pakket op een alpha. Dit werkt " +"waarschijnlijk niet; de DES-code, en de 'threaded' bestandsserver zijn " +"onbetrouwbaar op alpha. In alle waarschijnlijkheid zal de bestandsserver " +"weigeren op te starten, maar als deze toch start is data corruptie " +"waarschijnlijk. U bent gewaarschuwd. " diff --git a/src/packaging/Debian/po/pt.po b/src/packaging/Debian/po/pt.po index 0b764cd..58bc6b3 100644 --- a/src/packaging/Debian/po/pt.po +++ b/src/packaging/Debian/po/pt.po @@ -6,9 +6,9 @@ msgid "" msgstr "" "Project-Id-Version: openafs 1.4.2-5\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-01-30 04:32+0100\n" -"PO-Revision-Date: 2007-03-12 22:35+0000\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:24-0800\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "MIME-Version: 1.0\n" @@ -36,14 +36,14 @@ msgid "" "client to enable the client." msgstr "" "O AFS utiliza o ficheiro /etc/openafs/CellServDB para guardar a lista de " -"servidores que devem ser contactados para encontrar partes de uma célula. " -"A célula que você diz a que esta estação de trabalho pertence não está nesse " +"servidores que devem ser contactados para encontrar partes de uma célula. A " +"célula que você diz a que esta estação de trabalho pertence não está nesse " "ficheiro. Introduza os nomes das máquinas dos servidores de bases de dados " "separados por espaços. IMPORTANTE: Se está a criar uma nova célula e esta " -"máquina é uma máquina que irá servir a base de dados nessa célula, " -"apenas introduza o nome desta máquina; acrescente depois os outros " -"servidores depois de estes estarem a funcionar. Além disso, não habilite o " -"client AFS para iniciar no arranque neste servidor até que a célula esteja " +"máquina é uma máquina que irá servir a base de dados nessa célula, apenas " +"introduza o nome desta máquina; acrescente depois os outros servidores " +"depois de estes estarem a funcionar. Além disso, não habilite o client AFS " +"para iniciar no arranque neste servidor até que a célula esteja " "configurada. Quando você estiver pronto pode editar /etc/openafs/afs.conf." "client para habilitar o cliente." @@ -62,8 +62,9 @@ msgid "" "the site." msgstr "" "O espaço de ficheiros do AFS é organizado em células ou domínios " -"administrativos. Cada estação de trabalho pertence a uma célula. Normalmente " -"a célula é o nome de domínio DNS do site." +"administrativos. Cada estação de trabalho pertence a uma célula. " +"Normalmente a célula é o nome de domínio DNS do site." + #. Type: string #. Description #: ../openafs-client.templates:3001 @@ -79,8 +80,8 @@ msgid "" "not overfill the partition it is located on. Often, people find it useful " "to dedicate a partition to their AFS cache." msgstr "" -"O AFS utiliza uma área do disco para fazer cache de ficheiros remotos para um " -"acesso mais rápido. Esta cache irá ser montada em /var/cache/openafs. É " +"O AFS utiliza uma área do disco para fazer cache de ficheiros remotos para " +"um acesso mais rápido. Esta cache irá ser montada em /var/cache/openafs. É " "importante que a cache não encha a partição em que está localizada. Muitas " "vezes, algumas pessoas acham útil dedicar uma partição para a sua cache AFS." @@ -101,11 +102,11 @@ msgid "" "start to start the client when you wish to run it." msgstr "" "Normalmente, a maioria dos utilizadores que instalam o pacote openafs-client " -"esperam que o AFS seja montado automaticamente no arranque. No entanto, " -"se você está a planear instalar uma nova célula ou está num portátil pode " -"não querer que seja iniciado no arranque. Se escolher não iniciar o " -"AFS no arranque, corra /etc/init.d/openafs-client force-start para iniciar " -"o cliente quando quiser que este corra." +"esperam que o AFS seja montado automaticamente no arranque. No entanto, se " +"você está a planear instalar uma nova célula ou está num portátil pode não " +"querer que seja iniciado no arranque. Se escolher não iniciar o AFS no " +"arranque, corra /etc/init.d/openafs-client force-start para iniciar o " +"cliente quando quiser que este corra." #. Type: boolean #. Description @@ -145,11 +146,11 @@ msgid "" "significantly more difficult." msgstr "" "O AFS disponibiliza uma forma fraca de encriptação que pode ser utilizada " -"opcionalmente entre um cliente e os servidores de ficheiros. Enquanto " -"que esta encriptação é mais fraca que a DES e por isso não suficiente para " -"dados altamente confidenciais, esta disponibiliza alguma confidencialidade " -"e é provável que torne o trabalho de um casual atacante significativamente " -"mais difícil." +"opcionalmente entre um cliente e os servidores de ficheiros. Enquanto que " +"esta encriptação é mais fraca que a DES e por isso não suficiente para dados " +"altamente confidenciais, esta disponibiliza alguma confidencialidade e é " +"provável que torne o trabalho de um casual atacante significativamente mais " +"difícil." #. Type: boolean #. Description @@ -166,11 +167,11 @@ msgid "" "cell. However, OpenAFS clients can generate the contents of /afs " "dynamically based on the contents of /etc/openafs/CellServDB and DNS." msgstr "" -"O /afs geralmente contém uma entrada para cada célula para a qual cada cliente " -"pode falar. Tradicionalmente, estas entradas foram geradas por servidores " -"na célula do cliente. No entanto, os clientes OpenAFS podem gerar o " -"conteúdo dinamicamente de /afs baseado no conteúdo de " -"/etc/openafs/CellServDB e do DNS." +"O /afs geralmente contém uma entrada para cada célula para a qual cada " +"cliente pode falar. Tradicionalmente, estas entradas foram geradas por " +"servidores na célula do cliente. No entanto, os clientes OpenAFS podem " +"gerar o conteúdo dinamicamente de /afs baseado no conteúdo de /etc/openafs/" +"CellServDB e do DNS." #. Type: boolean #. Description @@ -203,8 +204,8 @@ msgid "" "operations locally to avoid these hangs. You want this option under most " "circumstances." msgstr "" -"Devido ao AFS ser um espaço de ficheiros global, as operações no directório " -"/afs podem gerar tráfego de rede significativo. Se algumas células AFS não " +"Devido ao AFS ser um espaço de ficheiros global, as operações no directório /" +"afs podem gerar tráfego de rede significativo. Se algumas células AFS não " "estiverem disponíveis então olhar para /afs utilizando o ls ou um explorador " "de ficheiros gráfico pode bloquear a sua máquina por minutos. O AFS tem uma " "opção para simular localmente respostas a essas operações para evitar esses " @@ -224,45 +225,20 @@ msgid "" "Kerberos service and serve volumes into that cell. Normally, this cell is " "the same cell as the workstation's client belongs to." msgstr "" -"Os servidores de ficheiros AFS pertencem a uma célula. Estes têm a chave para o " -"serviço Kerberos dessa célula e volumes a servir nessa célula. Normalmente, " -"esta célula é a mesma célula a que pertence o cliente da estação de trabalho." - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "Upgrading will move files to new locations; continue?" -msgstr "Actualizar irá mover ficheiros para novos locais; continuar?" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "" -"Entre o Openafs 1.1 e o Openafs 1.2, foram movidos vários ficheiros. Em " -"particular, os ficheiros em /etc/openafs/server-local foram distribuídos em " -"outras localizações. O ficheiro BosConfig agora está localizado em /etc/" -"openafs e os outros ficheiros estão localizados em /var/lib/openafs. Se " -"continuar com esta actualização, estes ficheiros irão ser movidos. Você " -"deve utilizar o comando para reiniciar o bos para carregar novamente os seus " -"servidores. Quaisquer alterações de configuração feitas antes de você o " -"fazer serão perdidas." +"Os servidores de ficheiros AFS pertencem a uma célula. Estes têm a chave " +"para o serviço Kerberos dessa célula e volumes a servir nessa célula. " +"Normalmente, esta célula é a mesma célula a que pertence o cliente da " +"estação de trabalho." #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "O servidor de ficheiros AFS provavelmente não funciona!" #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " @@ -271,6 +247,6 @@ msgid "" msgstr "" "Você está a correr o pacote do servidor de ficheiros OpenAFS num alpha. " "Isto provavelmente não funciona; o código DES tem problemas em alpha, além " -"do servidor de ficheiros com 'threads'. Provavelmente, o servidor de ficheiros " -"irá simplesmente falhar o arranque, mas se carregar, pode resultar em " -"corrupção de dados. Você foi avisado." +"do servidor de ficheiros com 'threads'. Provavelmente, o servidor de " +"ficheiros irá simplesmente falhar o arranque, mas se carregar, pode resultar " +"em corrupção de dados. Você foi avisado." diff --git a/src/packaging/Debian/po/pt_BR.po b/src/packaging/Debian/po/pt_BR.po index 21f20af..5bab301 100644 --- a/src/packaging/Debian/po/pt_BR.po +++ b/src/packaging/Debian/po/pt_BR.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: openafs\n" -"Report-Msgid-Bugs-To: hartmans@debian.org\n" -"POT-Creation-Date: 2006-06-07 12:06-0700\n" -"PO-Revision-Date: 2006-06-10 13:49-0300\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:24-0800\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -25,13 +25,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "DB server host names for your home cell:" msgstr "Nomes de host do servidor DB para sua célula home :" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "" "AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " "should be contacted to find parts of a cell. The cell you claim this " @@ -57,13 +57,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "AFS cell this workstation belongs to:" msgstr "Célula AFS a qual esta estação de trabalho pertence :" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "" "AFS filespace is organized into cells or administrative domains. Each " "workstation belongs to one cell. Usually the cell is the DNS domain name of " @@ -75,13 +75,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "Size of AFS cache in kB:" msgstr "Tamanho do cache AFS em kB :" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "" "AFS uses an area of the disk to cache remote files for faster access. This " "cache will be mounted on /var/cache/openafs. It is important that the cache " @@ -95,13 +95,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "Run Openafs client now and at boot?" msgstr "Executar o cliente OpenAFS agora e em tempo de inicialização ?" #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "" "Normally, most users who install the openafs-client package expect AFS to be " "mounted automatically at boot. However, if you are planning on setting up a " @@ -109,24 +109,23 @@ msgid "" "you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" "start to start the client when you wish to run it." msgstr "" -"Normalmente, a maioria dos usuários que instalam o pacote " -"openafs-client esperam que o AFS seja montado automaticamente na " -"inicialização. Porém, caso você esteja planejando configurar uma nova " -"célula ou esteja em um laptop, você pode não desejar que o AFS seja " -"iniciado automaticamente no momento da inicialização da máquina. Caso " -"você opte por não iniciar o AFS na inicialização da máquina, execute " -"/etc/init.d/openafs-client force-start para iniciar o cliente quando " -"desejar executá-lo." +"Normalmente, a maioria dos usuários que instalam o pacote openafs-client " +"esperam que o AFS seja montado automaticamente na inicialização. Porém, caso " +"você esteja planejando configurar uma nova célula ou esteja em um laptop, " +"você pode não desejar que o AFS seja iniciado automaticamente no momento da " +"inicialização da máquina. Caso você opte por não iniciar o AFS na " +"inicialização da máquina, execute /etc/init.d/openafs-client force-start " +"para iniciar o cliente quando desejar executá-lo." #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "Look up AFS cells in DNS?" msgstr "Procurar células AFS no DNS ?" #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "" "In order to contact an AFS cell, you need the IP addresses of the cell's " "database servers. Normally, this information is read from /etc/openafs/" @@ -141,13 +140,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "Encrypt authenticated traffic with AFS fileserver?" msgstr "Encriptar o tráfego autenticado com o servidor de arquivos AFS ?" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "" "AFS provides a weak form of encryption that can optionally be used between a " "client and the fileservers. While this encryption is weaker than DES and " @@ -163,13 +162,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "Dynamically generate the contents of /afs?" msgstr "Gerar dinamicamente o conteúdo de /afs ?" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "/afs generally contains an entry for each cell that a client can talk to. " "Traditionally, these entries were generated by servers in the client's home " @@ -184,7 +183,7 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "If you generate /afs dynamically, you may need to create /etc/openafs/" "CellAlias to include aliases for common cells. (The syntax of this file is " @@ -198,13 +197,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "Use fakestat to avoid hangs when listing /afs?" msgstr "Usar fakestat para evitar travadas na listagem do /afs ?" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "" "Because AFS is a global file space, operations on the /afs directory can " "generate significant network traffic. If some AFS cells are unavailable " @@ -223,13 +222,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "Cell this server serves files for:" msgstr "Célula para a qual este servidor serve arquivos :" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "" "AFS fileservers belong to a cell. They have the key for that cell's " "Kerberos service and serve volumes into that cell. Normally, this cell is " @@ -240,41 +239,15 @@ msgstr "" "Normalmente, essa célula é a mesma célula da qual a estação de trabalho faz " "parte." -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "Upgrading will move files to new locations; continue?" -msgstr "Atualizar irá mover arquivo para novos locais. Continuar ?" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "" -"Entre as versões do OpenAFS 1.1 e do OpenAFS 1.2, diversos arquivos foram " -"movidos. Em particular, aruivos em /etc/openafs/server-local foram " -"distribuídos para outros locais. O arquivo BosConfig está agora localizado " -"em /etc/openafs e os outros arquivos estão localizados em /var/lib/openafs. " -"Caso você continue com esta atualização, esses arquivos serão movidos. Você " -"deverá usar o comando \"bos restart\" para recarregar seus servidores. " -"Quaisquer mudanças em configurações feitas antes que você tenha feito isso " -"serão perdidas." - #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "Servidor de Arquivos OpenAFS provavelmente não funciona !" #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " diff --git a/src/packaging/Debian/po/ru.po b/src/packaging/Debian/po/ru.po new file mode 100644 index 0000000..f17680d --- /dev/null +++ b/src/packaging/Debian/po/ru.po @@ -0,0 +1,253 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov <yuray@komyakino.ru>, 2009. +msgid "" +msgstr "" +"Project-Id-Version: openafs 1.4.10+dfsg1-2\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-06-16 20:50+0400\n" +"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" +"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "DB server host names for your home cell:" +msgstr "Имена машин-серверов БД ячейки:" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "" +"AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " +"should be contacted to find parts of a cell. The cell you claim this " +"workstation belongs to is not in that file. Enter the host names of the " +"database servers separated by spaces. IMPORTANT: If you are creating a new " +"cell and this machine is to be a database server in that cell, only enter " +"this machine's name; add the other servers later after they are functioning. " +"Also, do not enable the AFS client to start at boot on this server until the " +"cell is configured. When you are ready you can edit /etc/openafs/afs.conf." +"client to enable the client." +msgstr "" +"AFS использует файл /etc/openafs/CellServDB для хранения списка серверов, " +"с которыми нужно соединяться при поиске частей ячейки. Ячейка, которой " +"принадлежит данная рабочая станция, указывается не в этом файле. Введите " +"имена хостов серверов базы данных через пробел. ВАЖНО: если вы создаёте " +"новую ячейку и эта машина является базой данных этой ячейки, то введите " +"здесь только имя данной машины; добавляйте другие серверы по мере ввода " +"их в работу. " +"Также, выключите запуск клиента AFS при загрузке машины пока не будет " +"настроена ячейка. Когда будете готовы, можете включить клиент, " +"отредактировав файл /etc/openafs/afs.conf.client." + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "AFS cell this workstation belongs to:" +msgstr "Ячейка AFS, которой принадлежит данная рабочая станция:" + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "" +"AFS filespace is organized into cells or administrative domains. Each " +"workstation belongs to one cell. Usually the cell is the DNS domain name of " +"the site." +msgstr "" +"Всё файловое пространство AFS сгруппировано в ячейки или административные " +"домены. Каждая рабочая станция принадлежит определённой ячейке. Обычно, " +"ячейка характеризуется доменным именем DNS данной машины." + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "Size of AFS cache in kB:" +msgstr "Размер кэша AFS в килобайтах:" + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "" +"AFS uses an area of the disk to cache remote files for faster access. This " +"cache will be mounted on /var/cache/openafs. It is important that the cache " +"not overfill the partition it is located on. Often, people find it useful " +"to dedicate a partition to their AFS cache." +msgstr "" +"AFS использует часть диска для кэширования удалённых файлов для ускорения " +"доступа. Этот кэш будет смонтирован в каталог /var/cache/openafs. " +"Очень важно, чтобы кэш не переполнил раздел на котором расположен. " +"Часто пользователи создают отдельный раздел для кэша AFS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "Run Openafs client now and at boot?" +msgstr "Запустить клиента Openafs сейчас и при включении компьютера?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "" +"Normally, most users who install the openafs-client package expect AFS to be " +"mounted automatically at boot. However, if you are planning on setting up a " +"new cell or are on a laptop, you may not want it started at boot time. If " +"you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" +"start to start the client when you wish to run it." +msgstr "" +"Обычно, большинство пользователей, устанавливающих пакет " +"openafs-client, ожидают, что AFS будет монтироваться автоматически " +"при включении компьютера. Однако, если вы планируете настройку " +"новой ячейки или работаете на ноутбуке, то можете не захотеть этого. " +"Если вы укажите не запускать AFS при включении, то по желанию " +"его можно запустить командой /etc/init.d/openafs-client force-start." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "Look up AFS cells in DNS?" +msgstr "Искать ячейки AFS в DNS?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "" +"In order to contact an AFS cell, you need the IP addresses of the cell's " +"database servers. Normally, this information is read from /etc/openafs/" +"CellServDB. However, if Openafs cannot find a cell in that file, it can use " +"DNS to look for AFSDB records that contain the information." +msgstr "" +"Чтобы подключиться к ячейке AFS вам нужны IP-адреса серверов базы данных " +"ячейки. Обычно, эта информация берётся из файла /etc/openafs/CellServDB. " +"Однако, если Openafs не может найти ячейку в этом файле, то она может " +"поискать записи AFSDB в DNS, в которых тоже содержится данная информация." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "Encrypt authenticated traffic with AFS fileserver?" +msgstr "Шифровать обмен с файловым сервером AFS во время аутентификации?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "" +"AFS provides a weak form of encryption that can optionally be used between a " +"client and the fileservers. While this encryption is weaker than DES and " +"thus is not sufficient for highly confidential data, it does provide some " +"confidentiality and is likely to make the job of a casual attacker " +"significantly more difficult." +msgstr "" +"AFS предоставляет нестойкое подобие шифрования, которое можно включить " +"для обмена данными между клиентом и файловыми серверами. Хотя это шифрование " +"слабее чем DES и недостаточно для очень конфиденциальных данных, оно всё же " +"обеспечивает некоторую защиту, которая значительно осложнит работу " +"неискушённому атакующему." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "Dynamically generate the contents of /afs?" +msgstr "Генерировать содержимое /afs динамически?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"/afs generally contains an entry for each cell that a client can talk to. " +"Traditionally, these entries were generated by servers in the client's home " +"cell. However, OpenAFS clients can generate the contents of /afs " +"dynamically based on the contents of /etc/openafs/CellServDB and DNS." +msgstr "" +"В /afs, в основном, содержатся элементы для каждой ячейки, с которыми работает клиент. " +"Обычно, эти элементы генерируются серверами клиентской домашней ячейки. Однако, " +"клиенты OpenAFS могут генерировать содержимое /afs динамически на основе содержимого " +"/etc/openafs/CellServDB и DNS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"If you generate /afs dynamically, you may need to create /etc/openafs/" +"CellAlias to include aliases for common cells. (The syntax of this file is " +"one line per alias, with the cell name, a space, and then the alias for that " +"cell.)" +msgstr "" +"Если вы разрешите генерировать /afs динамически, то вам может потребоваться " +"создать /etc/openafs/CellAlias с псевдонимами часто используемых ячеек. (В файле " +"указываются псевдонимы по одному на строку в формате: имя ячейки, пробел, " +"псевдоним ячейки.)" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "Use fakestat to avoid hangs when listing /afs?" +msgstr "" +"Использовать fakestat, чтобы избежать зависаний при просмотре списка " +"содержимого /afs?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "" +"Because AFS is a global file space, operations on the /afs directory can " +"generate significant network traffic. If some AFS cells are unavailable " +"then looking at /afs using ls or a graphical file browser may hang your " +"machine for minutes. AFS has an option to simulate answers to these " +"operations locally to avoid these hangs. You want this option under most " +"circumstances." +msgstr "" +"Так как AFS представляет собой глобальное файловое пространство, операции " +"с каталогом /afs могут создавать значительный сетевой трафик. " +"Если некоторые ячейки AFS недоступны, то просмотр /afs с помощью " +"команды ls или графического файлового обозревателя может приостановить " +"работу машины на несколько минут. В AFS есть возможность симулировать " +"ответы для таких операций, чтобы предотвратить зависания. В большинстве " +"случаев лучше воспользоваться данной возможностью." + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "Cell this server serves files for:" +msgstr "Ячейка, для которой работает сервер:" + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "" +"AFS fileservers belong to a cell. They have the key for that cell's " +"Kerberos service and serve volumes into that cell. Normally, this cell is " +"the same cell as the workstation's client belongs to." +msgstr "" +"Файловые серверы AFS принадлежат ячейке. У них есть ключ для службы Kerberos " +"их ячейки, и они обслуживают тома этой ячейки. Обычно, эта ячейка совпадает " +"с ячейкой, которой принадлежит клиент рабочей станции." + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "OpenAFS file server probably does not work!" +msgstr "Вероятно, файловый сервер OpenAFS не работает!" + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "" +"You are running the OpenAFS file server package on an alpha. This probably " +"doesn't work; the DES code is flaky on the alpha, along with the threaded " +"file server. Likely, the fileserver will simply fail to start, but if it " +"does load, data corruption may result. You have been warned." +msgstr "" +"Вы работаете с пакетом файлового сервера OpenAFS на архитектуре alpha. " +"Скорее всего, он не работает; код DES часто отказывает на alpha, тоже " +"случается и с потоковым файловым сервером. Вероятно, файловый сервер " +"просто не запустится, но если это даже произойдёт, то в результате " +"это может повредить данные. Это было предупреждение." + diff --git a/src/packaging/Debian/po/sv.po b/src/packaging/Debian/po/sv.po new file mode 100644 index 0000000..d3fd39d --- /dev/null +++ b/src/packaging/Debian/po/sv.po @@ -0,0 +1,246 @@ +# Swedish OpenAFS debconf +# Copyright (C) 2008 Martin Bagge and the OpenAFS task force. +# This file is distributed under the same license as the OpenAFS package. +# Martin Bagge <brother@bsnet.se>, 2008. +# +msgid "" +msgstr "" +"Project-Id-Version: openafs\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:24-0800\n" +"Last-Translator: Martin Bagge <brother@bsnet.se>\n" +"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Swedish\n" +"X-Poedit-Country: Sweden\n" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "DB server host names for your home cell:" +msgstr "Värdnamn för DB-server för din hemmacell:" + +#. Type: string +#. Description +#: ../openafs-client.templates:1001 +msgid "" +"AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " +"should be contacted to find parts of a cell. The cell you claim this " +"workstation belongs to is not in that file. Enter the host names of the " +"database servers separated by spaces. IMPORTANT: If you are creating a new " +"cell and this machine is to be a database server in that cell, only enter " +"this machine's name; add the other servers later after they are functioning. " +"Also, do not enable the AFS client to start at boot on this server until the " +"cell is configured. When you are ready you can edit /etc/openafs/afs.conf." +"client to enable the client." +msgstr "" +"AFS använder filer /etc/openafs/CellServDB för att hÃ¥lla reda pÃ¥ listan av " +"servrar som ska kontaktas för att hitta delar till en cell. Cellen du pÃ¥stÃ¥r " +"att den här arbetsstationen tillhör finns inte i den filen. Ange värdnamnet " +"pÃ¥ databasservrar, skilj med mellanslag. VIKTIGT: Om du hÃ¥ller pÃ¥ att skapa " +"en ny cell och denna maskinen ska agera databas för den cellen anger du bara " +"namnet pÃ¥ denna maskinen här. Lägg till de övriga servrarna när de är redo. " +"Du ska heller inte ange att AFS-klienten ska starta vid systemets uppstart " +"förrens cellen är helt konfigurerad. Redigera /etc/openafs/afs.conf.client " +"för att aktivera klienten." + +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "AFS cell this workstation belongs to:" +msgstr "AFS-cell som denna arbetsstation tillhör:" + +# altsÃ¥. det här med "the domain namne of the site" är helt menlöst att översätta.... /brother 31/7-08 +#. Type: string +#. Description +#: ../openafs-client.templates:2001 +msgid "" +"AFS filespace is organized into cells or administrative domains. Each " +"workstation belongs to one cell. Usually the cell is the DNS domain name of " +"the site." +msgstr "" +"Filsystemet i AFS är organiserat i celler eller administrativa domäner. " +"Varje arbetsstation tillhör en cell, cellnamnet är vanligen samma som " +"domännamnet." + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "Size of AFS cache in kB:" +msgstr "Storlek pÃ¥ AFS-cache i kB:" + +#. Type: string +#. Description +#: ../openafs-client.templates:3001 +msgid "" +"AFS uses an area of the disk to cache remote files for faster access. This " +"cache will be mounted on /var/cache/openafs. It is important that the cache " +"not overfill the partition it is located on. Often, people find it useful " +"to dedicate a partition to their AFS cache." +msgstr "" +"AFS använder en del av disken för att mellanlagrar fjärrfiler för snabbare " +"tillgÃ¥ng. Denna mellanlagring kommer att monteras som /var/cache/openafs. " +"Det är viktigt att mellanlagringen inte tar större plats än partitionen som " +"den huserar pÃ¥. Det är vanligt att ha en dedikerad partition för AFS " +"mellanlagring." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "Run Openafs client now and at boot?" +msgstr "Starta Openafsklienten nu och vid varje upstart?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 +msgid "" +"Normally, most users who install the openafs-client package expect AFS to be " +"mounted automatically at boot. However, if you are planning on setting up a " +"new cell or are on a laptop, you may not want it started at boot time. If " +"you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" +"start to start the client when you wish to run it." +msgstr "" +"Vanligen monteras AFS automatiskt vid uppstart men om du hÃ¥ller pÃ¥ att sätta " +"upp en ny cell eller arbetar med en bärbar dator kan det vara en idé att " +"inte starta klienten automatiskt. Om du inte väljer att starta AFS vid " +"uppstart ska du köra /etc/init.d/openafs-client force-start för att starta " +"klienten när du vill ha tillgÃ¥ng till den." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "Look up AFS cells in DNS?" +msgstr "SlÃ¥ upp AFS-celler i DNS?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 +msgid "" +"In order to contact an AFS cell, you need the IP addresses of the cell's " +"database servers. Normally, this information is read from /etc/openafs/" +"CellServDB. However, if Openafs cannot find a cell in that file, it can use " +"DNS to look for AFSDB records that contain the information." +msgstr "" +"För att kontakta en AFS-cell sÃ¥ behöver du IP-adresser till cellens " +"databasservrar. Vanligen kan dessa läsas frÃ¥n /etc/openafs/CellServDB men om " +"cellen inte finns där kan DNS användas för att slÃ¥ upp AFSDB-poster med " +"korrekt information." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "Encrypt authenticated traffic with AFS fileserver?" +msgstr "Kryptera autentiseringstrafiken till AFS-filservern?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 +msgid "" +"AFS provides a weak form of encryption that can optionally be used between a " +"client and the fileservers. While this encryption is weaker than DES and " +"thus is not sufficient for highly confidential data, it does provide some " +"confidentiality and is likely to make the job of a casual attacker " +"significantly more difficult." +msgstr "" +"AFS tillhandahÃ¥ller en svag typ av kryptering som kan användas mellan " +"klienten och filservrarna. Även om denna kryptering är svagare än DES och " +"därmed inte särskilt lämplig för känslig information sÃ¥ kan den förhindra " +"enklare attacker och försvÃ¥ra vissa steg för en utomstÃ¥ende." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "Dynamically generate the contents of /afs?" +msgstr "Skapa innehÃ¥ll i /afs dynamiskt?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"/afs generally contains an entry for each cell that a client can talk to. " +"Traditionally, these entries were generated by servers in the client's home " +"cell. However, OpenAFS clients can generate the contents of /afs " +"dynamically based on the contents of /etc/openafs/CellServDB and DNS." +msgstr "" +"/afs innehÃ¥ller generellt sett en post för varje cell som klienten kan prata " +"med. Dessa poster skapades tidigare av servrar i klientens hemmacell. Numera " +"kan OpenAFS-klienter skapa innehÃ¥llet i /afs dynamiskt med stöd av " +"innehÃ¥llet i /etc/openafs/CellServDB eller DNS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 +msgid "" +"If you generate /afs dynamically, you may need to create /etc/openafs/" +"CellAlias to include aliases for common cells. (The syntax of this file is " +"one line per alias, with the cell name, a space, and then the alias for that " +"cell.)" +msgstr "" +"Om /afs skapas dynamiskt sÃ¥ kan du behöva skapa /etc/openafs/CellAlias för " +"de vanligare cellerna. (Direktivet skrivs med ett alias per rad. Cellnamnet, " +"ett mellanslag och alias för den cellen)" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "Use fakestat to avoid hangs when listing /afs?" +msgstr "Ska fakestat användas för att undvika problem när /afs listas?" + +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 +msgid "" +"Because AFS is a global file space, operations on the /afs directory can " +"generate significant network traffic. If some AFS cells are unavailable " +"then looking at /afs using ls or a graphical file browser may hang your " +"machine for minutes. AFS has an option to simulate answers to these " +"operations locally to avoid these hangs. You want this option under most " +"circumstances." +msgstr "" +"DÃ¥ AFS är ett globalt filutrymme kan operationer pÃ¥ /afs skapa ganska mycket " +"nätverkstrafik. Om nÃ¥gra AFS-celler är onÃ¥bara sÃ¥ kan ls och grafiska " +"filhanterare lÃ¥sa maskinen i flera minuter om en eller flera celler är " +"onÃ¥bara. AFS kan ställas in att simulera svar frÃ¥n de onÃ¥bara cellerna för " +"att undvika lÃ¥sningar. Det är mycket sällsynt att inte aktivera detta " +"alternativ." + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "Cell this server serves files for:" +msgstr "Namn pÃ¥ cellen som denna server tillhandahÃ¥ller filer för:" + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 +msgid "" +"AFS fileservers belong to a cell. They have the key for that cell's " +"Kerberos service and serve volumes into that cell. Normally, this cell is " +"the same cell as the workstation's client belongs to." +msgstr "" +"AFS-filservrar tillhör en cell. De har en nyckel till cellens Kerberostjänst " +"och tillhandahÃ¥ller volymer i den cellen. Vanligen är denna cell samma cell " +"som arbetsstationens klient tillhör." + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "OpenAFS file server probably does not work!" +msgstr "Filservern OpenAFS fungerar troligen inte!" + +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 +msgid "" +"You are running the OpenAFS file server package on an alpha. This probably " +"doesn't work; the DES code is flaky on the alpha, along with the threaded " +"file server. Likely, the fileserver will simply fail to start, but if it " +"does load, data corruption may result. You have been warned." +msgstr "" +"Du kör OpenAFS filservern pÃ¥ en Alpha. Det kommer förmodligen inte att " +"fungera dÃ¥ DES-koden i kombination med den trÃ¥dade filservern är instabil. " +"Förmodligen kommer filservern helt enkelt att vägra starta, om den laddar sÃ¥ " +"kan data skadas. Nu har du fÃ¥tt varningen, det är ditt beslut." diff --git a/src/packaging/Debian/po/templates.pot b/src/packaging/Debian/po/templates.pot index 2ca8c16..46794ff 100644 --- a/src/packaging/Debian/po/templates.pot +++ b/src/packaging/Debian/po/templates.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: hartmans@debian.org\n" -"POT-Creation-Date: 2006-06-07 12:06-0700\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "DB server host names for your home cell:" msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:3 +#: ../openafs-client.templates:1001 msgid "" "AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " "should be contacted to find parts of a cell. The cell you claim this " @@ -39,13 +39,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "AFS cell this workstation belongs to:" msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:16 +#: ../openafs-client.templates:2001 msgid "" "AFS filespace is organized into cells or administrative domains. Each " "workstation belongs to one cell. Usually the cell is the DNS domain name of " @@ -54,13 +54,13 @@ msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "Size of AFS cache in kB:" msgstr "" #. Type: string #. Description -#: ../openafs-client.templates:24 +#: ../openafs-client.templates:3001 msgid "" "AFS uses an area of the disk to cache remote files for faster access. This " "cache will be mounted on /var/cache/openafs. It is important that the cache " @@ -70,13 +70,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "Run Openafs client now and at boot?" msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:34 +#: ../openafs-client.templates:4001 msgid "" "Normally, most users who install the openafs-client package expect AFS to be " "mounted automatically at boot. However, if you are planning on setting up a " @@ -87,13 +87,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "Look up AFS cells in DNS?" msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:45 +#: ../openafs-client.templates:5001 msgid "" "In order to contact an AFS cell, you need the IP addresses of the cell's " "database servers. Normally, this information is read from /etc/openafs/" @@ -103,13 +103,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "Encrypt authenticated traffic with AFS fileserver?" msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:55 +#: ../openafs-client.templates:6001 msgid "" "AFS provides a weak form of encryption that can optionally be used between a " "client and the fileservers. While this encryption is weaker than DES and " @@ -120,13 +120,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "Dynamically generate the contents of /afs?" msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "/afs generally contains an entry for each cell that a client can talk to. " "Traditionally, these entries were generated by servers in the client's home " @@ -136,7 +136,7 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:65 +#: ../openafs-client.templates:7001 msgid "" "If you generate /afs dynamically, you may need to create /etc/openafs/" "CellAlias to include aliases for common cells. (The syntax of this file is " @@ -146,13 +146,13 @@ msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "Use fakestat to avoid hangs when listing /afs?" msgstr "" #. Type: boolean #. Description -#: ../openafs-client.templates:79 +#: ../openafs-client.templates:8001 msgid "" "Because AFS is a global file space, operations on the /afs directory can " "generate significant network traffic. If some AFS cells are unavailable " @@ -164,46 +164,28 @@ msgstr "" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "Cell this server serves files for:" msgstr "" #. Type: string #. Description -#: ../openafs-fileserver.templates:3 +#: ../openafs-fileserver.templates:1001 msgid "" "AFS fileservers belong to a cell. They have the key for that cell's " "Kerberos service and serve volumes into that cell. Normally, this cell is " "the same cell as the workstation's client belongs to." msgstr "" -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "Upgrading will move files to new locations; continue?" -msgstr "" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:11 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "" - #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "" #. Type: note #. Description -#: ../openafs-fileserver.templates:22 +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " diff --git a/src/packaging/Debian/po/vi.po b/src/packaging/Debian/po/vi.po index 8bc2972..30d903a 100644 --- a/src/packaging/Debian/po/vi.po +++ b/src/packaging/Debian/po/vi.po @@ -1,13 +1,13 @@ # Vietnamese translation for ApenAFS. # Copyright © 2006 Free Software Foundation, Inc. # Clytie Siddall <clytie@riverland.net.au>, 2005-2006. -# +# msgid "" -"" -msgstr "Project-Id-Version: openafs 1.4.1-3\n" -"Report-Msgid-Bugs-To: hartmans@debian.org\n" -"POT-Creation-Date: 2006-06-07 12:06-0700\n" -"PO-Revision-Date: 2006-06-18 16:05+0930\n" +msgstr "" +"Project-Id-Version: openafs 1.4.1-3\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:25-0800\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" @@ -16,15 +16,15 @@ msgstr "Project-Id-Version: openafs 1.4.1-3\n" "Plural-Forms: nplurals=1; plural=0\n" "X-Generator: LocFactoryEditor 1.6a7\n" -#.Type: string -#.Description -#: ../openafs-client.templates:3 +#. Type: string +#. Description +#: ../openafs-client.templates:1001 msgid "DB server host names for your home cell:" msgstr "Các tên máy chạy trình phục vụ cÆ¡ sở dữ liệu cho ô chính của bạn:" -#.Type: string -#.Description -#: ../openafs-client.templates:3 +#. Type: string +#. Description +#: ../openafs-client.templates:1001 msgid "" "AFS uses the file /etc/openafs/CellServDB to hold the list of servers that " "should be contacted to find parts of a cell. The cell you claim this " @@ -35,7 +35,8 @@ msgid "" "Also, do not enable the AFS client to start at boot on this server until the " "cell is configured. When you are ready you can edit /etc/openafs/afs.conf." "client to enable the client." -msgstr "AFS dùng tập tin « /etc/openafs/CellServDB » để chứa danh sách các máy phục " +msgstr "" +"AFS dùng tập tin « /etc/openafs/CellServDB » để chứa danh sách các máy phục " "vụ nên được liên hệ để tìm phần ô. Bạn đã tuyên bố máy trạm này thuộc một ô " "không phải trong tập tin ấy. Hãy nhập tên máy của những máy phục vụ cÆ¡ sở dữ " "liệu, định giới bằng dấu cách. QUAN TRỌNG: nếu bạn đang tạo một ô mới, và " @@ -45,139 +46,154 @@ msgstr "AFS dùng tập tin « /etc/openafs/CellServDB » để chứa danh sác "máy, chỉ sau khi cấu hình ô ấy. Khi bạn sẵn sàng thì có thể hiệu chỉnh tập " "tin « /etc/openafs/afs.conf.client » để hiệu lá»±c trình khách ấy." -#.Type: string -#.Description -#: ../openafs-client.templates:16 +#. Type: string +#. Description +#: ../openafs-client.templates:2001 msgid "AFS cell this workstation belongs to:" msgstr "Ô AFS chứa máy trăm này:" -#.Type: string -#.Description -#: ../openafs-client.templates:16 +#. Type: string +#. Description +#: ../openafs-client.templates:2001 msgid "" "AFS filespace is organized into cells or administrative domains. Each " "workstation belongs to one cell. Usually the cell is the DNS domain name of " "the site." -msgstr "Khoảng cách tập tin loại AFS được tổ chức ra nhiều ô hay miền quản lý. Mỗi " +msgstr "" +"Khoảng cách tập tin loại AFS được tổ chức ra nhiều ô hay miền quản lý. Mỗi " "máy trạm thuộc một ô riêng lẻ. Thường ô ấy là tên miền DNS của nÆ¡i Mạng ấy." -#.Type: string -#.Description -#: ../openafs-client.templates:24 +#. Type: string +#. Description +#: ../openafs-client.templates:3001 msgid "Size of AFS cache in kB:" msgstr "Kích cỡ của bộ nhớ tạm AFS theo kB:" -#.Type: string -#.Description -#: ../openafs-client.templates:24 +#. Type: string +#. Description +#: ../openafs-client.templates:3001 msgid "" "AFS uses an area of the disk to cache remote files for faster access. This " "cache will be mounted on /var/cache/openafs. It is important that the cache " "not overfill the partition it is located on. Often, people find it useful " "to dedicate a partition to their AFS cache." -msgstr "AFS dùng một vùng trên đĩa để lÆ°u tạm tập tin từ xa, mà cho phép truy cập " +msgstr "" +"AFS dùng một vùng trên đĩa để lÆ°u tạm tập tin từ xa, mà cho phép truy cập " "nhanh hÆ¡n. Bộ nhớ tạm này sẽ được gắn vào « /var/cache/openafs ». Quan trọng " "là bộ nhớ tạm ấy không vượt quá phân vùng ở. Thường có ích khi dùng một phân " "vùng chỉ cho bộ nhớ tạm AFS thôi." -#.Type: boolean -#.Description -#: ../openafs-client.templates:34 +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 msgid "Run Openafs client now and at boot?" msgstr "Chạy trình khách Openafs ngay bây giờ và cÅ©ng khi khởi động máy không?" -#.Type: boolean -#.Description -#: ../openafs-client.templates:34 +#. Type: boolean +#. Description +#: ../openafs-client.templates:4001 msgid "" "Normally, most users who install the openafs-client package expect AFS to be " "mounted automatically at boot. However, if you are planning on setting up a " "new cell or are on a laptop, you may not want it started at boot time. If " "you choose not to start AFS at boot, run /etc/init.d/openafs-client force-" "start to start the client when you wish to run it." -msgstr "Bình thường, phần lớn người dùng cài đặt gói ứng dụng khách « openafs-client » ngờ AFS được gắn kết tá»± động khi khởi động. Tuy nhiên, nếu bạn định thiết lập một ô mới, hoặc sá»­ dụng máy tính xách tay, bạn có thể không muốn nó được khởi chạy vào lúc khởi động. Nếu bạn chọn không khởi chạy AFS vào lúc khởi động, hãy chạy lệnh ép buộc khởi chạy « /etc/init.d/openafs-client force-start » để khởi chạy ứng dụng khách khi bạn muốn khởi chạy nó." - -#.Type: boolean -#.Description -#: ../openafs-client.templates:45 +msgstr "" +"Bình thường, phần lớn người dùng cài đặt gói ứng dụng khách « openafs-client " +"» ngờ AFS được gắn kết tá»± động khi khởi động. Tuy nhiên, nếu bạn định thiết " +"lập một ô mới, hoặc sá»­ dụng máy tính xách tay, bạn có thể không muốn nó được " +"khởi chạy vào lúc khởi động. Nếu bạn chọn không khởi chạy AFS vào lúc khởi " +"động, hãy chạy lệnh ép buộc khởi chạy « /etc/init.d/openafs-client force-" +"start » để khởi chạy ứng dụng khách khi bạn muốn khởi chạy nó." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 msgid "Look up AFS cells in DNS?" msgstr "Tra cứu ô AFS trong DNS không?" -#.Type: boolean -#.Description -#: ../openafs-client.templates:45 +#. Type: boolean +#. Description +#: ../openafs-client.templates:5001 msgid "" "In order to contact an AFS cell, you need the IP addresses of the cell's " "database servers. Normally, this information is read from /etc/openafs/" "CellServDB. However, if Openafs cannot find a cell in that file, it can use " "DNS to look for AFSDB records that contain the information." -msgstr "Để liên hệ một ô AFS, bạn cần có địa chỉ IP của mọi máy phục vụ cÆ¡ sở dữ " +msgstr "" +"Để liên hệ một ô AFS, bạn cần có địa chỉ IP của mọi máy phục vụ cÆ¡ sở dữ " "liệu của nó. Bình thường, thông tin này được đọc từ tập tin « /etc/openafs/" "CellServDB ». Tuy nhiên, nếu trình Openafs không tìm thấy một ô nào đó trong " "tập tin ấy thì nó có thể dùng DNS (hệ thống tên miền) để tìm mục ghi AFSDB " "chứa thông tin ấy." -#.Type: boolean -#.Description -#: ../openafs-client.templates:55 +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 msgid "Encrypt authenticated traffic with AFS fileserver?" -msgstr "Mật mã hóa các dữ liệu xác thá»±c truyền với trình phục vụ tập tin AFS không?" +msgstr "" +"Mật mã hóa các dữ liệu xác thá»±c truyền với trình phục vụ tập tin AFS không?" -#.Type: boolean -#.Description -#: ../openafs-client.templates:55 +#. Type: boolean +#. Description +#: ../openafs-client.templates:6001 msgid "" "AFS provides a weak form of encryption that can optionally be used between a " "client and the fileservers. While this encryption is weaker than DES and " "thus is not sufficient for highly confidential data, it does provide some " "confidentiality and is likely to make the job of a casual attacker " "significantly more difficult." -msgstr "AFS cung cấp một cách mật mã yếu mà tùy chọn có thể được dùng giữa một trình " +msgstr "" +"AFS cung cấp một cách mật mã yếu mà tùy chọn có thể được dùng giữa một trình " "khách nào đó và những trình phục vụ tập tin khác. Dù cách mặt mã này yếu hÆ¡n " "DES, vì vậy không đủ cho dữ liệu quan trọng, nó có cung cấp một mức độ riêng " "tÆ°, thì sẽ làm cho người tấn công gặp khó khăn một phần." -#.Type: boolean -#.Description -#: ../openafs-client.templates:65 +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 msgid "Dynamically generate the contents of /afs?" msgstr "Tạo ra nội dung « /afs » một cách động không?" -#.Type: boolean -#.Description -#: ../openafs-client.templates:65 +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 msgid "" "/afs generally contains an entry for each cell that a client can talk to. " "Traditionally, these entries were generated by servers in the client's home " "cell. However, OpenAFS clients can generate the contents of /afs " "dynamically based on the contents of /etc/openafs/CellServDB and DNS." -msgstr "ThÆ° mục « /afs » thường chứa một mục ghi cho mỗi ô mà trình khách có thể " -"liên hệ. Trước này, trình phục vụ trong ô chính của trình khác đã tạo ra mục " -"ghi này. Tuy nhiên, trình khách loại OpenAFS có thể tạo ra nội dung « /afs » " -"một cách động, đựa vào nội dung « /etc/openafs/CellServDB » và vào DNS." - -#.Type: boolean -#.Description -#: ../openafs-client.templates:65 +msgstr "" +"ThÆ° mục « /afs » thường chứa một mục ghi cho mỗi ô mà trình khách có thể liên " +"hệ. Trước này, trình phục vụ trong ô chính của trình khác đã tạo ra mục ghi " +"này. Tuy nhiên, trình khách loại OpenAFS có thể tạo ra nội dung « /afs » một " +"cách động, đựa vào nội dung « /etc/openafs/CellServDB » và vào DNS." + +#. Type: boolean +#. Description +#: ../openafs-client.templates:7001 msgid "" "If you generate /afs dynamically, you may need to create /etc/openafs/" "CellAlias to include aliases for common cells. (The syntax of this file is " "one line per alias, with the cell name, a space, and then the alias for that " "cell.)" -msgstr "Nếu bạn chọn tạo ra « /afs » một cách động, có lẽ bạn sẽ cần phải tạo « etc/" +msgstr "" +"Nếu bạn chọn tạo ra « /afs » một cách động, có lẽ bạn sẽ cần phải tạo « etc/" "openafs/CellAlias » (bí danh ô) để gồm bí danh cho các ô chung. (Cú pháp của " "tập tin này là một dòng cho mỗi bí danh, mà chứa tên ô, rồi một dấu cách, " "rồi bí danh cho ô đó.)" -#.Type: boolean -#.Description -#: ../openafs-client.templates:79 +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 msgid "Use fakestat to avoid hangs when listing /afs?" -msgstr "Dùng « fakestat » (thống kê giả) để tránh hệ thống treo cứng khi liệt kê « /afs » không?" +msgstr "" +"Dùng « fakestat » (thống kê giả) để tránh hệ thống treo cứng khi liệt kê « /" +"afs » không?" -#.Type: boolean -#.Description -#: ../openafs-client.templates:79 +#. Type: boolean +#. Description +#: ../openafs-client.templates:8001 msgid "" "Because AFS is a global file space, operations on the /afs directory can " "generate significant network traffic. If some AFS cells are unavailable " @@ -185,71 +201,49 @@ msgid "" "machine for minutes. AFS has an option to simulate answers to these " "operations locally to avoid these hangs. You want this option under most " "circumstances." -msgstr "Vì AFS là một khoảng cách toàn cục, thao tác trên thÆ° mục « /afs » có thể " -"tạo ra nhiều tải cho mạng. Nếu một số ô AFS không sẵn sàng thì việc xem « /" -"afs » dùng lệnh « ls » (liệt kê) hoặc dùng một trình đồ họa duyệt tập tin " -"thì có thể treo cứng máy bạn trong vòng nhiều phút. AFS tùy chọn có thể mô " -"phỏng trả lời cho thao tác loại này một cách địa phÆ°Æ¡ng, để tránh treo cứng " -"hệ thống nhÆ° thế. Đệ nghi bạn sá»­ dụng tùy chọn này: nó cần thiết trong phần " -"lớn trường hợp." - -#.Type: string -#.Description -#: ../openafs-fileserver.templates:3 +msgstr "" +"Vì AFS là một khoảng cách toàn cục, thao tác trên thÆ° mục « /afs » có thể tạo " +"ra nhiều tải cho mạng. Nếu một số ô AFS không sẵn sàng thì việc xem « /afs » " +"dùng lệnh « ls » (liệt kê) hoặc dùng một trình đồ họa duyệt tập tin thì có " +"thể treo cứng máy bạn trong vòng nhiều phút. AFS tùy chọn có thể mô phỏng " +"trả lời cho thao tác loại này một cách địa phÆ°Æ¡ng, để tránh treo cứng hệ " +"thống nhÆ° thế. Đệ nghi bạn sá»­ dụng tùy chọn này: nó cần thiết trong phần lớn " +"trường hợp." + +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 msgid "Cell this server serves files for:" msgstr "Ô cho đó trình phục vụ tập tin:" -#.Type: string -#.Description -#: ../openafs-fileserver.templates:3 +#. Type: string +#. Description +#: ../openafs-fileserver.templates:1001 msgid "" "AFS fileservers belong to a cell. They have the key for that cell's " "Kerberos service and serve volumes into that cell. Normally, this cell is " "the same cell as the workstation's client belongs to." -msgstr "Mọi trình phục vụ tập tin AFS thuộc một ô nào đó. Trình ấy có khóa của dịch " +msgstr "" +"Mọi trình phục vụ tập tin AFS thuộc một ô nào đó. Trình ấy có khóa của dịch " "vụ Kerberos của ô này, và phục vụ khối đĩa vào ô này. Bình thường, ô này là " "cùng một ô với ô sở hữu trình khách của máy trạm này." -#.Type: boolean -#.Description -#: ../openafs-fileserver.templates:11 -msgid "Upgrading will move files to new locations; continue?" -msgstr "Nâng cấp sẽ di chuyển tập tin sang vị trí mới: bạn có muốn tiếp tục không?" - -#.Type: boolean -#.Description -#: ../openafs-fileserver.templates:11 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "Giữa Openafs phiên bản 1.1 và 1.2, vài tập tin đã được di chuyển. Đặc biệt, " -"những tập tin trong « /etc/openafs/server-local » (trình phục vụ địa phÆ°Æ¡ng) " -"đã được chia ra nhiều vị trí khác. Tập tin « BosConfig » lúc này trong « /" -"etc/openafs », và những tập tin khác có trong « /var/lib/openafs ». Nếu bạn " -"chọn tiếp tục nâng cấp, các tập tin ấy sẽ được di chuyển nhÆ° thế. Bạn hãy sá»­ " -"dụng lệnh « bos restart » (khởi chạy lại) để khởi chạy lại các trình phục vụ " -"của bạn. Mọi thay đổi cấu hình được tạo trước khi bạn khởi chạy lại thì sẽ " -"bị mất." - -#.Type: note -#.Description -#: ../openafs-fileserver.templates:22 +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "Rất có thể là trình phục vụ tập tin OpenAFS không hoạt động." -#.Type: note -#.Description -#: ../openafs-fileserver.templates:22 +#. Type: note +#. Description +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " "file server. Likely, the fileserver will simply fail to start, but if it " "does load, data corruption may result. You have been warned." -msgstr "Bạn có chạy gói tin trình phục vụ tập tin OpenAFS trên một anfa. Rất có thể " +msgstr "" +"Bạn có chạy gói tin trình phục vụ tập tin OpenAFS trên một anfa. Rất có thể " "là nó không hoạt động vì mã DES bị lỗi trên anfa, cÅ©ng với trình phục vụ tập " "tin theo mạch. Rất có thể là trình phục vụ tập tin sẽ không khởi chạy, nhÆ°ng " "mà nếu nó có phải khởi chạy thì dữ liệu có thể bị hỏng. Bạn đã nhận một cảnh " diff --git a/src/packaging/Debian/po/zh_CN.po b/src/packaging/Debian/po/zh_CN.po index a686562..cfa11fb 100644 --- a/src/packaging/Debian/po/zh_CN.po +++ b/src/packaging/Debian/po/zh_CN.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: openafs 1.4.2-4\n" -"Report-Msgid-Bugs-To: hartmans@debian.org\n" -"POT-Creation-Date: 2007-01-19 11:07-0800\n" -"PO-Revision-Date: 2007-01-08 20:44+0800\n" +"Report-Msgid-Bugs-To: openafs@packages.debian.org\n" +"POT-Creation-Date: 2009-02-13 09:22-0800\n" +"PO-Revision-Date: 2009-02-13 09:25-0800\n" "Last-Translator: Chun Tian (binghe) <binghe.lisp@gmail.com>\n" "Language-Team: Internationalization <debian-i18n@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -209,38 +209,15 @@ msgstr "" "AFS 文件服务器属于一个单元. 它们有该单元的 Kerberos 服务密钥并且为该单元提供" "卷服务. 正常情况下, 这个单元跟工作站上的客户端属于的那个单元是同一个." -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "Upgrading will move files to new locations; continue?" -msgstr "升级将移动文件到新的位置; 继续吗?" - -#. Type: boolean -#. Description -#: ../openafs-fileserver.templates:2001 -msgid "" -"Between Openafs 1.1 and Openafs 1.2, several files moved. In particular, " -"files in /etc/openafs/server-local have been distributed to other " -"locations. The BosConfig file is now located in /etc/openafs and the other " -"files are located in /var/lib/openafs. If you continue with this upgrade, " -"these files will be moved. You should use the bos restart command to reload " -"your servers. Any configuration changes made before you do so will be lost." -msgstr "" -"在 OpenAFS 1.1 和 OpenAFS 1.2 之间, 一些文件的位置移动了. 特别是, /etc/" -"openafs/server-local 里的文件已经被分发到其他位置了. BosConfig 文件现在位" -"于 /etc/openafs 目录里而其他文件位于 /var/lib/openafs. 如果您继续进行升级, " -"这些文件将会被移动. 您应该用 bos restart 命令重加载您的服务器. 在您操作之前" -"的任何配置改动将丢失." - #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 +#: ../openafs-fileserver.templates:2001 msgid "OpenAFS file server probably does not work!" msgstr "OpenAFS 文件服务器可能不会工作!" #. Type: note #. Description -#: ../openafs-fileserver.templates:3001 +#: ../openafs-fileserver.templates:2001 msgid "" "You are running the OpenAFS file server package on an alpha. This probably " "doesn't work; the DES code is flaky on the alpha, along with the threaded " diff --git a/src/packaging/Debian/rules b/src/packaging/Debian/rules new file mode 100755 index 0000000..9b6a535 --- /dev/null +++ b/src/packaging/Debian/rules @@ -0,0 +1,235 @@ +#!/usr/bin/make -f +# Based on the sample debian/rules that uses debhelper. +# GNU copyright 1997 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# Tell Autoconf the correct system types. +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + SYSTEM = --build $(DEB_HOST_GNU_TYPE) +else + SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + +# Determine whether we're building with optimization. This doesn't really +# work at the moment due to upstream problems. +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + DEBIAN_OPT_FLAGS = --disable-optimize --disable-optimize-lwp + DEBIAN_KERN_FLAGS = --disable-optimize-kernel +else + DEBIAN_OPT_FLAGS = + DEBIAN_KERN_FLAGS = +endif + +SYS_NAME := $(shell sh debian/sysname) + +package = openafs +srcpkg = openafs-modules-source +dkmspkg = openafs-modules-dkms +DOCS = $(CURDIR)/debian/openafs-doc/usr/share/doc/openafs-doc + +# The path to the XSLT used to generate HTML from the DocBook source files. +# This path is specific to different Linux distributions, so we have to pass +# it into configure. +HTML_XSL = /usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl + +# The /usr/share/doc directory for these packages should be a symlink to +# /usr/share/doc/openafs-client. Any package on this list must depend on +# openafs-client. +DOC_PACKAGES = libpam-openafs-kaserver openafs-dbserver openafs-kpasswd + +# These are files that we know we don't want to install. List them so that we +# can use dh_install --fail-missing and catch anything new that shows up. +IGNORE = -XAuthLog -Xcompile_et -Xcopyauth -Xdlog -Xdpass -Xfms.log \ + -Xfs_chgrp.1 -Xfs_chown.1 -Xfs_cscpolicy.1 -Xfs_flushall.1 \ + -Xfs_memdump.1 -Xfs_minidump.1 -Xfs_trace.1 -Xkadb_check -Xkaserver \ + -Xkdb -Xkdump -Xkpwvalid -Xlibafssetpag.so -Xlibafsrpc.so \ + -Xlibafsauthent.so -Xpackage -Xpagsh.krb -Xsymlink -Xtokens.krb \ + -Xuss -Xvldb_convert -Xvsys -Xxfs_size_check + +# Installed via other means since we have to rename them. +IGNORE += -Xpam_afs + +# These variables are used by get-orig-source and to construct dkms.conf. +# You will need to change TAG to package stable releases instead of +# experimental releases. +DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \ + | cut -d- -f1) +VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') +TAG := $(shell echo 'openafs-devel-$(VERSION)' | sed 's/\./_/g') +REPO := git://git.openafs.org/openafs.git + +# Upstream does tarball releases for major releases, but not for point +# relesaes, and the tarball releases are split into src and doc and contain +# the WINNT directory. Dropping WINNT, which is not used on Debian, saves a +# substantial amount of space in the source package, and there's no reason +# to include the files generated by regen.sh when we're going to run it +# again ourselves anyway. +# +# This rule therefore generates an upstream tarball from the upstream Git +# tag, rather than the tarball release, without the generated files that are +# not in Git and without the WINNT directory. It assumes that git-core is +# installed and there's network connectivity to the upstream repository. +get-orig-source: + git archive --remote='$(REPO)' --prefix='openafs_$(DEBVERS).orig/' \ + --format=tar '$(TAG)' | tar xf - + rm -r openafs_$(DEBVERS).orig/src/WINNT + tar cf openafs_$(DEBVERS).orig.tar openafs_$(DEBVERS).orig + rm -r openafs_$(DEBVERS).orig + gzip -9 openafs_$(DEBVERS).orig.tar + +# Handle the renaming of the up man page to afs-up here since the man pages +# are generated from POD source by regen.sh. +build: build-arch build-indep +build-arch: build-stamp +build-indep: +build-stamp: + @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi + dh build --before configure + mv doc/man-pages/pod1/up.pod doc/man-pages/pod1/afs-up.pod + rm -f doc/man-pages/man1/up.1 + sh regen.sh + afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local \ + sh configure \ + --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ + --prefix=/usr --mandir=\$${prefix}/share/man \ + --sysconfdir=/etc --libexecdir=/usr/lib \ + --localstatedir=/var/lib --with-krb5-conf=/usr/bin/krb5-config \ + --enable-supergroups --enable-demand-attach-fs \ + --enable-disconnected \ + --with-xslt-processor=xsltproc --with-html-xsl=$(HTML_XSL) \ + --enable-debug --enable-debug-lwp $(DEBIAN_OPT_FLAGS) $(SYSTEM) + chmod a+x config.sub src/libafs/make_kbuild_makefile.pl \ + src/config/make_vnode.pl + dh build --after configure + $(MAKE) libafs_tree + set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \ + $(MAKE) -C doc/xml/$$d all ; \ + done + touch $@ + +clean: + [ ! -f doc/man-pages/pod1/afs-up.pod ] \ + || mv doc/man-pages/pod1/afs-up.pod doc/man-pages/pod1/up.pod + set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \ + [ ! -f doc/xml/$$d/Makefile ] || $(MAKE) -C doc/xml/$$d clean ; \ + done + dh clean + +install: install-stamp +install-stamp: build-stamp + dh install --until dh_prep + mkdir -p $(CURDIR)/debian/tmp + $(MAKE) install_nolibafs DESTDIR=$(CURDIR)/debian/tmp + rm -f debian/tmp/usr/bin/klog.krb + rm -f debian/tmp/usr/share/man/man1/klog.krb.1 + chmod +x debian/afs-rootvol debian/afs-newcell + dh_installdirs + dh_install --fail-missing $(IGNORE) + dh_installinit -popenafs-client -r -- defaults 25 20 + dh_installinit -popenafs-fileserver -r + + mkdir -p $(DOCS)/html + cp doc/xml/*.gif doc/xml/*.html $(DOCS)/html/ + set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \ + mkdir $(DOCS)/html/$$d ; \ + cp doc/xml/$$d/*.html $(DOCS)/html/$$d/ ; \ + cp doc/xml/$$d/*.pdf $(DOCS)/ ; \ + done + cp doc/xml/AdminGuide/*.png $(DOCS)/html/AdminGuide/ + mkdir $(DOCS)/html/arch-overview + cp doc/arch/arch-overview.h $(DOCS)/html/arch-overview + cd $(DOCS)/html/arch-overview && doxygen *.h && rm *.h && mv html/* . \ + && rm -r latex html + set -e; for h in doc/protocol/*.h ; do \ + mkdir $(DOCS)/html/`basename $$h .h` ; \ + cp $$h $(DOCS)/html/`basename $$h .h` ; \ + cd $(DOCS)/html/`basename $$h .h` && doxygen *.h && rm *.h \ + && mv html/* . && rm -r latex html && cd $(CURDIR) ; \ + done + + install -d debian/$(srcpkg)/usr/src/modules/$(package) + cd libafs_tree && find . -print | \ + cpio -admp $(CURDIR)/debian/$(srcpkg)/usr/src/modules/$(package) + mkdir -p debian/$(srcpkg)/usr/src/modules/$(package)/debian + cp debian/copyright debian/module/* \ + debian/$(srcpkg)/usr/src/modules/$(package)/debian/ + sed 's/^openafs /openafs-modules /' debian/changelog \ + > debian/$(srcpkg)/usr/src/modules/$(package)/debian/changelog + chmod 755 debian/$(srcpkg)/usr/src/modules/$(package)/debian/rules + chown -R root.src debian/$(srcpkg) + find debian/$(srcpkg) -type d | xargs chmod 755 + find debian/$(srcpkg) -type f -perm -100 | xargs chmod 755 + find debian/$(srcpkg) -type f -not -perm -100 | xargs chmod 644 + chmod 775 debian/$(srcpkg)/usr/src/modules + cd debian/$(srcpkg)/usr/src && tar cf $(package).tar modules + bzip2 debian/$(srcpkg)/usr/src/$(package).tar + chmod 644 debian/$(srcpkg)/usr/src/$(package).tar.bz2 + install -d debian/$(dkmspkg)/usr/src + mv debian/$(srcpkg)/usr/src/modules/$(package) \ + debian/$(dkmspkg)/usr/src/openafs-$(VERSION) + rm -rf debian/$(dkmspkg)/usr/src/openafs-$(VERSION)/debian + rmdir debian/$(srcpkg)/usr/src/modules + + set -e; for pkg in $(DOC_PACKAGES) ; do \ + ln -s openafs-client debian/$$pkg/usr/share/doc/$$pkg; \ + done + + mv debian/openafs-client/usr/bin/pagsh \ + debian/openafs-client/usr/bin/pagsh.openafs + mv debian/openafs-client/usr/share/man/man1/pagsh.1 \ + debian/openafs-client/usr/share/man/man1/pagsh.openafs.1 + mv debian/openafs-client/usr/bin/klog \ + debian/openafs-client/usr/bin/klog.afs + mv debian/openafs-client/usr/share/man/man1/klog.1 \ + debian/openafs-client/usr/share/man/man1/klog.afs.1 + mv debian/openafs-client/usr/bin/up \ + debian/openafs-client/usr/bin/afs-up + + install -m 644 -c debian/tmp/usr/lib/pam_afs.so.1 \ + debian/libpam-openafs-kaserver/lib/security/pam_afs.so + install -m 644 -c debian/tmp/usr/lib/pam_afs.krb.so.1 \ + debian/libpam-openafs-kaserver/lib/security/pam_afs.krb.so + + install -d debian/openafs-dbserver/usr/share/man/man8 + ( cd debian && pod2man --section 8 --center "Debian GNU/Linux" \ + afs-rootvol ) \ + >debian/openafs-dbserver/usr/share/man/man8/afs-rootvol.8 + ( cd debian && pod2man --section 8 --center "Debian GNU/Linux" \ + afs-newcell ) \ + >debian/openafs-dbserver/usr/share/man/man8/afs-newcell.8 + + install -d debian/$(srcpkg)/usr/share/doc/$(srcpkg) + install -m 644 debian/openafs-client.NEWS \ + debian/$(srcpkg)/usr/share/doc/$(srcpkg)/NEWS.Debian + + dh_dkms -V $(VERSION) + dh install --after dh_install + chmod 700 debian/openafs-client/var/cache/openafs + chmod 700 debian/openafs-dbserver/var/lib/openafs/db + chmod 700 debian/openafs-fileserver/var/lib/openafs/local + touch $@ + +binary-indep: install-stamp + dh binary-indep + +# Only include debugging information for the servers installed into +# /usr/lib/openafs rather than for all binaries. The servers are where +# debugging backtraces really matter, and a 10MB debugging package is +# overkill. +binary-arch: install-stamp + dh binary-arch --before dh_strip + dh_strip --dbg-package=openafs-dbg + rm -rf debian/openafs-dbg/usr/lib/debug/lib + rm -rf debian/openafs-dbg/usr/lib/debug/sbin + rm -rf debian/openafs-dbg/usr/lib/debug/usr/bin + rm -rf debian/openafs-dbg/usr/lib/debug/usr/sbin + dh binary-arch --remaining + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep build build-arch build-indep clean +.PHONY: install diff --git a/src/packaging/Debian/rules.in b/src/packaging/Debian/rules.in deleted file mode 100644 index 086591b..0000000 --- a/src/packaging/Debian/rules.in +++ /dev/null @@ -1,235 +0,0 @@ -#!/usr/bin/make -f -# Based on the sample debian/rules that uses debhelper. -# GNU copyright 1997 by Joey Hess. - -# Use quilt to manage patches. -include /usr/share/quilt/quilt.make - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -# Tell Autoconf the correct system types. -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) - SYSTEM = --build $(DEB_HOST_GNU_TYPE) -else - SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -# Determine whether we're building with optimization. This doesn't really -# work at the moment due to upstream problems. -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - DEBIAN_OPT_FLAGS = --disable-optimize --disable-lwp-optimize - DEBIAN_KERN_FLAGS = --disable-kernel-optimize -else - DEBIAN_OPT_FLAGS = - DEBIAN_KERN_FLAGS = -endif - -SYS_NAME := $(shell sh debian/sysname) - -package = openafs -srcpkg = openafs-modules-source - -# These packages have lintian overrides. -LINTIAN_PACKAGES = openafs-dbserver openafs-client openafs-fileserver - -# The /usr/share/doc directory for these packages should be a symlink to -# /usr/share/doc/openafs-client. Any package on this list must depend on -# openafs-client. -DOC_PACKAGES = libpam-openafs-kaserver openafs-dbserver openafs-fileserver \ - openafs-kpasswd - -# These variable is used only by get-orig-source, which will normally only be -# run by maintainers. -VERSION = @VERSION@ -DEBVERS = @VERSION@.dfsg1 -UPSTREAM = /afs/grand.central.org/software/openafs/$(VERSION) - -# Download the upstream source, merge in the doc tarball, and do the -# repackaging that we have to do for DFSG reasons. This assumes AFS is -# mounted, as it's generally only used by the package maintainers. -get-orig-source: - cp $(UPSTREAM)/openafs-$(VERSION)-src.tar.bz2 . - tar xjf openafs-$(VERSION)-src.tar.bz2 - rm openafs-$(VERSION)-src.tar.bz2 - cp $(UPSTREAM)/openafs-$(VERSION)-doc.tar.bz2 . - tar xjf openafs-$(VERSION)-doc.tar.bz2 - rm openafs-$(VERSION)-doc.tar.bz2 - rm -r openafs-$(VERSION)/src/packaging/MacOS - rm -r openafs-$(VERSION)/src/platform/DARWIN - rm -r openafs-$(VERSION)/src/WINNT - rm openafs-$(VERSION)/src/afs/sysctl.h - rm openafs-$(VERSION)/src/util/fstab.c - mv openafs-$(VERSION) openafs_$(DEBVERS).orig - tar cf openafs_$(DEBVERS).orig.tar openafs_$(DEBVERS).orig - rm -r openafs_$(DEBVERS).orig - gzip -9 openafs_$(DEBVERS).orig.tar - -configure: configure-stamp -configure-stamp: patch - @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi - dh_testdir - sh regen.sh - afslogsdir=/var/log/openafs afslocaldir=/var/lib/openafs/local \ - sh configure \ - --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ - --prefix=/usr --mandir=\$${prefix}/share/man \ - --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var/lib --with-krb5-conf=/usr/bin/krb5-config \ - --enable-supergroups --enable-largefile-fileserver \ - --enable-bos-new-config \ - --enable-debug --enable-lwp-debug \ - $(DEBIAN_OPT_FLAGS) $(SYSTEM) - chmod a+x src/libafs/make_kbuild_makefile.pl - touch configure-stamp - -build: build-arch build-indep -build-arch: configure-stamp build-stamp -build-indep: -build-stamp: - dh_testdir - mkdir -p $(CURDIR)/debian/tmp - $(MAKE) install_nolibafs DESTDIR=$(CURDIR)/debian/tmp - chmod +x debian/afs-rootvol debian/afs-newcell - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp install-stamp - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean - -install: install-stamp -install-stamp: DH_OPTIONS= -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_installdirs - dh_install - - set -e; for pkg in $(LINTIAN_PACKAGES) ; do \ - install -d debian/$$pkg/usr/share/lintian/overrides; \ - install -m 644 -c debian/$$pkg.lintian \ - debian/$$pkg/usr/share/lintian/overrides/$$pkg; \ - done - set -e; for pkg in $(DOC_PACKAGES) ; do \ - ln -s openafs-client debian/$$pkg/usr/share/doc/$$pkg; \ - done - - mv debian/openafs-client/usr/bin/pagsh \ - debian/openafs-client/usr/bin/pagsh.openafs - mv debian/openafs-client/usr/share/man/man1/pagsh.1 \ - debian/openafs-client/usr/share/man/man1/pagsh.openafs.1 - mv debian/openafs-client/usr/bin/up \ - debian/openafs-client/usr/bin/afs-up - mv debian/openafs-client/usr/share/man/man1/up.1 \ - debian/openafs-client/usr/share/man/man1/afs-up.1 - - install -m 644 -c debian/tmp/usr/lib/pam_afs.so.1 \ - debian/libpam-openafs-kaserver/lib/security/pam_afs.so - install -m 644 -c debian/tmp/usr/lib/pam_afs.krb.so.1 \ - debian/libpam-openafs-kaserver/lib/security/pam_afs.krb.so - - install -d debian/openafs-dbserver/usr/share/man/man8 - ( cd debian && pod2man --section 8 --center "Debian GNU/Linux" \ - afs-rootvol ) \ - >debian/openafs-dbserver/usr/share/man/man8/afs-rootvol.8 - ( cd debian && pod2man --section 8 --center "Debian GNU/Linux" \ - afs-newcell ) \ - >debian/openafs-dbserver/usr/share/man/man8/afs-newcell.8 - - touch install-stamp - -# Rules for building the openafs-modules-source package. -binary-source: - dh_testdir - dh_testroot - -rm -rf debian/$(srcpkg) debian/substvars - install -d debian/$(srcpkg)/usr/src/modules/$(package) - find . \( -name \*.o -o -path ./debian -o -path \*/.svn \ - -o -path ./src/WINNT -o -path ./doc -o -path ./obj \ - -o -path ./$(SYS_NAME) -o -path ./.pc \) -prune -o -print | \ - cpio -admp debian/$(srcpkg)/usr/src/modules/$(package) - mkdir -p debian/$(srcpkg)/usr/src/modules/$(package)/debian - cp debian/changelog debian/copyright debian/module/* \ - debian/$(srcpkg)/usr/src/modules/$(package)/debian/ - chmod 755 debian/$(srcpkg)/usr/src/modules/$(package)/debian/rules - rm -f debian/$(srcpkg)/usr/src/modules/$(package)/*-stamp - cd debian/$(srcpkg)/usr/src/modules/$(package) && \ - $(MAKE) distclean - -cd debian/$(srcpkg)/usr/src/modules/$(package) && \ - rm -rf src/libafs/rx src/libafs/afs src/libafs/afsint - chown -R root.src debian/$(srcpkg) - find debian/$(srcpkg) -type d | xargs chmod 755 - find debian/$(srcpkg) -type f -perm -100 | xargs chmod 755 - find debian/$(srcpkg) -type f -not -perm -100 | xargs chmod 644 - chmod 775 debian/$(srcpkg)/usr/src/modules - cd debian/$(srcpkg)/usr/src && \ - tar cf $(package).tar modules && \ - rm -r modules - gzip -9 debian/$(srcpkg)/usr/src/$(package).tar - chmod 644 debian/$(srcpkg)/usr/src/$(package).tar.gz - -# Build architecture-independent files here. Pass -i to all debhelper -# commands in this target to reduce clutter. -# -# Also install debian/openafs-client.NEWS in the openafs-modules-source -# package. -binary-indep: DH_OPTIONS=-i -binary-indep: install-stamp binary-source - dh_testdir - dh_testroot - dh_installchangelogs NEWS - install -m 644 debian/openafs-client.NEWS \ - debian/$(srcpkg)/usr/share/doc/$(srcpkg)/NEWS.Debian - dh_installdocs -XAdminReference -XQuickStartWindows -Xwinnotes - dh_installexamples - dh_link - dh_compress - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture-dependent files here. Pass -a to all debhelper commands -# in this target to reduce clutter. -# -# We would like to install debugging information for everything, but currently -# OpenAFS's makefiles strip all binaries when installed except for the -# fileserver and the volserver. This is fixed in OpenAFS's development -# branch. Until that's released, only retain debugging information for the -# fileserver and the volserver. -binary-arch: DH_OPTIONS=-a -binary-arch: install-stamp - dh_testdir - dh_testroot - dh_installchangelogs NEWS - dh_installdocs - dh_installdebconf - DH_OPTIONS= dh_installinit -popenafs-client -r -- defaults 25 18 - DH_OPTIONS= dh_installinit -popenafs-fileserver -r - dh_link - dh_strip --dbg-package=openafs-dbg - dh_compress - dh_fixperms - chmod 700 debian/openafs-client/var/cache/openafs - chmod 700 debian/openafs-dbserver/var/lib/openafs/db - chmod 700 debian/openafs-fileserver/etc/openafs/server - dh_perl - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch - -.PHONY: binary binary-arch binary-indep binary-source build build-arch -.PHONY: build-indep clean configure install diff --git a/src/packaging/Debian/source/format b/src/packaging/Debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/src/packaging/Debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/src/packaging/Debian/sysname b/src/packaging/Debian/sysname index 9b67a70..da8fd1a 100755 --- a/src/packaging/Debian/sysname +++ b/src/packaging/Debian/sysname @@ -9,16 +9,13 @@ case `dpkg --print-architecture` in alpha) echo alpha_linux_26 ;; -amd64) - echo amd64_linux26 - ;; -armel) +arm|armel|armv5tel) echo arm_linux26 ;; -hppa) - echo parisc_linux24 +amd64) + echo amd64_linux26 ;; -i[3456]86) +i[3456]86|lpia) echo i386_linux26 ;; ia64) diff --git a/src/packaging/Debian/watch b/src/packaging/Debian/watch index f15eadd..e5ed849 100644 --- a/src/packaging/Debian/watch +++ b/src/packaging/Debian/watch @@ -1,5 +1,3 @@ -# debian/watch -- Rules for uscan to find new upstream versions. -# # Note that the following watch file does not find development releases, # only general releases and release candidates. If we package development # releases, a rule should be added to find them as well. @@ -7,11 +5,11 @@ version=3 # Without the /pages in the URL, one gets the frameset page. -opts=dversionmangle=s/\.dfsg\d+$// \ +opts=dversionmangle=s/[\.+]dfsg\d+$// \ http://www.openafs.org/pages/release/latest.html \ .*/openafs-([^-]+)-src\.tar\.gz # Release candidates are stashed in another secret place and we change the # version number for proper sorting of versions in Debian. -#opts="uversionmangle=s/-rc/~rc/ dversionmangle=s/\.dfsg\d+$//" \ -# http://dl.openafs.org/dl/openafs/candidate/ ([^/]+-rc\d+)/ +opts="uversionmangle=s/-rc/~rc/;s/pre/~pre/,dversionmangle=s/[\.+]dfsg\d+$//" \ + http://dl.openafs.org/dl/openafs/candidate/ ([^/]+-?(?:rc|pre)\d+)/ -- 1.9.4