Debian patches to get build working

diff --git a/aclocal.m4 b/aclocal.m4
index f0aa96ba62f508e80cd74596436ddf67fdc1ffe2..5c48a8ad55366f92107c336868fa3c2ac91ece6b 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -112,7 +112,7 @@ AC_PROG_LEX
 AC_DECL_YYTEXT])
 
 dnl
-dnl $Id: aclocal.m4,v 1.4 2001/07/16 09:32:21 hartmans Exp $
+dnl $Id: aclocal.m4,v 1.5 2001/07/16 12:53:29 hartmans Exp $
 dnl
 
 dnl check if this computer is little or big-endian

diff --git a/debian/afs-newcell b/debian/afs-newcell
index 92f6d9d6ce73945ccac1d49cc95eee8a11c23ca1..4da9c524967a8e938a18c4ef29ef59dcf154bb04 100644 (file)
--- a/debian/afs-newcell
+++ b/debian/afs-newcell
@@ -87,6 +87,10 @@ eoreqs
     print "Run this script again when you meet the requirements\n";
     exit(1);
   }
+       
+               if ($> != 0) {
+die "This script should almost always be run as root.  Use the --requirements-met option to run as non-root.\n";
+}
 }
 open(MOUNT, "mount |") or die "Failed to run mount: $!\n";
 while(<MOUNT>) {

diff --git a/debian/afs-rootvol b/debian/afs-rootvol
index 3fe115687a4f6391f60ce9f217afb2dae7594405..2f37890e6ba3e781b6094b2cd516c39f74f5f260 100644 (file)
--- a/debian/afs-rootvol
+++ b/debian/afs-rootvol
@@ -80,6 +80,10 @@ eotext
        print "Please restart the script when you meet these conditions.\n";
        exit(1);
     }
+       
+               if ($> != 0) {
+die "This script should almost always be run as root.  Use the --requirements-met option to run as non-root.\n";
+}
 
 }
 # Get configuration information we need

diff --git a/debian/changelog b/debian/changelog
index d0d49dcf026fb9284c5f780f3aa78d625cbe1d52..5c1ebf4bb38f7f720ab921d930c4cf85524a581b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.1.0-1) unstable; urgency=low
+
+  * New Upstream release.
+  * Warn if not running as root for afs-newcell|rootvol, closes: #103532
+
+ -- Sam Hartman <hartmans@debian.org>  Mon, 16 Jul 2001 06:13:41 -0400
+
 openafs (1.0.90.20010710.snapshot-1) experimental; urgency=low
 
   *  New upstream snapshot

diff --git a/debian/patch.001_libafs_destination_name b/debian/patch.001_libafs_destination_name
new file mode 100644 (file)
index 0000000..728f03a
--- /dev/null
+++ b/debian/patch.001_libafs_destination_name
@@ -0,0 +1,18 @@
+Index: src/libafs/MakefileProto.LINUX.in
+===================================================================
+RCS file: /afs/sipb.mit.edu/project/openafs/debian/cvs/openafs/src/libafs/MakefileProto.LINUX.in,v
+retrieving revision 1.1.1.3
+diff -u -r1.1.1.3 MakefileProto.LINUX.in
+--- src/libafs/MakefileProto.LINUX.in  14 Jul 2001 22:22:46 -0000      1.1.1.3
++++ src/libafs/MakefileProto.LINUX.in  16 Jul 2001 09:40:24 -0000
+@@ -143,8 +143,8 @@
+ LIBAFS = libafs-${CLIENT}.o
+ LIBAFS_MP = libafs-${CLIENT}.mp.o
+ 
+-DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS}
+-DEST_LIBAFS_MP = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS_MP}
++DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/openafs.o
++DEST_LIBAFS_MP = ${DESTDIR}/root.client/usr/vice/etc/modload/openafs.mp.o
+ 
+ 
+ libafs:       $(DEST_LIBAFS) 

diff --git a/debian/rules b/debian/rules
index cbd895f516a33c39d568f77b2ca17817c39ce34f..ee635189bcc6722ab69f8e83b095c0d234bedf99 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -207,6 +207,7 @@ binary-source:
                cpio -admp debian/$(srcpkg)/usr/src/modules/$(package)
        ( cd debian/$(srcpkg)/usr/src/modules/$(package)&& \
                $(MAKE) -f debian/rules clean && \
+       rm -rf src/libafs/rx src/libafs/afs src/libafs/afsint; \
                mv debian/kern-sysname debian/sysname)
        chown -R root.root debian/$(srcpkg)
        find debian/$(srcpkg) -type d | xargs chmod 755

diff --git a/src/config/Makefile.version b/src/config/Makefile.version
index 9edc0ddf0c64e31582c39b10dd2915c8b8a93a13..ffe07e4b7e3a44358fad9afad878df49986926b2 100644 (file)
--- a/src/config/Makefile.version
+++ b/src/config/Makefile.version
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.version-NOCML.in by configure.
 # Copyright 2000, International Business Machines Corporation and others.
 # All Rights Reserved.
 # 
@@ -5,11 +6,14 @@
 # License.  For details, see the LICENSE file in the top-level source
 # directory or online at http://www.openafs.org/dl/license10.html
 
+PACKAGE=openafs
+VERSION=1.1.0
+
 AFS_component_version_number.o: AFS_component_version_number.c
 
 AFS_component_version_number.c: 
-       echo 'char cml_version_number[]="@(#) OpenAFS devel built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c;
-       echo 'char* AFSVersion = "openafs devel"; ' >>AFS_component_version_number.c;
+       echo 'char cml_version_number[]="@(#) OpenAFS ${VERSION} built ' `date +"%Y-%m-%d"` '";' >AFS_component_version_number.c;
+       echo 'char* AFSVersion = "${PACKAGE} ${VERSION}"; ' >>AFS_component_version_number.c;
 
 noversion: install
 

diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index 94850a6ac2a79ec3e66d3292814deb5fbdc3b2f1..6b22917c18ad8c838c0f505defb61b182521973f 100644 (file)
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -143,8 +143,8 @@ ${COMPDIRS}:
 LIBAFS = libafs-${CLIENT}.o
 LIBAFS_MP = libafs-${CLIENT}.mp.o
 
-DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS}
-DEST_LIBAFS_MP = ${DESTDIR}/root.client/usr/vice/etc/modload/${LIBAFS_MP}
+DEST_LIBAFS = ${DESTDIR}/root.client/usr/vice/etc/modload/openafs.o
+DEST_LIBAFS_MP = ${DESTDIR}/root.client/usr/vice/etc/modload/openafs.mp.o
 
 
 libafs:        $(DEST_LIBAFS)