Skip to content

Commit

Permalink
Remove ALL tabs
Browse files Browse the repository at this point in the history 
Welcome "git blame" user.  This massive commit was decided upon by
the Cyrus development team meeting on June 8th, 2015 by unanimous
vote.  It changes the indent style to "all spaces, 4 spaces per
indent level, no tabs", and also strips all trailing whitespace.

To assist you with navigating around this change, there are two
tags applied to the changes.  This commit will be called "posttab"
and the one before it "pretab".

Chances are, you're trying to find the commit which changed a line,
and you've wound up here.  You need to redo your "git blame" on
prior commits like this:

git blame pretab imap/imapd.c

(or whatever file you're trying to blame on)

This will get you the history of the file before we rewrote all
the whitespace.

If you have a branch which you want to convert all the commits
into the new spacing style for easy rebase/cherry-pick, then
you can run:

   1) git checkout <mybranch>
   2) git rebase pretab
   3) git filter-branch --tree-filter tools/remove-tabs.pl pretab^..HEAD
   4) git rebase posttab

NOTE the "pretab^".  It is very important that you keep the ^ so that
this commit is the one that collects all the whitespace changes.

This will rewrite all the commits on your branch to the new whitespace
style and then rebase it on top of the posttab commit.  Since the
empty pretab commit will be rewritten to match posttab exactly by the
filter-branch process, the rebase will be clean and will skip the
pretab commit.

NOTE: you may need to make fixes at step 2 if your branch is old and
won't rebase cleanly on top of pretab.  Step 3 is noisy and slow, but
should always run correctly.
  • Loading branch information
@brong
brong committed Jun 15, 2015
1 parent 61b46ef commit 1f19b58
Show file tree
Hide file tree
Showing 632 changed files with 140,744 additions and 140,744 deletions.
6 changes: 3 additions & 3 deletions COPYING
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ALL versions of the Cyrus IMAP server are now covered by the following copyright:
ALL versions of the Cyrus IMAP server are now covered by the following copyright:

* Copyright (c) 1994-2008 Carnegie Mellon University. All rights reserved.
*
Expand Down Expand Up @@ -41,15 +41,15 @@ ALL versions of the Cyrus IMAP server are now covered by the following copyrigh

If you find this software useful and valuable in your work, we would
welcome any support you can offer toward continuing this work.

We gratefully accept contributions, whether intellectual or monetary.
Intellectual contributions in the form of code or constructive
collaboration can be directed to cyrus-bugs+@andrew.cmu.edu (even if
it is not a bug).

If you wish to provide financial support to the Cyrus Project, send a
check payable to "Carnegie Mellon University" to

Project Cyrus
Computing Services
Carnegie Mellon University
Expand Down
2 changes: 1 addition & 1 deletion README
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ the binary distribution.
----------------------------------------------------------------------
* For the real README file, please see doc/readme.html.

* To install the software, please read doc/install.html (but please
* To install the software, please read doc/install.html (but please
read doc/readme.html first!).

* To see the changes since previous versions, check doc/changes.html,
Expand Down
8 changes: 4 additions & 4 deletions README.andrew
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/sh

#
# This is internal documentation for Computing Services at
# Carnegie Mellon University.
# This is internal documentation for Computing Services at
# Carnegie Mellon University.
#
# Please refer to doc/readme.html for the 'real' README.
#
Expand All @@ -21,7 +21,7 @@ to build configure:
sh SMakefile

to build:
smake init all
smake init all

then, as admin (suid binaries on AFS)
smake -d install
Expand Down Expand Up @@ -129,7 +129,7 @@ Locality Name (eg, city) []:Pittsburgh
Organization Name (eg, company) [Internet Widgits Pty Ltd]:Carnegie Mellon University
Organizational Unit Name (eg, section) []:Andrew Systems Group
Common Name (eg, YOUR name) []:mail-fe3.andrew.cmu.edu
Email Address []:advisor@andrew.cmu.edu
Email Address []:advisor@andrew.cmu.edu

- is it a backend? run tools/mkimap (as cyrus!)

Expand Down
22 changes: 11 additions & 11 deletions SMakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,14 @@ if test "${WASH_CYRUS_DEBUG}" = "t"; then
DEBUG="--enable-debug"
fi

case `uname` in
Linux)
LDFLAGS="${LDFLAGS}"
LIBS="-lnsl" # for libwrap
case `uname` in
Linux)
LDFLAGS="${LDFLAGS}"
LIBS="-lnsl" # for libwrap
;;
SunOS)
LDFLAGS="${LDFLAGS} -L/usr/local/lib -Wl,-R,/usr/local/lib"
LIBS="-lkstat -ldoor"
LIBS="-lkstat -ldoor"
;;
*)
CC=cc
Expand All @@ -106,13 +106,13 @@ esac

case `sys` in
i386_fc3)
LIBS="$LIBS -ldes"
OS_CONFIG="--with-krbdes"
LIBS="$LIBS -ldes"
OS_CONFIG="--with-krbdes"
;;
sun4x_s10)
LIBS="$LIBS -ldes"
OS_CONFIG="--with-krbdes"
;;
LIBS="$LIBS -ldes"
OS_CONFIG="--with-krbdes"
;;
esac


Expand All @@ -122,7 +122,7 @@ WITHAUTH="--with-auth=pts --with-afs=/usr/local --enable-krb5afspts --without-kr
SSL_CONFIG="--with-openssl=/usr/local/lib"

# the defaults are good enough for us
DB_CONFIG=""
DB_CONFIG=""

# the following is for staticly linking SASL only
SASL_CONFIG="--with-staticsasl=/usr/local --with-gssapi=/usr/local"
Expand Down
4 changes: 2 additions & 2 deletions cmulocal/README.andrew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CMU_INIT_AUTOMAKE
automake runs aclocal, aclocal'll continue to pick up these macros.

CMU_ADD_LIBPATH
Add -L(arg), and possibly -R(arg) (or whatever the runpath is) to
Add -L(arg), and possibly -R(arg) (or whatever the runpath is) to
LDFLAGS.

CMU_ADD_LIBPATH_TO
Expand Down Expand Up @@ -66,6 +66,6 @@ CMU_SASL

CMU_KRB4
This attempts to find Kerberos 4 libraries and set up CFLAGS and LIBS
appropriately. It also updates and substitutes RPATH for shared library
appropriately. It also updates and substitutes RPATH for shared library
stuff.

130 changes: 65 additions & 65 deletions cmulocal/afs.m4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
AC_MSG_CHECKING(for AFS in $i)
CMU_AFS_INC_WHERE1("$i/include")
ac_cv_found_lwp_inc=$ac_cv_found_afs_inc
CMU_TEST_INCPATH($i/include, lwp)
CMU_TEST_INCPATH($i/include, lwp)
ac_cv_found_afs_inc=$ac_cv_found_lwp_inc
if test "$ac_cv_found_afs_inc" = "yes"; then
CMU_AFS_LIB_WHERE1("$i/$CMU_LIB_SUBDIR")
Expand All @@ -57,36 +57,36 @@ AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
AC_REQUIRE([CMU_SOCKETS])
AC_REQUIRE([CMU_LIBSSL])
AC_ARG_WITH(AFS,
[AS_HELP_STRING([--with-afs=PREFIX], [Compile with AFS support])],
[if test "X$with_AFS" = "X"; then
with_AFS=yes
fi])
[AS_HELP_STRING([--with-afs=PREFIX], [Compile with AFS support])],
[if test "X$with_AFS" = "X"; then
with_AFS=yes
fi])
if test "X$with_AFS" != "X"; then
ac_cv_afs_where=$with_AFS
fi
if test "X$ac_cv_afs_where" = "X"; then
CMU_AFS_WHERE(/usr/afsws /usr/local /usr/athena /Library/OpenAFS/Tools)
fi
if test "X$with_AFS" != "X"; then
ac_cv_afs_where=$with_AFS
fi
if test "X$ac_cv_afs_where" = "X"; then
CMU_AFS_WHERE(/usr/afsws /usr/local /usr/athena /Library/OpenAFS/Tools)
fi
AC_MSG_CHECKING(whether to include AFS)
if test "X$ac_cv_afs_where" = "Xno" -o "X$ac_cv_afs_where" = "X"; then
ac_cv_found_afs=no
AC_MSG_RESULT(no)
else
ac_cv_found_afs=yes
AC_MSG_RESULT(yes)
AFS_INC_DIR="$ac_cv_afs_where/include"
AFS_LIB_DIR="$ac_cv_afs_where/$CMU_LIB_SUBDIR"
AFS_TOP_DIR="$ac_cv_afs_where"
AFS_INC_FLAGS="-I${AFS_INC_DIR}"
AC_MSG_CHECKING(whether to include AFS)
if test "X$ac_cv_afs_where" = "Xno" -o "X$ac_cv_afs_where" = "X"; then
ac_cv_found_afs=no
AC_MSG_RESULT(no)
else
ac_cv_found_afs=yes
AC_MSG_RESULT(yes)
AFS_INC_DIR="$ac_cv_afs_where/include"
AFS_LIB_DIR="$ac_cv_afs_where/$CMU_LIB_SUBDIR"
AFS_TOP_DIR="$ac_cv_afs_where"
AFS_INC_FLAGS="-I${AFS_INC_DIR}"
AFS_LIB_FLAGS="-L${AFS_LIB_DIR} -L${AFS_LIB_DIR}/afs"
cmu_save_LIBS="$LIBS"
cmu_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS ${AFS_INC_FLAGS}"
cmu_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$cmu_save_LDFLAGS ${AFS_LIB_FLAGS}"
cmu_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$cmu_save_LDFLAGS ${AFS_LIB_FLAGS}"
AC_CHECK_HEADERS(afs/stds.h)
AC_MSG_CHECKING([if libdes is needed])
Expand All @@ -96,39 +96,39 @@ AC_ARG_WITH(AFS,
AC_TRY_LINK([], [des_quad_cksum();],AFS_DES_LIB="yes")
if test "X$AFS_DES_LIB" = "Xyes"; then
AC_MSG_RESULT([yes])
AFS_LIBDES="-ldes"
AFS_LIBDESA="${AFS_LIB_DIR}/libdes.a"
else
LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
AC_TRY_LINK([],
[des_quad_cksum();],AFS_DES_LIB="libcrypto")
if test "X$AFS_DES_LIB" = "Xlibcrypto"; then
AC_MSG_RESULT([libcrypto])
AFS_LIBDES="$LIBSSL_LIB_FLAGS"
AFS_LIBDESA="$LIBSSL_LIB_FLAGS"
else
LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
AC_TRY_LINK([],
[des_quad_cksum();],AFS_DES_LIB="libcrypto+descompat")
if test "X$AFS_DES_LIB" = "Xlibcrypto+descompat"; then
AC_MSG_RESULT([libcrypto+descompat])
AFS_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
AFS_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
else
AC_MSG_RESULT([unknown])
AC_MSG_ERROR([Could not use -ldes])
fi
fi
fi
else
AFS_LIBDES="-ldes"
AFS_LIBDESA="${AFS_LIB_DIR}/libdes.a"
else
LIBS="$cmu_save_LIBS $LIBSSL_LIB_FLAGS"
AC_TRY_LINK([],
[des_quad_cksum();],AFS_DES_LIB="libcrypto")
if test "X$AFS_DES_LIB" = "Xlibcrypto"; then
AC_MSG_RESULT([libcrypto])
AFS_LIBDES="$LIBSSL_LIB_FLAGS"
AFS_LIBDESA="$LIBSSL_LIB_FLAGS"
else
LIBS="$cmu_save_LIBS -L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
AC_TRY_LINK([],
[des_quad_cksum();],AFS_DES_LIB="libcrypto+descompat")
if test "X$AFS_DES_LIB" = "Xlibcrypto+descompat"; then
AC_MSG_RESULT([libcrypto+descompat])
AFS_LIBDES="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
AFS_LIBDESA="-L$LIBSSL_LIB_DIR -ldescompat $LIBSSL_LIB_FLAGS"
else
AC_MSG_RESULT([unknown])
AC_MSG_ERROR([Could not use -ldes])
fi
fi
fi
else
AC_MSG_RESULT([no])
fi
AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
AFS_KTC_LIBS_STATIC="${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
AFS_RX_LIBS="-lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
AFS_RX_LIBS="-lauth -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a"
AFS_KTC_LIBS="-lauth ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcom_err ${AFS_LIB_DIR}/afs/util.a"
LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
Expand All @@ -151,7 +151,7 @@ AC_ARG_WITH(AFS,
AC_MSG_RESULT([yes])
AC_MSG_ERROR([cannot use rxkad])
else
AC_MSG_RESULT([unknown])
AC_MSG_RESULT([unknown])
AC_MSG_ERROR([Unknown error testing rxkad])
fi
else
Expand Down Expand Up @@ -231,7 +231,7 @@ extern int UV_SetSecurity();],
fi
AC_MSG_CHECKING([if libaudit is needed])
AFS_LIBAUDIT=""
AFS_LIBAUDIT=""
LIBS="$cmu_save_LIBS $AFS_CLIENT_LIBS ${LIB_SOCKET}"
AC_TRY_LINK([#include <afs/param.h>
#ifdef HAVE_AFS_STDS_H
Expand All @@ -251,19 +251,19 @@ extern int UV_SetSecurity();],
[afsconf_SuperUser();],AFS_AUDIT_LIB="yes")
if test "X$AFS_AUDIT_LIB" = "Xyes"; then
AC_MSG_RESULT([yes])
AFS_LIBAUDIT="-laudit"
AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libaudit.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
AFS_LIBAUDIT="-laudit"
AFS_CLIENT_LIBS_STATIC="${AFS_LIB_DIR}/afs/libvolser.a ${AFS_LIB_DIR}/afs/libvldb.a ${AFS_LIB_DIR}/afs/libkauth.a ${AFS_LIB_DIR}/afs/libprot.a ${AFS_LIB_DIR}/libubik.a ${AFS_LIB_DIR}/afs/libauth.a ${AFS_LIB_DIR}/afs/libaudit.a ${AFS_LIB_DIR}/librxkad.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/afs/libsys.a ${AFS_LIB_DIR}/librx.a ${AFS_LIB_DIR}/liblwp.a ${AFS_LIBDESA} ${AFS_LIB_DIR}/afs/libcmd.a ${AFS_LIB_DIR}/afs/libcom_err.a ${AFS_LIB_DIR}/afs/util.a"
AFS_CLIENT_LIBS="-lvolser -lvldb -lkauth -lprot -lubik -lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
AFS_RX_LIBS="-lauth -laudit -lrxkad -lrx ${AFS_LIB_DIR}/afs/libsys.a -lrx -llwp ${AFS_LIBDES} -lcmd -lcom_err ${AFS_LIB_DIR}/afs/util.a $AFS_BSD_LIB $AFS_DESCOMPAT_LIB"
else
AC_MSG_RESULT([unknown])
AC_MSG_ERROR([Could not use -lauth while testing for -laudit])
fi
fi
else
AC_MSG_RESULT([no])
fi
AC_CHECK_FUNCS(VL_ProbeServer)
AC_CHECK_FUNCS(VL_ProbeServer)
AC_MSG_CHECKING([if new-style afs_ integer types are defined])
AC_CACHE_VAL(ac_cv_afs_int32,
dnl The next few lines contain a quoted argument to egrep
Expand All @@ -290,7 +290,7 @@ ac_cv_afs_int32=yes, ac_cv_afs_int32=no)])
CPPFLAGS="${cmu_save_CPPFLAGS}"
LDFLAGS="${cmu_save_LDFLAGS}"
LIBS="${cmu_save_LIBS}"
AC_DEFINE(AFS_ENV,, [Use AFS. (find what needs this and nuke it)])
AC_DEFINE(AFS_ENV,, [Use AFS. (find what needs this and nuke it)])
AC_DEFINE(AFS,, [Use AFS. (find what needs this and nuke it)])
AC_SUBST(AFS_CLIENT_LIBS_STATIC)
AC_SUBST(AFS_KTC_LIBS_STATIC)
Expand All @@ -299,12 +299,12 @@ ac_cv_afs_int32=yes, ac_cv_afs_int32=no)])
AC_SUBST(AFS_KTC_LIBS)
AC_SUBST(AFS_INC_FLAGS)
AC_SUBST(AFS_LIB_FLAGS)
AC_SUBST(AFS_TOP_DIR)
AC_SUBST(AFS_LIBAUDIT)
AC_SUBST(AFS_LIBDES)
AC_SUBST(AFS_TOP_DIR)
AC_SUBST(AFS_LIBAUDIT)
AC_SUBST(AFS_LIBDES)
AC_SUBST(AFS_LIBDESA)
fi
])
fi
])

AC_DEFUN([CMU_NEEDS_AFS],
[AC_REQUIRE([CMU_AFS])
Expand Down
Loading

0 comments on commit 1f19b58

Please sign in to comment.