--- muddleftpd-1.3.13.1.orig/Makefile.defs +++ muddleftpd-1.3.13.1/Makefile.defs @@ -17,7 +17,7 @@ # **** THINGS YOU CAN CHANGE! # Use the new malloc implementation. Disable to use the system malloc -NEWMALLOC = 1 +# NEWMALLOC = 1 # Build a debug version. Don't use for production #DEBUG = 1 --- muddleftpd-1.3.13.1.orig/configure.ac +++ muddleftpd-1.3.13.1/configure.ac @@ -190,6 +190,10 @@ fi # MYSQL module +AC_ARG_WITH(mysql-lib,AC_HELP_STRING([--with-mysql-lib=DIR],[Directory under prefix to search for mysql libraries]), + [ mysql_lib="$withval" ], + [ mysql_lib="" ]) + AC_ARG_WITH(authmysql, AC_HELP_STRING([--with-authmysql=DIR], [creates MySQL authentication module, optionally specifies the DIR of mysql files]), [authmysql="$withval"], --- muddleftpd-1.3.13.1.orig/debian/changelog +++ muddleftpd-1.3.13.1/debian/changelog @@ -0,0 +1,464 @@ +muddleftpd (1.3.13.1-4.3ubuntu2) xenial; urgency=medium + + * Rebuild against libmysqlclient20. + + -- Robie Basak Tue, 05 Apr 2016 12:45:27 +0000 + +muddleftpd (1.3.13.1-4.3ubuntu1) raring; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/rules: Fix link order to list libraries after the objects that + require them. + + -- Logan Rosen Sun, 06 Jan 2013 03:08:35 -0600 + +muddleftpd (1.3.13.1-4.3) unstable; urgency=low + + * Non-maintainer upload. + * Backported changes from Ubuntu to enable rebuild against + mysql-5.5 (Closes: #673260) + + -- Nicholas Bamber Sun, 10 Jun 2012 11:18:08 +0000 + +muddleftpd (1.3.13.1-4.2ubuntu3) precise; urgency=low + + * configure.ac, modules/auth/authlibmysql/configure.ac: Add + --with-mysql-lib to allow multi-arch libmysqlclient. + * d/control,d/rules: use dh_autoreconf to enable new option above. + + -- Clint Byrum Sat, 26 Nov 2011 01:04:01 -0800 + +muddleftpd (1.3.13.1-4.2ubuntu2) precise; urgency=low + + * Rebuild for libmysqlclient transition + + -- Clint Byrum Wed, 23 Nov 2011 23:55:45 -0800 + +muddleftpd (1.3.13.1-4.2ubuntu1) oneiric; urgency=low + + * Fix link order to list libraries after the objects that require them + (LP: #771107). + + -- Colin Watson Tue, 13 Sep 2011 11:59:32 +0100 + +muddleftpd (1.3.13.1-4.2build2) lucid; urgency=low + + * Rebuild for libmysqlclient transition. + + -- Chuck Short Mon, 05 Apr 2010 22:49:16 -0400 + +muddleftpd (1.3.13.1-4.2build1) lucid; urgency=low + + * No-change rebuild for libcap1 → libcap2 transition. + + -- Michael Bienia Sun, 24 Jan 2010 01:35:27 +0100 + +muddleftpd (1.3.13.1-4.2) unstable; urgency=low + + * Non-maintainer upload to solve release goal. + * Add LSB dependency header to init.d scripts (Closes: #469427). + * Do not build-depend on libcap-dev on GNU/kFreeBSD (Closes: #375027). + + -- Petter Reinholdtsen Fri, 4 Apr 2008 19:47:33 +0200 + +muddleftpd (1.3.13.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + Rebuild against libmysqlclient15-dev. Closes: #343782 + + -- Christian Hammers Tue, 21 Feb 2006 22:35:57 +0100 + +muddleftpd (1.3.13.1-4) unstable; urgency=low + + * Change libmysqlclient-dev to libmysqlclient12-dev + * muddleftpd: implicitly declared function returns a pointer that is + used (Closes: #226529) + + -- Joerg Jaspert Mon, 9 May 2005 21:54:24 +0200 + +muddleftpd (1.3.13.1-3) unstable; urgency=low + + * Bug fix: "muddleftpd: FTBFS on amd64: -fPIC missing", thanks to + Andreas Jochens (Closes: #253618). + + -- Joerg Jaspert Tue, 3 May 2005 22:17:49 +0200 + +muddleftpd (1.3.13.1-2) unstable; urgency=low + + * Well, one module fix wasnt right. + + -- Joerg Jaspert Mon, 3 Nov 2003 15:00:27 +0100 + +muddleftpd (1.3.13.1-1) unstable; urgency=low + + * New Upstream Version - it should fix the build failures in the + modules. + + -- Joerg Jaspert Mon, 3 Nov 2003 13:32:30 +0100 + +muddleftpd (1.3.13-1) unstable; urgency=low + + * New Upstream Version: + 1) Change: Revamped build system to use new build tools. + 2) Change: Included authentication modules into build system. + They are installed (if selected at configure time) into + the libdir from configure. Normally prefix/lib + (/usr/local/lib if not specified). + 3) Bug Fix: Scrambled output on PPC systems fixed. (possibly other + systems too) + 4) Change: Install .txt documentation in prefix/share/doc/muddleftpd/*. + * Bug fix: "muddleftpd: login does not work on ppc", thanks to Oyvind + Hvidsten (Closes: #173890). + * Remove dh_installdoc thing, Upstream install target does the work now. + * Build auth-module for smb, mud and mysql and ship them in the package. + Read the README.auth$MODULE files in /usr/share/doc/muddleftpd for more + info about them. + * For that we need to build-dep on a mysql dev package. + + -- Joerg Jaspert Sun, 2 Nov 2003 20:36:34 +0100 + +muddleftpd (1.3.12.1-3) unstable; urgency=low + + * Use system malloc lib, not the included one. That should + fix the FTBFS on s390 (Closes: #172225). + * Bug fix from CVS for: "muddleftpd: doesn't detach from terminal" (Closes: #172740). + * Standards-version 3.6.1 + * Updated control file. + + -- Joerg Jaspert Thu, 2 Oct 2003 21:50:09 +0200 + +muddleftpd (1.3.12.1-2) unstable; urgency=low + + * Install the ratiotool + + -- Joerg Jaspert Thu, 24 Oct 2002 20:26:16 +0200 + +muddleftpd (1.3.12.1-1) unstable; urgency=low + + * Another fix to the log thing. Now its upstream, so i no longer include my + own patch. (Yes, muddleftpd development is back alive) (closes: #145487) + + -- Joerg Jaspert Wed, 16 Oct 2002 10:43:19 +0200 + +muddleftpd (1.3.12-1) unstable; urgency=low + + * YES, New Upstream Version: + 1) Bug Fix: Linux does not like custom PASV replies with ip-masq. + Using reply recommended (but not mandatory) in RFC959. (Beau Kuiper) + 2) Change: Included support for large files (> 2 gig) on 32bit + systems. + 3) Change: Removed QUIET compile option, replaced by verbose + parameter. + 4) Change: Added support for HP-UX 11.00 + 5) Bug Fix: fixed warnings with GCC 3.X compiler + * This (closes: #156983) + * debhelper >= 4.02 now. + * Standards-Version 3.5.7 + + -- Joerg Jaspert Mon, 9 Sep 2002 12:47:35 +0200 + +muddleftpd (1.3.11-8) unstable; urgency=high + + * Last patch to logger.c was --- not good. This one is a little better. + It does not fix the problem (muddleftpd should reject Lines with \r + or \n) but it is better than nothing, and it does not kill the + logfile. This fixes #145487. + + -- Joerg Jaspert Sun, 5 May 2002 13:39:54 +0200 + +muddleftpd (1.3.11-7) unstable; urgency=low + + * New Maintainer (closes: #131183) + * Apply a patch to logger.c to change all non-printable chars to spaces. + Made with the aid of two peoples from #debian.de. + This should (closes: #107339) + + -- Joerg Jaspert (JJ) Mon, 8 Apr 2002 22:36:08 +0200 + +muddleftpd (1.3.11-6) unstable; urgency=low + + * Build with PAM support. + + -- Decklin Foster Thu, 12 Jul 2001 10:58:56 -0400 + +muddleftpd (1.3.11-5) unstable; urgency=low + + * Rebuild with dpkg 1.9.14.1 to fix source package (Closes: #102514) + + -- Decklin Foster Wed, 27 Jun 2001 14:46:28 -0400 + +muddleftpd (1.3.11-4) unstable; urgency=medium + + * Argh. I am an idiot. Fix removal of /etc/muddleftpd on purge. + Added some preinst cruft to prevent broken versions (-2 and -3) + from wiping out the user's config on upgrading. + * Changed the init script to bail out if muddleftpd.conf is missing. + If anything else goes wrong, this will at least allow dpkg to + continue configuring. + + -- Decklin Foster Mon, 25 Jun 2001 17:09:21 -0400 + +muddleftpd (1.3.11-3) unstable; urgency=low + + * Add missingok to logrotate conffile. (Closes: #100520) + * debconf has not been used for several releases (Closes: #102185) + + -- Decklin Foster Mon, 25 Jun 2001 14:22:08 -0400 + +muddleftpd (1.3.11-2) unstable; urgency=low + + * Remove /etc/muddleftpd on purge (Closes: #100062) + * Update Standards-Version to 3.5.5 + * Added man page for mudlogd + + -- Decklin Foster Sun, 10 Jun 2001 22:39:58 -0400 + +muddleftpd (1.3.11-1) unstable; urgency=medium + + * New upstream release. This fixes a possible security problem with + the 'allowfxp' directive (which is not enabled by default, so only + users who have turned it on are affected.) See http://www.arach. + net.au/~wildfire/muddleftpd/security/sec-report-5-2-2001-port.txt + for more information. + + -- Decklin Foster Wed, 2 May 2001 23:40:54 -0400 + +muddleftpd (1.3.9-2) unstable; urgency=low + + * Added Build-Depends on texinfo (Closes: #93086) + + -- Decklin Foster Fri, 6 Apr 2001 08:43:45 -0400 + +muddleftpd (1.3.9-1) unstable; urgency=low + + * New upstream release. + * Removed patch from Makefile.in and set mandir/infodir in + debian/rules instead. + * A few other patches were also merged, but hold off on removing + mudpasswd man page from debian/ for now due to upstream mangling. + * Updated debian/muddleftpd.examples. + * Deleted debian/muddleftpd.conffiles, since everything was listed + twice with debhelper v3. (Note to self: file a bug about this...) + + -- Decklin Foster Wed, 28 Mar 2001 20:20:54 -0500 + +muddleftpd (1.3.8-1) unstable; urgency=low + + * New upstream release. + * Applied file-listing patch. + * undefined RUN_FOREGROUND (this appears to be an upstream mistake). + + -- Decklin Foster Mon, 19 Mar 2001 12:14:42 -0500 + +muddleftpd (1.3.7-8) unstable; urgency=low + + * Oops. I put the db_purge call in the preinst, but this means I + should have changed the debconf dependency to a pre-dependency + (yuck). Instead of doing this, I've modified the script to first + check if debconf is still installed, and then only attempt to + purge the db if the test is sucessful. As a side effect, the + dependency is no longer needed. (well, unless the debconf API + changes, but then I'd be screwed anyway.) + + -- Decklin Foster Wed, 14 Mar 2001 17:02:05 -0500 + +muddleftpd (1.3.7-7) unstable; urgency=low + + * Remove debconf support. dpkg-stattoveride has been around for a + while, admins should know what to do with it, and I think + interrupting an install with debconf questions in order to manage + overrides from the maintainer scripts (which isn't very robust + anyway) is silly. Any existing overrides will be left in place + when upgrading to this version. + * Still depending on debconf for now so we can purge the db on an + upgrade from an old version. This will go away at some point after + the next stable release. + * Patched ftpwho to give a somewhat more informative error message + when run non-suid. + * Edited texinfo docs to remove some typos and add a section + heading. For now, I'm regenerating the .info file by hand. + * Updated default config, and install a default busydump file. + * Upgraded to debhelper v3 (>= 3.0.10, since we need dh_installinit) + and Standards-Version 3.5.2. + * Build without -g by default, and add DEB_BUILD_OPTIONS =~ /debug/ + support. + + -- Decklin Foster Tue, 13 Mar 2001 12:31:28 -0500 + +muddleftpd (1.3.7-6) unstable; urgency=low + + * Provide alternatives for ftpd/ftpd.1 (Closes: #82994) + * added Conflicts: ftp-server + + -- Decklin Foster Sat, 20 Jan 2001 21:20:32 -0500 + +muddleftpd (1.3.7-5) unstable; urgency=low + + * Switch from suidmanager to dpkg-statoverride. + * Fix package reconfiguration so that it updates the SUID bit + correctly. + + -- Decklin Foster Thu, 11 Jan 2001 13:10:55 -0500 + +muddleftpd (1.3.7-4) unstable; urgency=low + + * added Provides: ftp-server + * Bumped Standards-Version to 3.2.1.0 + * Updated debhelper rules to v2 + + -- Decklin Foster Mon, 8 Jan 2001 14:57:36 -0500 + +muddleftpd (1.3.7-3) unstable; urgency=low + + * Preliminary debconf support. + * debian/control: changed logrotate to Depends, added Suggests: + suidmanager + * Cleaned up init.d script a bit. + + -- Decklin Foster Sun, 1 Oct 2000 15:01:33 -0400 + +muddleftpd (1.3.7-2) unstable; urgency=low + + * Added some init.d script sanity checking. + * Patched fatal exit handler to return 1. + + -- Decklin Foster Fri, 15 Sep 2000 19:37:30 -0400 + +muddleftpd (1.3.7-1) unstable; urgency=medium + + * New upstream release. This should completely fix the user-count + problems that stopped people from logging in with the past two + revisions. Leaving severity at medium because this is a possible + (non-fatal) DOS and someone might have snatched an affected + package from Incoming before I got to it. + * Patched utils.c to disable hanging with an infinite loop on a + harmless assertion. Patch has been sent upstream. + + -- Decklin Foster Wed, 30 Aug 2000 08:45:42 -0400 + +muddleftpd (1.3.6-1) unstable; urgency=medium + + * New upstream release. This fixes a possible DOS attack in the + previous version if a newly introduced configuration option was + used. The previous version was deleted from Incoming before being + installed. + * Added Build-Depends field + * Fixed Recommends typo + + -- Decklin Foster Mon, 28 Aug 2000 10:15:28 -0400 + +muddleftpd (1.3.5-1) unstable; urgency=low + + * New upstream release + * Fixed a problem with init.d restart + * Logfiles rotated with group adm + + -- Decklin Foster Sun, 27 Aug 2000 11:02:56 -0400 + +muddleftpd (1.3.4-4) unstable; urgency=low + + * Updated lists of docs to be installed + + -- Decklin Foster Sun, 20 Aug 2000 00:04:21 -0400 + +muddleftpd (1.3.4-3) unstable; urgency=low + + * Fix logrotate typo + * Added a custom default config in debian/ again + + -- Decklin Foster Sun, 30 Jul 2000 05:34:21 -0400 + +muddleftpd (1.3.4-2) unstable; urgency=low + + * Rotate logfiles + + -- Decklin Foster Sat, 29 Jul 2000 23:52:21 -0400 + +muddleftpd (1.3.4-1) unstable; urgency=low + + * New upstream release + * Fixed init.d script pid problem. + + -- Decklin Foster Mon, 24 Jul 2000 13:55:37 -0400 + +muddleftpd (1.3.3-2) unstable; urgency=low + + * Wrote man page for mudpasswd. + + -- Decklin Foster Mon, 17 Jul 2000 00:15:05 -0500 + +muddleftpd (1.3.3-1) unstable; urgency=low + + * New upstream release. + + -- Decklin Foster Wed, 28 Jun 2000 09:06:14 -0400 + +muddleftpd (1.3.2-1) unstable; urgency=low + + * New upstream release + * Fixed homepage/email in copyright file. + + -- Decklin Foster Sat, 20 May 2000 20:29:36 -0400 + +muddleftpd (1.3.1-2) unstable; urgency=low + + * Fixed missing pid file problem. + + -- Decklin Foster Fri, 21 Apr 2000 22:37:49 -0400 + +muddleftpd (1.3.1-1) unstable; urgency=low + + * New upstream release + * Fixed config file problem. If you're upgrading, you'll need to + change your config files over to the new format. + + -- Decklin Foster Mon, 6 Mar 2000 12:44:45 -0500 + +muddleftpd (1.3.0-1) unstable; urgency=low + + * New upstream release + + -- Decklin Foster Sun, 23 Jan 2000 13:07:40 -0500 + +muddleftpd (1.2.4-1) unstable; urgency=low + + * New upstream release + + -- Decklin Foster Wed, 15 Dec 1999 10:54:42 -0500 + +muddleftpd (1.2.3-1) unstable; urgency=low + + * New upstream release + * New version numbering system (like the linux kernel). This is now + a "stable release." + * Got rid of customized config in debian/; the one in + examples/anon-only should be sufficent. + + -- Decklin Foster Thu, 9 Dec 1999 19:54:41 -0500 + +muddleftpd (1.1-2) unstable; urgency=low + + * Put docs in correct place (whoops). + + -- Decklin Foster Sat, 2 Oct 1999 15:54:54 -0400 + +muddleftpd (1.1-1) unstable; urgency=low + + * New upstream release + * More docs and examples added. + + -- Decklin Foster Sat, 18 Sep 1999 13:45:38 -0400 + +muddleftpd (1.1.b1-1) unstable; urgency=low + + * New upstream release + + -- Decklin Foster Thu, 19 Aug 1999 12:43:28 -0400 + +muddleftpd (1.1.a5-1) unstable; urgency=low + + * Initial release. + + -- Decklin Foster Wed, 18 Aug 1999 20:49:45 -0400 + + --- muddleftpd-1.3.13.1.orig/debian/control +++ muddleftpd-1.3.13.1/debian/control @@ -0,0 +1,22 @@ +Source: muddleftpd +Section: net +Priority: extra +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Joerg Jaspert +Standards-Version: 3.6.1 +Build-Depends: debhelper (>= 4.0.2), libpam0g-dev, texinfo, libcap-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libmysqlclient-dev, dh-autoreconf + +Package: muddleftpd +Provides: ftp-server +Architecture: any +Depends: ${shlibs:Depends}, logrotate +Conflicts: ftp-server, suidmanager (<< 0.50) +Description: A flexible and efficient FTP daemon + MuddleFTPd has been designed from the ground up to be efficient, + configurable and to be tolerant of being run in root or non-root mode. + This server enables users to set up a variety of configurations, from + a traditional FTP server using the password file for everything, to + using the password file for nothing running entirely as a single + user. + . + Modules for SMB, MySQL and MUD authentication included in the package. --- muddleftpd-1.3.13.1.orig/debian/copyright +++ muddleftpd-1.3.13.1/debian/copyright @@ -0,0 +1,10 @@ +This package was debianized by Decklin Foster +on Wed, 18 Aug 1999 20:49:45 -0400. + +Maintainer is now: Joerg Jaspert + +Downloaded from: http://www.nongnu.org/muddleftpd/ + +Upstream Author: Beau Kuiper and many others. Mailinglist is muddleftpd-users@nongnu.org + +Copyright: GPL (See /usr/share/common-licenses/GPL on Debian systems.) --- muddleftpd-1.3.13.1.orig/debian/default-config/busydump +++ muddleftpd-1.3.13.1/debian/default-config/busydump @@ -0,0 +1,2 @@ +Sorry, there are currently too many users logged on to this server. +Please try again later. --- muddleftpd-1.3.13.1.orig/debian/default-config/muddleftpd.conf +++ muddleftpd-1.3.13.1/debian/default-config/muddleftpd.conf @@ -0,0 +1,82 @@ +#--------------------------------------------------------------------- +# MuddleFTPd configuration for Debian; tweaked by decklin@red-bean.com + +[section] main + +# set some reasonable defaults + +ftpport 21 +maxusers 100 +timeout 300 +logfile /var/log/muddleftpd.log +pidfile /var/run/muddleftpd.pid +scratchfile /var/lock/muddleftpd.scratch + +# log everything execpt debugging logs +logstrength 63 + +# uncomment this to print a message on login +# logindump /etc/muddleftpd/logindump + +# allow any host to connect +ipacl A:* + +# be sure to change this to your own email address and hostname; they +# are used for cookies in the logindump/cddump files +email user@hostname +hostname muddleftpd + +# be sure to use this option; it makes multi-line messages be printed +# correctly +altlongreplies 1 + +# look for the following [section]s below to define the various groups +# (in this case, only one) that users can log in as. +group anonymous + +# -------------------------------------------------------------------- +# please note that anonymous access is *not* set up automatically; if +# you want to use this default configuration you must run `adduser +# ftp` to create a place to serve files. + +[section] anonymous + + # any host or username will match this group + ipacl A:* + nameacl A:* + + # tell the server to use chroot to the anonymous rootdir + chroot 1 + + # tell the server to use the ftp user as the anonymous rootdir + # and uid/gid + authparams ftp + + # tell the server to use the anonymous authenticator, and + # accept any password. + authmethod anonymous + + # disallow any changes to file permissions or upload umask + chmoding 0 + + # print out this file when the user logs in. It is not relative + # to anonymous's rootdir + welcome /home/ftp/welcome.msg + + # display this file when a user changes into a new directory + cddump .message + + # display this file when too many users are logged on + busydump /etc/muddleftpd/busydump + + # set the umask files are uploaded with + umask 077 + + # give anonymous user read/list access everywhere and add/list + # access to the incoming folder. The / on the end of the directive + # tells muddleftpd to apply ACL to a directory rather than a file. + # (chdir, list, read) + access /:CLR + # uncomment the following line to allow uploads to /incoming + # (chdir, list, read, add, mkdir) + # access /incoming/:CLRAM --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.README.Debian +++ muddleftpd-1.3.13.1/debian/muddleftpd.README.Debian @@ -0,0 +1,19 @@ +Muddleftpd for Debian +---------------------- + +The 'ftpwho' program can, by default, only be run as root. If you +would like to let other users see who is logged into the FTP server, +use dpkg-statoverride to make the program set-uid and set-gid (Note: +just set-uid won't work.) + + dpkg-statoverride --update --add root root 6755 /usr/bin/ftpwho + +Muddleftpd currently starts itself from the /etc/init.d/muddleftpd +script -- starting via inetd is not implemented in the Debian package +at this time. Upstream has added some inetd support, but I have not +received any requests to change the packaging (I don't run inetd at +all myself, either). If you want this for some reason, file a wishlist +bug. + + -- Joerg Jaspert Mon, 8 Apr 2002 22:36:08 +0200 + -- Decklin Foster Tue, 13 Mar 2001 12:31:28 -0500 --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.dirs +++ muddleftpd-1.3.13.1/debian/muddleftpd.dirs @@ -0,0 +1 @@ +etc/muddleftpd --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.examples +++ muddleftpd-1.3.13.1/debian/muddleftpd.examples @@ -0,0 +1,8 @@ +examples/README +examples/anon-only.conf +examples/anon-reigon.conf +examples/ratios.conf +examples/standard.conf +examples/vserver-host.conf +examples/vserver.conf +examples/vserverbig.conf --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.info +++ muddleftpd-1.3.13.1/debian/muddleftpd.info @@ -0,0 +1 @@ +doc/info/muddleftpd.info --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.init +++ muddleftpd-1.3.13.1/debian/muddleftpd.init @@ -0,0 +1,62 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: muddleftpd +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +### END INIT INFO +# +# Written by Miquel van Smoorenburg . +# Modified for Debian GNU/Linux by Ian Murdock . +# Modified for muddleftpd by Decklin Foster + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/muddleftpd +CFG=/etc/muddleftpd/muddleftpd.conf +NAME='muddleftpd' +DESC='FTP server' +PIDFILE=/var/run/$NAME.pid + +test -f $DAEMON || exit 0 +test -f $CFG || exit 0 + +set -e + +case "$1" in + start) + echo -n "Starting $DESC: " + if start-stop-daemon --start --quiet --exec $DAEMON; then + ftpwho -p > $PIDFILE + echo "$NAME." + else + echo "$NAME already running." + fi + ;; + stop) + echo -n "Stopping $DESC: " + if test -e $PIDFILE && start-stop-daemon --stop --quiet --pidfile $PIDFILE; then + rm /var/run/$NAME.pid + echo "$NAME." + else + echo "$NAME not running." + fi + ;; + reload) + echo -n "Reloading $DESC configuration files: " + if test -e $PIDFILE && start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE; then + echo "$NAME." + else + echo "$NAME not running." + fi + ;; + restart|force-reload) + $0 stop && $0 start + ;; + *) + echo "Usage: $0 {start|stop|restart|reload|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.logrotate +++ muddleftpd-1.3.13.1/debian/muddleftpd.logrotate @@ -0,0 +1,10 @@ +/var/log/muddleftpd.log { + rotate 7 + daily + create 640 root adm + compress + missingok + postrotate + /etc/init.d/muddleftpd reload >/dev/null + endscript +} --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.manpages +++ muddleftpd-1.3.13.1/debian/muddleftpd.manpages @@ -0,0 +1,2 @@ +debian/mudpasswd.1 +debian/mudlogd.1 --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.postinst +++ muddleftpd-1.3.13.1/debian/muddleftpd.postinst @@ -0,0 +1,18 @@ +#!/bin/sh + +set -e + +# stupid stupid stupid + +if [ -e /etc/muddleftpd.save -a ! -e /etc/muddleftpd ]; then + mv /etc/muddleftpd.save /etc/muddleftpd +fi + +if [ "$1" = "configure" ]; then + update-alternatives \ + --install /usr/bin/ftpd ftpd /usr/bin/muddleftpd 30 \ + --slave /usr/share/man/man1/ftpd.1.gz ftpd.1.gz \ + /usr/share/man/man1/muddleftpd.1.gz +fi + +#DEBHELPER# --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.postrm +++ muddleftpd-1.3.13.1/debian/muddleftpd.postrm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ]; then + rmdir /etc/muddleftpd || true +fi + +#DEBHELPER# --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.preinst +++ muddleftpd-1.3.13.1/debian/muddleftpd.preinst @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e + +# stupid stupid stupid + +if [ '(' "$1" = "upgrade" -o "$1" = "install" ')' -a '(' "$2" = "1.3.11-2" -o "$2" = "1.3.11-3" ')' ]; then + mv /etc/muddleftpd /etc/muddleftpd.save + mkdir /etc/muddleftpd +fi + +# clean up any debconf cruft lying around from older versions + +if [ "$1" = "upgrade" -o "$1" = "install" ] && dpkg --compare-versions "$2" lt 1.3.7-7; then + # but only if debconf is actually there... + if [ -e /usr/share/debconf/confmodule ]; then + . /usr/share/debconf/confmodule + db_purge + else + echo "Warning: debconf does not appear to be installed." + echo "Not attempting to purge obsolete db entries for muddleftpd." + fi +fi + +#DEBHELPER# --- muddleftpd-1.3.13.1.orig/debian/muddleftpd.prerm +++ muddleftpd-1.3.13.1/debian/muddleftpd.prerm @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +update-alternatives --remove ftpd /usr/bin/muddleftpd + +#DEBHELPER# --- muddleftpd-1.3.13.1.orig/debian/mudlogd.1 +++ muddleftpd-1.3.13.1/debian/mudlogd.1 @@ -0,0 +1,17 @@ +.TH MUDLOGD 1 +.SH NAME +mudlogd - log manager for muddleftpd(1) +.SH SYNOPSIS +.B mudlogd -c \fIconfig-file\fP +.SH DESCRIPTION +Mudlogd is a deamon designed to make rotating muddleftpd log files +simple, without bothering the main server. Muddleftpd isn't able to +rotate its log files sometimes because it has lost the permissions or +file access to do so. For details on its configuration files, see +/usr/share/doc/muddleftpd/mudlogd.txt. +.SH SEE ALSO +muddleftpd(1) +.SH AUTHOR +MuddleFTPd was written by Beau Kuiper . This +manual page was written for the Debian system by Decklin Foster +. --- muddleftpd-1.3.13.1.orig/debian/mudpasswd.1 +++ muddleftpd-1.3.13.1/debian/mudpasswd.1 @@ -0,0 +1,45 @@ +.TH MUDPASSWD 1 +.SH NAME +mudpasswd - manage muddleftpd(1) password files +.SH SYNOPSIS +.B muddleftpd -p \fIpassword-file\fP {-a \fIusername\fP +[\fIoptions...\fP]|-d \fIusername\fP|-e \fIusername\fP +\fIoptions...\fP} +.SH DESCRIPTION +\fBmudpasswd\fP modifies a password file to be used by muddleftpd(1)'s +\fIinternal\fP authentication method. Unless the \fI-h\fP or +\fI-V\fP options are given, the \fI-p\fP option and one of the +\fI-a\fP, \fI-e\fP, or \fI-d\fP options must be specified. +Aditionally, if \fI-e\fP is selected, at least one of \fI-P\fP, +\fI-H\fP, or \fI-R\fP must be given. +.SH OPTIONS +.TP +.B -p \fIpassword-file\fP +Edit the passwords found in \fIpassword-file\fP. +.TP +.B -a \fIusername\fP +Add the user \fIusername\fP. +.TP +.B -d \fIusername\fP +Delete user \fIusername\fP. +.TP +.B -e \fIusername\fP +Edit the information for user \fIusername\fP. +.TP +.B -P \fIpassword\fP +Set the password for the user specified by -a or -e. +.TP +.B -R \fIdirectory\fP +Set the root directory for the user specified by -a or -e. +.TP +.B -H \fIdirectory\fP +Set the home directory for the user specified by -a or -e. +.TP +.B -W +Interactively read in a password for the user specified by -e. +.SH SEE ALSO +ftpwho(1) +.SH AUTHOR +MuddleFTPd was written by Beau Kuiper . This +manual page was written for the Debian system by Decklin Foster +. --- muddleftpd-1.3.13.1.orig/debian/rules +++ muddleftpd-1.3.13.1/debian/rules @@ -0,0 +1,84 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 +export DH_COMPAT=4 + +CFLAGS = -Wall -g -fPIC + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +CFLAGS += -O0 +else +CFLAGS += -O2 +endif + +PACKAGE := muddleftpd +pwd=$(shell pwd) + +TOPDIR := $(shell pwd) +t = ${TOPDIR}/debian/muddleftpd + +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +configure: configure-stamp +configure-stamp: + dh_testdir + dh_autoreconf + + CFLAGS='$(CFLAGS)' ./configure --prefix=/usr --mandir='$${prefix}/share/man' \ + --infodir='$${prefix}/share/info' --with-authsmb --with-authmud --with-authmysql \ + --with-mysql-lib=lib/$(DEB_HOST_MULTIARCH) + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + $(MAKE) + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -$(MAKE) distclean + dh_autoreconf_clean + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) prefix=$(CURDIR)/debian/muddleftpd/usr install + install -m 644 debian/default-config/* debian/muddleftpd/etc/muddleftpd + install -m 755 src/ratiotool debian/muddleftpd/usr/bin/ratiotool + +# Build architecture-independent files here. +binary-indep: build install +#Nothing todo, no -indep + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installmenu + dh_installlogrotate + dh_installinit + dh_installman + dh_installinfo + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- muddleftpd-1.3.13.1.orig/doc/Makefile.in +++ muddleftpd-1.3.13.1/doc/Makefile.in @@ -51,6 +51,9 @@ install man/muddleftpd.1 -m 644 $(MANDIR)/man1/$(MUDOUTPROG).1 install man/ftpwho.1 -m 644 $(MANDIR)/man1/$(WHOPROG).1 install man/mudpasswd.1 -m 644 $(MANDIR)/man1/$(MUDPASSWDPROG).1 + gzip -9vf $(MANDIR)/man1/$(MUDOUTPROG).1 + gzip -9vf $(MANDIR)/man1/$(WHOPROG).1 + gzip -9vf $(MANDIR)/man1/$(MUDPASSWDPROG).1 mkdir -p $(INFODIR) install $(DOCOBJ) -m 644 $(INFODIR) mkdir -p $(DOCDIR)/doc/muddleftpd --- muddleftpd-1.3.13.1.orig/doc/info/muddleftpd.info +++ muddleftpd-1.3.13.1/doc/info/muddleftpd.info @@ -1,4 +1,4 @@ -This is info/muddleftpd.info, produced by makeinfo version 4.2 from +This is info/muddleftpd.info, produced by makeinfo version 4.13 from info/muddleftpd.texi. INFO-DIR-SECTION Internet @@ -35,24 +35,23 @@  File: muddleftpd.info, Node: Introduction, Next: Invocation, Prev: Top, Up: Top -Introduction -************ +1 Introduction +************** - MUDDLEFTPD is a server for the Internet File Transfer Protocol. -Normal FTP servers tend to always want to run with root privileges on -the server host. MUDDLEFTPD is designed to overcome this obstacle -without limiting the available features when running without root -privileges. +MUDDLEFTPD is a server for the Internet File Transfer Protocol. Normal +FTP servers tend to always want to run with root privileges on the +server host. MUDDLEFTPD is designed to overcome this obstacle without +limiting the available features when running without root privileges. This manual describes version 1.1 of the program.  File: muddleftpd.info, Node: Invocation, Next: Site Configuration, Prev: Introduction, Up: Top -Invocation -********** +2 Invocation +************ - Neither the server program, MUDDLEFTPD, or the special information +Neither the server program, MUDDLEFTPD, or the special information program, FTPWHO takes any special arguments except the name of the configuration file to use. If no configuration file is specified on the command line, both programs will try to open the default configuration @@ -61,10 +60,10 @@  File: muddleftpd.info, Node: Site Configuration, Next: Troubleshooting, Prev: Invocation, Up: Top -Site Configuration -****************** +3 Site Configuration +******************** - MUDDLEFTPD uses two different configuration files. The main +MUDDLEFTPD uses two different configuration files. The main configuration file and the user configuration files. They both use a simple format where lines consist of two items separated by space (key and value). There can only be one pair of key and value on each line. @@ -83,10 +82,10 @@  File: muddleftpd.info, Node: Main config, Next: User config, Up: Site Configuration -Main config -*********** +4 Main config +************* - The main config file is read when muddleftpd is first started. It +The main config file is read when muddleftpd is first started. It contains information that applies to the entire program. Some options can be declared several times in the configuration file to add more values. @@ -109,8 +108,8 @@  File: muddleftpd.info, Node: ftpport, Next: maxusers, Up: Main config -ftpport -******* +5 ftpport +********* * Accepted value: (port)/(ip) | (port) @@ -133,8 +132,8 @@  File: muddleftpd.info, Node: maxusers, Next: logstrength, Prev: ftpport, Up: Main config -maxusers -******** +6 maxusers +********** * Accepted value: (maximum user count) @@ -150,8 +149,8 @@  File: muddleftpd.info, Node: logstrength, Next: runasuid, Prev: maxusers, Up: Main config -logstrength -*********** +7 logstrength +************* * Accepted value: (logvalue) @@ -160,7 +159,8 @@ `logstrength' tells the server what information to log. The value for this option is the sum of any of the following types: -1 Clients that try to access the server from invalid ip addresses +1 Clients that try to access the server from invalid ip + addresses 2 File transfers, uploads and downloads. 4 Commands the user sends to the server. 8 The replies the server sends to the user. @@ -176,8 +176,8 @@  File: muddleftpd.info, Node: runasuid, Next: runasgid, Prev: logstrength, Up: Main config -runasuid -******** +8 runasuid +********** * Accepted value: (uid) @@ -196,8 +196,8 @@  File: muddleftpd.info, Node: runasgid, Next: logfile, Prev: runasuid, Up: Main config -runasgid -******** +9 runasgid +********** * Accepted value: (gid) @@ -216,8 +216,8 @@  File: muddleftpd.info, Node: logfile, Next: accessdir, Prev: runasgid, Up: Main config -logfile -******* +10 logfile +********** * Accepted value: (filename) @@ -235,8 +235,8 @@  File: muddleftpd.info, Node: accessdir, Next: timeout, Prev: logfile, Up: Main config -accessdir -********* +11 accessdir +************ * Accepted value: (directory) @@ -254,8 +254,8 @@  File: muddleftpd.info, Node: timeout, Next: addhost, Prev: accessdir, Up: Main config -timeout -******* +12 timeout +********** * Accepted value: (seconds) @@ -272,8 +272,8 @@  File: muddleftpd.info, Node: addhost, Next: logindump, Prev: timeout, Up: Main config -addhost -******* +13 addhost +********** * Accepted value: (ip address)/(netmask) @@ -295,8 +295,8 @@  File: muddleftpd.info, Node: logindump, Next: pidfile, Prev: addhost, Up: Main config -logindump -********* +14 logindump +************ * Accepted value: (filename) @@ -315,8 +315,8 @@  File: muddleftpd.info, Node: pidfile, Next: email, Prev: logindump, Up: Main config -pidfile -******* +15 pidfile +********** * Accepted value: (filename) @@ -335,8 +335,8 @@  File: muddleftpd.info, Node: email, Prev: pidfile, Up: Main config -email -***** +16 email +******** * Accepted value: (email address) @@ -353,10 +353,10 @@  File: muddleftpd.info, Node: User config, Prev: Main config, Up: Site Configuration -User config -*********** +17 User config +************** - The user configuration files define almost everything about a user +The user configuration files define almost everything about a user connection to the ftp server. This includes home directory, root directory, password and file access rights. MUDDLEFTPD will have at least one ofthese files, and will load them in the following order: @@ -399,8 +399,8 @@  File: muddleftpd.info, Node: group, Next: password, Up: User config -group -***** +18 group +******** * Accepted value: (group name) @@ -419,8 +419,8 @@  File: muddleftpd.info, Node: password, Next: rootdir, Prev: group, Up: User config -password -******** +19 password +*********** * Accpted value: (encrypted password) @@ -438,8 +438,8 @@  File: muddleftpd.info, Node: rootdir, Next: homedir, Prev: password, Up: User config -rootdir -******* +20 rootdir +********** * Accepted value: (directory) @@ -458,8 +458,8 @@  File: muddleftpd.info, Node: homedir, Next: welcome, Prev: rootdir, Up: User config -homedir -******* +21 homedir +********** * Accepted value: (directory) @@ -478,8 +478,8 @@  File: muddleftpd.info, Node: welcome, Next: access, Prev: homedir, Up: User config -welcome -******* +22 welcome +********** * Accepted value: (filename) @@ -496,8 +496,8 @@  File: muddleftpd.info, Node: access, Next: umask, Prev: welcome, Up: User config -access -****** +23 access +********* * Accepted value: (filename or directory):(keys) @@ -541,8 +541,8 @@  File: muddleftpd.info, Node: umask, Next: unixuser, Prev: access, Up: User config -umask -***** +24 umask +******** * Accepted value: (octal integer) @@ -558,8 +558,8 @@  File: muddleftpd.info, Node: unixuser, Next: maxconnect, Prev: umask, Up: User config -unixuser -******** +25 unixuser +*********** * Accepted value: (username) @@ -577,8 +577,8 @@  File: muddleftpd.info, Node: maxconnect, Next: utimeout, Prev: unixuser, Up: User config -maxconnect -********** +26 maxconnect +************* * Accepted value: (count) @@ -596,8 +596,8 @@  File: muddleftpd.info, Node: utimeout, Next: permissions, Prev: maxconnect, Up: User config -utimeout -******** +27 utimeout +*********** * Accepted value: (seconds) @@ -613,8 +613,8 @@  File: muddleftpd.info, Node: permissions, Next: dumpfiles, Prev: utimeout, Up: User config -permissions -*********** +28 permissions +************** * Accepted value: (integer) @@ -634,8 +634,8 @@  File: muddleftpd.info, Node: dumpfiles, Next: chmoding, Prev: permissions, Up: User config -dumpfiles -********* +29 dumpfiles +************ * Accepted value: (filename) @@ -660,8 +660,8 @@  File: muddleftpd.info, Node: chmoding, Prev: dumpfiles, Up: User config -chmoding -******** +30 chmoding +*********** * Accepted value: 0 | 1 @@ -677,14 +677,14 @@  File: muddleftpd.info, Node: Troubleshooting, Next: FTP Commands, Prev: Site Configuration, Up: Top -Troubleshooting -*************** +31 Troubleshooting +****************** - If problems occur while compiling, check the following: +If problems occur while compiling, check the following: * If you are running OpenLinux 2.2, make sure that you have downloaded and installed the crypt package. Get it from: - + `ftp://ftp.linuxland.de/pub/OpenLinux/crypto/2.2/glibc-crypt-2.1-3i.i386.rpm' If you get either of these messages when running the sever: @@ -701,13 +701,14 @@ memory). You must give the user running muddleftpd write permission to the main config file muddleftpd will be running as. +  File: muddleftpd.info, Node: FTP Commands, Next: Magic Cookies, Prev: Troubleshooting, Up: Top -FTP Commands -************ +32 FTP Commands +*************** - The following commands are understood and used by muddleftpd: +The following commands are understood and used by muddleftpd: PORT Define the data port the server will connect to PASV Tell the server that the next data connection will use @@ -759,10 +760,10 @@  File: muddleftpd.info, Node: Magic Cookies, Next: Reporting Bugs, Prev: FTP Commands, Up: Top -Magic Cookies -************* +33 Magic Cookies +**************** - Magic cookies are used in MUDDLEFTPD user config files and in files +Magic cookies are used in MUDDLEFTPD user config files and in files displayed to the user. Magic cookies recognized in files are replaced with the values they represent as MUDDLEFTPD parses them. eg: @@ -859,86 +860,87 @@  File: muddleftpd.info, Node: Reporting Bugs, Next: Directive Index, Prev: Magic Cookies, Up: Top -Reporting Bugs -************** +34 Reporting Bugs +***************** - Report bugs to Beau Kuiper . +Report bugs to Beau Kuiper .  File: muddleftpd.info, Node: Directive Index, Prev: Reporting Bugs, Up: Top -Directive Index -*************** +35 Directive Index +****************** +[index] * Menu: -* access: access. -* accessdir: accessdir. -* addhost: addhost. -* busydump: dumpfiles. -* cddump: dumpfiles. -* chmoding: chmoding. -* email: email. -* ftpport: ftpport. -* gid: permissions. -* group: group. -* homedir: homedir. -* logfile: logfile. -* logindump: logindump. -* logstrength: logstrength. -* maxconnect: maxconnect. -* maxusers: maxusers. -* password: password. -* pidfile: pidfile. -* quitdump: dumpfiles. -* rootdir: rootdir. -* runasgid: runasgid. -* runasuid: runasuid. -* timeout: timeout. -* uid: permissions. -* umask: umask. -* unixuser: unixuser. -* utimeout: utimeout. -* welcome: welcome. +* access: access. (line 6) +* accessdir: accessdir. (line 6) +* addhost: addhost. (line 6) +* busydump: dumpfiles. (line 6) +* cddump: dumpfiles. (line 6) +* chmoding: chmoding. (line 6) +* email: email. (line 6) +* ftpport: ftpport. (line 6) +* gid: permissions. (line 6) +* group: group. (line 6) +* homedir: homedir. (line 6) +* logfile: logfile. (line 6) +* logindump: logindump. (line 6) +* logstrength: logstrength. (line 6) +* maxconnect: maxconnect. (line 6) +* maxusers: maxusers. (line 6) +* password: password. (line 6) +* pidfile: pidfile. (line 6) +* quitdump: dumpfiles. (line 6) +* rootdir: rootdir. (line 6) +* runasgid: runasgid. (line 6) +* runasuid: runasuid. (line 6) +* timeout: timeout. (line 6) +* uid: permissions. (line 6) +* umask: umask. (line 6) +* unixuser: unixuser. (line 6) +* utimeout: utimeout. (line 6) +* welcome: welcome. (line 6)  Tag Table: -Node: Top653 -Node: Introduction1375 -Node: Invocation1825 -Node: Site Configuration2237 -Node: Main config3055 -Node: ftpport4054 -Node: maxusers4841 -Node: logstrength5432 -Node: runasuid6254 -Node: runasgid6864 -Node: logfile7495 -Node: accessdir8009 -Node: timeout8560 -Node: addhost9024 -Node: logindump9655 -Node: pidfile10291 -Node: email10896 -Node: User config11304 -Node: group13258 -Node: password13849 -Node: rootdir14389 -Node: homedir14977 -Node: welcome15562 -Node: access15997 -Node: umask17638 -Node: unixuser18095 -Node: maxconnect18625 -Node: utimeout19136 -Node: permissions19585 -Node: dumpfiles20262 -Node: chmoding21084 -Node: Troubleshooting21445 -Node: FTP Commands22624 -Node: Magic Cookies24797 -Node: Reporting Bugs28969 -Node: Directive Index29165 +Node: Top654 +Node: Introduction1376 +Node: Invocation1828 +Node: Site Configuration2241 +Node: Main config3060 +Node: ftpport4060 +Node: maxusers4851 +Node: logstrength5446 +Node: runasuid6280 +Node: runasgid6894 +Node: logfile7529 +Node: accessdir8049 +Node: timeout8606 +Node: addhost9076 +Node: logindump9713 +Node: pidfile10355 +Node: email10966 +Node: User config11380 +Node: group13337 +Node: password13934 +Node: rootdir14480 +Node: homedir15074 +Node: welcome15665 +Node: access16106 +Node: umask17753 +Node: unixuser18216 +Node: maxconnect18752 +Node: utimeout19269 +Node: permissions19724 +Node: dumpfiles20407 +Node: chmoding21235 +Node: Troubleshooting21602 +Node: FTP Commands22785 +Node: Magic Cookies24961 +Node: Reporting Bugs29136 +Node: Directive Index29335  End Tag Table --- muddleftpd-1.3.13.1.orig/modules/auth/authlibmysql/configure.ac +++ muddleftpd-1.3.13.1/modules/auth/authlibmysql/configure.ac @@ -38,6 +38,10 @@ exit ]) +AC_ARG_WITH(mysql-lib,AC_HELP_STRING([--with-mysql-lib=DIR],[Directory under prefix to search for mysql libraries]), + [ mysql_lib="$withval" ], + [ mysql_lib="" ]) + AC_ARG_WITH(authmysql, AC_HELP_STRING([--with-authmysql=DIR],[Create MySQL authentication module, optionally specify dir of mysql files]), [ with_mysql="$withval" ], @@ -79,7 +83,7 @@ fi else - for i in lib lib/mysql; do + for i in $mysql_lib lib lib/mysql; do str="$MYSQL_DIR/$i/libmysqlclient.*" for j in `echo $str`; do if test -r $j; then --- muddleftpd-1.3.13.1.orig/modules/auth/authlibsmb/smbval/Makefile.in +++ muddleftpd-1.3.13.1/modules/auth/authlibsmb/smbval/Makefile.in @@ -1,6 +1,7 @@ # makefile for smblib # Type make system, where system is ULTRIX, DU, DECOSF1, Solaris etc AR = ar +CFLAGS=@CFLAGS@ INCLUDES = smblib.h smblib-priv.h @@ -22,7 +23,7 @@ .c.o: $(INCLUDES) @echo Compiling $*.c - $(CC) $(CFLAGS) -c $*.c + $(CC) $(CFLAGS) -fPIC -c $*.c clean: rm -f *.o smbvalid.a --- muddleftpd-1.3.13.1.orig/modules/auth/authlibsmb/smbval/smblib.c +++ muddleftpd-1.3.13.1/modules/auth/authlibsmb/smbval/smblib.c @@ -25,6 +25,7 @@ #include "../config.h" #include +#include int SMBlib_errno; int SMBlib_SMB_Error; --- muddleftpd-1.3.13.1.orig/modules/auth/authlibsmb/smbval/std-defines.h +++ muddleftpd-1.3.13.1/modules/auth/authlibsmb/smbval/std-defines.h @@ -5,7 +5,7 @@ Copyright (C) 1996, Richard Sharpe -/* One day we will conditionalize these on OS types ... */ + One day we will conditionalize these on OS types ... */ /* This program is free software; you can redistribute it and/or modify --- muddleftpd-1.3.13.1.orig/src/Makefile.in +++ muddleftpd-1.3.13.1/src/Makefile.in @@ -87,19 +87,19 @@ $(CC) $(CFLAGS) -DDATESTR="\"$(shell date)\"" -c $(@:.o=.c) -o $@ $(WHOPROG): $(WHOOBJ) - $(CC) $(CFLAGS) $(LIBS) -o $(WHOPROG) $(WHOOBJ) + $(CC) $(CFLAGS) -o $(WHOPROG) $(WHOOBJ) $(LIBS) $(MUDPASSWDPROG): $(MUDPASSWDOBJ) - $(CC) $(CFLAGS) $(LIBS) -o $(MUDPASSWDPROG) $(MUDPASSWDOBJ) + $(CC) $(CFLAGS) -o $(MUDPASSWDPROG) $(MUDPASSWDOBJ) $(LIBS) $(RATIOTOOLPROG): $(RATIOTOOLOBJ) - $(CC) $(CFLAGS) $(LIBS) -o $(RATIOTOOLPROG) $(RATIOTOOLOBJ) + $(CC) $(CFLAGS) -o $(RATIOTOOLPROG) $(RATIOTOOLOBJ) $(LIBS) $(MUDOUTPROG): $(OBJ) - $(CC) $(CFLAGS) $(LIBS) -o $(MUDOUTPROG) $(OBJ) + $(CC) $(CFLAGS) -o $(MUDOUTPROG) $(OBJ) $(LIBS) $(MUDLOGD): $(MUDLOGDOBJ) - $(CC) $(CFLAGS) $(LIBS) -o $(MUDLOGD) $(MUDLOGDOBJ) + $(CC) $(CFLAGS) -o $(MUDLOGD) $(MUDLOGDOBJ) $(LIBS) install: all mkdir -p $(BINDIR)