diff options
| author |  Karl Ramm <kcr@mit.edu> | 2007-07-20 05:07:19 +0000 |
|---|---|---|
| committer | Karl Ramm <kcr@mit.edu> | 2007-07-20 05:07:19 +0000 |
| commit | 15cf157d47aafe49fd59b7acc23fe172f8a23566 (patch) | |
| tree | 747829bb544497cad68906bb21b2fd9fbb2cc1f3 | |
| parent | 82ea504def6eb144c2b13b315890b297e29345c5 (diff) | |
debian patch applied and reconciled, version unfinalized
104 files changed, 2475 insertions, 57 deletions
diff --git a/Makefile.in b/Makefile.in index 017ef25..1d7392e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,7 +7,7 @@ sysconfdir=@sysconfdir@ sbindir=@sbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ bindir=${exec_prefix}/bin libdir=${exec_prefix}/lib @@ -277,7 +277,7 @@ if test "$hesiod" != yes; then LDFLAGS="$LDFLAGS -L$hesiod/lib" fi AC_CHECK_LIB(hesiod, hes_resolve, :, - [AC_MSG_ERROR(Hesiod library not found)])]) + [AC_MSG_ERROR(Hesiod library not found)],$LIBS)]) AC_DEFUN([ATHENA_HESIOD], [AC_ARG_WITH(hesiod, diff --git a/clients/xzwrite/Makefile.in b/clients/xzwrite/Makefile.in index 6641df6..7ece4a9 100644 --- a/clients/xzwrite/Makefile.in +++ b/clients/xzwrite/Makefile.in @@ -9,7 +9,7 @@ lsbindir=@lsbindir@ top_builddir=../.. includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin diff --git a/clients/zaway/Makefile.in b/clients/zaway/Makefile.in index ebee5af..689e4dd 100644 --- a/clients/zaway/Makefile.in +++ b/clients/zaway/Makefile.in @@ -9,7 +9,7 @@ lsbindir=@lsbindir@ top_builddir=../.. includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin diff --git a/clients/zctl/Makefile.in b/clients/zctl/Makefile.in index 0540927..f84e048 100644 --- a/clients/zctl/Makefile.in +++ b/clients/zctl/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/zleave/Makefile.in b/clients/zleave/Makefile.in index cff622f..a16ff18 100644 --- a/clients/zleave/Makefile.in +++ b/clients/zleave/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/zlocate/Makefile.in b/clients/zlocate/Makefile.in index fe88f0e..1f84150 100644 --- a/clients/zlocate/Makefile.in +++ b/clients/zlocate/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/zmailnotify/Makefile.in b/clients/zmailnotify/Makefile.in index 0461a60..fc38fea 100644 --- a/clients/zmailnotify/Makefile.in +++ b/clients/zmailnotify/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/znol/Makefile.in b/clients/znol/Makefile.in index 969e44b..aa01641 100644 --- a/clients/znol/Makefile.in +++ b/clients/znol/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/zpopnotify/Makefile.in b/clients/zpopnotify/Makefile.in index 020a181..55c63b6 100644 --- a/clients/zpopnotify/Makefile.in +++ b/clients/zpopnotify/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/zshutdown_notify/Makefile.in b/clients/zshutdown_notify/Makefile.in index f619a09..9df06c0 100644 --- a/clients/zshutdown_notify/Makefile.in +++ b/clients/zshutdown_notify/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/zstat/Makefile.in b/clients/zstat/Makefile.in index d5aae02..1ffdf1b 100644 --- a/clients/zstat/Makefile.in +++ b/clients/zstat/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/clients/zwrite/Makefile.in b/clients/zwrite/Makefile.in index 304f268..62f656d 100644 --- a/clients/zwrite/Makefile.in +++ b/clients/zwrite/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=../.. diff --git a/configure.in b/configure.in index db07e50..c894ab8 100644 --- a/configure.in +++ b/configure.in @@ -76,6 +76,7 @@ AC_SEARCH_LIBS(socket, socket) if test "$hesiod" != "no"; then AC_CHECK_LIB(44bsd, strerror) AC_CHECK_LIB(resolv, res_send) + AC_CHECK_LIB(resolv, __res_send) fi AC_CHECK_LIB(curses, tgetstr, [TLIB=-lcurses], [TLIB=-ltermcap]) diff --git a/debian/acl/class-registry.acl b/debian/acl/class-registry.acl new file mode 100644 index 0000000..272e138 --- /dev/null +++ b/debian/acl/class-registry.acl @@ -0,0 +1,9 @@ +wg_ctl: +hm_ctl: +hm_stat: +locate: +login: +zephyr_admin: +zephyr_ctl: +zmatch_all: +operations: diff --git a/debian/acl/iui-hm_ctl.acl b/debian/acl/iui-hm_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iui-hm_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iui-hm_stat.acl b/debian/acl/iui-hm_stat.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iui-hm_stat.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iui-login.acl b/debian/acl/iui-login.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iui-login.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iui-operations.acl b/debian/acl/iui-operations.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/iui-operations.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/acl/iui-user_locate.acl b/debian/acl/iui-user_locate.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iui-user_locate.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iui-wg_ctl.acl b/debian/acl/iui-wg_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iui-wg_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iui-zephyr_admin.acl b/debian/acl/iui-zephyr_admin.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iui-zephyr_admin.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iui-zephyr_ctl.acl b/debian/acl/iui-zephyr_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iui-zephyr_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iws-hm_ctl.acl b/debian/acl/iws-hm_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iws-hm_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iws-hm_stat.acl b/debian/acl/iws-hm_stat.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iws-hm_stat.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iws-login.acl b/debian/acl/iws-login.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iws-login.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iws-operations.acl b/debian/acl/iws-operations.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/iws-operations.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/acl/iws-user_locate.acl b/debian/acl/iws-user_locate.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iws-user_locate.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iws-wg_ctl.acl b/debian/acl/iws-wg_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iws-wg_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iws-zephyr_admin.acl b/debian/acl/iws-zephyr_admin.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iws-zephyr_admin.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/iws-zephyr_ctl.acl b/debian/acl/iws-zephyr_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/iws-zephyr_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/sub-hm_ctl.acl b/debian/acl/sub-hm_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/sub-hm_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/sub-hm_stat.acl b/debian/acl/sub-hm_stat.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/sub-hm_stat.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/sub-login.acl b/debian/acl/sub-login.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/sub-login.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/acl/sub-operations.acl b/debian/acl/sub-operations.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/sub-operations.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/acl/sub-user_locate.acl b/debian/acl/sub-user_locate.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/sub-user_locate.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/acl/sub-wg_ctl.acl b/debian/acl/sub-wg_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/sub-wg_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/sub-zephyr_admin.acl b/debian/acl/sub-zephyr_admin.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/sub-zephyr_admin.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/sub-zephyr_ctl.acl b/debian/acl/sub-zephyr_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/sub-zephyr_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/xmt-hm_ctl.acl b/debian/acl/xmt-hm_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/xmt-hm_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/xmt-hm_stat.acl b/debian/acl/xmt-hm_stat.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/xmt-hm_stat.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/xmt-login.acl b/debian/acl/xmt-login.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/xmt-login.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/acl/xmt-operations.acl b/debian/acl/xmt-operations.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/xmt-operations.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/xmt-user_locate.acl b/debian/acl/xmt-user_locate.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/xmt-user_locate.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/acl/xmt-wg_ctl.acl b/debian/acl/xmt-wg_ctl.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/xmt-wg_ctl.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/xmt-zephyr_admin.acl b/debian/acl/xmt-zephyr_admin.acl new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/acl/xmt-zephyr_admin.acl @@ -0,0 +1 @@ + diff --git a/debian/acl/xmt-zephyr_ctl.acl b/debian/acl/xmt-zephyr_ctl.acl new file mode 100644 index 0000000..74c91fb --- /dev/null +++ b/debian/acl/xmt-zephyr_ctl.acl @@ -0,0 +1 @@ +*.*@* diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..70c5731 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,353 @@ +zephyr (2.1.20070719.SNAPSHOT-1) unstable; urgency=low + + * + + -- + +zephyr (2.1.20010518.SNAPSHOT-18) unstable; urgency=low + + * fix braino in postinst. Closes: #433953 + * Don't mark internal use messages as translatable. Closes: #413237 + * Galician translation. Closes: #412802 + * Dutch translation. Closes: #413876 + * Portugese translation. Closes: #414817 + * Updates Spanish translatoin. Closes: #420839 + + * Package supports using hesiod to find zephyr servers. Closes: #174535 + * Package does not fail to configure if the daemon won't start. Closes: #120421 + * zhm shouldn't hang for ever if it can't find a server on startup. Closes: #433602 + + * remove DH_COMPAT setting and update substvars to placate lintian. + + -- Karl Ramm <kcr@debian.org> Thu, 19 Jul 2007 04:31:53 -0400 + +zephyr (2.1.20010518.SNAPSHOT-17.1) unstable; urgency=low + + * Non-maintainer upload to fix l10n issues + * Debconf translation updates: + - German. Closes: #396775 + - French. Closes: #395978 + - Russian. Closes: #404414 + + -- Christian Perrier <bubulle@debian.org> Sat, 20 Jan 2007 19:47:23 +0100 + +zephyr (2.1.20010518.SNAPSHOT-17) unstable; urgency=low + + * Fix build-depends for seemlingly oddly picky autobuilders. + Closes: #393579 + + -- Karl Ramm <kcr@debian.org> Tue, 17 Oct 2006 21:09:06 -0400 + +zephyr (2.1.20010518.SNAPSHOT-16) unstable; urgency=low + + * Tweak zhm and postinst scripts to not flush subs on restart. + (it will happen one last time on upgrade, sorry) + Closes: #148870 + * Avoid possible doubling of zephyr-server name in configuration. + Closes: #177477 + * Add Swedish debconf template. Closes: #343756 + * Update Spanish debconf template. Closes: #385052 + * Fixup build-depends for new X world. + * Make debconf templates lintian compliant (short titles instead of + questions, "for internal use" instead of "You should never see this") + * LSB init info + * invoke init.d scripts properly + * Assert Standards-Version: 3.7.2 + + -- Karl Ramm <kcr@debian.org> Mon, 16 Oct 2006 02:41:22 -0400 + +zephyr (2.1.20010518.SNAPSHOT-15) unstable; urgency=low + + * fix X build-deps for upcoming xorg transition. Closes: #346863 + * (also add back a | libreadline4-dev for my own convenience) + + -- Karl Ramm <kcr@debian.org> Tue, 10 Jan 2006 00:44:13 -0500 + +zephyr (2.1.20010518.SNAPSHOT-14) unstable; urgency=low + + * Fix libzephyr-dev override disparity. + * DH_COMPAT=4 + * build against libreadline5-dev. Closes: #326280 + * Cleanup /etc/zephyr/server.list on purge. Closes: #333280 + * Add Vietnamese debconf translation. Closes: #324283 + + -- Karl Ramm <kcr@debian.org> Mon, 28 Nov 2005 19:52:00 -0500 + +zephyr (2.1.20010518.SNAPSHOT-13) unstable; urgency=low + + * Add alternate dependency on zephyr-2.0 + * Fix brain-damage in package description. Closes: #218079 + (libzephyr3 was misidentified as having kerberos support, and + libzephyr3-krb was not identified as such.) + + -- Karl Ramm <kcr@debian.org> Thu, 11 Aug 2005 09:36:28 -0400 + +zephyr (2.1.20010518.SNAPSHOT-12) unstable; urgency=low + + * Acknowledge NMU. + * Now using svn repository at svn://svn.1ts.org/debian. (For obscure + reasons, the debian packages come from the branch at + <svn://svn.1ts.org/debian/branches/pre_sourceforge_packages/zephyr>.) + * Don't use SO_BSDCOMPAT anymore; it logs annoying messages. + * Update config.guess and config.sub from autotools-dev 20050324.2. + Closes: #294147 + + -- Karl Ramm <kcr@debian.org> Sat, 23 Apr 2005 14:35:38 -0400 + +zephyr (2.1.20010518.SNAPSHOT-11.2) unstable; urgency=low + + * Non-maintainer upload to incorporate the forgotten + Brazilian Portuguese translation + * Debconf translations + - Added Brazilian Portuguese. Closes: #300822 + + -- Christian Perrier <bubulle@debian.org> Tue, 29 Mar 2005 06:52:28 +0200 + +zephyr (2.1.20010518.SNAPSHOT-11.1) unstable; urgency=low + + * Non-maintainer upload to fix the longstanding switch to + po-debconf suggestion. Closes: #199684 + * Debconf translations: + - French added. Closes: #200444 + - German added. + - Czech added. + + -- Christian Perrier <bubulle@debian.org> Fri, 11 Mar 2005 18:42:28 +0100 + +zephyr (2.1.20010518.SNAPSHOT-11) unstable; urgency=low + + * Fix to build with latest krb5: + - kopt defines swap_u_long + - Remove far from pointers in kopt + * Add Sam Hartman to uploaders, with permission of maintainer + + -- Sam Hartman <hartmans@debian.org> Sat, 5 Jul 2003 21:18:10 -0400 + +zephyr (2.1.20010518.SNAPSHOT-10) unstable; urgency=low + + * Attack of the Standards-Version continues. + * versioned debhelper depend. + * add debhelper toked to zephyr-clients.preinst + * update config.{guess,sub} from autotools-dev 20030110.1 + + -- Karl Ramm <kcr@debian.org> Sun, 27 Apr 2003 16:22:27 -0400 + +zephyr (2.1.20010518.SNAPSHOT-9) unstable; urgency=low + + * depend on libxaw7-dev, closes: #169990 + * Fix miraculously appearing syntax problem in decade-old yacc code. + closes: #167056 + * do not depend on libzephyr-dev, which is an utterly crackheaded + thing to do. + + -- Karl Ramm <kcr@debian.org> Sun, 24 Nov 2002 21:17:33 -0500 + +zephyr (2.1.20010518.SNAPSHOT-8) unstable; urgency=low + + * Missing build-depends on libhesiod-dev. I cannot begin to describe + how stupid I feel. closes: #148250 + + -- Karl Ramm <kcr@DEBIAN.ORG> Mon, 27 May 2002 21:31:32 -0400 + +zephyr (2.1.20010518.SNAPSHOT-7) unstable; urgency=low + + * Stop using some egregious ?roff hacks in the zwgc man page that seem + to be not quite compatible with either groff or groff's -man + implementation. closes: #134480 + * Fix shlibs file for libzephyr3-krb so that depending packages end up + pointing at libzephyr3 instead. closes: #148175 + * Add dependency on the shared library to the -dev package. + <slaps self on forehead> closes: #110486 + * Add Russian translation for zephyr-server. closes: #136936 + * Add Russian translation for zephyr-clients. closes: #138326 + * Hack the server so that it still checks the server.list file even when + built with Hesiod. + * Build with hesiod. closes: #99011 + + -- Karl Ramm <kcr@debian.org> Sun, 26 May 2002 17:05:03 -0400 + +zephyr (2.1.20010518.SNAPSHOT-6) unstable; urgency=low + + * Second try at placating the ia64 autobuilders. Why they weren't + building non-US, I don't know... closes: #142951 + + -- Karl Ramm <kcr@debian.org> Tue, 16 Apr 2002 04:11:33 -0400 + +zephyr (2.1.20010518.SNAPSHOT-5) unstable; urgency=low + + * (hopefully) fix build problem on ia64, closes: #142650 + + -- Karl Ramm <kcr@debian.org> Sun, 14 Apr 2002 02:27:50 -0400 + +zephyr (2.1.20010518.SNAPSHOT-4) unstable; urgency=low + + * moved into main + * flesh out extended descriptions in control file, closes: #135513 + + -- Karl Ramm <kcr@debian.org> Tue, 2 Apr 2002 01:05:32 -0500 + +zephyr (2.1.20010518.SNAPSHOT-3) unstable; urgency=low + + * hopefully build non-Kerberos packages successfully, closes: #106610 + * clean up zephyr-server.init slightly, closes: #106751 + * Spanish translation for zephyr-server debconf, closes #106573, #106572 + * Spanish translation for zephyr-clients debconf, closes #106571 + * include hints for people trying to use zephyr-server-krb, closes: #106852 + * attempt to get some small bits of documentation into + /usr/share/doc/... + * fix formatting bug. closes: #116389 + + -- Karl Ramm <kcr@debian.org> Sun, 21 Oct 2001 15:27:08 -0400 + +zephyr (2.1.20010518.SNAPSHOT-2) unstable; urgency=low + + * On linux/alpha, longs are 8 octets, not 4. Thus, timeval is sixteen + octets, not eight. Unfortunately, part of the protocol is coded in + terms of sizeof (struct timeval), and another part in terms of a + sizeof(long). Work around with ints. closes: #99158 + * streamline server config script + * have client config script check for existence of /etc/zephyr/servers.list + + -- Karl Ramm <kcr@debian.org> Wed, 25 Jul 2001 06:00:47 -0400 + +zephyr (2.1.20010518.SNAPSHOT-1) unstable; urgency=low + + * fix typo in zephyr-server config script + * make the zephyr-server init script check for a srvtab + * make sure zwgc doesn't define PC or ospeed to keep curses happy + * new upstream version + * update config.{guess,sub} + + -- Karl Ramm <kcr@debian.org> Tue, 3 Jul 2001 16:44:41 -0400 + +zephyr (2.1.20000421.SNAPSHOT-16) unstable; urgency=low + + * fix bugs in zephyr-server config script + * be more explicit about conflicts between kerberized and non-kerberized + versions + + -- Karl Ramm <kcr@debian.org> Tue, 19 Jun 2001 09:54:32 -0400 + +zephyr (2.1.20000421.SNAPSHOT-15) unstable; urgency=low + + * remove the /etc/defaults/zephyr-clients.dpkg-new temporary file + + -- Karl Ramm <kcr@debian.org> Tue, 19 Jun 2001 07:53:14 -0400 + +zephyr (2.1.20000421.SNAPSHOT-14) unstable; urgency=low + + * Fix typo, closes: #100465 [hartmans] + + -- Sam Hartman <hartmans@debian.org> Sun, 10 Jun 2001 23:21:32 -0400 + +zephyr (2.1.20000421.SNAPSHOT-13) unstable; urgency=low + + * The lucky version. No warranty express or implied. YMMV. + * zephyr-server should have a default.subscriptions file now, closes: #94125 + * libzephyr3-krb and zephyr-server-krb now depend on krb4-config, should + improve out-of-box functionality + * alter init script to print a message and exit 0 if no zephyr servers + were specified. closes: #96723 + * rework debconf stuff to be more clever about where the data is coming from. + + -- Karl Ramm <kcr@debian.org> Sun, 10 Jun 2001 07:29:56 -0400 + +zephyr (2.1.20000421.SNAPSHOT-12) unstable; urgency=low + + * libzephyr-dev failed to have any files in it... and no one noticed. + * pull down a new config.guess and config.sub while we're at it. + + -- Karl Ramm <kcr@debian.org> Wed, 16 May 2001 10:33:07 -0400 + +zephyr (2.1.20000421.SNAPSHOT-11) unstable; urgency=low + + * tweak to kopt.c to maybe allow alpha build to work. closes: #94600 + * build shlibs using gcc, and against the latest krb5. closes: #93779 + + -- Karl Ramm <kcr@1TS.ORG> Tue, 24 Apr 2001 16:32:52 -0400 + +zephyr (2.1.20000421.SNAPSHOT-10) unstable; urgency=low + + * [hartmans] libzephyr3 should not depend on krb5, closes: #93187 + * maybe run "/etc/init.d/zhm stop" in the preinst script, closes: #93349 + + -- Karl Ramm <kcr@1TS.ORG> Sat, 14 Apr 2001 21:37:09 -0400 + +zephyr (2.1.20000421.SNAPSHOT-9) unstable; urgency=low + + * New maintainer, closes: #92061 + * This builds with glibc2.2, closes: #86183 + * This builds with Sam's MIT krb5 packages, closes: #40001, #40215 + * There are now kerberized shared libraries, thanks to Sam, closes: #56691 + * zaway works for me, closes: #76302 + * build-depends fixed in packaging new version, + closes: #72006, #74371, #84558 + * drop dummy zephyr-client package + * rename /etc/init.d/zephyr-clients to /etc/init.d/zhm + * rename /etc/init.d/zephyr-server to /etc/init.d/zephyrd + * rename /etc/init.d/zephyr-server-krb to /etc/init.d/zephyr.d + * fix build dependencies + * make config files in /etc/zephyr not installed executable + * cleanup debhelper examples + * actually build position-independent shared libraries + + -- Karl Ramm <kcr@1TS.ORG> Tue, 3 Apr 2001 01:16:56 -0400 + +zephyr (2.1.20000421.SNAPSHOT-8) unstable; urgency=low + + * zephyr-client -> zephyr-clients + * Produce libzephyr3 package and used shared libs + * Clean up debian/rules to only call movefiles once + * Depend on libxaw-dev for sid/woody + * Support both Kerberos and non-Kerberos + * Add dummy zephyr-client package to phase upgrades. + + -- Sam Hartman <hartmans@mit.edu> Wed, 28 Mar 2001 18:19:32 -0500 + +zephyr (2.1.20000421.SNAPSHOT-7) unstable; urgency=low + + * Fix incorrect potato build-depends (xlib6g-dev instead of xlib6g) + + -- Karl Ramm <kcr@1TS.ORG> Sat, 24 Feb 2001 11:40:12 -0500 + +zephyr (2.1.20000421.SNAPSHOT-6) unstable; urgency=low + + * get the acl stuff right, so it goes into the source package + * remove the zmatch_all acl + + -- Karl Ramm <kcr@1ts.org> Tue, 20 Feb 2001 01:24:03 -0500 + +zephyr (2.1.20000421.SNAPSHOT-5) unstable; urgency=low + + * fix braino in my debconf stuff. + + -- Karl C. Ramm <kcr@permabit.com> Wed, 7 Feb 2001 17:18:45 -0500 + +zephyr (2.1.20000421.SNAPSHOT-4) unstable; urgency=low + + * rename /etc/zephyr/zephyr.conf to /etc/default/zephyr-client + * fix bug in zephyr-client postinst + + -- Karl C. Ramm <kcr@permabit.com> Wed, 7 Feb 2001 17:00:51 -0500 + +zephyr (2.1.20000421.SNAPSHOT-3) unstable; urgency=low + + * make the acl files on the server actually work + * make zwgc look in the light place for zephyr.vars + * in short, fix everything from -2. + + -- Karl C. Ramm <kcr@permabit.com> Wed, 7 Feb 2001 15:06:10 -0500 + +zephyr (2.1.20000421.SNAPSHOT-2) unstable; urgency=low + + * add acl files to the server + * add zephyr.vars file to the client + + -- Karl C. Ramm <kcr@permabit.com> Tue, 2 Jan 2001 13:13:01 -0500 + +zephyr (2.1.20000421.SNAPSHOT-1) unstable; urgency=low + + * Initial Release. + + -- Karl Ramm <kcr@1ts.org> Mon, 4 Dec 2000 05:28:22 -0500 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..a7d5058 --- /dev/null +++ b/debian/control @@ -0,0 +1,97 @@ +Source: zephyr +Section: net +Priority: optional +Maintainer: Karl Ramm <kcr@debian.org> +Uploaders: Karl Ramm <kcr@debian.org>, Sam Hartman <hartmans@debian.org> +Build-Depends: debhelper (>= 4), libares-dev, libkrb5-dev (>= 1.2.2-4), comerr-dev, ss-dev, libreadline5-dev, libx11-dev, libxt-dev, x-dev, libxaw7-dev | libxaw8-dev, libxmu-dev, libncurses5-dev, bison, libhesiod-dev +Standards-Version: 3.7.2.2 + +Package: libzephyr3 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: libzephyr3-krb +Description: The original "Instant Message" system libraries without Kerberos + This is the Project Athena Zephyr notification system 2000/04/21 snapshot. + Zephyr allows users to send messages to other users or to groups of + users. Users can view incoming Zephyr messages as windowgrams + (transient X windows) or as text on a terminal. + +Package: libzephyr3-krb +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, krb4-config +Conflicts: libzephyr3 +Provides: libzephyr3 +Description: The original "Instant Message" system libraries with Kerberos + This version of the library uses Kerberos for message authentication. + . + This is the Project Athena Zephyr notification system 2000/04/21 snapshot. + Zephyr allows users to send messages to other users or to groups of + users. Users can view incoming Zephyr messages as windowgrams + (transient X windows) or as text on a terminal. + +Package: zephyr-clients +Section: net +Replaces: zephyr-client +Architecture: any +Depends: ${shlibs:Depends}, debianutils (>= 1.6), debconf | debconf-2.0 +Description: The original "Instant Message" system client + This package only contains the clients; you'll need a server to talk to. + . + This is the Project Athena Zephyr notification system 2000/04/21 snapshot. + Zephyr allows users to send messages to other users or to groups of + users. Users can view incoming Zephyr messages as windowgrams + (transient X windows) or as text on a terminal. + +Package: zephyr-server +Section: net +Architecture: any +Depends: ${shlibs:Depends}, debconf | debconf-2.0 +Conflicts: zephyr-server-krb +Description: The original "Instant Message" system-server without Kerberos + You probably only need one server for a group of clients. + This can be a memory-intensive server, especially for very large sites. + . + The server maintains a location and subscription database for all the + receiving clients. All zephyrgrams are sent to the server to be routed + to the intended recipient. + . + This is the Project Athena Zephyr notification system 2000/04/21 snapshot. + Zephyr allows users to send messages to other users or to groups of + users. Users can view incoming Zephyr messages as windowgrams + (transient X windows) or as text on a terminal. + +Package: zephyr-server-krb +Section: net +Architecture: any +Depends: ${shlibs:Depends}, debconf | debconf-2.0, libzephyr3-krb +Conflicts: zephyr-server +Description: The original "Instant Message" system-server with Kerberos + You probably only need one server for a group of clients. + This can be a memory-intensive server, especially for very large sites. + . + The server maintains a location and subscription database for all the + receiving clients. All zephyrgrams are sent to the server to be routed + to the intended recipient. + . + This version of the server uses Kerberos for message authentication. + . + This is the Project Athena Zephyr notification system 2000/04/21 snapshot. + Zephyr allows users to send messages to other users or to groups of + users. Users can view incoming Zephyr messages as windowgrams + (transient X windows) or as text on a terminal. + +Package: libzephyr-dev +Section: libdevel +Architecture: any +Depends: libzephyr3 (= ${binary:Version}) | libzephyr3-krb (= ${binary:Version}), libc6-dev +Description: The original "Instant Message" system development libraries + This package is needed to compile certain other zephyr clients. There are + various other clients available, including a totally gratuitous Motif client, + a Tcl client, several Emacs clients, and a number of X clients. + . + This is the Project Athena Zephyr notification system 2000/04/21 snapshot. + Zephyr allows users to send messages to other users or to groups of + users. Users can view incoming Zephyr messages as windowgrams + (transient X windows) or as text on a terminal. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..5cafbf0 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,31 @@ +This package was debianized by Karl Ramm <kcr@1ts.org> on +Mon, 4 Dec 2000 05:28:22 -0500. + +It was downloaded from ftp://athena-dist.mit.edu/pub/ATHENA/zephyr + +Copyright: + +/* + +Copyright 1987,1988,1995 by the Massachusetts Institute of Technology + +All rights reserved. + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation, and that the name of the Massachusetts +Institute of Technology (M.I.T.) not be used in advertising or publicity +pertaining to distribution of the software without specific, written +prior permission. + +M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING +ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL +M.I.T. BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR +ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + +*/ diff --git a/debian/default.subscriptions b/debian/default.subscriptions new file mode 100644 index 0000000..2ef3863 --- /dev/null +++ b/debian/default.subscriptions @@ -0,0 +1,3 @@ +operations,message,* +message,personal,%me% +message,urgent,%me% diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..ca882bb --- /dev/null +++ b/debian/dirs @@ -0,0 +1,2 @@ +usr/bin +usr/sbin diff --git a/debian/libzephyr-dev.files b/debian/libzephyr-dev.files new file mode 100644 index 0000000..539326d --- /dev/null +++ b/debian/libzephyr-dev.files @@ -0,0 +1,5 @@ +usr/lib/libzephyr.a +usr/lib/libzephyr.so +usr/include/zephyr/mit-copyright.h +usr/include/zephyr/zephyr.h +usr/include/zephyr/zephyr_err.h diff --git a/debian/libzephyr3.files b/debian/libzephyr3.files new file mode 100644 index 0000000..a837249 --- /dev/null +++ b/debian/libzephyr3.files @@ -0,0 +1 @@ +usr/lib/libzephyr.so.* diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in new file mode 100644 index 0000000..8713a70 --- /dev/null +++ b/debian/po/POTFILES.in @@ -0,0 +1,2 @@ +[type: gettext/rfc822deb] zephyr-clients.templates +[type: gettext/rfc822deb] zephyr-server.templates diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 0000000..3764deb --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,86 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2005-03-16 20:16+0100\n" +"Last-Translator: Miroslav Kure <kurem@debian.cz>\n" +"Language-Team: Czech <debian-l10n-czech@debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-2\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Zadejte mezerami oddìlená celá jména va¹ich zephyr serverù (mù¾e to být i " +"podmno¾ina toho, co sdìlujete serverùm)." + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Zadejte mezerami oddìlená celá jména va¹ich zephyr serverù (mù¾e to být i " +"nadmno¾ina toho, co sdìlujete klientùm)." + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Sna¾íme se rozpoznat a zachytit u¾ivatelovy ruèní zmìny v konfiguraèním " +#~ "souboru, co¾ se dìje v konfiguraèním skriptu. Ov¹em v pøípadì " +#~ "pøedkonfigurace je konfiguraèní skript spu¹tìn dvakrát pøed spu¹tìním " +#~ "poinstalaèního skriptu a tudí¾ mù¾eme pøeèíst chybnou hodnotu pøed tím, " +#~ "ne¾ je upravená hodnota zapsána v poinstalaèním kroku. Pokud je to " +#~ "chybnì, pøeskoèíme ètení kofiguraèních souborù a¾ do poinstalaèní fáze." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Pro klienta jste nezadali ¾ádné zephyr servery" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Balíèek zephyr-clients nemá z nìjakého dùvodu nakonfigurován ¾ádný zephyr " +#~ "server. Upravte prosím soubor /etc/default/zephyr-clients a pøidejte do " +#~ "nìj do promìnné zhm_args mezerami oddìlená jména zephyr serverù." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Jaké jsou va¹e zephyr servery?" + +#~ msgid "You should never see this" +#~ msgstr "Toto jste nikdy nemìli vidìt" diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 0000000..602207e --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,89 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +# Tobias Toedter <t.toedter@gmx.net>, 2005, 2006. +msgid "" +msgstr "" +"Project-Id-Version: zephyr\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2006-11-02 21:36+0100\n" +"Last-Translator: Tobias Toedter <t.toedter@gmx.net>\n" +"Language-Team: German <debian-l10n-german@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.2\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "Zephyr-Server:" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Bitte geben Sie die vollständigen Namen Ihrer zephyr-Server durch " +"Leerzeichen getrennt ein. (Beachten Sie, dass dies eine Untermenge von dem " +"sein kann, was Sie den Servern angeben.)" + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Bitte geben Sie die vollständigen Namen Ihrer zephyr-Server durch " +"Leerzeichen getrennt ein. (Beachten Sie, dass dies eine Obermenge von dem " +"sein kann, was Sie den Clients angeben.)" + +#~ msgid "for internal use" +#~ msgstr "Für interne Verwendung" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Es wird versucht, manuelle Änderungen des Benutzers an den " +#~ "Konfigurationsdateien zu erkennen. Aus diesem Grund werden die Dateien " +#~ "mit Hilfe des Konfigurationsskripts angesehen. Allerdings wird dieses " +#~ "Konfigurationsskript im Falle von »preconfigure« zweimal ausgeführt, " +#~ "bevor »postinst« an der Reihe ist. Daher kann es sein, dass ein falscher " +#~ "Wert eingelesen wird, bevor der korrekte Wert während »postinst« " +#~ "geschrieben wird. Falls dies nicht richtig ist, wird das Einlesen von " +#~ "Konfigurationsdateien übersprungen, bis »postinst« ausgeführt wird." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Sie haben keine zephyr-Server für den Client angegeben" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Aus irgendwelchen Gründen wurden im Paket zephyr-clients keine zephyr-" +#~ "Server eingerichtet. Bitte ändern Sie die Datei /etc/default/zephyr-" +#~ "clients und fügen Sie die Namen Ihrer zephyr-Server zur Variablen " +#~ "zhm_args durch Leerzeichen getrennt hinzu." diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 0000000..e72e58e --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,96 @@ +# zephyr debconf translation to spanish +# Copyright (C) 2001, 2006, 2007 Software in the Public Interest +# This file is distributed under the same license as the zephyr package. +# +# Changes: +# - Initial translation +# Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>, 2001, 2006, 2007 +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-17\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2007-04-25 01:00+0200\n" +"Last-Translator: Carlos Valdivia Yagüe <valyag@dat.etsit.upm.es>\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 +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "Servidores zephyr:" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Por favor, introduzca el nombre completo de sus servidores zephyr separados " +"por espacios (tenga en cuenta que puede tratarse de un subconjunto de lo que " +"usted considera como los servidores)." + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Por favor, introduzca los nombres completos de los servidores zephyr " +"separados por espacios (tenga en cuenta que se puede tratar de un conjunto " +"más amplio de lo que usted considera como los clientes)." + +#~ msgid "for internal use" +#~ msgstr "para uso interno" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Para averiguar qué cambios ha realizado el usuario manualmente en el " +#~ "fichero de configuración, es preciso mirar en el fichero que hay en el " +#~ "script de configuración. Sin embargo, si se trata de preconfigurar el " +#~ "paquete, dicho script se ejecuta dos veces antes de que lo haga el " +#~ "posterior a la instalación. De ese modo, es posible obtener un valor " +#~ "equivocado antes de que se guarde después de la instalación el valor " +#~ "editado. Si no es éste el caso, nos saltamos la lectura de los ficheros " +#~ "de configuración hasta que se ejecute el script posterior a la " +#~ "instalación." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "No ha especificado servidores zephyr para el cliente" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Por algún motivo el paquete zephyr-clients no tiene configurado ningún " +#~ "servidor zephyr. Por favor, edite el fichero /etc/default/zephyr-clients " +#~ "y añada los nombres de los servidores zephyr separados por espacios en la " +#~ "variable zhm_args." diff --git a/debian/po/fr.po b/debian/po/fr.po new file mode 100644 index 0000000..92847d7 --- /dev/null +++ b/debian/po/fr.po @@ -0,0 +1,94 @@ +# translation of fr.po to French +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr_2.1.20010518.SNAPSHOT-17\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2006-10-22 10:46+0200\n" +"Last-Translator: Michel Grentzinger <mic.grentz@online.fr>\n" +"Language-Team: French <debian-l10n-french@lists.debian.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=ISO-8859-15\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "Serveurs Zephyr :" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Veuillez indiquer les noms complets de vos serveurs Zephyr, séparés par des " +"espaces (veuillez noter que cette liste peut être un sous-ensemble de ce que " +"vous indiquez aux serveurs)." + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Veuillez indiquer les noms complets de vos serveurs Zephyr, séparés par des " +"espaces (veuillez noter que cela peut être un sur-ensemble de ce que vous " +"indiquez aux clients)." + +#~ msgid "for internal use" +#~ msgstr "Usage interne" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Nous souhaitons essayer de collecter les modifications faites par des " +#~ "utilisateurs lorsqu'ils changent eux-mêmes un fichier de configuration. " +#~ "Pour cela, nous regardons le fichier dans le script de configuration. " +#~ "Cependant lors de la préconfiguration, le script est lancé deux fois " +#~ "avant que le script « postinst » ne soit lancé. Ainsi, nous pouvons lire " +#~ "la mauvaise valeur avant que la valeur modifiée ne soit écrite dans le " +#~ "script « postinst ». Si cela est faux, nous passerons à travers la " +#~ "lecture des fichiers de configuration jusqu'à ce que « postinst » soit " +#~ "lancé." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Aucun serveur Zephyr indiqué pour le client" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Pour une raison quelconque, le paquet zephyr-clients ne contient pas de " +#~ "serveur Zephyr configuré. Veuillez modifier le fichier /etc/default/" +#~ "zephyr-clients et ajouter les noms de vos serveurs Zephyr, séparés par " +#~ "des espaces, dans la variable zhm_args." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Serveurs Zephyr :" + +#~ msgid "You should never see this" +#~ msgstr "Vous ne devriez jamais voir cela" diff --git a/debian/po/gl.po b/debian/po/gl.po new file mode 100644 index 0000000..6cb85ae --- /dev/null +++ b/debian/po/gl.po @@ -0,0 +1,78 @@ +# Galician translation of zephyr's debconf templates +# This file is distributed under the same license as the zephyr package. +# Jacobo Tarrio <jtarrio@debian.org>, 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2007-02-28 10:30+0100\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 +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "Servidores zephyr:" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Escriba os nomes completos dos seus servidores zephyr, separados por " +"espazos. (Teña en conta que isto pode ser un subconxunto do que lles conta " +"aos servidores)" + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Escriba os nomes completos dos seus servidores zephyr, separados por " +"espazos. (Teña en conta que pode ser un superconxunto do que lles di aos " +"clientes)." + +#~ msgid "for internal use" +#~ msgstr "para uso interno" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Preténdes capturar os cambios que fan os usuarios cando modifican " +#~ "manualmente un ficheiro de configuración. Para facelo consúltase o " +#~ "ficheiro no script de configuración. Nembargantes, no caso da " +#~ "preconfiguración, o script de configuración execútase dúas veces antes de " +#~ "executar o script de post-instalación. Polo tanto, pódese ler o valor " +#~ "incorrecto antes de que se grave o valor editado na post-instalación. Se " +#~ "isto é falso omÃtese a lectura de ficheiros de configuración ata que se " +#~ "execute o script de post-instalación." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Non especificou servidores zephyr para o cliente" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Por algún motivo, o paquete zephyr-clients non ten configurado ningún " +#~ "servidor zephyr. Edite o ficheiro /etc/default/zephyr-clients e engada os " +#~ "nomes dos servidores zephyr, separados por espazos, á variable zhm_args." diff --git a/debian/po/nl.po b/debian/po/nl.po new file mode 100644 index 0000000..0832d6d --- /dev/null +++ b/debian/po/nl.po @@ -0,0 +1,89 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2007-02-28 21:28+0100\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" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "Zephyr-servers:" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Gelieve de volledige naam van uw zephyr-servers op te geven gescheiden door " +"spaties (merk op dat dit een subset kan zijn van wat u aan de servers " +"vertelt)." + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Gelieve de volledige namen van uw zephyr-servers op te geven, gescheiden " +"door spaties (merk op dat dit een superset kan zijn van wat u de clients " +"verteld)." + +#~ msgid "for internal use" +#~ msgstr "voor intern gebruik" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Er wordt geprobeerd om gebruikersaanpassingen op te vangen wanneer een " +#~ "configuratiebestand handmatig aangepast wordt. Hiertoe kijkt het " +#~ "'config'-script in het configuratiebestand, maar in het geval van " +#~ "preconfigure wordt dit script tweemaal uitgevoerd voordat het 'postinst'-" +#~ "script gedraaid wordt. Dit kan er toe leiden dat de verkeerde waarde " +#~ "wordt uitgeschreven voordat de aangepaste waarde uitgeschreven wordt in " +#~ "het 'postinst'-script. Als dit onwaar is slaan we het lezen van " +#~ "configuratiebestanden over totdat het 'postinst'-script uitgevoerd is." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "U heeft geen zephyr-servers opgegeven voor de client." + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Het 'zephyr-clients'-pakket heeft om wat voor reden dan ook geen zephyr-" +#~ "servers ingesteld. Gelieve het bestand /etc/default/zephyr-clients aan te " +#~ "passen en de namen van uw zephyr-servers gescheiden door spaties toe te " +#~ "voegen aan de 'zhm_args'-variabele." diff --git a/debian/po/pt.po b/debian/po/pt.po new file mode 100644 index 0000000..b8f9a30 --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,87 @@ +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-17.1\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2007-03-12 21:15+0000\n" +"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n" +"Language-Team: Portuguese <traduz@debianpt.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "Servidores Zephyr:" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Por favor escreva os nomes completos dos seus servidores zephyr, separados " +"por espaços. (note que esta lista pode ser um subconjunto do que diz aos " +"servidores)" + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Por favor escreva os nomes completos dos seus servidores zephyr, separados " +"por espaços. (Note que esta lista pode ser um super-conjunto do que diz aos " +"clientes.)" + +#~ msgid "for internal use" +#~ msgstr "para uso interno" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Tentamos determinar que alterações os utilizadores fazem quando editam um " +#~ "ficheiro de configuração manualmente. Para tal analisamos o ficheiro no " +#~ "script de configuração. No entanto quando há pré-configuração, o script " +#~ "de configuração é corrido duas vezes antes do pós-instalação. Assim " +#~ "podemos ler os valores errados antes que o valor editado seja escrito no " +#~ "pós-instalação. Se esta opção for falsa não analisamos os ficheiros de " +#~ "configuração até que o pós-instalação corra." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Não tem nenhum servidor zephyr especificado para o cliente" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "O pacote zephyr-clients por alguma razão não tem nenhum servidor zephyr " +#~ "configurado. Por favor edite o ficheiro /etc/default/zephyr-clients e " +#~ "adicione os nomes dos seus servidores zephyr, separados por espaços à " +#~ "variável zhm_args." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po new file mode 100644 index 0000000..12ad702 --- /dev/null +++ b/debian/po/pt_BR.po @@ -0,0 +1,91 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# +# +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr 2.1\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2005-03-21 23:30-0300\n" +"Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs." +"org>\n" +"Language-Team: Portuguese/Brazil <debian-l10n-portuguese@listas.cipsga.org." +"br>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"pt_BR\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Por favor digite o nome completo dos seus servidores zephyr, separado por " +"espaços. (note que isso pode ser um subconjunto daquilo que você está " +"dizendo aos servidores)" + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Por favor digite os nomes completos de seus servidores zephyr, separado por " +"espaços. (Note que isso pode ser um subconjunto daquilo que você está " +"dizendo aos clientes.)" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Nós queremos tentar e capturar mudanças de usuários quando eles editam um " +#~ "arquivo de configuração manualmente. Para fazer isso nós olhamos no " +#~ "arquivo do script de configuração. De qualquer forma, no caso de pré-" +#~ "configuração, o script de configuração é executado duas vezes antes do " +#~ "\"postinst\" ser executado. Se isso for falso nós continuamos lendo os " +#~ "arquivos de configuração até que o \"postinst\" seja executado." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Você não tem servidores zephyr especificados para o cliente" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Por uma razão qualquer o pacote zephyr-clients não possui qualquer " +#~ "servidor zephyr configurado. Por favor edite o arquivo /etc/default/" +#~ "zephyr-clients e adicione os nomes dos seus servidores zephyr, separado " +#~ "por espaços na variável zhm_args." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Quais são os seus servidores zephyr?" + +#~ msgid "You should never see this" +#~ msgstr "Você nunca deveria ter visto isso" diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 0000000..87b7a1e --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,91 @@ +# translation of zephyr_2.1.20010518.SNAPSHOT-17_ru.po to Russian +# +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# +# Developers do not need to manually edit POT or PO files. +# +# Unknown, 2003, +# Yuri Kozlov <kozlov.y@gmail.com>, 2006. +msgid "" +msgstr "" +"Project-Id-Version: 2.1.20010518.SNAPSHOT-17\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2006-12-24 18:45+0300\n" +"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\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 +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "Серверы Zephyr:" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Введите полные имена ваших Ñерверов zephyr, разделÑÑ Ð¸Ñ… пробелами. (заметим, " +"что Ñто может быть подмножеÑтвом того, что вы указываете Ñерверам.)" + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Введите полные имена ваших Ñерверов zephyr, разделÑÑ Ð¸Ñ… пробелами. (заметим, " +"что Ñто может быть надмножеÑтвом того, что вы указываете клиентам.)" + +#~ msgid "for internal use" +#~ msgstr "Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ³Ð¾ иÑпользованиÑ" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Мы хотим попробовать захватить пользовательÑкие изменениÑ, когда " +#~ "пользователи редактируют файл наÑтроек вручную. Чтобы Ñто Ñделать, мы " +#~ "Ñмотрим в файл ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ config. Однако в Ñлучае preconfigure, Ñценарий " +#~ "config запуÑкаетÑÑ Ð´Ð²Ð°Ð¶Ð´Ñ‹ до запуÑка postinst. Потому мы можем прочитать " +#~ "неверное значение до того, как отредактированное значение будет запиÑано " +#~ "из postinst. ЕÑли Ñто не удалоÑÑŒ, то мы пропуÑкаем чтение файлов " +#~ "наÑтроек, пока не будет запущен postinst." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Ð’Ñ‹ не указали Ñервера zephyr Ð´Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Пакет zephyr-clients по какой-то причине не наÑтроен ни на один из " +#~ "Ñерверов zephyr. ПожалуйÑта, отредактируйте файл /etc/default/zephyr-" +#~ "clients и добавьте имена ваших Ñерверов zephyr, разделÑÑ Ð¸Ñ… пробелами, в " +#~ "переменную zhm_args." diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 0000000..07d1ff0 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,88 @@ +# Translators, if you are not familiar with the PO format, gettext +# documentation is worth reading, especially sections dedicated to +# this format, e.g. by running: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# Some information specific to po-debconf are available at +# /usr/share/doc/po-debconf/README-trans +# or http://www.debian.org/intl/l10n/po-debconf/README-trans +# Developers do not need to manually edit POT or PO files. +# , fuzzy +# +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-13\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2005-12-17 23:27+0100\n" +"Last-Translator: Daniel Nylander <po@danielnylander.se>\n" +"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Vänligen ange hela namnen för dina zephyr-servrar, separerade med " +"mellanslag. (notera att detta kan vara ett subset av vad du berättar för " +"servrarna)" + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Vänligen ange hela namnen för dina zephyr-servrar, separerade med mellanslag " +"(Notera att detta kan vara ett superset av vad du berättar för klienterna.)" + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Vi vill försöka att fånga in användarändringar när de redigerar en " +#~ "konfigurationsfil manuellt. För att göra dett ser vi på filen i " +#~ "konfigurationsskriptet. Hur som helst, i fallet med förkonfigurationer " +#~ "körs konfigurationsskriptet dubbelt före postinst körs. Därför kan vi " +#~ "läsa av fel värde före det redigerade värdet har skrivits ut i postinst. " +#~ "Om detta är falskt hoppar vi över läsning av konfigurationsfiler tills " +#~ "postinst körs." + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "Du har inga zephyr-servrar angivna för klienten" + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Paketet zephyr-clients har av någon anledning inte några zephyr-servrar " +#~ "konfigurerade. Vänligen redigera filen /etc/default/zephyr-clients och " +#~ "lägg till namnen för din zephyr-servrar i variabeln zhm_args, separera " +#~ "med mellanslag." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Vilka är dina zephyr-servrar?" + +#~ msgid "You should never see this" +#~ msgstr "Du bör aldrig se detta" diff --git a/debian/po/templates.pot b/debian/po/templates.pot new file mode 100644 index 0000000..4a081ae --- /dev/null +++ b/debian/po/templates.pot @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\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" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 0000000..b8462c0 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,84 @@ +# Vietnamese translation for Zephyr. +# Copyright © 2005 Free Software Foundation, Inc. +# Clytie Siddall <clytie@riverland.net.au>, 2005. +# +msgid "" +msgstr "" +"Project-Id-Version: zephyr 2.1.20010518.SNAPSHOT-13\n" +"Report-Msgid-Bugs-To: kcr@debian.org\n" +"POT-Creation-Date: 2007-07-19 04:11-0400\n" +"PO-Revision-Date: 2005-08-21 21:51+0930\n" +"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" +"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0\n" +"X-Generator: LocFactoryEditor 1.2.2\n" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 ../zephyr-server.templates:1001 +msgid "Zephyr servers:" +msgstr "" + +#. Type: string +#. Description +#: ../zephyr-clients.templates:1001 +#, fuzzy +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(note that this can be a subset of what you're telling the servers) If you " +"are using hesiod to advertise your zephyr servers, leave this blank." +msgstr "" +"Hãy gõ tên đầy đủ của các trình phục vụ zephyr của bạn, định giá»›i bằng dấu " +"cách (ghi chú: đây có thể là nhóm con của Ä‘iá»u mà bạn Ä‘ang báo những trình " +"phục vụ)." + +#. Type: string +#. Description +#: ../zephyr-server.templates:1001 +msgid "" +"Please type the full names of your zephyr servers, separated by spaces. " +"(Note that this can be a superset of that you're telling the clients.)" +msgstr "" +"Hãy gõ tên đầy đủ của các trình phục vụ zephyr của bạn, định giá»›i bằng dấu " +"cách (ghi chú: Ä‘iá»u nà y có thể là siêu nhóm của Ä‘iá»u mà bạn Ä‘ang báo những " +"trình khách)." + +#~ msgid "" +#~ "We want to try and capture user changes when they edit a config file " +#~ "manually. To do this we look at the file in the config script. However, " +#~ "in the case of preconfigure, the config script is run twice before the " +#~ "postinst is run. Thus we may read the wrong value before the edited " +#~ "value is written out in postinst. If this is false we skip reading config " +#~ "files until postinst runs." +#~ msgstr "" +#~ "Chúng tôi muốn cố bắt các thay đổi của ngÆ°á»i dùng khi há» hiệu chỉnh táºp " +#~ "tin cấu hình. Äể là m nhÆ° thế, chúng tôi xem táºp tin trong cấu hình. Tuy " +#~ "nhiên, trong trÆ°á»ng hợp cấu hình trÆ°á»›c, có chạy táºp lệnh cấu hình hai lần " +#~ "trÆ°á»›c khi chạy tiến trình cuối cùng cà i đặt. Vì váºy chúng tôi có lẽ sẽ " +#~ "Ä‘á»c giá trị không đúng, trÆ°á»›c khi giá trị đã sá»a đổi được ghi ra trong " +#~ "tiến trình cuối cùng cà i đặt. Nếu giá trị nà y Sai thì cúng tôi bá» qua Ä‘á»c " +#~ "táºp tin cấu hình, đến khi tiến trình cuối cùng cà i đặt có cháy. " + +#~ msgid "You have no zephyr servers specified for the client" +#~ msgstr "" +#~ "Bạn không có trình phục vụ zephyr nà o được xác định cho trình khách." + +#~ msgid "" +#~ "The zephyr-clients package for whatever reason does not have any zephyr " +#~ "servers configured. Please edit the file /etc/default/zephyr-clients and " +#~ "add the names of your zephyr servers, separated by spaces to the zhm_args " +#~ "variable." +#~ msgstr "" +#~ "Gói zephyr-clients (khách zephyr), vì lý do nà o, không có cấu hình trình " +#~ "phục vụ zephyr nà o. Bạn hãy hiệu chỉnh táºp tin </etc/default/zephyr-" +#~ "clients> và thêm tên của các trình phục vụ zephyr bạn, định giá»›i bằng dấu " +#~ "cách đến biến « zhm_args »." + +#~ msgid "What are your zephyr servers?" +#~ msgstr "Bạn có trình phục vụ zephyr nà o?" + +#~ msgid "You should never see this" +#~ msgstr "Bạn không bao giá» nên thấy Ä‘iá»u nà y." diff --git a/debian/rules b/debian/rules new file mode 100644 index 0000000..b9e67b4 --- /dev/null +++ b/debian/rules @@ -0,0 +1,164 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 by Joey Hess. +# +# This version is for a hypothetical package that builds an +# architecture-dependant package, as well as an architecture-independent +# package. + +# 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 +SONAME=3 +CONFIGURE_ROOT=--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc --datadir=/etc --with-ares=/usr --with-hesiod=/usr + +# see /usr/share/doc/autotools-dev/README.Debian.gz +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# FOR AUTOCONF 2.52 AND NEWER ONLY +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + + +# The autotools target adds forced build-time dependencies on +# autotools-dev (for /usr/share/misc/config.*) and devscripts (for dch) +# It's also a .PHONY make target. +autotools: + chmod u+x config.sub + chmod u+x config.guess + OLDDATESUB=`config.sub -t | tr -d -` ;\ + OLDDATEGUESS=`config.guess -t | tr -d -` ;\ + NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\ + NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\ + if [ $$OLDDATESUB -lt $$NEWDATESUB -o \ + $$OLDDATEGUESS -lt $$NEWDATEGUESS ]; then \ + dch -a -p "GNU config automated update: config.sub\ + ($$OLDDATESUB to $$NEWDATESUB), config.guess\ + ($$OLDDATEGUESS to $$NEWDATEGUESS)" ;\ + cp -f /usr/share/misc/config.sub config.sub ;\ + cp -f /usr/share/misc/config.guess config.guess ;\ + echo WARNING: GNU config scripts updated from master copies 1>&2 ;\ + fi + +configure: configure-stamp autotools +configure-stamp: + dh_testdir + # Add here commands to configure the package. + -mkdir krb + cd krb&&../configure --with-krb4=/usr $(CONFIGURE_ROOT) + -mkdir no-krb + cd no-krb&&../configure $(CONFIGURE_ROOT) + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + set -e; \ + for dir in krb no-krb ; do \ + cd $$dir; \ + rm -f lib/*.o || true; \ + $(MAKE) -C lib \ + FPIC= \ + LIBEXT=a; \ + rm -f lib/*.o; \ + $(MAKE) LIBEXT=so \ + FPIC=-fpic SONAME=$(SONAME); \ + cd ..; \ + done + + touch build-stamp + +clean: + dh_testdir + dh_testroot + -rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -rm -rf krb no-krb debian/tmp-krb + -rm debian/zephyr-server-krb.files + -rm debian/zephyr-server-krb.templates + -rm debian/zephyr-server-krb.config + -rm debian/zephyr-server-krb.postinst + -rm debian/libzephyr3-krb.files + + dh_clean + +install: DH_OPTIONS= +install: build + dh_testdir + dh_testroot + dh_clean -k + -rm -rf debian/tmp-krb + dh_installdirs + + # Add here commands to install the package into debian/tmp. + cd no-krb&&$(MAKE) install DESTDIR=`pwd`/../debian/tmp + cd krb&&$(MAKE) DESTDIR=`pwd`/../debian/tmp-krb install + mv debian/tmp/usr/lib/libzephyr.so debian/tmp/usr/lib/libzephyr.so.$(SONAME) + ln -s libzephyr.so.$(SONAME) debian/tmp/usr/lib/libzephyr.so + mv debian/tmp-krb/usr/lib/libzephyr.so debian/tmp-krb/usr/lib/libzephyr.so.$(SONAME) + ln -s libzephyr.so.$(SONAME) debian/tmp-krb/usr/lib/libzephyr.so + mkdir -p debian/tmp/etc/zephyr/acl + set -x; for i in debian/acl/*; do install -c -m 644 -o root $$i debian/tmp/etc/zephyr/acl; done; set +x + install -c -m 644 debian/zephyr.vars debian/tmp/etc/zephyr + install -c -m 644 debian/default.subscriptions debian/tmp/etc/zephyr + cp -pr debian/tmp/etc/zephyr/acl debian/tmp-krb/etc/zephyr + +# Build architecture-independent files here. +# Pass -i to all debhelper commands in this target to reduce clutter. +binary-indep: build install + +# Build architecture-dependent files here. +# Pass -a to all debhelper commands in this target to reduce clutter. +binary-arch: build install + dh_testdir + dh_testroot + set -e; \ + for file in files templates config postinst docs; do \ + cp debian/zephyr-server.$$file debian/zephyr-server-krb.$$file; \ + done + cp debian/libzephyr3.files debian/libzephyr3-krb.files + dh_movefiles -plibzephyr3 -pzephyr-clients -pzephyr-server -plibzephyr-dev + dh_movefiles --sourcedir=debian/tmp-krb -plibzephyr3-krb -pzephyr-server-krb + dh_installdebconf + dh_installdocs +# dh_installexamples +# dh_installmenu +# dh_installemacsen +# dh_installpam + dh_installinit -pzephyr-clients --init-script=zhm --no-start + dh_installinit -pzephyr-server-krb --init-script=zephyrd + dh_installinit -pzephyr-server --init-script=zephyrd +# dh_installcron +# dh_installmanpages +# dh_installinfo +# dh_undocumented + dh_installchangelogs + dh_strip +# dh_link + dh_compress + dh_fixperms + # You may want to make some executables suid here. + dh_makeshlibs + # sigh + cp debian/libzephyr3/DEBIAN/shlibs debian/libzephyr3-krb/DEBIAN/shlibs + dh_shlibdeps + dh_installdeb +# dh_perl + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: autotools build clean binary-indep binary-arch binary install configure + + diff --git a/debian/zephyr-clients.config b/debian/zephyr-clients.config new file mode 100644 index 0000000..643eb7f --- /dev/null +++ b/debian/zephyr-clients.config @@ -0,0 +1,42 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule +db_version 2.0 + +db_get zephyr-clients/servers || true +if test -z "$RET" +then + # If there's an /etc/zephyr/server.list file lying around, read it + if test -f /etc/zephyr/server.list + then + z="`cat /etc/zephyr/server.list`" + + if test -n "$z" + then + db_set zephyr-clients/servers "$z" + fi + else + # if there happens to be zephyr server decconf on this machine, + # see what its debconf knows about zephyr servers... + if db_get zephyr-server/servers && test -n "$RET" + then + db_set zephyr-clients/servers $RET + fi + fi +fi + +db_get zephyr-clients/read_conf +if test -f /etc/default/zephyr-clients -a \( "$RET" = true \) +then + zhm_args="" + . /etc/default/zephyr-clients + if test -n "$zhm_args" + then + db_set zephyr-clients/read_conf false + db_set zephyr-clients/servers "$zhm_args" + fi +fi + +db_input high zephyr-clients/servers || true + +db_go diff --git a/debian/zephyr-clients.docs b/debian/zephyr-clients.docs new file mode 100644 index 0000000..a70b3c8 --- /dev/null +++ b/debian/zephyr-clients.docs @@ -0,0 +1 @@ +USING diff --git a/debian/zephyr-clients.files b/debian/zephyr-clients.files new file mode 100644 index 0000000..afc8fe2 --- /dev/null +++ b/debian/zephyr-clients.files @@ -0,0 +1,32 @@ +usr/bin/xzwrite +usr/bin/zaway +usr/bin/zctl +usr/bin/zleave +usr/bin/zlocate +usr/bin/zmailnotify +usr/bin/znol +usr/bin/zstat +usr/bin/zwrite +usr/bin/zwgc +usr/sbin/zpopnotify +usr/sbin/zshutdown_notify +usr/sbin/zhm +usr/share/man/man1/zephyr.1 +usr/share/man/man1/xzwrite.1 +usr/share/man/man1/zaway.1 +usr/share/man/man1/zctl.1 +usr/share/man/man1/zleave.1 +usr/share/man/man1/zlocate.1 +usr/share/man/man1/zmailnotify.1 +usr/share/man/man1/znol.1 +usr/share/man/man1/zwrite.1 +usr/share/man/man1/zwgc.1 +usr/share/man/man8/zpopnotify.8 +usr/share/man/man8/zshutdown_notify.8 +usr/share/man/man8/zstat.8 +usr/share/man/man8/zhm.8 +etc/zephyr/XZwrite +etc/zephyr/xzwrite.bitmap +etc/zephyr/zwgc.desc +etc/zephyr/zwgc_resources +etc/zephyr/zephyr.vars diff --git a/debian/zephyr-clients.init b/debian/zephyr-clients.init new file mode 100644 index 0000000..d329ae7 --- /dev/null +++ b/debian/zephyr-clients.init @@ -0,0 +1,75 @@ +#! /bin/sh +# +# skeleton example file to build /etc/init.d/ scripts. +# This file should be used to construct scripts for /etc/init.d. +# +# Written by Miquel van Smoorenburg <miquels@cistron.nl>. +# Modified for Debian GNU/Linux +# by Ian Murdock <imurdock@gnu.ai.mit.edu>. +# +# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl +# +# This file was automatically customized by dh-make on Mon, 4 Dec 2000 05:28:22 -0500 + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/zhm +NAME=zhm +DESC="zephyr host manager" + +test -f $DAEMON || exit 0 + +set -e + +if test -f /etc/default/zephyr-clients +then + . /etc/default/zephyr-clients +fi + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON -- $zhm_args + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --oknodo --stop --quiet --pidfile /var/run/$NAME.pid \ + --exec $DAEMON + echo "$NAME." + ;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: " + start-stop-daemon --oknodo --stop --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- -N $zhm_args + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 + +### BEGIN INIT INFO +# Provides: zhm +# Required-Start: $syslog $network +# Required-Stop: $syslog +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the zephyr host manager daemon. +# Description: Start the zephyr host manager daemon. +### END INIT INFO + diff --git a/debian/zephyr-clients.postinst b/debian/zephyr-clients.postinst new file mode 100644 index 0000000..40ff3c2 --- /dev/null +++ b/debian/zephyr-clients.postinst @@ -0,0 +1,84 @@ +#! /bin/sh +# postinst script for zephyr +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see /usr/share/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + + . /usr/share/debconf/confmodule + db_version 2.0 + + db_set zephyr-clients/read_conf true + + if test -f /etc/zephyr/zephyr.conf + then + if test ! -f /etc/default/zephyr-clients + then + mv /etc/zephyr/zephyr.conf /etc/default/zephyr-clients + fi + fi + + # if /etc/default/zephyr-clients already exists and has a zhm_args + # line, the config script should have sucked it into debconf + db_get zephyr-clients/servers + + tmpfile=/etc/default/zephyr-client.dpkg-new + if test -f /etc/default/zephyr-clients + then + grep -v ^zhm_args /etc/default/zephyr-clients > $tmpfile || true + else + cat > $tmpfile << EOF +# This file is automatically rewritten by the zephyr-clients post-install +# script. So treat it right. +EOF + fi + echo zhm_args=\"${RET}\" >> $tmpfile + cat $tmpfile > /etc/default/zephyr-clients + rm $tmpfile + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +if [ -x "/etc/init.d/zhm" ]; then + # this script does not necessarily fail if these do + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d zhm restart + else + /etc/init.d/zhm restart + fi +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/zephyr-clients.prerm b/debian/zephyr-clients.prerm new file mode 100644 index 0000000..69beaac --- /dev/null +++ b/debian/zephyr-clients.prerm @@ -0,0 +1,49 @@ +#! /bin/sh +# prerm script for zephyr-client +# +# see: dh_installdeb(1) + +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 + deconfigure|remove) + rm /etc/default/zephyr-clients || true + ;; + upgrade) +# remove|upgrade|deconfigure) +# install-info --quiet --remove /usr/info/zephyr.info.gz + ;; + failed-upgrade) + ;; + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +if [ -x "/etc/init.d/zhm" ] && [ "$1" = remove ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d zhm stop || exit $? + else + /etc/init.d/zhm stop || exit $? + fi +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/zephyr-clients.templates b/debian/zephyr-clients.templates new file mode 100644 index 0000000..9b85e80 --- /dev/null +++ b/debian/zephyr-clients.templates @@ -0,0 +1,18 @@ +Template: zephyr-clients/servers +Type: string +_Description: Zephyr servers: + Please type the full names of your zephyr servers, separated by spaces. + (note that this can be a subset of what you're telling the servers) + If you are using hesiod to advertise your zephyr servers, leave this + blank. + +Template: zephyr-clients/read_conf +Type: boolean +Default: true +Description: for internal use + We want to try and capture user changes when they edit a config file + manually. To do this we look at the file in the config script. However, + in the case of preconfigure, the config script is run twice before the + postinst is run. Thus we may read the wrong value before the edited value + is written out in postinst. If this is false we skip reading config files + until postinst runs. diff --git a/debian/zephyr-server-krb.README.Debian b/debian/zephyr-server-krb.README.Debian new file mode 100644 index 0000000..4b03c1d --- /dev/null +++ b/debian/zephyr-server-krb.README.Debian @@ -0,0 +1,30 @@ +To run a zephyr server with MIT Kerberos support, you need to generate a +Kerberos IV srvtab for the principal zephyr.zephyr@YOUR.REALM.NAME. + +Doing this with the MIT Kerberos V server is a somewhat convoluted process, +but here we go: + +[Note that this presumes that you have Kerberos administrator privileges, if +you don't, find someone who does.] + +At the kadmin prompt, type + +ank -randkey zephyr/zephyr + +this creates the Kerberos principal, with whatever key types and cryptosystems +your realm defaults to. Next, also at the kadmin prompt, type the following +substituting appropriately for your realm name and various file locations: + +xst -k /tmp/keytab -e des-cbc-crc:v4 zephyr/zephyr@YOUR.REALM.NAME + +The key type is necessary because zephyr uses an older version of Kerberos +that used only single-DES. Now run ktutil: + +rkt /tmp/keytab +wst /etc/zephyr/srvtab +q + +You now want to make sure that the /tmp/keytab file is written-over and +removed. Fortunately, you have Kerberos, you have kdestroy. + +env KRB5CCNAME=/tmp/keytab kdestroy diff --git a/debian/zephyr-server-krb.docs b/debian/zephyr-server-krb.docs new file mode 100644 index 0000000..a3a5154 --- /dev/null +++ b/debian/zephyr-server-krb.docs @@ -0,0 +1 @@ +OPERATING diff --git a/debian/zephyr-server-krb.init b/debian/zephyr-server-krb.init new file mode 100644 index 0000000..b890a88 --- /dev/null +++ b/debian/zephyr-server-krb.init @@ -0,0 +1,77 @@ +#! /bin/sh +# +# skeleton example file to build /etc/init.d/ scripts. +# This file should be used to construct scripts for /etc/init.d. +# +# Written by Miquel van Smoorenburg <miquels@cistron.nl>. +# Modified for Debian GNU/Linux +# by Ian Murdock <imurdock@gnu.ai.mit.edu>. +# +# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl +# +# This file was automatically customized by dh-make on Mon, 4 Dec 2000 05:28:22 -0500 + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/zephyrd +NAME=zephyrd +DESC="zephyr server" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + if test ! -f /etc/zephyr/srvtab + then + echo 'You need to get a srvtab before the kerberized zephyr server will function' + echo 'correctly. Get a srvtab for zephyr/zephyr and put it in /etc/zephyr/srvtab.' + exit 0 + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --exec $DAEMON + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --oknodo --stop --quiet --exec $DAEMON + echo "$NAME." + ;; + restart) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: " + start-stop-daemon --oknodo --stop --quiet --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON -- $zhm_args + echo "$NAME." + ;; + reload|force-reload) + echo -n "Telling $NAME to reload..." + start-stop-daemon --stop --signal HUP --exec $DAEMON + echo done. + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + # echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 + +### BEGIN INIT INFO +# Provides: zephyrd +# Required-Start: $syslog $network +# Required-Stop: $syslog +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the zephyr server. +# Description: Start the zephyr server. +### END INIT INFO diff --git a/debian/zephyr-server-krb.postrm b/debian/zephyr-server-krb.postrm new file mode 100644 index 0000000..0025153 --- /dev/null +++ b/debian/zephyr-server-krb.postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +if test "$1" = purge; then + rm -f /etc/zephyr/server.list +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/zephyr-server.config b/debian/zephyr-server.config new file mode 100644 index 0000000..0b9cccb --- /dev/null +++ b/debian/zephyr-server.config @@ -0,0 +1,33 @@ +#!/bin/sh -e + +. /usr/share/debconf/confmodule +db_version 2.0 + +db_get zephyr-server/servers || true +if test -z "$RET" +then + # if there happens to be zephyr-clients running on this machine + # it might know something about servers. + # else default to just the current host + z="`hostname --fqdn`" + if db_get zephyr-clients/servers && test -n "$RET" && ! echo "$RET" | grep -q "$z" + then + z="$RET $z" + fi + db_set zephyr-server/servers "$z" +fi + +db_get zephyr-server/read_conf +if test -f /etc/zephyr/server.list -a \( "$RET" = true \) +then + z="`cat /etc/zephyr/server.list`" + + if test -n "$z" + then + db_set zephyr-server/read_conf false + db_set zephyr-server/servers "$z" + fi +fi + +db_input high zephyr-server/servers || true +db_go diff --git a/debian/zephyr-server.docs b/debian/zephyr-server.docs new file mode 100644 index 0000000..a3a5154 --- /dev/null +++ b/debian/zephyr-server.docs @@ -0,0 +1 @@ +OPERATING diff --git a/debian/zephyr-server.files b/debian/zephyr-server.files new file mode 100644 index 0000000..f0f9687 --- /dev/null +++ b/debian/zephyr-server.files @@ -0,0 +1,36 @@ +usr/sbin/zephyrd +usr/share/man/man8/zephyrd.8 +etc/zephyr/acl/class-registry.acl +etc/zephyr/acl/iui-hm_ctl.acl +etc/zephyr/acl/iui-hm_stat.acl +etc/zephyr/acl/iui-login.acl +etc/zephyr/acl/iui-operations.acl +etc/zephyr/acl/iui-user_locate.acl +etc/zephyr/acl/iui-wg_ctl.acl +etc/zephyr/acl/iui-zephyr_admin.acl +etc/zephyr/acl/iui-zephyr_ctl.acl +etc/zephyr/acl/iws-hm_ctl.acl +etc/zephyr/acl/iws-hm_stat.acl +etc/zephyr/acl/iws-login.acl +etc/zephyr/acl/iws-operations.acl +etc/zephyr/acl/iws-user_locate.acl +etc/zephyr/acl/iws-wg_ctl.acl +etc/zephyr/acl/iws-zephyr_admin.acl +etc/zephyr/acl/iws-zephyr_ctl.acl +etc/zephyr/acl/sub-hm_ctl.acl +etc/zephyr/acl/sub-hm_stat.acl +etc/zephyr/acl/sub-login.acl +etc/zephyr/acl/sub-operations.acl +etc/zephyr/acl/sub-user_locate.acl +etc/zephyr/acl/sub-wg_ctl.acl +etc/zephyr/acl/sub-zephyr_admin.acl +etc/zephyr/acl/sub-zephyr_ctl.acl +etc/zephyr/acl/xmt-hm_ctl.acl +etc/zephyr/acl/xmt-hm_stat.acl +etc/zephyr/acl/xmt-login.acl +etc/zephyr/acl/xmt-operations.acl +etc/zephyr/acl/xmt-user_locate.acl +etc/zephyr/acl/xmt-wg_ctl.acl +etc/zephyr/acl/xmt-zephyr_admin.acl +etc/zephyr/acl/xmt-zephyr_ctl.acl +etc/zephyr/default.subscriptions diff --git a/debian/zephyr-server.init b/debian/zephyr-server.init new file mode 100644 index 0000000..b0c96cd --- /dev/null +++ b/debian/zephyr-server.init @@ -0,0 +1,72 @@ +#! /bin/sh +# +# skeleton example file to build /etc/init.d/ scripts. +# This file should be used to construct scripts for /etc/init.d. +# +# Written by Miquel van Smoorenburg <miquels@cistron.nl>. +# Modified for Debian GNU/Linux +# by Ian Murdock <imurdock@gnu.ai.mit.edu>. +# +# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl +# +# This file was automatically customized by dh-make on Mon, 4 Dec 2000 05:28:22 -0500 + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/zephyrd +NAME=zephyrd +DESC="zephyr server" + +test -f $DAEMON || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --exec $DAEMON + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --oknodo --stop --quiet --exec $DAEMON + echo "$NAME." + ;; + restart) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + echo -n "Restarting $DESC: " + start-stop-daemon --oknodo --stop --quiet --exec $DAEMON + sleep 1 + start-stop-daemon --start --quiet --pidfile \ + /var/run/$NAME.pid --exec $DAEMON + echo "$NAME." + ;; + reload|force-reload) + echo -n "Telling $NAME to reload..." + start-stop-daemon --stop --signal HUP --exec $DAEMON + echo done. + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + # echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 + +### BEGIN INIT INFO +# Provides: zephyrd +# Required-Start: $syslog $network +# Required-Stop: $syslog +# Should-Stop: $network +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Start the zephyr server. +# Description: Start the zephyr server. +### END INIT INFO + diff --git a/debian/zephyr-server.postinst b/debian/zephyr-server.postinst new file mode 100644 index 0000000..3157084 --- /dev/null +++ b/debian/zephyr-server.postinst @@ -0,0 +1,59 @@ +#! /bin/sh +# postinst script for zephyr +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * <postinst> `configure' <most-recently-configured-version> +# * <old-postinst> `abort-upgrade' <new version> +# * <conflictor's-postinst> `abort-remove' `in-favour' <package> +# <new-version> +# * <deconfigured's-postinst> `abort-deconfigure' `in-favour' +# <failed-install-package> <version> `removing' +# <conflicting-package> <version> +# for details, see /usr/share/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + + . /usr/share/debconf/confmodule + db_version 2.0 + + db_set zephyr-server/read_conf true + + db_get zephyr-server/servers + : > /etc/zephyr/server.list + for i in $RET + do + echo $i >> /etc/zephyr/server.list + done + + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + diff --git a/debian/zephyr-server.postrm b/debian/zephyr-server.postrm new file mode 100644 index 0000000..0025153 --- /dev/null +++ b/debian/zephyr-server.postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +if test "$1" = purge; then + rm -f /etc/zephyr/server.list +fi + +#DEBHELPER# + +exit 0 diff --git a/debian/zephyr-server.templates b/debian/zephyr-server.templates new file mode 100644 index 0000000..5616327 --- /dev/null +++ b/debian/zephyr-server.templates @@ -0,0 +1,16 @@ +Template: zephyr-server/servers +Type: string +_Description: Zephyr servers: + Please type the full names of your zephyr servers, separated by spaces. + (Note that this can be a superset of that you're telling the clients.) + +Template: zephyr-server/read_conf +Type: boolean +Default: true +Description: for internal use + We want to try and capture user changes when they edit a config file + manually. To do this we look at the file in the config script. However, + in the case of preconfigure, the config script is run twice before the + postinst is run. Thus we may read the wrong value before the edited value + is written out in postinst. If this is false we skip reading config files + until postinst runs. diff --git a/debian/zephyr.vars b/debian/zephyr.vars new file mode 100644 index 0000000..eaf70f0 --- /dev/null +++ b/debian/zephyr.vars @@ -0,0 +1,11 @@ +# $Id$ + +# Zephyr default variables file. Format is: +# +# var = value + +# Exposure setting defaults to realm-visible. +exposure = realm-visible + +# Initialization programs. +#initprogs = /etc/athena/zinit diff --git a/h/internal.h b/h/internal.h index 433a9b4..f0b482c 100644 --- a/h/internal.h +++ b/h/internal.h @@ -97,5 +97,6 @@ Code_t Z_WaitForNotice __P((ZNotice_t *notice, int (*pred) __P((ZNotice_t *, void *)), void *arg, int timeout)); +void Z_gettimeofday(struct _ZTimeval *ztv, struct timezone *tz); #endif /* __INTERNAL_H__ */ diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h index fc9cd05..713e261 100644 --- a/h/zephyr/zephyr.h +++ b/h/zephyr/zephyr.h @@ -62,14 +62,19 @@ typedef enum { } ZNotice_Kind_t; extern ZCONST char *ZNoticeKinds[9]; +struct _ZTimeval { + int tv_sec; + int tv_usec; +}; + /* Unique ID format */ typedef struct _ZUnique_Id_t { struct in_addr zuid_addr; - struct timeval tv; + struct _ZTimeval tv; } ZUnique_Id_t; /* Checksum */ -typedef unsigned long ZChecksum_t; +typedef unsigned int ZChecksum_t; /* Notice definition */ typedef struct _ZNotice_t { @@ -78,7 +83,7 @@ typedef struct _ZNotice_t { ZNotice_Kind_t z_kind; ZUnique_Id_t z_uid; #define z_sender_addr z_uid.zuid_addr - struct timeval z_time; + struct _ZTimeval z_time; unsigned short z_port; int z_auth; int z_checked_auth; diff --git a/h/zephyr/zephyr_err.h b/h/zephyr/zephyr_err.h new file mode 100644 index 0000000..3fd16e9 --- /dev/null +++ b/h/zephyr/zephyr_err.h @@ -0,0 +1,34 @@ +/* + * zephyr_err.h: + * This file is automatically generated; please do not edit it. + */ + +#define ZERR_PKTLEN (-772103680L) +#define ZERR_HEADERLEN (-772103679L) +#define ZERR_ILLVAL (-772103678L) +#define ZERR_HMPORT (-772103677L) +#define ZERR_PORTINUSE (-772103676L) +#define ZERR_BADPKT (-772103675L) +#define ZERR_VERS (-772103674L) +#define ZERR_NOPORT (-772103673L) +#define ZERR_NONOTICE (-772103672L) +#define ZERR_QLEN (-772103671L) +#define ZERR_HMDEAD (-772103670L) +#define ZERR_INTERNAL (-772103669L) +#define ZERR_NOLOCATIONS (-772103668L) +#define ZERR_NOMORELOCS (-772103667L) +#define ZERR_FIELDLEN (-772103666L) +#define ZERR_BADFIELD (-772103665L) +#define ZERR_SERVNAK (-772103664L) +#define ZERR_AUTHFAIL (-772103663L) +#define ZERR_LOGINFAIL (-772103662L) +#define ZERR_NOSUBSCRIPTIONS (-772103661L) +#define ZERR_NOMORESUBSCRIPTIONS (-772103660L) +#define ZERR_TOOMANYSUBS (-772103659L) +#define ZERR_EOF (-772103658L) +extern void initialize_zeph_error_table(void); +#define ERROR_TABLE_BASE_zeph (-772103680L) + +/* for compatibility with older versions... */ +#define init_zeph_err_tbl initialize_zeph_error_table +#define zeph_err_base ERROR_TABLE_BASE_zeph diff --git a/lib/Makefile.in b/lib/Makefile.in index cdaecc8..5415797 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -9,8 +9,9 @@ lsbindir=@lsbindir@ top_builddir=.. includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib +LIBS=@LIBS@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ @@ -21,8 +22,9 @@ CC=@CC@ INSTALL=@INSTALL@ RANLIB=@RANLIB@ +DEBUG=-O CPPFLAGS=@CPPFLAGS@ -CFLAGS=@CFLAGS@ +CFLAGS=@CFLAGS@ ${DEBUG} ALL_CFLAGS=${CFLAGS} -DSYSCONFDIR=\"${sysconfdir}\" -I${top_srcdir}/h \ -I${BUILDTOP}/h ${CPPFLAGS} LDFLAGS=@LDFLAGS@ diff --git a/lib/ZVariables.c b/lib/ZVariables.c index 1d9cd06..7352860 100644 --- a/lib/ZVariables.c +++ b/lib/ZVariables.c @@ -36,7 +36,7 @@ char *ZGetVariable(var) if ((ret = get_varval(varfile, var)) != ZERR_NONE) return (ret); - sprintf(varfile, "%s/zephyr.vars", SYSCONFDIR); + sprintf(varfile, "%s/zephyr/zephyr.vars", SYSCONFDIR); return (get_varval(varfile, var)); } diff --git a/lib/Zinternal.c b/lib/Zinternal.c index 1a3fcec..0efcc56 100644 --- a/lib/Zinternal.c +++ b/lib/Zinternal.c @@ -580,6 +580,14 @@ Code_t Z_AddNoticeToEntry(qptr, notice, part) return (ZERR_NONE); } +void Z_gettimeofday(struct _ZTimeval *ztv, struct timezone *tz) +{ + struct timeval tv; + (void) gettimeofday(&tv, tz); /* yeah, yeah, I know */ + ztv->tv_sec=tv.tv_sec; + ztv->tv_usec=tv.tv_usec; +} + Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine) ZNotice_t *notice; char *buffer; @@ -609,7 +617,7 @@ Code_t Z_FormatHeader(notice, buffer, buffer_len, len, cert_routine) notice->z_multinotice = ""; - (void) gettimeofday(¬ice->z_uid.tv, (struct timezone *)0); + (void) Z_gettimeofday(¬ice->z_uid.tv, (struct timezone *)0); notice->z_uid.tv.tv_sec = htonl((u_long) notice->z_uid.tv.tv_sec); notice->z_uid.tv.tv_usec = htonl((u_long) notice->z_uid.tv.tv_usec); @@ -878,8 +886,8 @@ Code_t Z_SendFragmentedNotice(notice, len, cert_func, send_func) (void) sprintf(multi, "%d/%d", offset, notice->z_message_len); partnotice.z_multinotice = multi; if (offset > 0) { - (void) gettimeofday(&partnotice.z_uid.tv, - (struct timezone *)0); + (void) Z_gettimeofday(&partnotice.z_uid.tv, + (struct timezone *)0); partnotice.z_uid.tv.tv_sec = htonl((u_long) partnotice.z_uid.tv.tv_sec); partnotice.z_uid.tv.tv_usec = diff --git a/libdyn/Makefile.in b/libdyn/Makefile.in index 655c6e3..6589f93 100644 --- a/libdyn/Makefile.in +++ b/libdyn/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib srcdir=@srcdir@ diff --git a/server/Makefile.in b/server/Makefile.in index 3cba0fc..9c9cd3f 100644 --- a/server/Makefile.in +++ b/server/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib top_builddir=.. diff --git a/server/main.c b/server/main.c index 37b8efb..e160929 100644 --- a/server/main.c +++ b/server/main.c @@ -91,9 +91,7 @@ unsigned short hm_srv_port; /* host manager server sending port */ char *programname; /* set to the basename of argv[0] */ char myname[MAXHOSTNAMELEN]; /* my host name */ -#ifndef HAVE_HESIOD char list_file[128]; -#endif #ifdef HAVE_KRB4 char srvtab_file[128]; char my_realm[REALM_SZ]; @@ -139,9 +137,7 @@ main(argc, argv) extern char *optarg; extern int optind; -#ifndef HAVE_HESIOD sprintf(list_file, "%s/zephyr/%s", SYSCONFDIR, SERVER_LIST_FILE); -#endif #ifdef HAVE_KRB4 sprintf(srvtab_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_SRVTAB); sprintf(tkt_file, "%s/zephyr/%s", SYSCONFDIR, ZEPHYR_TKFILE); diff --git a/server/realm.c b/server/realm.c index 37b0df9..ecef9eb 100644 --- a/server/realm.c +++ b/server/realm.c @@ -619,12 +619,14 @@ realm_deathgram(server) zdbug((LOG_DEBUG, "rlm_deathgram: suggesting %s to %s", (server) ? server->addr_str : "nothing", realm->name)); +#ifdef HAVE_KRB4 if (!ticket_lookup(realm->name)) if ((retval = ticket_retrieve(realm)) != ZERR_NONE) { syslog(LOG_WARNING, "rlm_deathgram failed: %s", error_message(retval)); return; } +#endif if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) != ZERR_NONE) @@ -683,12 +685,14 @@ realm_wakeup() snotice.z_message = NULL; snotice.z_message_len = 0; +#ifdef HAVE_KRB4 if (!ticket_lookup(realm->name)) if ((retval = ticket_retrieve(realm)) != ZERR_NONE) { syslog(LOG_WARNING, "rlm_wakeup failed: %s", error_message(retval)); continue; } +#endif if ((retval = ZFormatNotice(&snotice, &pack, &packlen, ZAUTH)) != ZERR_NONE) @@ -1227,8 +1231,8 @@ realm_sendit_auth(notice, who, auth, realm, ack_to_sender) (void) sprintf(multi, "%d/%d", offset+origoffset, origlen); partnotice.z_multinotice = multi; if (offset > 0) { - (void) gettimeofday(&partnotice.z_uid.tv, - (struct timezone *)0); + (void) Z_gettimeofday(&partnotice.z_uid.tv, + (struct timezone *)0); partnotice.z_uid.tv.tv_sec = htonl((u_long) partnotice.z_uid.tv.tv_sec); partnotice.z_uid.tv.tv_usec = diff --git a/server/server.c b/server/server.c index 377d397..5cce0ff 100644 --- a/server/server.c +++ b/server/server.c @@ -92,10 +92,8 @@ static Code_t server_register(); #endif static struct in_addr *get_server_addrs __P((int *number)); -#ifndef HAVE_HESIOD static char **get_server_list __P((char *file)); static void free_server_list __P((char **list)); -#endif static Unacked *srv_nacktab[SRV_NACKTAB_HASHSIZE]; Server *otherservers; /* points to an array of the known @@ -981,22 +979,21 @@ get_server_addrs(number) int *number; /* RETURN */ { int i; - char **server_hosts; + char **server_hosts = NULL; + char **server_hosts_free = NULL; char **cpp; struct in_addr *addrs; struct in_addr *addr; struct hostent *hp; + server_hosts = get_server_list(list_file); + server_hosts_free = server_hosts; #ifdef HAVE_HESIOD - /* get the names from Hesiod */ - server_hosts = hes_resolve("zephyr","sloc"); if (!server_hosts) - return NULL; -#else - server_hosts = get_server_list(list_file); + server_hosts = hes_resolve("zephyr","sloc"); +#endif if (!server_hosts) return NULL; -#endif /* count up */ i = 0; for (cpp = server_hosts; *cpp; cpp++) @@ -1015,14 +1012,11 @@ get_server_addrs(number) } } *number = i; -#ifndef HAVE_HESIOD - free_server_list(server_hosts); -#endif + if (server_hosts_free) + free_server_list(server_hosts_free); return addrs; } -#ifndef HAVE_HESIOD - static int nhosts = 0; /* @@ -1090,7 +1084,6 @@ free_server_list(list) free(orig_list); return; } -#endif /* * initialize the server structure for address addr, and set a timer diff --git a/server/zserver.h b/server/zserver.h index dc84cf5..221e26b 100644 --- a/server/zserver.h +++ b/server/zserver.h @@ -269,8 +269,8 @@ void sweep_ticket_hash_table __P((void *)); Sched *check_key_sched_cache __P((des_cblock key)); void add_to_key_sched_cache __P((des_cblock key, Sched *sched)); int krb_set_key __P((char *key, int cvt)); -int krb_rd_req __P((KTEXT authent, char *service, char *instance, - unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); +/* int krb_rd_req __P((KTEXT authent, char *service, char *instance, + unsigned KRB_INT32 from_addr, AUTH_DAT *ad, char *fn)); */ int krb_find_ticket __P((KTEXT authent, KTEXT ticket)); int krb_get_lrealm __P((char *r, int n)); #endif @@ -354,9 +354,7 @@ extern fd_set interesting; /* the file descrips we are listening extern int nfds; /* number to look at in select() */ extern int zdebug; extern char myname[]; /* domain name of this host */ -#ifndef HAVE_HESIOD extern char list_file[]; -#endif #ifdef HAVE_KRB4 extern char srvtab_file[]; extern char my_realm[]; diff --git a/server/zsrv_conf.h b/server/zsrv_conf.h index d2f32ed..7b663da 100644 --- a/server/zsrv_conf.h +++ b/server/zsrv_conf.h @@ -16,9 +16,7 @@ /* Path names are relative to CONFDIR, except for the class registry. */ -#ifndef HAVE_HESIOD #define SERVER_LIST_FILE "server.list" -#endif #define REALM_LIST_FILE "realm.list" #ifdef HAVE_KRB4 #define ZEPHYR_SRVTAB "srvtab" diff --git a/zhm/Makefile.in b/zhm/Makefile.in index 29d7217..10bfe54 100644 --- a/zhm/Makefile.in +++ b/zhm/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib top_builddir=.. @@ -22,11 +22,13 @@ int use_hesiod = 0; #define srandom srand48 #endif -#define PIDDIR "/var/athena/" +#define PIDDIR "/var/run/" int hmdebug, rebootflag, noflushflag, errflg, dieflag, inetd, oldpid, nofork; int no_server = 1, nservchang, nserv, nclt; int booting = 1, timeout_type, deactivated = 1; +int bootflag = 1; +int started = 0; long starttime; u_short cli_port; struct sockaddr_in cli_sin, serv_sin, from; @@ -76,7 +78,7 @@ char *argv[]; exit(-1); } prim_serv[0] = '\0'; - while ((opt = getopt(argc, argv, "drhinf")) != EOF) + while ((opt = getopt(argc, argv, "drhinfN")) != EOF) switch(opt) { case 'd': hmdebug = 1; @@ -101,6 +103,9 @@ char *argv[]; case 'f': noflushflag = 1; break; + case 'N': + bootflag = 0; + break; case '?': default: errflg++; @@ -150,6 +155,7 @@ char *argv[]; exit(ZERR_SERVNAK); } init_hm(); + started = 1; DPR2("zephyr server port: %u\n", ntohs(serv_sin.sin_port)); DPR2("zephyr client port: %u\n", ntohs(cli_port)); @@ -309,6 +315,8 @@ static void choose_server() } while ((serv_list = hes_resolve(zcluster, "sloc")) == (char **)NULL) { syslog(LOG_ERR, "No servers or no hesiod"); + if (!started) + return; /* do not hang forever*/ /* wait a bit, and try again */ sleep(30); } @@ -427,7 +435,10 @@ static void init_hm() memcpy(&serv_sin.sin_addr, hp->h_addr, 4); } - send_boot_notice(HM_BOOT); + if (bootflag) + send_boot_notice(HM_BOOT); + else + send_boot_notice(HM_ATTACH); deactivated = 0; #ifdef _POSIX_VERSION @@ -600,7 +611,6 @@ static void send_stats(notice, sin) void die_gracefully() { syslog(LOG_INFO, "Terminate signal caught..."); - send_flush_notice(HM_FLUSH); unlink(PidFile); closelog(); exit(0); diff --git a/zwgc/Makefile.in b/zwgc/Makefile.in index dca3f72..c752e05 100644 --- a/zwgc/Makefile.in +++ b/zwgc/Makefile.in @@ -8,7 +8,7 @@ sbindir=@sbindir@ lsbindir=@lsbindir@ includedir=${prefix}/include -mandir=${prefix}/man +mandir=@mandir@ libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin top_builddir=.. |