From b898c3aa8a9628cc8ffd4a5bd5ad0954cb9a39b8 Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Mon, 16 Jul 2001 12:53:33 +0000 Subject: [PATCH] Debian patches to get build working --- aclocal.m4 | 2 +- debian/afs-newcell | 4 ++++ debian/afs-rootvol | 4 ++++ debian/changelog | 7 +++++++ debian/patch.001_libafs_destination_name | 18 ++++++++++++++++++ debian/rules | 1 + src/config/Makefile.version | 8 ++++++-- src/libafs/MakefileProto.LINUX.in | 4 ++-- 8 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 debian/patch.001_libafs_destination_name diff --git a/aclocal.m4 b/aclocal.m4 index f0aa96ba6..5c48a8ad5 100644 --- 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 92f6d9d6c..4da9c5249 100644 --- 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() { diff --git a/debian/afs-rootvol b/debian/afs-rootvol index 3fe115687..2f37890e6 100644 --- 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 d0d49dcf0..5c1ebf4bb 100644 --- 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 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 index 000000000..728f03a00 --- /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 cbd895f51..ee635189b 100755 --- 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 9edc0ddf0..ffe07e4b7 100644 --- 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 94850a6ac..6b22917c1 100644 --- 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) -- 2.39.5