Revert "util: Add base64 from Heimdal's roken"

This reverts commit d552426b14d5f5befe74958a21bc9375d5312287.

util already has a base64.c, the Windows bits of this are half-baked,
and we need to find a config.h from somewhere so that this builds
cleanly.

Just back it out, until I can do it properly.

Change-Id: Iec3ef4579c8f83c7c00e03ad777489e287bbd2f3
Reviewed-on: http://gerrit.openafs.org/2909
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>

diff --git a/Makefile.in b/Makefile.in
index ab92808..70a39a1 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,8 +109,7 @@ packages: dest
                echo Not building packages for ${SYS_NAME} ;; \
        esac
 
-${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto \
-    ${TOP_INCDIR}/util ${TOP_LIBDIR} ${TOP_JLIBDIR}:
+${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto ${TOP_LIBDIR} ${TOP_JLIBDIR}:
        mkdir -p $@
 
 install_dirs: force
@@ -136,8 +135,7 @@ dest_dirs: force
        mkdir -p ${DEST}/root.server/etc
        mkdir -p ${DEST}/root.server/usr/afs/bin
 
-prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des \
-        ${TOP_INCDIR}/hcrypto ${TOP_INCDIR}/util ${TOP_LIBDIR}
+prelude: ${TOP_INCDIR}/afs ${TOP_INCDIR}/rx ${TOP_INCDIR}/des ${TOP_INCDIR}/hcrypto ${TOP_LIBDIR}
 
 project: cmd comerr 
 

diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index aea0225..4a81136 100644 (file)
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -22,7 +22,6 @@ objects = assert.o base64.o casestrcpy.o config_file.o ktime.o volparse.o \
         pthread_glock.o daemon.o ${REGEX_OBJ}
 
 includes = \
-       ${TOP_INCDIR}/util/base64.h \
        ${TOP_INCDIR}/afs/dirpath.h \
        ${TOP_INCDIR}/afs/pthread_nosigs.h \
        ${TOP_INCDIR}/afs/assert.h \
@@ -55,9 +54,6 @@ buildtools_clean: clean
 
 depinstall: ${includes}
 
-${TOP_INCDIR}/util/base64.h: ${TOP_SRCDIR}/external/heimdal/roken/base64.h
-       ${INSTALL_DATA} $? $@
-
 ${TOP_INCDIR}/afs/dirpath.h: dirpath.h
        ${INSTALL_DATA} $? $@
 
@@ -152,9 +148,6 @@ util.a: ${objects} AFS_component_version_number.o
        $(AR) crv util.a ${objects} AFS_component_version_number.o
        $(RANLIB) util.a
 
-base64.o: ${TOP_SRCDIR}/external/heimdal/roken/base64.c
-       ${CCOBJ} ${CFLAGS} -c ${TOP_SRCDIR}/external/heimdal/roken/base64.c
-
 pthread_glock.o: ${srcdir}/pthread_glock.c ${includes}
        ${MT_CC} ${CFLAGS} ${MT_CFLAGS} -c ${srcdir}/pthread_glock.c
 

diff --git a/src/util/NTMakefile b/src/util/NTMakefile
index ee81f09..3f463da 100644 (file)
--- a/src/util/NTMakefile
+++ b/src/util/NTMakefile
@@ -16,7 +16,6 @@ INCFILEDIR = $(DESTDIR)\include\afs  # header file install directory
 INCFILES =\
        $(INCFILEDIR)\afsutil.h \
        $(INCFILEDIR)\assert.h \
-       $(DESTDIR)\include\util\base64.h \
        $(INCFILEDIR)\dirent.h \
        $(INCFILEDIR)\errors.h \
        $(INCFILEDIR)\itc.h \
@@ -39,9 +38,6 @@ $(DESTDIR)\include\afs\dirent.h: dirent_nt.h
 $(DESTDIR)\include\afs\dirpath.h: dirpath_nt.h
        $(COPY) $** $@
 
-$(DESTDIR)\include\util\base64.h: base64.h
-       $(COPY) $** $@
-
 LIBFILE = $(DESTDIR)\lib\afs\afsutil.lib
 
 MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib
@@ -49,7 +45,6 @@ MT_LIBFILE = $(DESTDIR)\lib\afs\mtafsutil.lib
 LIBOBJS = \
        $(OUT)\assert.obj \
        $(OUT)\base32.obj \
-       $(OUT)\base64.obj \
        $(OUT)\casestrcpy.obj \
        $(OUT)\get_krbrlm.obj \
        $(OUT)\hostparse.obj \
@@ -76,7 +71,6 @@ LIBOBJS = \
 MT_LIBOBJS = \
        $(OUT)\assert.obj \
        $(OUT)\base32.obj \
-       $(OUT)\base64.obj \
        $(OUT)\casestrcpy.obj \
        $(OUT)\get_krbrlm.obj \
        $(OUT)\hostparse.obj \