Hello community,
here is the log from the commit of package openafs for openSUSE:Factory checked
in at 2018-04-22 14:39:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openafs (Old)
and /work/SRC/openSUSE:Factory/.openafs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openafs"
Sun Apr 22 14:39:54 2018 rev:3 rq:598777 version:1.8.0~pre5
Changes:
--------
--- /work/SRC/openSUSE:Factory/openafs/openafs.changes 2018-04-19
15:31:16.282667640 +0200
+++ /work/SRC/openSUSE:Factory/.openafs.new/openafs.changes 2018-04-22
14:39:58.760230170 +0200
@@ -1,0 +2,10 @@
+Thu Apr 19 16:53:21 UTC 2018 - christof.ha...@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 openafs-1.8.x.heimdal.patch and everything heimdal-related.
+ SUSE does not provide a proper heimdal and it's untested for a long
+ time.
+
+-------------------------------------------------------------------
Old:
----
openafs-1.8.x.heimdal.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openafs.spec ++++++
--- /var/tmp/diff_new_pack.5VMPY8/_old 2018-04-22 14:40:00.840154909 +0200
+++ /var/tmp/diff_new_pack.5VMPY8/_new 2018-04-22 14:40:00.844154765 +0200
@@ -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 @@
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: fdupes
BuildRequires: flex
BuildRequires: git
+BuildRequires: krb5-devel
BuildRequires: libtool
BuildRequires: ncurses-devel
@@ -118,14 +114,6 @@
%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 @@
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 @@
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 @@
: @@@ 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 @@
%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 @@
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 @@
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 @@
%files client
%defattr(-,root,root)
%{_bindir}/fs
+ %{_bindir}/aklog
%{_bindir}/klog.krb5
%{_bindir}/pagsh
%{_bindir}/pagsh.krb
@@ -831,6 +765,7 @@
%{_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 @@
%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 @@
%{_libexecdir}/openafs/upserver
%{_libexecdir}/openafs/vlserver
%{_libexecdir}/openafs/volserver
+%{_sbindir}/asetkey
%{_sbindir}/akeyconvert
%{_sbindir}/bos_util
%{_sbindir}/bosserver
@@ -960,19 +897,6 @@
%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)
