Dash:
[t2-trunk.git] / package / mail / vmailmgr / stricter_gcc.patch
blob79245451172019f6b8c0a5d2a2aa44d759e54fef
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../vmailmgr/stricter_gcc.patch
5 # Copyright (C) 2004 - 2006 The T2 SDE Project
6 #
7 # More information can be found in the files COPYING and README.
8 #
9 # This patch file is dual-licensed. It is available under the license the
10 # patched project is licensed under, as long as it is an OpenSource license
11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
12 # of the GNU General Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at your option) any later
14 # version.
15 # --- T2-COPYRIGHT-NOTE-END ---
16 --- ./lib/mystring/mystring.h.orig 2004-05-07 09:43:14.000000000 -0400
17 +++ ./lib/mystring/mystring.h 2004-05-07 09:43:29.000000000 -0400
18 @@ -18,6 +18,7 @@
19 #define MYSTRING__H__
21 #include <sys/types.h>
22 +#include <string.h>
23 #include "mystring/rep.h"
25 class mystringjoin;
26 --- ./cgi/Makefile.am.orig 2004-05-07 10:31:42.000000000 -0400
27 +++ ./cgi/Makefile.am 2004-05-07 10:32:34.000000000 -0400
28 @@ -3,7 +3,7 @@
29 cgi_PROGRAMS = vpasswd vadduser vdeluser vaddalias vchattr vchforwards \
30 listvdomain
32 -CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
33 +CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
34 INCLUDES = -I../lib
36 vpasswd_SOURCES = vpasswd.cc
37 --- ./commands/Makefile.am.orig 2004-05-07 10:31:53.000000000 -0400
38 +++ ./commands/Makefile.am 2004-05-07 10:32:41.000000000 -0400
39 @@ -31,7 +31,7 @@
40 %.1: %.pod ../configure.in; $(POD2MAN) --section=1 $< >$@
41 %.html: %.pod; $(POD2HTML) $< >$@
43 -CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
44 +CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
45 INCLUDES = -I../lib -DBINDIR=\"@bindir@\"
47 listvdomain_SOURCES = listvdomain.cc vcommand.cc
48 --- ./daemon/Makefile.am.orig 2004-05-07 10:32:03.000000000 -0400
49 +++ ./daemon/Makefile.am 2004-05-07 10:32:48.000000000 -0400
50 @@ -20,7 +20,7 @@
51 %.8: %.pod ../configure.in; $(POD2MAN) --section=8 $< >$@
52 %.html: %.pod; $(POD2HTML) $< >$@
54 -CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
55 +CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
56 INCLUDES = -I../lib
58 vmailmgrd_SOURCES = daemon.h \
59 --- ./authenticate/Makefile.am.orig 2004-05-07 10:30:39.000000000 -0400
60 +++ ./authenticate/Makefile.am 2004-05-07 10:30:54.000000000 -0400
61 @@ -20,7 +20,7 @@
62 %.1: %.pod ../configure.in; $(POD2MAN) --section=1 $< >$@
63 %.html: %.pod; $(POD2HTML) $< >$@
65 -CXXLINK = $(CC) $(CXXFLAGS) $(LDFLAGS) -o $@
66 +CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@
67 INCLUDES = $(CIINCLUDES) -I../lib
69 checkvpw_SOURCES = checkvpw.cc authvlib.cc authvlib.h
70 --- ./authenticate/checkvpw.cc.orig 2004-05-07 10:56:06.000000000 -0400
71 +++ ./authenticate/checkvpw.cc 2004-05-07 10:57:26.000000000 -0400
72 @@ -18,6 +18,7 @@
73 #include <errno.h>
74 #include <string.h>
75 #include <sys/types.h>
76 +#include <stdlib.h>
77 #include "config/configrc.h"
78 #include "misc/exec.h"
79 #include "misc/stat_fns.h"
80 --- ./authenticate/vauthenticate.cc.orig 2004-05-07 11:03:27.000000000 -0400
81 +++ ./authenticate/vauthenticate.cc 2004-05-07 11:03:42.000000000 -0400
82 @@ -17,6 +17,7 @@
83 #include <config.h>
84 #include <errno.h>
85 #include <unistd.h>
86 +#include <stdlib.h>
87 #include "authvlib.h"
88 #include "fdbuf/fdbuf.h"
90 --- ./commands/vpasswd2cdb.cc.orig 2004-05-07 11:06:27.000000000 -0400
91 +++ ./commands/vpasswd2cdb.cc 2004-05-07 11:06:52.000000000 -0400
92 @@ -27,9 +27,9 @@
93 const char* cli_program = "vpasswd2cdb";
94 const char* cli_help_prefix = "Converts text password tables to CDB format\n";
95 const char* cli_help_suffix =
96 -"Reads in a standard virtual password table in the current directory,
97 -and writes it out to a CDB table. The file names for the text and CDB
98 -tables are determined from the configuration file.";
99 +"Reads in a standard virtual password table in the current directory,\n"
100 +"and writes it out to a CDB table. The file names for the text and CDB\n"
101 +"tables are determined from the configuration file.";
102 const char* cli_args_usage = "";
103 const int cli_args_min = 0;
104 const int cli_args_max = 0;
105 --- ./commands/vchforwards.cc.orig 2004-05-07 11:13:22.000000000 -0400
106 +++ ./commands/vchforwards.cc 2004-05-07 11:14:04.000000000 -0400
107 @@ -25,8 +25,7 @@
108 const char* cli_help_prefix =
109 "Change virtual user forwarding addresses.\n";
110 const char* cli_help_suffix =
111 -"If no forwarding addresses are given, forwarding is disabled.
113 +"If no forwarding addresses are given, forwarding is disabled.\n";
114 const char* cli_args_usage = "USERNAME [DESTINATION1 ...]";
115 const int cli_args_min = 1;
116 const int cli_args_max = -1;
117 --- ./commands/vcheckquota.cc.orig 2004-05-07 11:17:37.000000000 -0400
118 +++ ./commands/vcheckquota.cc 2004-05-07 11:18:11.000000000 -0400
119 @@ -31,10 +31,10 @@
121 const char* cli_program = "vcheckquota";
122 const char* cli_help_prefix = "vmailmgr quota enforcement program\n";
123 -const char* cli_help_suffix = "
124 -Warning: the soft-message is linked into the users maildir once for each
125 -message that is received while the account is over its soft quota. This may
126 -result in multiple warning messages.\n";
127 +const char* cli_help_suffix =
128 +"\nWarning: the soft-message is linked into the users maildir once for each\n"
129 +"message that is received while the account is over its soft quota. This may\n"
130 +"result in multiple warning messages.\n";
131 const char* cli_args_usage = "";
132 const int cli_args_min = 0;
133 const int cli_args_max = 0;
134 --- ./commands/vpasswd2db.cc.orig 2004-05-07 11:22:08.000000000 -0400
135 +++ ./commands/vpasswd2db.cc 2004-05-07 11:22:35.000000000 -0400
136 @@ -26,9 +26,9 @@
137 const char* cli_program = "vpasswd2db";
138 const char* cli_help_prefix = "Converts text password tables to current vpwtable DB format\n";
139 const char* cli_help_suffix =
140 -"Reads in a standard virtual password table in the current directory,
141 -and writes it out to a table. The file names for the input and output
142 -tables are determined from the configuration file.";
143 +"Reads in a standard virtual password table in the current directory,\n"
144 +"and writes it out to a table. The file names for the input and output\n"
145 +"tables are determined from the configuration file.";
146 const char* cli_args_usage = "";
147 const int cli_args_min = 0;
148 const int cli_args_max = 0;