* updated krdc (21.12.1 -> 21.12.2), untested
[t2-trunk.git] / package / network / ipsvd / patches / twoftpd.diff
blobe3f8791507e2fabd9225685abae538277c5cf8dc
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../ipsvd/patches/twoftpd.diff
5 # Copyright (C) 2004 - 2005 The T2 SDE Project
6 # Copyright (C) 1998 - 2004 ROCK Linux Project
7 #
8 # More information can be found in the files COPYING and README.
9 #
10 # This patch file is dual-licensed. It is available under the license the
11 # patched project is licensed under, as long as it is an OpenSource license
12 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
13 # of the GNU General Public License as published by the Free Software
14 # Foundation; either version 2 of the License, or (at your option) any later
15 # version.
16 # --- T2-COPYRIGHT-NOTE-END ---
18 --- ./twoftpd-anon-conf.c.orig 2004-05-10 11:00:38.000000000 -0400
19 +++ ./twoftpd-anon-conf.c 2004-05-10 11:06:23.000000000 -0400
20 @@ -92,15 +92,15 @@
21 "exec 2>&1\n"
22 "umask 022\n"
23 "exec \\\n"
24 - "tcpserver -DRHv -llocalhost ", ip, " 21 \\\n"
25 + "tcpsvd -vv -llocalhost ", ip, " 21 \\\n"
26 "softlimit -m 2000000 \\\n"
27 "envdir ", maindir, "/env \\\n",
28 conf_bin, "/twoftpd-anon");
29 make_file("log/run", 0755,
30 "#!/bin/sh\n"
31 "exec \\\n"
32 "setuidgid ", logname, " \\\n"
33 - "multilog t ", logdir, 0, 0, 0);
34 + "svlogd -t ", logdir, 0, 0, 0);
35 make_fileu("env/CHROOT", 1);
36 make_fileu("env/GID", ftpgid);
37 make_file("env/HOME", 0644, ftpdir, 0, 0, 0, 0, 0, 0);
38 --- ./twoftpd-conf.c.orig 2004-05-10 11:00:38.000000000 -0400
39 +++ ./twoftpd-conf.c 2004-05-10 11:05:28.000000000 -0400
40 @@ -84,7 +84,7 @@
41 "exec 2>&1\n"
42 "umask 022\n"
43 "exec \\\n"
44 - "tcpserver -DRHv -llocalhost ", ip, " 21 \\\n"
45 + "tcpsvd -vv -llocalhost ", ip, " 21 \\\n"
46 "envdir ", maindir, "/env \\\n");
47 obuf_put7s(&conf_out,
48 "softlimit -m 2000000 \\\n",
49 @@ -96,8 +96,8 @@
50 make_file("log/run", 0755,
51 "#!/bin/sh\n"
52 "exec \\\n"
53 "setuidgid ", logacct->pw_name, " \\\n"
54 - "multilog t ", logdir, 0, 0, 0);
55 + "svlogd -t ", logdir, 0, 0, 0);
57 if (dochroot) make_fileu("env/CHROOT", 1);