Date: Monday, January 4, 2010 @ 04:21:26 Author: tpowa Revision: 62215
Merged revisions 62212 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/nfs-utils/trunk ........ r62212 | tpowa | 2010-01-04 09:17:48 +0000 (Mo, 04 Jan 2010) | 2 lines upgpkg: nfs-utils 1.2.1-2 moved gssapi_mech.conf to libgssglue ........ Modified: nfs-utils/repos/testing-i686/ (properties) nfs-utils/repos/testing-i686/PKGBUILD Deleted: nfs-utils/repos/testing-i686/gssapi_mech.conf ------------------+ PKGBUILD | 35 ++++++++++++++++------------------- gssapi_mech.conf | 22 ---------------------- 2 files changed, 16 insertions(+), 41 deletions(-) Property changes on: nfs-utils/repos/testing-i686 ___________________________________________________________________ Modified: svnmerge-integrated - /nfs-utils/trunk:1-62197 + /nfs-utils/trunk:1-62214 Modified: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2010-01-04 09:19:11 UTC (rev 62214) +++ testing-i686/PKGBUILD 2010-01-04 09:21:26 UTC (rev 62215) @@ -7,16 +7,15 @@ pkgname=nfs-utils pkgver=1.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' license=('GPL') -backup=(etc/{exports,gssapi_mech.conf,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) -depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=1.3e') +backup=(etc/{exports,idmapd.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf}) +depends=('glibc' 'tcp_wrappers' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=1.3e' 'libgssglue') makedepends=('pkgconfig' 'autoconf') source=(http://downloads.sourceforge.net/nfs/${pkgname}-${pkgver}.tar.bz2 - gssapi_mech.conf nfs-common nfs-common.conf nfs-server @@ -30,6 +29,19 @@ nfs-utils-1.1.4-mtab-sym.patch nfs-utils-1.1.4-no-exec.patch) install=nfs-utils.install +md5sums=('c3ccd16c147befd49fe4541a506dd177' + '990a07943fa958d4abb1cb7bd52c9a7b' + '768928d9cbe5d0c6719e43b445e69ac6' + '5ae080f6117cef3140f02bc162bdc755' + '7bb672c320b10b3716b40c3f5bd6b6a8' + 'ff585faf410a62c4333a027c50b56bae' + 'eb4f4027fab6fc1201f1ca04f5954c76' + '97c9c6765ac793c5b684b2d6bbe1bc3f' + 'f3be115d392d9f9bb0f056e8d4341a14' + '20c6fae1c771b9d8e91c4973f16372e3' + 'e6fd3a8acfe97970a53db1b902c34f45' + '7674106eaaa4c149bccd4f05fe3604e9' + '4f4827dfc93008dfadd0a530ad0872b2') build() { cd $srcdir/${pkgname}-${pkgver} @@ -63,24 +75,9 @@ # Configuration install -D -m 644 ../exports "$pkgdir/"etc/exports install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf - install -D -m 644 ../gssapi_mech.conf "$pkgdir/"etc/gssapi_mech.conf install -D -m 644 ../nfs-common.conf "$pkgdir/"etc/conf.d/nfs-common.conf install -D -m 644 ../nfs-server.conf "$pkgdir/"etc/conf.d/nfs-server.conf # directories mkdir "$pkgdir/"var/lib/nfs/rpc_pipefs mkdir "$pkgdir/"var/lib/nfs/v4recovery } -md5sums=('c3ccd16c147befd49fe4541a506dd177' - '234b9cca75a33af98eda3f1683756879' - '990a07943fa958d4abb1cb7bd52c9a7b' - '768928d9cbe5d0c6719e43b445e69ac6' - '5ae080f6117cef3140f02bc162bdc755' - '7bb672c320b10b3716b40c3f5bd6b6a8' - 'ff585faf410a62c4333a027c50b56bae' - 'eb4f4027fab6fc1201f1ca04f5954c76' - '97c9c6765ac793c5b684b2d6bbe1bc3f' - 'f3be115d392d9f9bb0f056e8d4341a14' - '20c6fae1c771b9d8e91c4973f16372e3' - 'e6fd3a8acfe97970a53db1b902c34f45' - '7674106eaaa4c149bccd4f05fe3604e9' - '4f4827dfc93008dfadd0a530ad0872b2') Deleted: testing-i686/gssapi_mech.conf =================================================================== --- testing-i686/gssapi_mech.conf 2010-01-04 09:19:11 UTC (rev 62214) +++ testing-i686/gssapi_mech.conf 2010-01-04 09:21:26 UTC (rev 62215) @@ -1,22 +0,0 @@ -# Example /etc/gssapi_mech.conf file -# -# GSSAPI Mechanism Definitions -# -# This configuration file determines which GSS-API mechanisms -# the gssd code should use -# -# NOTE: -# The initiaiization function "mechglue_internal_krb5_init" -# is used for the MIT krb5 gssapi mechanism. This special -# function name indicates that an internal function should -# be used to determine the entry points for the MIT gssapi -# mechanism funtions. -# -# library initialization function -# ================================ ========================== -# The MIT K5 gssapi library, use special function for initialization. -#/usr/lib/libgssapi_krb5.so mechglue_internal_krb5_init -/usr/lib/libgssapi.so mechglue_internal_krb5_init -# -# The SPKM3 gssapi library function. Use the function spkm3_gss_initialize. -# /usr/local/gss_mechs/spkm/spkm3/libgssapi_spkm3.so spkm3_gss_initialize