* Remove patches integrated upstream

* Add fs setcrypt support for debconf
* document changes

diff --git a/debian/changelog b/debian/changelog
index a9d66c0f11ec16c637ce1604bb63095475dd5f86..a807abafb9f9119ccb852b292e4d8918f846e6b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.2.3final-1) unstable; urgency=low
+
+  * New upstream release
+  * Add support for fs setcrypt in debconf; by default traffic is encrypted.
+
+ -- Sam Hartman <hartmans@debian.org>  Wed, 30 Jan 2002 10:46:46 -0500
+
 openafs (1.2.3candidate3-1) unstable; urgency=low
 
   *  New  upstream release candidate

diff --git a/debian/openafs-client.config b/debian/openafs-client.config
index 7252034de9379f7cf1ba96fdf1f2338cd16de638..1d1fdf1cc6af8088585b8da06e55fd86df626b41 100644 (file)
--- a/debian/openafs-client.config
+++ b/debian/openafs-client.config
@@ -27,4 +27,5 @@ if [ "x$AFS_AFSDB" != "x" ] ;then
     db_set openafs-client/afsdb $AFS_AFSDB
     fi
 db_input low openafs-client/afsdb ||true
+db_input low openafs-client/crypt || true
 db_go

diff --git a/debian/openafs-client.postinst b/debian/openafs-client.postinst
index 47de839ee839516495adaff85a3d48cdb8313254..f7ebdbab3cdc599813ac6398d0c0cb19fe6fa8d4 100644 (file)
--- a/debian/openafs-client.postinst
+++ b/debian/openafs-client.postinst
@@ -61,8 +61,10 @@ case "$1" in
 
        db_get openafs-client/run-client
        echo AFS_CLIENT=$RET >/etc/openafs/afs.conf.client
-db_get openafs-client/afsdb
-echo AFS_AFSDB=$RET >>/etc/openafs/afs.conf.client
+       db_get openafs-client/afsdb
+       echo AFS_AFSDB=$RET >>/etc/openafs/afs.conf.client
+       db_get openafs-client/crypt
+       echo AFS_CRYPT=$RET >>/etc/openafs/afs.conf.client
 
     ;;
 

diff --git a/debian/openafs-client.templates b/debian/openafs-client.templates
index 845863cfcd2a0eca24c9dfd9519a997f8993ec14..8a2542929d20427e13879c9dea950ad8c76c7f3d 100644 (file)
--- a/debian/openafs-client.templates
+++ b/debian/openafs-client.templates
@@ -50,3 +50,12 @@ Description: Look up AFS cells in DNS?
  that file it can use DNS to look for AFSDB records that contain the
  information.
 
+Template: openafs-client/crypt
+Type: boolean
+Default: true
+Description: ENcrypt authenticated traffic with AFS fileserver? 
+ AFS provides a weak form of encryption that can optionally be used
+ between a client and the fileservers.  While this encryption is weaker
+ than DES and thus is not sufficient for highly confidential data, it
+ does provide some confidentiality and is likely to make the job of a
+ casual attacker significantly more difficult.

diff --git a/debian/patch.003_ppc_makefile b/debian/patch.003_ppc_makefile
deleted file mode 100644 (file)
index a551247..0000000
--- a/debian/patch.003_ppc_makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: src/config//Makefile.ppc_linux22.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/Makefile.ppc_linux22.in,v
-retrieving revision 1.4
-diff -u -r1.4 Makefile.ppc_linux22.in
---- src/config//Makefile.ppc_linux22.in        11 Sep 2001 15:48:00 -0000      1.4
-+++ src/config//Makefile.ppc_linux22.in        13 Sep 2001 20:26:09 -0000
-@@ -35,7 +35,7 @@
- MV=mv
- RANLIB=ranlib
- RM=rm
--
-+INSTALL=${TOP_SRCDIR}/pinstall/pinstall
- # Other OS specific requirements
- #
- YACC = bison -y
-Index: src/config//Makefile.ppc_linux24.in
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/config/Makefile.ppc_linux24.in,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 Makefile.ppc_linux24.in
---- src/config//Makefile.ppc_linux24.in        11 Sep 2001 14:32:08 -0000      1.1.1.2
-+++ src/config//Makefile.ppc_linux24.in        13 Sep 2001 20:26:09 -0000
-@@ -35,7 +35,6 @@
- MV=mv
- RANLIB=ranlib
- RM=rm
--
- INSTALL=${TOP_SRCDIR}/pinstall/pinstall
- #
- # Other OS specific requirements

diff --git a/debian/patch.005_lseek_declaration b/debian/patch.005_lseek_declaration
deleted file mode 100644 (file)
index da511d5..0000000
--- a/debian/patch.005_lseek_declaration
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: src/auth/ktc.c
-===================================================================
-RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/auth/ktc.c,v
-retrieving revision 1.1.1.7
-diff -u -r1.1.1.7 ktc.c
---- ktc.c      2001/10/14 18:04:01     1.1.1.7
-+++ ktc.c      2001/11/25 23:09:22
-@@ -1274,7 +1274,7 @@
-     struct ktc_principal principal;
-     struct ktc_token token;
-     int     status;
--    off_t   start, lseek();
-+    off_t   start;
-     int     lifetime, kvno;
-     int     count;            /* count for write */
-