From c6f7bb80ee01f477743a3496507e082fb5760884 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 13 Jul 2010 15:39:29 -0700 Subject: [PATCH] Update Debian packaging to 1.5.75-1 This update now builds shared library packages for the libafsauthent and libafsrpc shared libraries. It should also fix problems with make dpkg due to debian/changelog being deleted on make distclean. Change-Id: I14ce0633edc1f0cc9e081eb7383b2f1e7bfc729f Reviewed-on: http://gerrit.openafs.org/2405 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- src/packaging/Debian/README.source | 2 +- src/packaging/Debian/TODO | 6 +- src/packaging/Debian/changelog.in | 81 ++++++++++++ src/packaging/Debian/clean | 1 + src/packaging/Debian/control | 71 +++++++--- src/packaging/Debian/libafsauthent1.install | 1 + src/packaging/Debian/libafsauthent1.symbols | 79 ++++++++++++ src/packaging/Debian/libafsrpc1.install | 1 + src/packaging/Debian/libafsrpc1.symbols | 122 ++++++++++++++++++ src/packaging/Debian/libkopenafs1.symbols | 1 + src/packaging/Debian/module/control | 2 +- src/packaging/Debian/module/control.in | 6 +- src/packaging/Debian/module/prep-modules | 26 ++-- src/packaging/Debian/module/sysname | 2 +- .../Debian/openafs-client.lintian-overrides | 7 + .../Debian/openafs-doc.README.Debian | 6 +- .../Debian/openafs-fileserver.install | 43 ++++-- src/packaging/Debian/rules | 38 +++--- src/packaging/Debian/sysname | 4 +- 19 files changed, 417 insertions(+), 82 deletions(-) create mode 100644 src/packaging/Debian/libafsauthent1.install create mode 100644 src/packaging/Debian/libafsauthent1.symbols create mode 100644 src/packaging/Debian/libafsrpc1.install create mode 100644 src/packaging/Debian/libafsrpc1.symbols diff --git a/src/packaging/Debian/README.source b/src/packaging/Debian/README.source index bd7816be1..abad91b60 100644 --- a/src/packaging/Debian/README.source +++ b/src/packaging/Debian/README.source @@ -133,4 +133,4 @@ Pulling Upstream Changes edited as necessary to keep the length of the changelog lines down. - -- Russ Allbery , Tue, 6 Apr 2010 14:27:11 -0700 + -- Russ Allbery , Tue, 13 Jul 2010 19:30:15 -0700 diff --git a/src/packaging/Debian/TODO b/src/packaging/Debian/TODO index f5850de9d..24318af78 100644 --- a/src/packaging/Debian/TODO +++ b/src/packaging/Debian/TODO @@ -5,8 +5,4 @@ with a style sheet to set off the transcript in a different background color). -* Consider including the kdump executable in the kernel module package. - openafs-client would have to provide a wrapper script to run the - appropriate kdump and the kernel module package would need to install - the kdump executable, maybe in /usr/lib/openafs, named after the kernel - image installed. +* Use pts addu -local instead of pt_util for initial cell setup. diff --git a/src/packaging/Debian/changelog.in b/src/packaging/Debian/changelog.in index 7399576fc..533ec9da8 100644 --- a/src/packaging/Debian/changelog.in +++ b/src/packaging/Debian/changelog.in @@ -12,6 +12,87 @@ openafs (@DEB_PKGVER@-1~openafs) unstable; urgency=low -- Russ Allbery Thu, 08 Apr 2010 13:20:50 -0700 +openafs (1.5.75-1) experimental; urgency=low + + * New upstream testing release. + - Path MTU discovery for networks with bad fragmentation. + - New -human flag for human-readable units in some fs commands. + - Provide reasons for locked volumes in vos when known. + - Improvements to Rx ping and NAT handling. + - Improvements to the userspace AFS client. + - Substantial updates to the Administrator's Guide. + - Various bug fixes and improvements to the file server. + - Force core file generation in bosserver. + - Improve vlclient and vldb_check. + - Avoid volume corruption on creation if files were left over from a + previous failed cleanup. + - Do not tie up fileserver threads with volumes being taken offline. + - Break origin's callback on the target of a rename operation. + - Do not open /dev/console in the fileserver. (Closes: #582111) + - Avoid unneeded sync() calls in the fileserver. + - Update client disk cache version. + - Parallelization improvements in lock management in the client. + - New -dynroot-sparse mode for afsd to not show all cells in the + CellServDB until that cell is needed. + - Fix aklog crash with linked cell handling. + - Fix fs getserverprefs -vlservers with default CellServDB list. + - Report server address when logging warnings. + - Avoid panic in GetCapabilities with an unknown cell. + - Report process name and ID for advisory lock warnings when + possible. + - Flush pending changes to server when releasing file locks. + - Various other client bug fixes on error handling and callbacks. + - Disable syscall probes when keyrings are supported. + - Use filehandles for all Linux 2.6 versions to avoid + incompatibilities with mismatched afsds. + - Update Linux kernel support for 2.6.35. + - The stripped source tree generated for kernel module builds is now + truly architecture-independent and can build on i386 for amd64 + kernels (for example). (Closes: #518270) + - Fix build problems on alpha. + * Apply upstream deltas: + - [bbce0515] Add NEWS entries for 1.5.75 + - [c790e7d0] Remove a few erroneous NEWS entries for 1.5.75 + - [9e2aba99] Fix ktime test for errors + - [5cc6293c] Provide man pages for more fssync-debug commands + * Set the OpenAFS build version to the Debian package version with + -debian appended so that the Debian package versions can be + distinguished from unmodified upstream versions. + * Build shared library packages for libafsauthent and libafsrpc. + Upstream is now more careful about the ABI. (Closes: #433054) + * Explicitly link libafsauthent with -lresolv -lcrypt. This is a + temporary fix for Linux that will be replaced by a better upstream fix + in the next release. + * openafs-modules-source and openafs-modules-dkms are now architecture: + all. The generated kernel source is now architecture-independent. + * openafs-modules-source and openafs-modules-dkms now recommend an + appropriate version of openafs-client. + * Update kernel module packaging scripts: + - Remove selection of linux-image vs. kernel-image for kernel names. + - Use Breaks instead of Conflicts. + - Update standards version to 3.9.0. + * Tighten the dependencies on openafs-client in packages that symlink + their /usr/share/doc directories to openafs-client's to meet the + Policy requirements for changelog files. + * Remove the lpia architecture. This was an experiment in Ubuntu that + has apparently been dropped. + * Add preliminary support for powerpcspe, mapping that architecture to + ppc_linux26. The kernel build won't work unless uname -m on that + architecture returns ppc. + * Minor update to README.Debian for openafs-doc: the old IBM release + notes are no longer included. + * Remove conflicts/replaces/provides for openafs-ptutil, which was + ancient (removed in 2001). + * Install an upstream changelog file now that upstream provides one. + * Add a workaround in the clean target to allow the same packaging files + to be used by upstream, which removes changelog during distclean + because it's Autoconf-generated. This workaround will not trigger + during a normal Debian package build. + * Update standards version to 3.9.0. + - Use Breaks instead of Conflicts where appropriate. + + -- Russ Allbery Tue, 13 Jul 2010 14:46:10 -0700 + openafs (1.5.74.1-1) experimental; urgency=low * New upstream testing release. diff --git a/src/packaging/Debian/clean b/src/packaging/Debian/clean index 454dc1256..ac1bb432a 100644 --- a/src/packaging/Debian/clean +++ b/src/packaging/Debian/clean @@ -1,3 +1,4 @@ +.version aclocal.m4 configure configure-libafs diff --git a/src/packaging/Debian/control b/src/packaging/Debian/control index 8bdee81f2..31c5c5a95 100644 --- a/src/packaging/Debian/control +++ b/src/packaging/Debian/control @@ -7,19 +7,20 @@ Build-Depends: debhelper (>= 7), autoconf, automake, bison, comerr-dev, cpio, dblatex, dkms (>= 2.1.1.1), docbook-xsl, doxygen, flex, libfuse-dev, libkrb5-dev, libncurses5-dev, libpam0g-dev, libxml2-utils, perl, pkg-config, xsltproc -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Homepage: http://www.openafs.org/ Vcs-Git: git://git.debian.org/git/pkg-k5-afs/openafs.git Vcs-Browser: http://git.debian.org/?p=pkg-k5-afs/openafs.git Package: openafs-client -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: lsof, openafs-modules-dkms (>= ${source:Version}) | openafs-modules-source (>= ${source:Version}) | openafs-modules3 Suggests: openafs-doc, openafs-krb5 -Conflicts: arla, openafs-modules1, openafs-modules2 +Conflicts: arla +Breaks: openafs-modules1, openafs-modules2 Description: AFS distributed filesystem client support AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -32,7 +33,8 @@ Description: AFS distributed filesystem client support Package: openafs-fuse Priority: extra Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc -Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client (>= 1.5.74.1) +Depends: ${shlibs:Depends}, ${misc:Depends}, + openafs-client (= ${binary:Version}) Description: AFS distributed file system experimental FUSE client AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -46,8 +48,9 @@ Description: AFS distributed file system experimental FUSE client Package: openafs-kpasswd Priority: extra -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc -Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${misc:Depends}, + openafs-client (= ${binary:Version}) Conflicts: krb5-user, heimdal-clients, kerberos4kth-clients Description: AFS distributed filesystem old password changing AFS is a distributed filesystem allowing cross-platform sharing of @@ -60,7 +63,7 @@ Description: AFS distributed filesystem old password changing package for new cells or for cells using Kerberos v5. Package: openafs-fileserver -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client, lsb-base Recommends: ntp | time-daemon Suggests: openafs-doc @@ -73,13 +76,10 @@ Description: AFS distributed filesystem file server installed on any machine that will export files into AFS. Package: openafs-dbserver -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${perl:Depends}, ${misc:Depends}, - openafs-fileserver, openafs-client + openafs-fileserver, openafs-client (= ${binary:Version}) Suggests: openafs-doc -Conflicts: openafs-ptutil -Replaces: openafs-ptutil -Provides: openafs-ptutil Description: AFS distributed filesystem database server AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -102,9 +102,9 @@ Description: AFS distributed filesystem documentation protocol documentation, and other OpenAFS documentation. Package: openafs-krb5 -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${shlibs:Depends}, ${misc:Depends} -Conflicts: openafs-client (<< 1.4.7.dfsg1-1) +Breaks: openafs-client (<< 1.4.7.dfsg1-1) Description: AFS distributed filesystem Kerberos 5 integration AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access control, @@ -128,11 +128,37 @@ Description: AFS distributed file system runtime library (PAGs) manipulating AFS process authentication groups (PAGs). It provides the a subset of the interface provided by the Heimdal libkafs library. +Package: libafsauthent1 +Section: libs +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: AFS distributed file system runtime library (authentication) + AFS is a distributed filesystem allowing cross-platform sharing of + files among multiple computers. Facilities are provided for access + control, authentication, backup and administrative management. + . + This package provides the shared library implementing AFS client + authentication and token management. + +Package: libafsrpc1 +Section: libs +Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: AFS distributed file system runtime library (RPC layer) + AFS is a distributed filesystem allowing cross-platform sharing of + files among multiple computers. Facilities are provided for access + control, authentication, backup and administrative management. + . + This package provides the shared library implementing the Rx protocol and + other AFS RPC functionality. + Package: libopenafs-dev Section: libdevel -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends} +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc +Depends: ${shlibs:Depends}, ${misc:Depends}, + libafsauthent1 (= ${binary:Version}), libafsrpc1 (= ${binary:Version}), + libkopenafs1 (= ${binary:Version}), Suggests: openafs-doc Conflicts: arla-dev, liblwp-dev Description: AFS distributed filesystem development libraries @@ -146,9 +172,10 @@ Description: AFS distributed filesystem development libraries Package: openafs-modules-source Section: kernel Priority: extra -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: all Depends: ${misc:Depends}, bison, flex, debhelper (>= 5), module-assistant | kernel-package +Recommends: openafs-client (>= ${source:Version}) Description: AFS distributed filesystem kernel module source AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -160,8 +187,9 @@ Description: AFS distributed filesystem kernel module source Package: openafs-modules-dkms Section: kernel Priority: extra +Architecture: all Depends: ${misc:Depends}, dkms, bison, flex -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Recommends: openafs-client (>= ${source:Version}) Description: AFS distributed filesystem kernel module DKMS source AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -171,10 +199,11 @@ Description: AFS distributed filesystem kernel module DKMS source approriate configuration for DKMS to build new modules dynamically. Package: libpam-openafs-kaserver -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Section: admin Priority: extra -Depends: ${shlibs:Depends}, ${misc:Depends}, openafs-client +Depends: ${shlibs:Depends}, ${misc:Depends}, + openafs-client (= ${binary:Version}) Description: AFS distributed filesystem kaserver PAM module AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access @@ -188,7 +217,7 @@ Description: AFS distributed filesystem kaserver PAM module Package: openafs-dbg Section: debug Priority: extra -Architecture: alpha amd64 arm armel i386 ia64 lpia powerpc ppc64 s390 s390x sparc +Architecture: alpha amd64 arm armel i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc Depends: ${misc:Depends}, openafs-fileserver (= ${binary:Version}) | openafs-dbserver (= ${binary:Version}) Description: AFS distributed filesystem debugging information diff --git a/src/packaging/Debian/libafsauthent1.install b/src/packaging/Debian/libafsauthent1.install new file mode 100644 index 000000000..3c12cebb0 --- /dev/null +++ b/src/packaging/Debian/libafsauthent1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libafsauthent.so.* diff --git a/src/packaging/Debian/libafsauthent1.symbols b/src/packaging/Debian/libafsauthent1.symbols new file mode 100644 index 000000000..2b71c1281 --- /dev/null +++ b/src/packaging/Debian/libafsauthent1.symbols @@ -0,0 +1,79 @@ +libafsauthent.so.1 libafsauthent1 #MINVER# + afsconf_AddKey@Base 1.5.75 + afsconf_AddUser@Base 1.5.75 + afsconf_CellApply@Base 1.5.75 + afsconf_CheckAuth@Base 1.5.75 + afsconf_ClientAuth@Base 1.5.75 + afsconf_ClientAuthSecure@Base 1.5.75 + afsconf_Close@Base 1.5.75 + afsconf_DeleteKey@Base 1.5.75 + afsconf_DeleteUser@Base 1.5.75 + afsconf_GetCellInfo@Base 1.5.75 + afsconf_GetKey@Base 1.5.75 + afsconf_GetKeys@Base 1.5.75 + afsconf_GetLatestKey@Base 1.5.75 + afsconf_GetLocalCell@Base 1.5.75 + afsconf_GetNoAuthFlag@Base 1.5.75 + afsconf_GetNthUser@Base 1.5.75 + afsconf_IntGetKeys@Base 1.5.75 + afsconf_Open@Base 1.5.75 + afsconf_ServerAuth@Base 1.5.75 + afsconf_SetCellInfo@Base 1.5.75 + afsconf_SetNoAuthFlag@Base 1.5.75 + afsconf_SuperUser@Base 1.5.75 + ka_AuthServerConn@Base 1.5.75 + ka_Authenticate@Base 1.5.75 + ka_CellConfig@Base 1.5.75 + ka_CellToRealm@Base 1.5.75 + ka_ChangePassword@Base 1.5.75 + ka_ExpandCell@Base 1.5.75 + ka_ExplicitCell@Base 1.5.75 + ka_GetAdminToken@Base 1.5.75 + ka_GetAuthToken@Base 1.5.75 + ka_GetSecurity@Base 1.5.75 + ka_GetServerToken@Base 1.5.75 + ka_GetServers@Base 1.5.75 + ka_GetToken@Base 1.5.75 + ka_Init@Base 1.5.75 + ka_LocalCell@Base 1.5.75 + ka_ParseLoginName@Base 1.5.75 + ka_ReadPassword@Base 1.5.75 + ka_SingleServerConn@Base 1.5.75 + ka_StringToKey@Base 1.5.75 + ka_KeyCheckSum@Base 1.5.75 + ka_UserAuthenticateGeneral@Base 1.5.75 + ka_VerifyUserToken@Base 1.5.75 + ktc_ForgetAllTokens@Base 1.5.75 + ktc_ForgetToken@Base 1.5.75 + ktc_GetToken@Base 1.5.75 + ktc_ListTokens@Base 1.5.75 + ktc_OldPioctl@Base 1.5.75 + ktc_SetToken@Base 1.5.75 + ktc_curpag@Base 1.5.75 + ubik_Call@Base 1.5.75 + ubik_Call_New@Base 1.5.75 + ubik_CallIter@Base 1.5.75 + ubik_ClientDestroy@Base 1.5.75 + ubik_ClientInit@Base 1.5.75 + ubik_ParseClientList@Base 1.5.75 + pioctl@Base 1.5.75 + getDirPath@Base 1.5.75 + ka_AuthSpecificServersConn@Base 1.5.75 + pthread_recursive_mutex_lock@Base 1.5.75 + pthread_recursive_mutex_unlock@Base 1.5.75 + grmutex@Base 1.5.75 + initAFSDirPath@Base 1.5.75 + renamefile@Base 1.5.75 + pr_GetCPS@Base 1.5.75 + pr_Initialize@Base 1.5.75 + pr_GetHostCPS@Base 1.5.75 + afs_krb_get_lrealm@Base 1.5.75 + pr_NameToId@Base 1.5.75 + pr_IdToName@Base 1.5.75 + pr_ListMembers@Base 1.5.75 + pr_End@Base 1.5.75 + pr_SNameToId@Base 1.5.75 + afs_get_pag_from_groups@Base 1.5.75 + setpag@Base 1.5.75 + afs_snprintf@Base 1.5.75 + LogThreadNum@Base 1.5.75 diff --git a/src/packaging/Debian/libafsrpc1.install b/src/packaging/Debian/libafsrpc1.install new file mode 100644 index 000000000..80c3b95e0 --- /dev/null +++ b/src/packaging/Debian/libafsrpc1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libafsrpc.so.* diff --git a/src/packaging/Debian/libafsrpc1.symbols b/src/packaging/Debian/libafsrpc1.symbols new file mode 100644 index 000000000..4bc964f79 --- /dev/null +++ b/src/packaging/Debian/libafsrpc1.symbols @@ -0,0 +1,122 @@ +libafsrpc.so.1 libafsrpc1 #MINVER# + des_check_key_parity@Base 1.5.75 + des_fixup_key_parity@Base 1.5.75 + des_init_random_number_generator@Base 1.5.75 + des_is_weak_key@Base 1.5.75 + des_key_sched@Base 1.5.75 + des_random_key@Base 1.5.75 + des_string_to_key@Base 1.5.75 + des_cbc_cksum@Base 1.5.75 + des_ecb_encrypt@Base 1.5.75 + des_pcbc_encrypt@Base 1.5.75 + ktohl@Base 1.5.75 + life_to_time@Base 1.5.75 + rx_DestroyConnection@Base 1.5.75 + rx_EndCall@Base 1.5.75 + rx_Finalize@Base 1.5.75 + rx_GetCachedConnection@Base 1.5.75 + rx_GetCall@Base 1.5.75 + rx_GetIFInfo@Base 1.5.75 + rx_GetSpecific@Base 1.5.75 + rx_Init@Base 1.5.75 + rx_KeyCreate@Base 1.5.75 + rx_NewCall@Base 1.5.75 + rx_NewConnection@Base 1.5.75 + rx_NewService@Base 1.5.75 + rx_PrintPeerStats@Base 1.5.75 + rx_PrintStats@Base 1.5.75 + rx_PrintTheseStats@Base 1.5.75 + rx_ReadProc@Base 1.5.75 + rx_ReleaseCachedConnection@Base 1.5.75 + rx_ServerProc@Base 1.5.75 + rx_SetSpecific@Base 1.5.75 + rx_StartServer@Base 1.5.75 + rx_WriteProc@Base 1.5.75 + rxevent_Init@Base 1.5.75 + rxevent_Post@Base 1.5.75 + rxkad_GetServerInfo@Base 1.5.75 + rxkad_NewClientSecurityObject@Base 1.5.75 + rxkad_NewServerSecurityObject@Base 1.5.75 + rxnull_NewClientSecurityObject@Base 1.5.75 + rxnull_NewServerSecurityObject@Base 1.5.75 + rxs_Release@Base 1.5.75 + time_to_life@Base 1.5.75 + tkt_CheckTimes@Base 1.5.75 + tkt_DecodeTicket@Base 1.5.75 + tkt_MakeTicket@Base 1.5.75 + xdrrx_create@Base 1.5.75 + hton_syserr_conv@Base 1.5.75 + rxkad_global_stats@Base 1.5.75 + rxkad_global_stats_lock@Base 1.5.75 + rxkad_stats_key@Base 1.5.75 + afs_com_err@Base 1.5.75 + afs_error_message@Base 1.5.75 + rx_socket@Base 1.5.75 + rxevent_debugFile@Base 1.5.75 + rx_debugFile@Base 1.5.75 + rx_connDeadTime@Base 1.5.75 + rx_maxReceiveSize@Base 1.5.75 + rx_UdpBufSize@Base 1.5.75 + rx_extraQuota@Base 1.5.75 + rx_extraPackets@Base 1.5.75 + rx_tranquil@Base 1.5.75 + rx_getAllAddr@Base 1.5.75 + rx_nWaiting@Base 1.5.75 + rx_stats@Base 1.5.75 + rx_SetNoJumbo@Base 1.5.75 + rx_SetConnDeadTime@Base 1.5.75 + rx_FlushWrite@Base 1.5.75 + rx_thread_id_key@Base 1.5.75 + multi_Finalize@Base 1.5.75 + multi_Select@Base 1.5.75 + multi_Init@Base 1.5.75 + multi_Finalize_Ignore@Base 1.5.75 + afs_add_to_error_table@Base 1.5.75 + xdr_afsUUID@Base 1.5.75 + xdr_afs_int32@Base 1.5.75 + xdr_afs_uint32@Base 1.5.75 + xdr_afs_int64@Base 1.5.75 + xdr_afs_uint64@Base 1.5.75 + rx_IncrementTimeAndCount@Base 1.5.75 + rx_enable_stats@Base 1.5.75 + rx_GetServerDebug@Base 1.5.75 + rx_GetServerStats@Base 1.5.75 + rx_GetServerVersion@Base 1.5.75 + rx_GetServerConnections@Base 1.5.75 + rx_stats_mutex@Base 1.5.75 + rx_GetServerPeers@Base 1.5.75 + rx_RetrieveProcessRPCStats@Base 1.5.75 + rx_RetrievePeerRPCStats@Base 1.5.75 + rx_FreeRPCStats@Base 1.5.75 + rx_queryProcessRPCStats@Base 1.5.75 + rx_queryPeerRPCStats@Base 1.5.75 + rx_enableProcessRPCStats@Base 1.5.75 + rx_enablePeerRPCStats@Base 1.5.75 + rx_disableProcessRPCStats@Base 1.5.75 + rx_disablePeerRPCStats@Base 1.5.75 + RXSTATS_ExecuteRequest@Base 1.5.75 + RXSTATS_RetrieveProcessRPCStats@Base 1.5.75 + RXSTATS_RetrievePeerRPCStats@Base 1.5.75 + RXSTATS_QueryProcessRPCStats@Base 1.5.75 + RXSTATS_QueryPeerRPCStats@Base 1.5.75 + RXSTATS_EnableProcessRPCStats@Base 1.5.75 + RXSTATS_EnablePeerRPCStats@Base 1.5.75 + RXSTATS_DisableProcessRPCStats@Base 1.5.75 + RXSTATS_DisablePeerRPCStats@Base 1.5.75 + RXSTATS_QueryRPCStatsVersion@Base 1.5.75 + RXSTATS_ClearProcessRPCStats@Base 1.5.75 + RXSTATS_ClearPeerRPCStats@Base 1.5.75 + TM_GetTimeOfDay@Base 1.5.75 + FT_GetTimeOfDay@Base 1.5.75 + strcompose@Base 1.5.75 + stolower@Base 1.5.75 + ucstring@Base 1.5.75 + lcstring@Base 1.5.75 + AssertionFailed@Base 1.5.75 + rx_GetLocalPeers@Base 1.5.75 + rx_GetMaxReceiveWindow@Base 1.5.75 + rx_GetMaxSendWindow@Base 1.5.75 + rx_SetMaxReceiveWindow@Base 1.5.75 + rx_SetMaxSendWindow@Base 1.5.75 + rx_GetMinPeerTimeout@Base 1.5.75 + rx_SetMinPeerTimeout@Base 1.5.75 diff --git a/src/packaging/Debian/libkopenafs1.symbols b/src/packaging/Debian/libkopenafs1.symbols index 1179d65c0..d31bb7965 100644 --- a/src/packaging/Debian/libkopenafs1.symbols +++ b/src/packaging/Debian/libkopenafs1.symbols @@ -1,6 +1,7 @@ libkopenafs.so.1 libkopenafs1 #MINVER# KOPENAFS_1.0@KOPENAFS_1.0 1.5.69 k_hasafs@KOPENAFS_1.0 1.5.69 + k_haspag@KOPENAFS_1.0 1.5.75 k_pioctl@KOPENAFS_1.0 1.5.69 k_setpag@KOPENAFS_1.0 1.5.69 k_unlog@KOPENAFS_1.0 1.5.69 diff --git a/src/packaging/Debian/module/control b/src/packaging/Debian/module/control index a16b7e802..85e422300 100644 --- a/src/packaging/Debian/module/control +++ b/src/packaging/Debian/module/control @@ -4,5 +4,5 @@ Priority: optional Maintainer: Russ Allbery Uploaders: Sam Hartman Build-Depends: debhelper (>= 5), flex, bison -Standards-Version: 3.8.3 +Standards-Version: 3.9.0 Homepage: http://www.openafs.org/ diff --git a/src/packaging/Debian/module/control.in b/src/packaging/Debian/module/control.in index 260b195a7..69e7e882a 100644 --- a/src/packaging/Debian/module/control.in +++ b/src/packaging/Debian/module/control.in @@ -4,13 +4,13 @@ Priority: optional Maintainer: Russ Allbery Uploaders: Sam Hartman Build-Depends: debhelper (>= 5), flex, bison -Standards-Version: 3.8.3 +Standards-Version: 3.9.0 Package: openafs-modules-=KVERS -Conflicts: openafs-client (<< 1.5.61) +Breaks: openafs-client (<< 1.5.61) Provides: openafs-modules3 Architecture: any -Recommends: =IMG-=KVERS +Recommends: linux-image-=KVERS Description: AFS distributed filesystem kernel module AFS is a distributed filesystem allowing cross-platform sharing of files among multiple computers. Facilities are provided for access diff --git a/src/packaging/Debian/module/prep-modules b/src/packaging/Debian/module/prep-modules index 03c37d8de..91846ea0f 100755 --- a/src/packaging/Debian/module/prep-modules +++ b/src/packaging/Debian/module/prep-modules @@ -7,12 +7,13 @@ # major kernel revision plus the debian subrevision and whatever # architecture string is appropriate if building against the stock Debian # kernels. $(KVERS) should be identical to the version component contained -# in the Debian kernel package names. +# in the Debian kernel package names (in other words, the ABI version, not +# the package version).. # -# * Make the package recommend either kernel-image-$(KVERS) or -# linux-image-$(KVERS) as appropriate for the kernel version that we're -# building against. Use recommend rather than depends since the user may -# have built their own kernel outside of the Debian package infrastructure. +# * Make the package recommend linux-image-$(KVERS) as appropriate for the +# kernel version that we're building against. Use recommend rather than +# depends since the user may have built their own kernel outside of the +# Debian package infrastructure. # # * Save the version number of the binary package in debian/VERSION for later # use by dh_gencontrol. This will be the version number of the source @@ -29,7 +30,7 @@ set -e if [ "$#" -ne 1 ]; then - echo Usage: $0 kernelsource-location + echo "Usage: $0 " >&2 exit 1 fi @@ -73,20 +74,9 @@ else | sed -e 's/.*source-\([^ ]*\) (\([^)]*\)).*/\2/'` fi -# Determine the kernel package name. For right now, assume linux-image for -# 2.6.12 and later, and kernel-image for anything earlier. If this doesn't -# work for someone, please submit a bug with the details. - -if dpkg --compare-versions "$afs_kvers" ge "2.6.12" ; then - afs_image=linux-image -else - afs_image=kernel-image -fi - # Generate the control file from the template. -sed -e "s/=KVERS/${afs_kvers}/g" -e "s/=IMG/${afs_image}/g" \ - debian/control.in > debian/control +sed -e "s/=KVERS/${afs_kvers}/g" debian/control.in > debian/control # Now, calcuate the binary package version. Extract the epoch from the kernel # package revision and add it to the beginning of the binary package version diff --git a/src/packaging/Debian/module/sysname b/src/packaging/Debian/module/sysname index 9a75e80e1..3762999a7 100755 --- a/src/packaging/Debian/module/sysname +++ b/src/packaging/Debian/module/sysname @@ -31,7 +31,7 @@ arm|armel|armv5tel) ;; esac ;; -i[3456]86|lpia) +i[3456]86) case $KVERS in 2.2*) echo i386_linux22 diff --git a/src/packaging/Debian/openafs-client.lintian-overrides b/src/packaging/Debian/openafs-client.lintian-overrides index 2eb27a365..8986848e1 100644 --- a/src/packaging/Debian/openafs-client.lintian-overrides +++ b/src/packaging/Debian/openafs-client.lintian-overrides @@ -1,3 +1,10 @@ # The AFS client cache should not be world-readable, since it may contain # files only readable by some of the local users based on their tokens. openafs-client: non-standard-dir-perm var/cache/openafs/ 0700 != 0755 + +# These are virtual packages, and breaks is more correct than Conflicts +# since upgrading to something that provides openafs-modules3 will fix +# the problem but the packages can be co-installed from a file system +# perspective. +openafs-client: breaks-without-version openafs-modules1 +openafs-client: breaks-without-version openafs-modules2 diff --git a/src/packaging/Debian/openafs-doc.README.Debian b/src/packaging/Debian/openafs-doc.README.Debian index 830381aee..01d3e15e3 100644 --- a/src/packaging/Debian/openafs-doc.README.Debian +++ b/src/packaging/Debian/openafs-doc.README.Debian @@ -12,12 +12,10 @@ All of the manuals are included because, even including significant portions that are not relevant to Debian, because they all do contain some valuable information. Debian users should ignore the installation information and much of the Quick Start Guide in favor of the -documentation that comes with the Debian OpenAFS packages, and should be -aware that the IBM AFS 3.6 Release Notes are for the IBM release -immediately prior to OpenAFS 1.0 (and are therefore rather dated). +documentation that comes with the Debian OpenAFS packages. The AFS protocol information included here is dated and may not be accurate in all details, but is the best protocol information currently available. - -- Russ Allbery , Sat Nov 19 12:45:55 2005 + -- Russ Allbery , Mon, 14 Jun 2010 18:18:35 -0700 diff --git a/src/packaging/Debian/openafs-fileserver.install b/src/packaging/Debian/openafs-fileserver.install index 37ef493de..e167b0e6c 100644 --- a/src/packaging/Debian/openafs-fileserver.install +++ b/src/packaging/Debian/openafs-fileserver.install @@ -28,14 +28,35 @@ debian/tmp/usr/share/man/man5/krb.conf.5 usr/share/man/man5 debian/tmp/usr/share/man/man5/salvage.lock.5 usr/share/man/man5 debian/tmp/usr/share/man/man5/sysid.5 usr/share/man/man5 -debian/tmp/usr/share/man/man8/bos_util.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/bosserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/fileserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/salvager.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/salvageserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/state_analyzer.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/upclient.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/upserver.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/voldump.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/volinfo.8 usr/share/man/man8 -debian/tmp/usr/share/man/man8/volserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bos_util.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/bosserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fileserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_attach.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_callback.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_detach.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_error.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_header.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_leaveoff.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_list.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_mode.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_move.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_offline.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_online.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_query.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_stats.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_vgcadd.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_vgcdel.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_vgcquery.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_vgcscan.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_vgcscanall.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_vnode.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/fssync-debug_volop.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/salvager.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/salvageserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/state_analyzer.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/upclient.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/upserver.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/voldump.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/volinfo.8 usr/share/man/man8 +debian/tmp/usr/share/man/man8/volserver.8 usr/share/man/man8 diff --git a/src/packaging/Debian/rules b/src/packaging/Debian/rules index 7826b91dc..b86cd1f55 100755 --- a/src/packaging/Debian/rules +++ b/src/packaging/Debian/rules @@ -47,18 +47,17 @@ DOC_PACKAGES = libpam-openafs-kaserver openafs-dbserver openafs-fuse \ IGNORE = -XAuthLog -Xcompile_et -Xcopyauth -Xdlog -Xdpass -Xfms.log \ -Xfs_chgrp.1 -Xfs_chown.1 -Xfs_cscpolicy.1 -Xfs_flushall.1 \ -Xfs_memdump.1 -Xfs_minidump.1 -Xfs_trace.1 -Xkadb_check -Xkaserver \ - -Xkdb -Xkdump -Xkpwvalid -Xlibafssetpag.so -Xlibafsrpc.so \ - -Xlibafsauthent.so -Xpackage -Xpagsh.krb -Xsymlink -Xtokens.krb \ - -Xuss -Xvldb_convert -Xvsys -Xxfs_size_check + -Xkdb -Xkdump -Xkpwvalid -Xpagsh.krb -Xsymlink -Xtokens.krb -Xuss \ + -Xvldb_convert -Xvsys -Xxfs_size_check # Installed via other means since we have to rename them. IGNORE += -Xafsd.fuse.8 -Xpam_afs -# These variables are used by get-orig-source and to construct dkms.conf. -# You will need to change TAG to package stable releases instead of -# experimental releases. -DEBVERS := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \ - | cut -d- -f1) +# These variables are used by get-orig-source, to construct dkms.conf, and +# to set the build version. You will need to change TAG to package stable +# releases instead of experimental releases. +DEBIAN := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) +DEBVERS := $(shell echo '$(DEBIAN)' | cut -d- -f1) VERSION := $(shell echo '$(DEBVERS)' | sed -e 's/[+-].*//' -e 's/~//g') TAG := $(shell echo 'openafs-devel-$(VERSION)' | sed 's/\./_/g') REPO := git://git.openafs.org/openafs.git @@ -90,6 +89,7 @@ build-indep: build-stamp: @if test x"$(SYS_NAME)" = x"UNKNOWN" ; then exit 1 ; fi dh build --before configure + echo '$(DEBIAN)'-debian > .version mv doc/man-pages/pod1/up.pod doc/man-pages/pod1/afs-up.pod rm -f doc/man-pages/man1/up.1 sh regen.sh @@ -97,14 +97,13 @@ build-stamp: sh configure \ --with-afs-sysname=$(SYS_NAME) --disable-kernel-module \ --prefix=/usr --mandir=\$${prefix}/share/man \ - --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var/lib --with-krb5-conf=/usr/bin/krb5-config \ - --enable-supergroups --enable-demand-attach-fs \ - --enable-disconnected --enable-fuse-client \ + --sysconfdir=/etc --libexecdir=/usr/lib --with-krb5 \ + --localstatedir=/var/lib --enable-supergroups \ + --enable-demand-attach-fs --enable-disconnected \ + --enable-fuse-client --enable-debug --enable-debug-lwp \ --with-xslt-processor=xsltproc --with-html-xsl=$(HTML_XSL) \ - --enable-debug --enable-debug-lwp $(DEBIAN_OPT_FLAGS) $(SYSTEM) - chmod a+x config.sub src/libafs/make_kbuild_makefile.pl \ - src/config/make_vnode.pl + --enable-reduced-depends $(DEBIAN_OPT_FLAGS) $(SYSTEM) + chmod a+x config.sub dh build --after configure $(MAKE) libafs_tree set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \ @@ -112,13 +111,20 @@ build-stamp: done touch $@ +# The manipulation of debian/changelog here is unnecessary with a regular +# Debian build. It is provided solely so that upstream can share the Debian +# packaging files, working around problems caused by upstream's distclean +# removing packaging/Debian/changelog because it's Autoconf-generated. clean: [ ! -f doc/man-pages/pod1/afs-up.pod ] \ || mv doc/man-pages/pod1/afs-up.pod doc/man-pages/pod1/up.pod set -e; for d in AdminGuide QuickStartUnix UserGuide ; do \ [ ! -f doc/xml/$$d/Makefile ] || $(MAKE) -C doc/xml/$$d clean ; \ done + [ ! -f debian/changelog.in ] \ + || cp debian/changelog debian/changelog.save dh clean + [ -f debian/changelog ] || mv debian/changelog.save debian/changelog install: install-stamp install-stamp: build-stamp @@ -155,6 +161,7 @@ install-stamp: build-stamp install -d debian/$(srcpkg)/usr/src/modules/$(package) cd libafs_tree && find . -print | \ cpio -admp $(CURDIR)/debian/$(srcpkg)/usr/src/modules/$(package) + cp .version debian/$(srcpkg)/usr/src/modules/$(package)/ mkdir -p debian/$(srcpkg)/usr/src/modules/$(package)/debian cp debian/copyright debian/module/* \ debian/$(srcpkg)/usr/src/modules/$(package)/debian/ @@ -208,6 +215,7 @@ install-stamp: build-stamp debian/$(srcpkg)/usr/share/doc/$(srcpkg)/NEWS.Debian dh_dkms -V $(VERSION) + dh_installchangelogs NEWS dh install --after dh_install chmod 700 debian/openafs-client/var/cache/openafs chmod 700 debian/openafs-dbserver/var/lib/openafs/db diff --git a/src/packaging/Debian/sysname b/src/packaging/Debian/sysname index da8fd1a5f..482712726 100755 --- a/src/packaging/Debian/sysname +++ b/src/packaging/Debian/sysname @@ -15,13 +15,13 @@ arm|armel|armv5tel) amd64) echo amd64_linux26 ;; -i[3456]86|lpia) +i[3456]86) echo i386_linux26 ;; ia64) echo ia64_linux26 ;; -powerpc) +powerpc|powerpcspe) echo ppc_linux26 ;; ppc64) -- 2.39.5