Accepting request 598765 from home:hauky

- remove package krb5-mit. It contained binaries for server and client.
  Besides, client and server already had an implicit dependency on krb5.
  Put the binaries to client and server-package respectively.
- Remove heimdal stuff. Untested for a long time.

OBS-URL: https://build.opensuse.org/request/show/598765
OBS-URL: https://build.opensuse.org/package/show/filesystems/openafs?expand=0&rev=12

openafs-1.8.x.heimdal.patch

@@ -1,11 +0,0 @@
---- a/src/rxkad/asn1_err.h.orig	2011-05-14 09:49:51.000000000 +0000
-+++ a/src/rxkad/asn1_err.h	2011-05-14 09:53:49.000000000 +0000
-@@ -6,7 +6,7 @@
- 
- struct et_list;
- 
--void initialize_asn1_error_table_r(struct et_list **);
-+extern void initialize_asn1_error_table_r(void);
- 
- void initialize_asn1_error_table(void);
- #define init_asn1_err_tbl initialize_asn1_error_table

openafs.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Apr 16 18:16:10 UTC 2018 - christof.hanke@mpcdf.mpg.de
+
+- remove package krb5-mit. It contained binaries for server and client.
+  Besides, client and server already had an implicit dependency on krb5.
+  Put the binaries to client and server-package respectively.
+- Remove heimdal stuff. Untested for a long time.
+
 -------------------------------------------------------------------
 Mon Apr 16 15:35:15 UTC 2018 - christof.hanke@mpcdf.mpg.de
 

openafs.spec

@@ -28,10 +28,6 @@
 
 # package-wide definitions here
 
-#kerberos5
-# 0=MIT | 1=Heimdal
-%define	option_heimdal 0
-
 # build authlibs
 %define build_authlibs 1
 
@@ -96,7 +92,6 @@ Source56:       openafs.CellAlias
 Source57:       openafs.ThisCell
 Source58:       openafs.cacheinfo
 Source99:       openafs.changes
-Patch2:         openafs-1.8.x.heimdal.patch
 Patch3:         openafs-1.8.x.ncurses6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -110,6 +105,7 @@ BuildRequires:  coreutils
 BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  git
+BuildRequires:  krb5-devel
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
 
@@ -118,14 +114,6 @@ Requires(post): %insserv_prereq
 %endif
 Requires(post): %fillup_prereq
 
-%if %{option_heimdal}
-BuildRequires:  heimdal-devel
-%define krb5_config /usr/lib/heimdal/bin/krb5-config
-%else
-BuildRequires:  krb5-devel
-%define krb5_config /usr/lib/mit/bin/krb5-config
-%endif
-
 %if %{build_kernel_modules} 
 BuildRequires:  kernel-source
 BuildRequires:  kernel-syms
@@ -234,47 +222,6 @@ administrative management.
 This package provides the source code to build your own AFS kernel
 module.
 
-%if %{option_heimdal}
-%package krb5-heimdal
-Summary:        OpenAFS programs to use with krb5
-Group:          System/Filesystems
-Requires:       %{name} = %{version}
-Requires:       heimdal-lib
-Requires:       heimdal-tools
-
-%description krb5-heimdal
-The AFS distributed filesystem.  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 compatibility programs so you can use krb5
-to authenticate to AFS services, instead of using AFS's homegrown
-krb4 lookalike services.
-This is using the  implementation of krb5.
-Requires:       heimdal-lib
-Requires:       heimdal-tools
-%else 
-
-%package krb5-mit
-Summary:        OpenAFS programs to use with krb5
-Group:          System/Filesystems
-Requires:       %{name}-client
-Requires:       krb5-client
-
-%description krb5-mit
-The AFS distributed filesystem.  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 compatibility programs so you can use krb5
-to authenticate to AFS services, instead of using AFS's homegrown
-krb4 lookalike services.
-This is using the MIT implementation of krb5.
-
-%endif
-
 %if %{build_kernel_modules}
 %package KMP
 Summary:        OpenAFS Distributed File System - kernel module
@@ -310,7 +257,6 @@ Summary:        OpenAFS File System Client
 Group:          System/Filesystems
 Requires:       %{name} = %{version}
 Requires:       %{name}-kmp
-Requires:       %{name}-krb5-mit = %{version}
 
 %description client
 AFS is a cross-platform distributed file system product pioneered at
@@ -339,11 +285,6 @@ and load balancing, and ACLs. This package contains the OpenAFS client.
 : @@@ sysconf dir:    	  %{_sysconfdir}
 : @@@ man dir:    	  %{_mandir}
 : @@@ build modules:      %{build_kernel_modules}
-%if %{option_heimdal}
-: @@@ krb5 : heimdal
-%else
-: @@@ krb5 : mit
-%endif
 : @@@ architecture:               %{_arch}
 : @@@ target cpu:         %{_target_cpu}
 : @@@
@@ -362,10 +303,6 @@ done
 
 %setup -q -n openafs-%{upstream_version} -T -b 0 -b 1
 
-%if %{option_heimdal}
-%patch2 -p1
-%endif
-
 %if %{run_regen}
 %patch3 -p1
  ./regen.sh
@@ -399,11 +336,7 @@ afs_sysname=${sysbase}_linux26
 RPM_OPT_FLAGS=`echo ${RPM_OPT_FLAGS} | sed s/-D_FORTIFY_SOURCE=2//`
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fPIC" 
 
-%if %{option_heimdal}
-export CFLAGS="$CFLAGS -I/usr/include/heimdal" 
-%else
 export KRB5LIBS='-lcom_err -lkrb5'
-%endif
 export PATH_KRB5_CONFIG=%{krb5_config}
 
 %configure \
@@ -568,7 +501,7 @@ find %{buildroot} -type f -name "*.a" -delete
 for x in dlog symlink symlink_list symlink_make symlink_remove; do
     rm %{buildroot}/%{_mandir}/man1/${x}.1
 done
-for x in rmtsysd xfs_size_check; do
+for x in rmtsysd xfs_size_check aklog_dynamic_auth; do
     rm %{buildroot}/%{_mandir}/man8/${x}.8
 done
 
@@ -820,6 +753,7 @@ fi
 %files client
 %defattr(-,root,root)
  %{_bindir}/fs
+ %{_bindir}/aklog
  %{_bindir}/klog.krb5
  %{_bindir}/pagsh
  %{_bindir}/pagsh.krb	
@@ -831,6 +765,7 @@ fi
  %{_sbindir}/fstrace
 %doc %{_mandir}/man1/fs.1.gz
 %doc %{_mandir}/man1/fs_*.1.gz
+%doc %{_mandir}/man1/aklog.1.gz
 %doc %{_mandir}/man1/klog.krb5.1.gz
 %doc %{_mandir}/man1/pagsh.1.gz
 %doc %{_mandir}/man1/pagsh.krb.1.gz
@@ -885,6 +820,7 @@ fi
 %doc %{_mandir}/man5/tapeconfig.5.gz
 %doc %{_mandir}/man5/vldb.DB0.5.gz
 %doc %{_mandir}/man8/akeyconvert.8.gz
+%doc %{_mandir}/man8/asetkey.8.gz
 %doc %{_mandir}/man8/bos_util.8.gz
 %doc %{_mandir}/man8/bosserver.8.gz
 %doc %{_mandir}/man8/buserver.8.gz
@@ -924,6 +860,7 @@ fi
 %{_libexecdir}/openafs/upserver
 %{_libexecdir}/openafs/vlserver
 %{_libexecdir}/openafs/volserver
+%{_sbindir}/asetkey
 %{_sbindir}/akeyconvert
 %{_sbindir}/bos_util
 %{_sbindir}/bosserver
@@ -960,19 +897,6 @@ fi
 %dir /usr/src/kernel-modules/openafs
 /usr/src/kernel-modules/openafs/*
 
-%if %{option_heimdal}
-%files krb5-heimdal
-%defattr(-,root,root)
-%else 
-%files krb5-mit
-%defattr(-,root,root)
-%endif
-%{_bindir}/aklog
-%doc %{_mandir}/man1/aklog.1.gz
-%doc %{_mandir}/man8/aklog_dynamic_auth.8.gz
-%doc %{_mandir}/man8/asetkey.8.gz
-%{_sbindir}/asetkey
-
 %if %{build_authlibs}
 %files authlibs
 %defattr(-,root,root)