rpms/cfs/FC-3 sources, 1.2, 1.3 cfs.spec, 1.4, 1.5 cfs-INSTALL, 1.1, 1.2 .cvsignore, 1.2, 1.3
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Thu May 19 16:55:14 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/cfs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6974/cfs/FC-3
Modified Files:
sources cfs.spec cfs-INSTALL .cvsignore
Log Message:
synced with devel/ branch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfs/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:08:40 -0000 1.2
+++ sources 19 May 2005 16:55:12 -0000 1.3
@@ -1,2 +1,2 @@
f850c0ded4f4c2d4f929990827e4327d cfs-1.4.1.tar.gz
-553ae2033de68f48d95a8901f12fa57e cfs_1.4.1-10.diff.gz
+52e5f2d1fe70c3e0e4dc1e77843da89e cfs_1.4.1-15.diff.gz
Index: cfs.spec
===================================================================
RCS file: /cvs/extras/rpms/cfs/FC-3/cfs.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cfs.spec 10 Dec 2004 22:03:01 -0000 1.4
+++ cfs.spec 19 May 2005 16:55:12 -0000 1.5
@@ -1,26 +1,30 @@
-%define debpatch_version 10
+## $Id$
-Summary: An userspace crypto-filesystem
+%global debpatch_version 15
+
+%{!?release_func:%global release_func() %1%{?dist}}
+
+Summary: Userspace crypto-filesystem
Name: cfs
Version: 1.4.1
-Release: 3
-Epoch: 0
+Release: %release_func 6
+
License: BSD like
Group: System Environment/Daemons
URL: http://www.crypto.com/software
-Source0: http://www.crypto.com/software/%{name}-%{version}.tar.gz
+Source0: http://www.crypto.com/software/%name-%version.tar.gz
Source1: cfsd.init
Source2: mcrypt
Source3: cfs-INSTALL
Source4: cfsd.sysconfig
-Patch0: http://ftp.debian.org/debian/pool/main/c/cfs/cfs_1.4.1-%{debpatch_version}.diff.gz
-Patch1: cfs-blowfish.patch
+Patch0: http://ftp.debian.org/debian/pool/main/c/cfs/cfs_1.4.1-%debpatch_version.diff.gz
+Patch1: cfs-blowfish.patch
Patch3: cfs-root.patch
Patch4: cfs-1.4.1-rpm.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot: %_tmppath/%name-%version-%release-root
Requires: nfs-utils
-Requires(post,preun): /sbin/chkconfig
-Requires(post): %{__mkdir}
+Requires(post): %__mkdir /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
%description
CFS is an encrypting file system for Unix-like OSs. It uses NFS as its
@@ -30,7 +34,7 @@
%package utils
Summary: Some (inofficial) utilities for cfs
Group: Applications/System
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %name = %version-%release
Requires: openssh-askpass procmail
%description utils
@@ -56,50 +60,50 @@
%patch3 -p1 -b .root
%patch4 -p1 -b .rpm
-%{__cp} -a %{SOURCE3} INSTALL
+%__install -p -m0644 %SOURCE3 INSTALL
-%define makeflags BINDIR=$D%{_bindir} ETCDIR=$D%{_sysconfdir}
+%define makeflags BINDIR=$D%_bindir ETCDIR=$D%_sysconfdir
%build
unset D
-%{__make} %{makeflags} %{?_smp_mflags} CFLAGS_EXTRA="$RPM_OPT_FLAGS" cfs
+%__make %makeflags %{?_smp_mflags} CFLAGS_EXTRA="$RPM_OPT_FLAGS" cfs
%install
-%{__rm} -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
-%{__install} -d $RPM_BUILD_ROOT{/.cfsfs,%{_bindir},%{_sbindir}} \
- $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
- $RPM_BUILD_ROOT%{_initrddir} \
- $RPM_BUILD_ROOT%{_mandir}/man{1,8}/ \
- $RPM_BUILD_ROOT%{_libdir}/%{name} \
- $RPM_BUILD_ROOT/mnt/crypt
+%__install -d $RPM_BUILD_ROOT{/.cfsfs,%_bindir,%_sbindir} \
+ $RPM_BUILD_ROOT%_sysconfdir/sysconfig \
+ $RPM_BUILD_ROOT%_initrddir \
+ $RPM_BUILD_ROOT%_mandir/man{1,8}/ \
+ $RPM_BUILD_ROOT%_libdir/%name \
+ $RPM_BUILD_ROOT/mnt/crypt
D=$RPM_BUILD_ROOT
-%{__make} %{makeflags} install_cfs
-%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/cfsd $RPM_BUILD_ROOT%{_sbindir}/
+%__make %makeflags install_cfs
+%__mv $RPM_BUILD_ROOT%_sysconfdir/cfsd $RPM_BUILD_ROOT%_sbindir/
-%{__install} -p -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/cfsd
-%{__install} -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_libdir}/%{name}/
-%{__install} -p -m644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/cfsd
-%{__ln_s} mcrypt $RPM_BUILD_ROOT%{_libdir}/%{name}/ucrypt
+%__install -p -m755 %SOURCE1 $RPM_BUILD_ROOT%_initrddir/cfsd
+%__install -p -m755 %SOURCE2 $RPM_BUILD_ROOT%_libdir/%name/
+%__install -p -m644 %SOURCE4 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/cfsd
+%__ln_s mcrypt $RPM_BUILD_ROOT%_libdir/%name/ucrypt
for i in 1 8; do
- %{__install} -m644 *.$i $RPM_BUILD_ROOT%{_mandir}/man$i/
+ %__install -m644 *.$i $RPM_BUILD_ROOT%_mandir/man$i/
done
find ${RPM_BUILD_ROOT} -name '*esm*' -print0 | xargs -0r rm -f
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
%post
/sbin/chkconfig --add cfsd
## See %%files-section below...
-test -d /mnt/crypt || %{__mkdir} -m755 /mnt/crypt
+test -d /mnt/crypt || %__mkdir -m755 /mnt/crypt
%preun
if [ "$1" = "0" ]; then
@@ -114,11 +118,11 @@
%files
%defattr(-,root,root)
%doc LEVELS README* VERSION INSTALL
-%doc %{_mandir}/*/*
-%config %{_initrddir}/*
-%config(noreplace) %{_sysconfdir}/sysconfig/*
-%{_bindir}/*
-%{_sbindir}/*
+%doc %_mandir/*/*
+%config %_initrddir/*
+%config(noreplace) %_sysconfdir/sysconfig/*
+%_bindir/*
+%_sbindir/*
%attr(0,root,root)/.cfsfs
## cfsd creates this directory with mode 0777 but allows write
@@ -132,10 +136,29 @@
%files utils
%defattr(-,root,root)
-%{_libdir}/%{name}
+%_libdir/%name
%changelog
+* Thu May 19 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.4.1-6
+- set %%dist-tag
+
+* Tue Apr 26 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.4.1-5
+- merged with 1.4.1-0.fdr.5
+- updated to debian patch version 15
+- removed some curlies
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
+* Fri Mar 4 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Split context marked dependency syntax to work around #118773.
+
+* Wed Jun 30 2004 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:1.4.1-0.fdr.5
+- updated to debian-patch version 14
+- updated documentation (fstab entry) so that it works with FC2's
+ mount also
+
* Tue Jul 15 2003 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 0:1.4.1-0.fdr.3
- s!%%optflags!$RPM_OPT_FLAGS!
- require nfs-utils
@@ -166,10 +189,6 @@
* Sat Sep 15 2001 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> 1.4.0.beta2-6
- Prepared for rhcontrib
- Added mcrypt-script + INSTALL file
-
+
* Tue Sep 12 2000 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
- initial build
-
-### Local Variables:
-### compile-command: "cd .. && ./buildpkg cfs"
-### End:
Index: cfs-INSTALL
===================================================================
RCS file: /cvs/extras/rpms/cfs/FC-3/cfs-INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cfs-INSTALL 8 Nov 2004 04:08:40 -0000 1.1
+++ cfs-INSTALL 19 May 2005 16:55:12 -0000 1.2
@@ -24,7 +24,7 @@
2. Add the following line into your /etc/fstab:
- | localhost:/.cfsfs /mnt/crypt nfs port=3049,noauto,noexec,nodev,nosuid,intr,rw
+ | localhost:/.cfsfs /mnt/crypt nfs port=3049,noauto,noexec,nodev,nosuid,intr,rw,nfsprog=1092830567,nfsvers=2
3. Add the following line into your /etc/exports:
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfs/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:08:40 -0000 1.2
+++ .cvsignore 19 May 2005 16:55:12 -0000 1.3
@@ -1,2 +1,2 @@
-cfs-1.4.1.tar.gz
-cfs_1.4.1-10.diff.gz
+cfs-*.tar.gz
+cfs_*-[0-9]*.diff.gz
More information about the fedora-extras-commits
mailing list