From d9b441897c54a28bd1113056069db3ec0e245847 Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Sun, 3 Jun 2001 17:29:52 +0000 Subject: [PATCH] split-deprecated-into-insecure-and-obsolete-in-top-makefile-20010602 so it's obvious to people which mistakes are silly and which are dangerous --- src/Makefile | 36 +++++++++++++----------------------- src/README.OBSOLETE | 3 +++ src/README.SECURITY | 2 ++ 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/src/Makefile b/src/Makefile index 09d129e7e..2effa7a09 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,7 +22,8 @@ MKDIR_IF_NEEDED=[ -d $$1 ] || mkdir -p $$1 # Enable build+install of obsolete and insecure packages # Set to anything other than YES, or comment out to disable the build -WITH_DEPRECATED=YES +WITH_OBSOLETE=YES +WITH_INSECURE=YES # To compile AFS from scratch in the src tree run "make SYS_NAME=". # This recursively calls "make install ..." and does not depend on the @@ -179,17 +180,7 @@ kerndir: minproject dir: project ${COMPILE_PART1} dir ${COMPILE_PART2} -# Removed from sgi_* case below: -# ${COMPILE_PART1} sgiefs ${COMPILE_PART2};; -sgiefs: - case ${SYS_NAME} in \ - sgi_*) \ - echo "SGI efs not supported" ;; \ - *) \ - echo No efs stuff for ${SYS_NAME};; \ - esac - -vol: project dir afs sgiefs +vol: project dir afs ${COMPILE_PART1} vol ${COMPILE_PART2} vlserver: project vol audit @@ -289,7 +280,6 @@ KERNELDIR= \ kernutil \ kernacl \ kvlserver \ - sgiefs \ krxstat @@ -552,25 +542,25 @@ links: # mpp: project - @case ${WITH_DEPRECATED} in \ + @case ${WITH_OBSOLETE} in \ YES) ${COMPILE_PART1} mpp ${COMPILE_PART2} ;; \ *) echo skipping deprecated target: mpp ;; \ esac package: project mpp - @case ${WITH_DEPRECATED} in \ + @case ${WITH_OBSOLETE} in \ YES) ${COMPILE_PART1} package ${COMPILE_PART2} ;; \ *) echo skipping deprecated target: package ;; \ esac package.files: package - @case ${WITH_DEPRECATED} in \ + @case ${WITH_OBSOLETE} in \ YES) ${DESTDIR}/bin/makepkgfiles afs.dev ;; \ *) echo skipping deprecated target: package.files ;; \ esac ntp: project volser - @case ${WITH_DEPRECATED} in \ + @case ${WITH_OBSOLETE} in \ YES) case ${SYS_NAME} in \ sun4x_58 | *linux* | *fbsd* | ppc_darwin* ) echo skipping ntp for ${SYS_NAME} ;; \ * ) ${COMPILE_PART1} ntp ${COMPILE_PART2} ;; \ @@ -579,7 +569,7 @@ ntp: project volser esac sgistuff: project rlogind - @case ${WITH_DEPRECATED} in \ + @case ${WITH_OBSOLETE} in \ YES) case ${SYS_NAME} in \ sgi_* ) ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \ * ) echo skipping sgistuff for ${SYS_NAME} ;; \ @@ -588,7 +578,7 @@ sgistuff: project rlogind esac ftpd43+: project kauth rxkad - @case ${WITH_DEPRECATED} in \ + @case ${WITH_INSECURE} in \ YES) case ${SYS_NAME} in \ rs_aix* | sun4x_55 | *linux*) \ ${COMPILE_PART1} ftpd43+ ${COMPILE_PART2} ;; \ @@ -598,19 +588,19 @@ ftpd43+: project kauth rxkad esac inetd: project kauth rxkad - @case ${WITH_DEPRECATED} in \ + @case ${WITH_INSECURE} in \ YES) ${COMPILE_PART1} inetd ${COMPILE_PART2} ;; \ *) echo skipping deprecated target: inetd ;; \ esac rsh: project inetd - @case ${WITH_DEPRECATED} in \ + @case ${WITH_INSECURE} in \ YES) ${COMPILE_PART1} rsh ${COMPILE_PART2} ;; \ *) echo skipping deprecated target: rsh ;; \ esac rlogind: project rsh ftpd43+ login - @case ${WITH_DEPRECATED} in \ + @case ${WITH_INSECURE} in \ YES) case ${SYS_NAME} in \ rs_aix*) ${COMPILE_PART1} rlogind ${COMPILE_PART2} ;; \ *) echo skipping rlogind for ${SYS_NAME} ;; \ @@ -619,7 +609,7 @@ rlogind: project rsh ftpd43+ login esac rcp: project rsh inetd - @case ${WITH_DEPRECATED} in \ + @case ${WITH_INSECURE} in \ YES) case ${SYS_NAME} in \ sgi_* ) echo skip rcp for ${SYS_NAME} ;; \ *) ${COMPILE_PART1} rcp ${COMPILE_PART2} ;; \ diff --git a/src/README.OBSOLETE b/src/README.OBSOLETE index 5dc6de188..3c8c8f0fb 100644 --- a/src/README.OBSOLETE +++ b/src/README.OBSOLETE @@ -13,3 +13,6 @@ with it, mpp) are not strictly part of a distributed filesystem package. However, Carnegie Mellon Computing Services has continued to use and occasionally develop them, and current versions can be found at: ftp://ftp.andrew.cmu.edu/pub/AFS-Tools + +To disable building of the obsolete code included with OpenAFS, set the +WITH_OBSOLETE flag in the makefile to NO. diff --git a/src/README.SECURITY b/src/README.SECURITY index d23e76416..fa58335ae 100644 --- a/src/README.SECURITY +++ b/src/README.SECURITY @@ -20,3 +20,5 @@ has RFC2228 security extensions. In any case, carefully consider the security implications before deploying these utilities. +To disable building of the insecure code included with OpenAFS, set the +WITH_INSECURE flag in the makefile to NO. -- 2.39.5