Hello community,
here is the log from the commit of package openafs for openSUSE:Factory checked
in at 2018-04-19 15:31:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openafs (Old)
and /work/SRC/openSUSE:Factory/.openafs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openafs"
Thu Apr 19 15:31:10 2018 rev:2 rq:597537 version:1.8.0~pre5
Changes:
--------
--- /work/SRC/openSUSE:Factory/openafs/openafs.changes 2018-03-31
15:36:56.945554586 +0200
+++ /work/SRC/openSUSE:Factory/.openafs.new/openafs.changes 2018-04-19
15:31:16.282667640 +0200
@@ -1,0 +2,20 @@
+Mon Apr 16 15:35:15 UTC 2018 - christof.ha...@mpcdf.mpg.de
+
+- fdupes: use symlinks instead of hardlinks. Do not fdupe
+ /etc and /var
+
+-------------------------------------------------------------------
+Fri Apr 6 10:53:13 UTC 2018 - christof.ha...@mpcdf.mpg.de
+
+- fix dependencies between packages, so that fuse-client
+ can be installed.
+- cleanup old sys-v sysconfig files and other minor fixes
+- fix unit file for fuse-client
+
+-------------------------------------------------------------------
+Mon Apr 2 20:59:53 UTC 2018 - christof.ha...@mpcdf.mpg.de
+
+- build fuse-client unconditionally.
+- do not build KMP on unsupported architectures so that overall
+ build succeeds.
+
Old:
----
sysconfig.openafs-client
sysconfig.openafs-server
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openafs.spec ++++++
--- /var/tmp/diff_new_pack.IjQELa/_old 2018-04-19 15:31:17.354623592 +0200
+++ /var/tmp/diff_new_pack.IjQELa/_new 2018-04-19 15:31:17.354623592 +0200
@@ -26,11 +26,7 @@
# TUNABLES
#
-#
-# define distribution and version
-#
-
-#distribution-definitions here
+# package-wide definitions here
#kerberos5
# 0=MIT | 1=Heimdal
@@ -42,14 +38,11 @@
# build kernel modules
%define build_kernel_modules 1
-# build fuse-based client
-%define build_fuse_client 0
-
# run regen to create new configure script
%define run_regen 1
#
-# auto-determined parameters
+# package internal directories
#
%define afslogsdir /var/log/openafs
%define afsconfdir /etc/openafs/server
@@ -57,6 +50,14 @@
%define vicecachedir /var/cache/openafs
%define afslocaldir /var/lib/openafs
+%ifarch ppc64le ppc64
+%define build_kernel_modules 0
+%endif
+
+%if %{_arch} == arm
+%define build_kernel_modules 0
+%endif
+
# used for %setup only
# leave upstream tar-balls untouched for integrity checks.
%define upstream_version 1.8.0pre5
@@ -77,8 +78,6 @@
Source4: openafs-%{version}-src.tar.bz2.sha256
Source5: openafs-%{version}-doc.tar.bz2.sha256
Source10: README.SUSE.openafs
-Source13: sysconfig.openafs-client
-Source14: sysconfig.openafs-server
Source15: logrotate.openafs-server
Source16: ld.conf.openafs
Source18: RELNOTES-%{version}
@@ -133,10 +132,8 @@
BuildRequires: module-init-tools
%endif
-%if %{build_fuse_client}
BuildRequires: fuse-devel
BuildRequires: pkg-config
-%endif
%description
AFS is a cross-platform distributed file system product pioneered at
@@ -262,7 +259,7 @@
%package krb5-mit
Summary: OpenAFS programs to use with krb5
Group: System/Filesystems
-Requires: %{name}-client = %{version}
+Requires: %{name}-client
Requires: krb5-client
%description krb5-mit
@@ -291,18 +288,11 @@
%endif
-%if %{build_fuse_client}
%package fuse_client
Summary: OpenAFS FUSE File System Client
Group: System/Filesystems
-Requires: %{name} = %{version}
-Requires: %{name}-krb5-mit = %{version}
Conflicts: %{name}-client
-Requires: coreutils
-Requires: diffutils
-Requires: fillup
-Requires: grep
-Requires: sed
+Requires: %{name} = %{version}
%description fuse_client
AFS is a cross-platform distributed file system product pioneered at
@@ -315,19 +305,12 @@
This client is using the EXPERIMENTAL FUSE interface on LINUX.
It does not offer authentication etc.
-%else
-
%package client
Summary: OpenAFS File System Client
Group: System/Filesystems
Requires: %{name} = %{version}
Requires: %{name}-kmp
Requires: %{name}-krb5-mit = %{version}
-Requires: coreutils
-Requires: diffutils
-Requires: fillup
-Requires: grep
-Requires: sed
%description client
AFS is a cross-platform distributed file system product pioneered at
@@ -341,7 +324,6 @@
caching, disconnected operations, replication for higher availability
and load balancing, and ACLs. This package contains the OpenAFS client.
-%endif
%prep
@@ -357,7 +339,6 @@
: @@@ sysconf dir: %{_sysconfdir}
: @@@ man dir: %{_mandir}
: @@@ build modules: %{build_kernel_modules}
-: @@@ build fuse client: %{build_fuse_client}
%if %{option_heimdal}
: @@@ krb5 : heimdal
%else
@@ -391,21 +372,28 @@
%endif
%build
+# architecture specific settings
sysbase=%{_arch}
+
%ifarch ppc
- perl -pi -e 's,^(XCFLAGS.*),\1 -fPIC,'
src/config/Makefile.ppc_linux24.in
+perl -pi -e 's,^(XCFLAGS.*),\1 -fPIC,' src/config/Makefile.ppc_linux24.in
+%endif
+%ifarch ppc64 ppc64le
+sysbase=ppc64
+export LDFLAGS="$LDFLAGS -m64"
%endif
-%ifarch ppc64
- sysbase=ppc64
+%ifarch armv7l
+sysbase=arm
%endif
%ifarch s390x
- sysbase=s390
+sysbase=s390
%endif
%ifarch x86_64
- sysbase=amd64
- perl -pi -e 's,^(XCFLAGS.*),\1 -fPIC,'
src/config/Makefile.amd64_linux24.in
- perl -pi -e 's,^(XLIBS.*),\1 -lresolv,'
src/config/Makefile.amd64_linux24.in
+sysbase=amd64
+perl -pi -e 's,^(XCFLAGS.*),\1 -fPIC,' src/config/Makefile.amd64_linux24.in
+perl -pi -e 's,^(XLIBS.*),\1 -lresolv,' src/config/Makefile.amd64_linux24.in
%endif
+
afs_sysname=${sysbase}_linux26
RPM_OPT_FLAGS=`echo ${RPM_OPT_FLAGS} | sed s/-D_FORTIFY_SOURCE=2//`
@@ -418,10 +406,6 @@
%endif
export PATH_KRB5_CONFIG=%{krb5_config}
-%ifarch ppc64
-export LDFLAGS="$LDFLAGS -m64"
-%endif
-
%configure \
--disable-transarc-paths \
--disable-pam \
@@ -479,6 +463,7 @@
mkdir -p %{buildroot}%{_datadir}/openafs/C
mkdir -p %{buildroot}/%{afsconfdir}
mkdir -p %{buildroot}/%{afslocaldir}
+mkdir -p %{buildroot}/%{_sbindir}
#
# client
@@ -490,15 +475,13 @@
cp -a src/afs/afszcm.cat %{buildroot}%{_datadir}/openafs/C
install -m 644 %{S:27} %{buildroot}/%{_fillupdir}/sysconfig.openafs-client
install -m 644 %{S:23} %{buildroot}/%_unitdir
-ln -s %{_sbindir}//service %{buildroot}/%{_sbindir}/rcopenafs-client
+ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcopenafs-client
#
# fuse client package
-%if %{build_fuse_client}
install -m 644 %{S:29} %{buildroot}/%{_fillupdir}/sysconfig.openafs-fuse-client
install -m 644 %{S:26} %{buildroot}/%_unitdir
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rcopenafs-fuse-client
-%endif
#
# server
@@ -553,6 +536,10 @@
done
cd $OLD_PWD
+# create manpage for afsd.fuse as a real file
+rm %{buildroot}/%{_mandir}/man8/afsd.fuse.8
+cp -p %{buildroot}/%{_mandir}/man8/afsd.8
%{buildroot}/%{_mandir}/man8/afsd.fuse.8
+
# move %%{_libdir}/afs-stuff to %%{_libdir}/openafs
mv %{buildroot}/%{_libdir}/afs/* %{buildroot}/%{_libdir}/openafs
mv %{buildroot}/%{_libdir}/*.* %{buildroot}/%{_libdir}/openafs
@@ -574,9 +561,6 @@
rm %{buildroot}/%{_libdir}/libkopenafs.so
%endif
-# check for duplicates, remove them and link them
-%fdupes %{buildroot}
-
# remove all static libraries
find %{buildroot} -type f -name "*.a" -delete
@@ -604,6 +588,9 @@
done
cd $OLD_PWD
+# replace duplicates by symlinks
+%fdupes -s %{buildroot}/usr
+
#
# main
@@ -611,9 +598,6 @@
%postun -p /sbin/ldconfig
-#
-# kernel-source
-
%post kernel-source
echo To install the kernel-module, do:
echo cd /usr/src/kernel-modules/openafs
@@ -623,14 +607,19 @@
#
# fuse client
-%if %{build_fuse_client}
-
%pre fuse_client
-%service_add_pre openafs-client.service
+%service_add_pre openafs-fuse-client.service
+
+%preun fuse_client
+%service_del_preun openafs-fuse-client.service
+%{stop_on_removal}
%post fuse_client
+if [ ! -d /afs ]; then
+ mkdir /afs
+fi
%{fillup_only -n openafs-fuse-client}
-%service_add_post openafs-client.service
+%service_add_post openafs-fuse-client.service
/sbin/ldconfig
if [ "x$1" = "x" ]; then
@@ -648,16 +637,13 @@
echo authentication etc. is not implemented yet in this version.
fi
-%preun fuse_client
-%service_del_preun openafs-client.service
-%{stop_on_removal}
-
%postun fuse_client
-%service_del_postun openafs-client.service
+%service_del_postun openafs-fuse-client.service
+if [ -d /afs ]; then
+ echo make sure to remove directory /afs if unwanted.
+fi
/sbin/ldconfig
-%else
-
#
# client
@@ -696,9 +682,6 @@
/sbin/ldconfig
%service_del_postun openafs-client.service
-#fuse-client
-%endif
-
#
# server
@@ -823,17 +806,17 @@
%{_sbindir}/vos
%{_sbindir}/vsys
-%if %{build_fuse_client}
%files fuse_client
%defattr(-,root,root)
%{_sbindir}/afsd.fuse
+%{_sbindir}/rcopenafs-fuse-client
%config(noreplace) %{viceetcdir}/SuidCells
%config(noreplace) %{viceetcdir}/cacheinfo
+%doc %{_mandir}/man8/afsd.fuse.8.gz
%_unitdir/openafs-fuse-client.service
-%{_sbindir}/rcopenafs-fuse-client
%{_fillupdir}/sysconfig.openafs-fuse-client
%{vicecachedir}
-%else
+
%files client
%defattr(-,root,root)
%{_bindir}/fs
@@ -871,7 +854,6 @@
%{_sbindir}/rcopenafs-client
%{_fillupdir}/sysconfig.openafs-client
%{vicecachedir}
-%endif
%files server
%defattr(-,root,root)
++++++ openafs-client.service ++++++
--- /var/tmp/diff_new_pack.IjQELa/_old 2018-04-19 15:31:17.562615046 +0200
+++ /var/tmp/diff_new_pack.IjQELa/_new 2018-04-19 15:31:17.566614881 +0200
@@ -11,7 +11,7 @@
ExecStartPre=/sbin/modprobe libafs
ExecStart=/usr/sbin/afsd $AFSD_ARGS
ExecStartPost=/usr/bin/fs sysname $SYSNAME
-ExecStop=/bin/umount /afs
+ExecStop=/usr/bin/umount /afs
ExecStop=/usr/sbin/afsd -shutdown
ExecStop=/sbin/rmmod libafs
KillMode=none
++++++ openafs-fuse-client.service ++++++
--- /var/tmp/diff_new_pack.IjQELa/_old 2018-04-19 15:31:17.594613731 +0200
+++ /var/tmp/diff_new_pack.IjQELa/_new 2018-04-19 15:31:17.598613566 +0200
@@ -7,13 +7,11 @@
[Service]
Type=forking
RemainAfterExit=true
-EnvironmentFile=/etc/sysconfig/openafs-client
+EnvironmentFile=/etc/sysconfig/openafs-fuse-client
ExecStartPre=/bin/chmod 0644 /etc/openafs/CellServDB
-ExecStartPre=/sbin/modprobe libafs
-ExecStart=/usr/sbin/afsd $AFSD_ARGS
-ExecStop=/bin/umount /afs
-ExecStop=/etc/openafs/afsd -shutdown
-ExecStop=/sbin/rmmod libafs
+ExecStart=/usr/sbin/afsd.fuse $AFSD_ARGS
+ExecStop=/usr/bin/umount /afs
+ExecStop=/usr/sbin/afsd.fuse -shutdown
KillMode=none
[Install]
