- up to 6.0.10

Changed files:
    coda-FHS.patch -> 1.4
    coda-gcc-334-2.patch -> 1.2
    coda.spec -> 1.58

diff --git a/coda-FHS.patch b/coda-FHS.patch
index 065eaa98af4272c381058f97d20b53671bcd9a3c..e789d669990c5cd4fe71bded2794631cf21f1832 100644 (file)
--- a/coda-FHS.patch
+++ b/coda-FHS.patch
@@ -177,9 +177,9 @@ diff -ur coda-6.0.5/coda-src/scripts/vice-setup-scm coda-6.0.5-new/coda-src/scri
  fi
  
  # current first maximum replicated volume id
-diff -ur coda-6.0.5/coda-src/scripts/vice-setup-srvdir coda-6.0.5-new/coda-src/scripts/vice-setup-srvdir
---- coda-6.0.5/coda-src/scripts/vice-setup-srvdir      2003-06-02 21:33:55.000000000 -0600
-+++ coda-6.0.5-new/coda-src/scripts/vice-setup-srvdir  2004-04-02 23:42:20.073495966 -0700
+diff -ur coda-6.0.10/coda-src/scripts/vice-setup-srvdir.orig coda-6.0.10/coda-src/scripts/vice-setup-srvdir
+--- coda-6.0.10/coda-src/scripts/vice-setup-srvdir.orig        2004-09-04 08:03:32.000000000 +0200
++++ coda-6.0.10/coda-src/scripts/vice-setup-srvdir     2005-05-27 04:09:36.000000000 +0200
 @@ -28,7 +28,7 @@
  #
  # Configuration
@@ -189,12 +189,12 @@ diff -ur coda-6.0.5/coda-src/scripts/vice-setup-srvdir coda-6.0.5-new/coda-src/s
  numservers=1
  . "`codaconfedit server.conf`"
  
-@@ -66,15 +66,15 @@
+@@ -62,15 +62,15 @@
      echo
      
      if [ $numservers -gt 1 ]; then
--      echon "Where shall we store your file data for server $n ($bn) [/vicepa]? "
-+      echon "Where shall we store your file data for server $n ($bn) [/var/lib/coda/vicepa]? "
+-      echon "Where shall we store your file data for server $n ($hn) [/vicepa]? "
++      echon "Where shall we store your file data for server $n ($hn) [/var/lib/coda/vicepa]? "
      else
 -      echon 'Where shall we store your file data [/vicepa]? '
 +      echon 'Where shall we store your file data [/var/lib/coda/vicepa]? '
@@ -208,7 +208,6 @@ diff -ur coda-6.0.5/coda-src/scripts/vice-setup-srvdir coda-6.0.5-new/coda-src/s
      fi
  
      # Create the directory if needed.  (Symlink is OK.)
-Only in coda-6.0.5-new/coda-src/scripts: vice-setup-srvdir.orig
 diff -ur coda-6.0.5/coda-src/scripts/vice-setup-user coda-6.0.5-new/coda-src/scripts/vice-setup-user
 --- coda-6.0.5/coda-src/scripts/vice-setup-user        2003-05-23 12:26:52.000000000 -0600
 +++ coda-6.0.5-new/coda-src/scripts/vice-setup-user    2004-04-02 23:42:20.104491640 -0700

diff --git a/coda-gcc-334-2.patch b/coda-gcc-334-2.patch
index e1ebe5d798ffa8c2e0373b3372a7de1a704bec45..2c9eccb96878761da44aaccf822e31bf5cc604ff 100644 (file)
--- a/coda-gcc-334-2.patch
+++ b/coda-gcc-334-2.patch
@@ -10,16 +10,3 @@ diff -ur coda-6.0.6-orig/coda-src/kerndep/pioctl.h coda-6.0.6/coda-src/kerndep/p
  #define _VALIDVICEIOCTL(com) (com >= _VICEIOCTL(0) && com <= _VICEIOCTL(255))
  
  
-Only in coda-6.0.6/coda-src/kerndep: pioctl.h~
-diff -ur coda-6.0.6-orig/coda-src/venus/comm.cc coda-6.0.6/coda-src/venus/comm.cc
---- coda-6.0.6-orig/coda-src/venus/comm.cc     2004-02-02 12:32:34.000000000 -0700
-+++ coda-6.0.6/coda-src/venus/comm.cc  2004-06-29 01:55:00.058082534 -0600
-@@ -173,7 +173,7 @@
-     sei.AckPoint = sftp_ackpoint;
-     sei.PacketSize = sftp_packetsize;
-     sei.EnforceQuota = 1;
--    sei.Port.Tag = (enum PortTag)0;
-+    sei.Port.Tag = (PortTag)0;
-     SFTP_Activate(&sei);
- 
-     /* RPC2 initialization. */

diff --git a/coda.spec b/coda.spec
index 5f0c3db002de423ed73de6687cbde1ef4cf93b6e..e1fb1c2e7bcb6a156eb9f79e4ccc6e209b56439b 100644 (file)
--- a/coda.spec
+++ b/coda.spec
@@ -5,19 +5,18 @@
 Summary:       Coda distributed filesystem
 Summary(pl):   Rozproszony system plików Coda
 Name:          coda
-Version:       6.0.6
+Version:       6.0.10
 Release:       0.1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       ftp://ftp.coda.cs.cmu.edu/pub/coda/src/%{name}-%{version}.tar.gz
-# Source0-md5: 1feb4b431b72f725b568cc57a759714f
+# Source0-md5: b2313baa5e5cc535b013648233825a84
 Source1:       %{name}.venus.init
 Source2:       %{name}.auth2.init
 Source3:       %{name}.codasrv.init
 Source4:       %{name}.update.init
 Patch0:                %{name}-ugly-common.patch
 Patch1:                %{name}-FHS.patch
-Patch2:                %{name}-gcc-334.patch
 Patch3:                %{name}-gcc-334-2.patch
 URL:           http://www.coda.cs.cmu.edu/
 BuildRequires: autoconf
@@ -26,7 +25,7 @@ BuildRequires:        bison
 BuildRequires: db-devel
 BuildRequires: e2fsprogs-devel >= 1.34
 BuildRequires: libstdc++-devel
-BuildRequires: lwp-devel
+BuildRequires: lwp-devel >= 2.0
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 BuildRequires: rpc2-devel
@@ -120,9 +119,6 @@ narz
 %setup -q
 %patch0 -p1
 %patch1 -p1
-cd coda-src/venus
-%patch2
-cd ../../
 %patch3 -p1
 
 %build
@@ -256,7 +252,7 @@ fi
 %attr(755,root,root) %{_sbindir}/venus-setup
 %attr(755,root,root) %{_sbindir}/vutil
 %attr(755,root,root) %{_sbindir}/venus
-%attr(755,root,root) %{_sbindir}/au
+%attr(755,root,root) %{_bindir}/au
 %attr(755,root,root) %{_bindir}/clog
 %attr(755,root,root) %{_bindir}/coda_replay
 %attr(755,root,root) %{_bindir}/cpasswd
@@ -289,7 +285,6 @@ fi
 %attr(755,root,root) %{_sbindir}/partial-reinit.sh
 %attr(755,root,root) %{_sbindir}/createvol_rep
 %attr(755,root,root) %{_sbindir}/pdbtool
-%attr(755,root,root) %{_sbindir}/purgevol
 %attr(755,root,root) %{_sbindir}/purgevol_rep
 %attr(755,root,root) %{_sbindir}/bldvldb.sh
 %attr(755,root,root) %{_sbindir}/vice-setup
@@ -310,8 +305,8 @@ fi
 %attr(755,root,root) %{_sbindir}/updateclnt
 %attr(755,root,root) %{_sbindir}/updatefetch
 %attr(755,root,root) %{_sbindir}/coda-server-logrotate
-%attr(755,root,root) %{_bindir}/norton
-%attr(755,root,root) %{_bindir}/norton-reinit
+%attr(755,root,root) %{_sbindir}/norton
+%attr(755,root,root) %{_sbindir}/norton-reinit
 %attr(755,root,root) %{_bindir}/reinit
 %attr(754,root,root) /etc/rc.d/init.d/codasrv
 %attr(754,root,root) /etc/rc.d/init.d/auth2