Author: jjneely Update of /cvs/free/rpms/openafs/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19105 Modified Files: .cvsignore openafs.spec sources Added Files: openafs-1.6.0-fPIC.patch Log Message: * Fri Sep 02 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-1 - Update to OpenAFS 1.6.0 final openafs-1.6.0-fPIC.patch: osconf.m4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- NEW FILE openafs-1.6.0-fPIC.patch --- --- src/cf/osconf.m4.orig 2011-08-05 13:46:52.780804506 -0400 +++ src/cf/osconf.m4 2011-08-05 13:50:10.734686871 -0400 @@ -240,7 +240,7 @@ amd64_linux*) CCOBJ="${CC} -fPIC" KERN_OPTMZ=-O2 - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -fPIC' MT_LIBS="-lpthread" PAM_OPTMZ=-O2 PAM_CFLAGS="-Dlinux -DLINUX_PAM -fPIC" @@ -263,8 +263,9 @@ ;; i386_linux*) + CCOBJ="${CC} -fPIC" KERN_OPTMZ=-O2 - MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}' + MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS} -fPIC' MT_LIBS="-lpthread" DBG=-g KERN_DBG=-g Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/openafs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Apr 2011 14:57:47 -0000 1.2 +++ .cvsignore 6 Sep 2011 18:25:09 -0000 1.3 @@ -1,2 +1,2 @@ -openafs-1.6.0pre4-doc.tar.bz2 -openafs-1.6.0pre4-src.tar.bz2 +openafs-1.6.0-doc.tar.bz2 +openafs-1.6.0-src.tar.bz2 Index: openafs.spec =================================================================== RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- openafs.spec 7 Jun 2011 19:20:48 -0000 1.9 +++ openafs.spec 6 Sep 2011 18:25:09 -0000 1.10 @@ -10,17 +10,15 @@ %define sysname amd64_linux26 %endif -%define pre pre4 - Summary: Enterprise Network File System Name: openafs Version: 1.6.0 -Release: 0.1.%{pre}%{?dist} +Release: 1%{?dist} License: IBM Group: System Environment/Daemons URL: http://www.openafs.org -Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}%{pre}-src... -Source1: http://www.openafs.org/dl/openafs/%{version}%{pre}/openafs-%{version}%{pr... +Source0: http://www.openafs.org/dl/openafs/%{version}/%{name}-%{version}-src.tar.bz2 +Source1: http://www.openafs.org/dl/openafs/%{version}/openafs-%{version}-doc.tar.bz2 Source11: CellServDB Source12: cacheinfo Source13: openafs.init @@ -28,7 +26,9 @@ BuildRoot: %{_tmppath}/%{name}-root BuildRequires: krb5-devel, pam-devel, ncurses-devel, flex, byacc, bison -BuildRequires: automake +BuildRequires: automake, autoconf + +Patch0: openafs-1.6.0-fPIC.patch %description The AFS distributed filesystem. AFS is a distributed filesystem @@ -90,7 +90,10 @@ Cell. %prep -%setup -q -b 1 -n openafs-%{version}%{pre} +%setup -q -b 1 -n openafs-%{version} + +# This changes osconf.m4 to build with -fPIC on i386 and x86_64 +%patch0 # Convert the licese to UTF-8 mv src/LICENSE src/LICENSE~ @@ -116,8 +119,7 @@ --disable-kernel-module \ --disable-strip-binaries \ --enable-supergroups \ - --with-krb5-conf=/usr/bin/krb5-config \ - CCOBJ=-fPIC + --with-krb5-conf=/usr/bin/krb5-config # Build is not SMP compliant make $RPM_OPT_FLGS all_nolibafs @@ -150,6 +152,10 @@ # Include kpasswd as kapasswd so I can change my admin tokens mv ${RPM_BUILD_ROOT}/usr/bin/kpasswd ${RPM_BUILD_ROOT}/usr/bin/kapasswd +# Rename /usr/bin/backup to not conflict with Coda +# (Future AFS upstream change) +mv ${RPM_BUILD_ROOT}/usr/sbin/backup ${RPM_BUILD_ROOT}/usr/sbin/afsbackup + # Put the PAM modules in a sane place mkdir -p ${RPM_BUILD_ROOT}/%{_lib}/security mv ${RPM_BUILD_ROOT}%{_libdir}/pam_afs.krb.so.1 \ @@ -176,6 +182,13 @@ mv $RPM_BUILD_ROOT%{_mandir}/man1/kpasswd.1 \ $RPM_BUILD_ROOT%{_mandir}/man1/kapasswd.1 +# rename backup man page to afsbackup +mv $RPM_BUILD_ROOT%{_mandir}/man8/backup.8 \ + $RPM_BUILD_ROOT%{_mandir}/man8/afsbackup.8 + +# Create the cache directory +install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/cache/openafs + # don't restart in post because kernel modules could well have changed %post /sbin/ldconfig @@ -234,7 +247,7 @@ %{_bindir}/unlog %{_bindir}/up %{_bindir}/translate_et -%{_sbindir}/backup +%{_sbindir}/afsbackup %{_sbindir}/butc %{_sbindir}/fstrace %{_sbindir}/rxdebug @@ -251,6 +264,7 @@ %files client %defattr(-, root, root) %dir %{_sysconfdir}/openafs +%dir %{_localstatedir}/cache/openafs %config(noreplace) %{_sysconfdir}/openafs/CellServDB %config(noreplace) %{_sysconfdir}/openafs/ThisCell %config(noreplace) %{_sysconfdir}/openafs/cacheinfo @@ -304,6 +318,29 @@ %{_datadir}/openafs/C/afszcm.cat %changelog +* Fri Sep 02 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-1 +- Update to OpenAFS 1.6.0 final + +* Thu Aug 04 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-0.pre7.2 +- BuildReq autoconf +- Patch osconf.m4 to force building with -fPIC as there were still + objects used in libraries that were not build with -fPIC +- Removed the CCOBJ environment variable with the configure line + +* Mon Jul 25 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-0.pre7.1 +- rpmFusion Bug 1783 +- Populate and set SELinux context for the AFS cache directory + even though we use memcache by default + +* Thu Jul 21 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-0.pre7 +- Update to OpenAFS 1.6.0 pre-release 7 +- Rename /usr/sbin/backup to /usr/sbin/afsbackup rpmFusion Bug # 1727 +- Add the -fakestat option to the default options for afsd + rpmfusion Bug # 1837 + +* Wed Jun 08 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-0.1.pre6 +- Update to OpenAFS 1.6.0 pre-release 6 + * Tue Jun 07 2011 Jack Neely <jjneely(a)ncsu.edu&gt; 0:1.6.0-0.1.pre4 - rpmFusion Bug # 1782 - rename the kpasswd binary to kapasswd to match its man page Index: sources =================================================================== RCS file: /cvs/free/rpms/openafs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 14 Apr 2011 14:57:47 -0000 1.5 +++ sources 6 Sep 2011 18:25:09 -0000 1.6 @@ -1,2 +1,2 @@ -78a540a97ed6c355583ab07a8a95d4de openafs-1.6.0pre4-doc.tar.bz2 -f0f34f75d539b495bd89523ac9774fde openafs-1.6.0pre4-src.tar.bz2 +41180f1adacd926dc6c8c94e947dfb60 openafs-1.6.0-doc.tar.bz2 +ad53439fb0fbebcbcffc046835e40d54 openafs-1.6.0-src.tar.bz2