[Muddleftpd-cvs] CVSROOT: /cvsroot/muddleftpd

[Joerg Jaspert]

Module name:    muddleftpd
Branch:         dev-ganneff-autotools
Changes by:     Joerg Jaspert <address@hidden>  03/11/06 11:16:42
Reply-to: address@hidden

CVSROOT:        /cvsroot/muddleftpd
Module name:    muddleftpd
Branch:         dev-ganneff-autotools
Changes by:     Joerg Jaspert <address@hidden>  03/11/06 11:16:42

Modified files:
        .              : configure.ac ChangeLog 

Log message:
        First start of auto* changes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/configure.ac.diff?only_with_tag=dev-ganneff-autotools&tr1=1.4&tr2=1.4.4.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/muddleftpd/muddleftpd/ChangeLog.diff?only_with_tag=dev-ganneff-autotools&tr1=1.9&tr2=1.9.4.1&r1=text&r2=text

Patches:
Index: muddleftpd/ChangeLog
diff -c /dev/null muddleftpd/ChangeLog:1.9.4.1
*** /dev/null   Thu Nov  6 11:16:42 2003
--- muddleftpd/ChangeLog        Thu Nov  6 11:16:42 2003
***************
*** 0 ****
--- 1,274 ----
+ 2003-11-06  Joerg Jaspert  <address@hidden>
+ 
+       * configure.ac: Many changes to it. It doesnt work right now,
+       but its a start to convert muddleftpd to use more of auto* tools.
+ 
+ 2003-11-03  Joerg Jaspert  <address@hidden>
+ 
+       * modules/auth/authlibsmb/smbval/Makefile.in: Added CFLAGS and
+       -fPIC so this thing compiles on 64bit architectures too.
+ 
+       * modules/auth: authlibexample/Makefile.in,
+       authlibmud/Makefile.in, authlibsmb/Makefile.in,
+       authlibmysql/Makefile.in, authlibmsql/Makefile.in: Added -fPIC so
+       it actually compiles on different platforms.
+ 
+ 2003-11-02  Joerg Jaspert  <address@hidden>
+ 
+       * configure.ac, modules/auth/authlibmysql/configure.ac: Changed
+       way we look for mysql. Thats easier for users now.
+ 
+       * modules/auth/: authlibmsql/auth.h, authlibmysql/auth.h,
+       authlibsmb/auth.h, authlibmud/auth.h, authlibexample/auth.h:
+       Changed include from varargs.h to stdarg.h as gcc no longer
+       includes varargs.h
+ 
+       * modules/auth/: authlibmsql/README, authlibmysql/README,
+       authlibsmb/README, authlibmud/README, authlibexample/README:
+       Changed documentation to be in sync with new configure/makefile
+       things.
+ 
+       * modules/auth: authlibmsql/Makefile.in,
+       authlibmysql/Makefile.in, authlibexample/Makefile.in,
+       authlibsmb/Makefile.in, authlibmud/Makefile.in: Change Install
+       Target from TODO to something useful. Install the autlibfile in
+       libdir/muddleftpd set by configure run.
+       Also install the READMEs as README.auth$MODULE in the
+       documentation dir (see below).
+ 
+       * doc/Makefile.in: Added things to install txt documentation in
+       prefix/share/doc/muddleftpd/*
+ 
+ 2003-11-02  Beau Kuiper <address@hidden>
+ 
+       * src/ftpd.h: removed headers for string.h since they are in
+       string.h. Updated prototype for safe_vsnprintf().
+ 
+       * src/string.c: fixed double use of varargs in string_catvprintf().
+       This fixed muddleftpd problems on PPC and possibly other archs.
+ 
+       * src/string.h: updated prototype for string_catvprintf()
+ 
+       * src/ftpout.c: modified ftp_write to use fixed string_catvprintf()
+ 
+       * src/logger.c: modified debuglog() to use fixed safe_vsnprint()
+ 
+       * src/utils.c: fixed possible double use of varargs in safe_vsnprintf()
+       Fixed safe_snprintf() so it does not use safe_vsnprintf() to prevent
+       performance degredation due to new design.
+ 
+       * Configure.ac: Added a check for stdarg.h, since the replacement
+       snprintf code needs it.
+ 
+ 2003-04-15  Beau Kuiper <address@hidden>
+ 
+       * src/main.c: mainprog(): added code to close all file descriptors.
+       After the server is started, it will also close the terminal file
+       desciptors, so ssh sessions are not stalled at logout.
+ 
+       * src/utils.c: fd_closeall_nonterminal(): determines the max file
+       descriptors number and attempts to close all open fds. The terminal
+       file descriptors are left untouched.
+ 
+ 2002-11-20  Beau Kuiper <address@hidden>
+ 
+       * src/acl.c: transfer_config(): Added code that allows the server
+       to retrieve the gid a user will operate as from the password file.
+       Just put "!" in front of the gid parameter. (eg gid !anuser) will
+       give the user the gid of the user anuser.
+ 
+ 2002-10-29  Beau Kuiper <address@hidden>
+ 
+       * src/string.c: string_filterbadchars(): Added code to only allow
+       /r and /n characters if and only if they are together as a TELNET
+       newline (/r/n). This fixes the bug of muddleftpd accepting input
+       with those characters in it and then mucking the log files up with
+       it.
+ 
+       * src/logger.c: Removed code that replaces /r and /n with spaces.
+       It doesn't need it anymore, since I have cured the original bug.
+ 
+ 2002-10-21  Joerg Jaspert  <address@hidden>
+ 
+       * modules/auth/authlibexample/COPYING: Added back. This license
+       is different (a public domain one) and not GPL as I blindly
+       assumed from the name. Sorry Beau.
+ 
+ 2002-10-20  Joerg Jaspert  <address@hidden>
+ 
+       * NEWS: Added. Contains summaries of changes between releases.
+ 
+       * CHANGES: Removed, that is now in NEWS.
+ 
+       * modules/auth/: authlibmsql/README, authlibmysql/README,
+       authlibsmb/README: No need to mention that it depends
+       on muddleftpd. Of course it does, it is distributed with it. :)
+ 
+       * tools/muddlestats.0.3.0/: AUTHORS, COPYING: Removed.
+       AUTHORS integrated into the main AUTHORS, license is the same as
+       Muddleftpd, GPL.
+ 
+       * AUTHORS: Rewrote so it reflects current state of the Art.
+ 
+       * modules/auth/: authlibmysql/AUTHORS, authlibmysql/COPYING,
+       authlibsmb/AUTHORS, authlibsmb/COPYING,
+       authlibexample/AUTHORS, authlibexample/COPYING,
+       authlibmsql/AUTHORS, authlibmsql/COPYING,
+       authlibmud/AUTHORS, authlibmud/COPYING: Removed.
+       Authors is now integrated into the main AUTHORS file and license is
+       same as Muddleftpd.
+ 
+ 2002-10-20  Joerg Jaspert  <address@hidden>
+ 
+       * Developer.txt: Added Section about Changelogs/Commit
+       Messages.  Changed (C) for new Files to be for the Muddleftpd team.
+ 
+ 2002-10-20  Beau Kuiper  <address@hidden>
+ 
+       * modules/auth/: authlibexample/AUTHORS,
+       authlibexample/CHANGES, authlibexample/COPYING,
+       authlibexample/Makefile.in, authlibexample/README,
+       authlibexample/auth.h, authlibexample/authunix.c,
+       authlibexample/configure.ac, authlibmsql/AUTHORS,
+       authlibmsql/CHANGES, authlibmsql/COPYING,
+       authlibmsql/Makefile.in, authlibmsql/README,
+       authlibmsql/auth.h, authlibmsql/authmsql.c,
+       authlibmsql/configure.ac, authlibmud/AUTHORS,
+       authlibmud/CHANGES, authlibmud/COPYING,
+       authlibmud/Makefile.in, authlibmud/README,
+       authlibmud/auth.h, authlibmud/authmud.c,
+       authlibmud/configure.ac, authlibmysql/AUTHORS,
+       authlibmysql/CHANGES, authlibmysql/COPYING,
+       authlibmysql/Makefile.in, authlibmysql/README,
+       authlibmysql/auth.h, authlibmysql/authmysql.c,
+       authlibmysql/configure.ac, authlibsmb/AUTHORS,
+       authlibsmb/CHANGES, authlibsmb/COPYING,
+       authlibsmb/Makefile.in, authlibsmb/README,
+       authlibsmb/auth.h, authlibsmb/authsmb.c,
+       authlibsmb/configure.ac, authlibsmb/valid.h,
+       authlibsmb/smbval/Makefile.in, authlibsmb/smbval/byteorder.h,
+       authlibsmb/smbval/md4.c,
+       authlibsmb/smbval/rfcnb-common.h,
+       authlibsmb/smbval/rfcnb-error.h, authlibsmb/smbval/rfcnb-io.c,
+       authlibsmb/smbval/rfcnb-io.h,
+       authlibsmb/smbval/rfcnb-priv.h,
+       authlibsmb/smbval/rfcnb-util.c,
+       authlibsmb/smbval/rfcnb-util.h, authlibsmb/smbval/rfcnb.h,
+       authlibsmb/smbval/session.c,
+       authlibsmb/smbval/smbdes.c, authlibsmb/smbval/smbencrypt.c,
+       authlibsmb/smbval/smblib-common.h,
+       authlibsmb/smbval/smblib-priv.h,
+       authlibsmb/smbval/smblib-util.c, authlibsmb/smbval/smblib.c,
+       authlibsmb/smbval/smblib.h,
+       authlibsmb/smbval/std-defines.h,
+       authlibsmb/smbval/std-includes.h, authlibsmb/smbval/valid.c,
+       authlibsmb/smbval/valid.h: Finally added module code
+       into CVS
+ 
+ 2002-10-20  Beau Kuiper  <address@hidden>
+ 
+       * Makefile.in, autogen.sh, configure.ac,
+       defaults.h, defaults.h.in, install-sh: Imported
+       authentication modules into build system.
+       
+       Install does not work properly for modules, and there are still
+       some more tweaks to do
+ 
+ 2002-10-20  Joerg Jaspert  <address@hidden>
+ 
+       * Developer.txt: Added suggestions from Beau
+ 
+ 2002-10-19  Joerg Jaspert  <address@hidden>
+ 
+       * Developer.txt: First version of Guidelines for People
+       working on Muddleftpd
+ 
+ 2002-10-17  Beau Kuiper  <address@hidden>
+ 
+       * Makefile.in, config.h.in, src/version.c:
+       updated to autoconf 2.54
+ 
+ 2002-10-17  Beau Kuiper  <address@hidden>
+ 
+       * Makefile.in, configure, configure.ac,
+       configure.in: updated to autoconf 2.54
+ 
+ 2002-10-16  Beau Kuiper  <address@hidden>
+ 
+       * src/logger.c: Logger patch was broken
+       
+       Character constants are in ', not in " And character 20 is not a
+       space, while 0x20 is
+ 
+ 2002-09-28  Joerg Jaspert  <address@hidden>
+ 
+       * src/util/seteguid.c~: Well, it exists in the original
+       tarball, but its a backup file -> delete it :)
+ 
+ 2002-09-28  Joerg Jaspert  <address@hidden>
+ 
+       * src/util/: pwgrent.c, seteguid.c, seteguid.c~,
+       snprintf.c, strerror.c, strerror.h: Uhh, looks
+       like i missed to add them into CVS
+ 
+ 2002-09-26  Joerg Jaspert  <address@hidden>
+ 
+       * defaults.h: Ok, devel version is odd, stable is even.
+ 
+ 2002-09-26  Joerg Jaspert  <address@hidden>
+ 
+       * defaults.h: This is now 1.3.12 and no longer 1.3.11-devel
+ 
+ 2002-09-26  Joerg Jaspert  <address@hidden>
+ 
+       * src/logger.c: Remove \r and \n before output to logfile
+ 
+ 2002-09-26  Joerg Jaspert  <address@hidden>
+ 
+       * AUTHORS: Changed debian maintainer
+ 
+ 2002-09-26  Joerg Jaspert  <address@hidden>
+ 
+       * AUTHORS, CHANGES, COPYING, INSTALL,
+       Makefile.defs, Makefile.in, README, TESTING,
+       TODO, config.h.in, configure, configure.in,
+       defaults.h, doc/Makefile.in, doc/cookie.txt,
+       doc/ftpcmds.txt, doc/muddleftpd.txt,
+       doc/mudlogd.txt, doc/mudpasswd.txt, doc/reference.txt,
+       doc/info/muddleftpd.info, doc/info/muddleftpd.texi,
+       doc/man/ftpwho.1, doc/man/muddleftpd.1,
+       doc/man/mudpasswd.1, examples/README,
+       examples/anon-only.conf, examples/anon-reigon.conf,
+       examples/mudlogd.conf, examples/ratios.conf,
+       examples/standard.conf, examples/vserver-host.conf,
+       examples/vserver.conf, examples/vserverbig.conf,
+       src/Makefile.in, src/acl.c, src/acl.h, src/auth.c,
+       src/auth.h, src/authanon.c, src/authdisable.c,
+       src/authint.c, src/authpam.c, src/authunix.c,
+       src/bufread.c, src/cfloader.c, src/checkip.c,
+       src/cmd.c, src/config.c, src/configfile.h,
+       src/datasock.c, src/dir.c, src/file.c, src/ftp.c,
+       src/ftpcmd.h, src/ftpd.h, src/ftplist.c,
+       src/ftpout.c, src/ftpsite.c, src/ftpstat.c,
+       src/ftpstate.c, src/ftptrans.c, src/ftpwho.c,
+       src/init.c, src/logger.c, src/main.c,
+       src/malloc.c, src/mudlogd.c, src/mudpasswd.c,
+       src/myglob.c, src/myglob.h, src/newfile.c,
+       src/pnums.h, src/procnum.c, src/proxy.c,
+       src/ratio.c, src/ratio.h, src/ratiotool.c,
+       src/reply.h, src/select.c, src/shmem.c,
+       src/socket.c, src/string.c, src/string.h,
+       src/tokset.h, src/utils.c, src/version.c,
+       tools/muddlestats.0.3.0/AUTHORS,
+       tools/muddlestats.0.3.0/COPYING,
+       tools/muddlestats.0.3.0/INSTALL,
+       tools/muddlestats.0.3.0/README, tools/muddlestats.0.3.0/TODO,
+       tools/muddlestats.0.3.0/muddleftpd.logrotate,
+       tools/muddlestats.0.3.0/muddlestats-gather.py,
+       tools/muddlestats.0.3.0/muddlestats.lsm,
+       tools/muddlestats.0.3.0/muddlestats.py: Imported muddleftpd
+ 
+ 
+ Copyright (C) 2002 Muddleftpd Team, http://www.nongnu.org/muddleftpd/
+ Copying and distribution of this file, with or without modification, are
+ permitted provided the copyright notice and this notice are preserved.
Index: muddleftpd/configure.ac
diff -c /dev/null muddleftpd/configure.ac:1.4.4.1
*** /dev/null   Thu Nov  6 11:16:42 2003
--- muddleftpd/configure.ac     Thu Nov  6 11:16:42 2003
***************
*** 0 ****
--- 1,180 ----
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(mailfilter, 1.3.13.1, address@hidden)
+ AC_PREREQ(2.57)
+ AC_REVISION($Revision: 1.4.4.1 $)
+ AC_COPYRIGHT(Copyright (C) 2003 Muddleftpd Team)
+ 
+ AC_CONFIG_SRCDIR([src/acl.c])
+ AC_CONFIG_HEADER(config.h)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_INSTALL
+ AC_PROG_CC_SWITCH(rdynamic)
+ 
+ dnl Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+ AC_HEADER_SYS_WAIT
+ AC_CHECK_HEADERS([fcntl.h sys/time.h syslog.h unistd.h sys/uio.h
+                                 crypt.h dlfcn.h sys/capability.h 
netinet/in_systm.h stdarg.h
+                                 arpa/inet.h netdb.h netinet/in.h shadow.h 
stddef.h stdlib.h
+                                 string.h strings.h sys/param.h sys/socket.h 
sys/time.h
+                                 sys/vfs.h syslog.h unistd.h])
+ dnl malloc.h
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STAT
+ AC_C_CONST
+ AC_TYPE_UID_T
+ AC_TYPE_OFF_T
+ AC_TYPE_PID_T
+ AC_TYPE_SIZE_T
+ AC_STRUCT_ST_BLOCKS
+ AC_CHECK_MEMBERS([struct stat.st_rdev])
+ AC_HEADER_TIME
+ AC_STRUCT_TM
+ AC_C_VOLATILE
+ AC_CHECK_TYPES([ptrdiff_t])
+ AC_SYS_LARGEFILE()
+ 
+ # Checks for library functions.
+ AC_FUNC_CLOSEDIR_VOID
+ AC_FUNC_FORK
+ AC_FUNC_LSTAT
+ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
+ AC_FUNC_MALLOC
+ AC_FUNC_MEMCMP
+ AC_FUNC_MMAP
+ AC_FUNC_REALLOC
+ AC_FUNC_SELECT_ARGTYPES
+ AC_TYPE_SIGNAL
+ AC_FUNC_STAT
+ AC_FUNC_STRFTIME
+ AC_CHECK_FUNCS([alarm bzero endgrent ftruncate getcwd gethostbyaddr 
gethostbyname
+                           gethostname getpagesize getpass getspnam 
gettimeofday memmove
+                 memset mkdir munmap rmdir select socket strcasecmp strchr 
strdup
+                 strerror strrchr strstr strtol dlopen usleep pam_start 
fgetpwent
+                 fgetgrent sendfilecap_init seteuid setegid])
+ 
+ dnl Replace `main' with a function in -lcrypt:
+ AC_CHECK_LIB(crypt, main)
+ AC_SEARCH_LIBS(connect, socket)
+ AC_SEARCH_LIBS(gethostbyname, nsl)
+ AC_SEARCH_LIBS(dlopen, dl)
+ AC_CHECK_LIB(pam, main)
+ AC_CHECK_LIB(cap, cap_init)
+ AC_FUNC_SNPRINTF
+ 
+ dnl check for additional features
+ 
+ # MUD module
+ AC_ARG_WITH(authmud,
+       AC_HELP_STRING([--with-authmud], [create MUD authentication module. 
(no)]), 
+       authmud=$withval, authmud=no
+ )
+ 
+ # SMB module
+ AC_ARG_WITH(authsmb,
+       AC_HELP_STRING([--with-authsmb], [create SMB authentication module. 
(yes)]), 
+       authsmb=$withval, authsmb=yes
+ )
+ 
+ # MSQL module
+ AC_ARG_WITH(authmsql,
+       AC_HELP_STRING([--with-authmsql], [create mSQL authentication module. 
(no)]), 
+       authmsql=$withval, authmsql=no
+ )
+ 
+ AC_ARG_WITH(msqlpath, 
+       AC_HELP_STRING([--with-msqlpath], 
+                    [specify the top level of the msql installation tree.  
(default is /usr/local/Hughes)]),
+                          msqltop=$withval, msqltop=/usr/local/Hughes
+ )
+ 
+ # MYSQL module
+ AC_ARG_WITH(authmysql,
+       AC_HELP_STRING([--with-authmysql], [create MySQL authentication module. 
(no)]), 
+       authmysql=$withval, authmysql=no
+ )
+ 
+ AC_ARG_WITH(mysql-libs,
+       AC_HELP_STRING([--with-mysql-libs=DIR],
+                                  [Look for mysql libs in this dir (default: 
use output from mysql_config)]),
+       MYSQL_LIBS="-L$withval -lmysqlclient"
+       noconfiglibs=1
+ )
+ AC_ARG_WITH(mysql-includes,
+       AC_HELP_STRING([--with-mysql-includes=DIR],
+                                  [Look for mysql includes in this dir 
(default: use output from mysql_config)]),
+       MYSQL_CFLAGS="-I$withval"
+       noconfigincludes=1
+ )
+ 
+ AC_PATH_PROGS(MYSQL_CONFIG, mysql_config, mysql_config, $PATH:/usr/local/bin)
+ 
+ if test -x "$MYSQL_CONFIG"
+ then
+       if test "$noconfiglibs" != 1; then
+               MYSQL_LIBS="`mysql_config --libs`"
+       fi
+       if test "$noconfigincludes" != 1; then
+               MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
+       fi
+ 
+       eval "MYSQL_CFLAGS=\"\`echo $MYSQL_CFLAGS\`\""
+       eval "MYSQL_LIBS=\"\`echo $MYSQL_LIBS\`\""
+ fi
+ 
+ AC_SUBST(MYSQL_LIBS)
+ AC_SUBST(MYSQL_CFLAGS)
+ 
+ # work out zerobind default (false on linux, true on other systems)
+ 
+ case `uname -s` in
+       Linux)
+               zero_bind=FALSE
+               ;;
+       *)
+               zero_bind=TRUE
+               ;;
+ esac
+ AC_SUBST(zerobind, "$zero_bind")
+ 
+ # Should we use new malloc?
+ AC_ARG_WITH([system-malloc], 
+                        AC_HELP_STRING([--with-system-malloc],
+                                                [Use malloc from system, not 
included one. (default: System]),
+                        newmalloc=yes, newmalloc=no)
+ 
+ # Compile a debug version?
+ AC_ARG_ENABLE([debug-mode],
+                        AC_HELP_STRING([--enable-debug-mode],
+                                               [Build a debug version. Don't 
use for production systems (default: No)]),
+                        debug=yes, debug=no)
+ 
+ AM_CONDITIONAL([AUTHMUD], [test "$authmud" = yes])
+ AM_CONDITIONAL([AUTHSMB], [test "$authsmb" = yes])
+ AM_CONDITIONAL([AUTHMYSQL], [test "$authmysql" = yes])
+ AM_CONDITIONAL([AUTHMSQL], [test "$authmsql" = yes])
+ AM_CONDITIONAL([NEWMALLOC], [test "$newmalloc" = yes])
+ AM_CONDITIONAL([DEBUG], [test "$debug" = yes])
+ 
+ AC_CONFIG_FILES([Makefile
+                  doc/Makefile
+                  modules/Makefile
+                  modules/auth/Makefile
+                  modules/auth/authlibexample/Makefile
+                  modules/auth/authlibmsql/Makefile
+                  modules/auth/authlibmud/Makefile
+                  modules/auth/authlibmysql/Makefile
+                  modules/auth/authlibsmb/Makefile
+                  modules/auth/authlibsmb/smbval/Makefile
+                  src/Makefile
+                                defaults.h])
+ AC_OUTPUT
+ 
+ echo
+ echo Muddleftpd is now ready to be compiled!
+ echo
+