]>
Commit | Line | Data |
---|---|---|
a49f3e30 | 1 | --- bjorb-0.5.5p1/src/Config-staff.cc.orig Fri Feb 21 10:27:31 2003 |
2 | +++ bjorb-0.5.5p1/src/Config-staff.cc Fri Feb 21 10:27:47 2003 | |
3 | @@ -342,7 +342,7 @@ | |
4 | PUTERR(1, ("Generating a %d bit RSA private key\n", bits)); | |
5 | ||
6 | EVP_PKEY *pkey = 0; | |
7 | - EVP_MD *digest = EVP_md5(); | |
8 | + const EVP_MD *digest = EVP_md5(); | |
9 | X509 *x509 = 0; | |
10 | X509_NAME *n = 0; | |
11 | X509_NAME_ENTRY *ne = 0; | |
12 | --- bjorb-0.5.5p1/src/Makefile.in.orig Mon Feb 22 05:01:20 1999 | |
13 | +++ bjorb-0.5.5p1/src/Makefile.in Sun Jan 12 14:46:10 2003 | |
14 | @@ -29,7 +29,7 @@ | |
15 | LDFLAGS = | |
16 | LIBS = @LIBS@ | |
17 | ||
18 | -PREFIX = @prefix@ | |
19 | +PREFIX ?= @prefix@ | |
20 | exec_prefix = $(PREFIX) | |
21 | sbindir = $(exec_prefix)/sbin | |
22 | etcdir = $(exec_prefix)/etc | |
23 | @@ -81,7 +81,7 @@ | |
24 | $(INSTALL_DATA) ../doc/sample/bjorb.conf.sample $(etcdir)/bjorb.conf.sample | |
25 | ||
26 | $(TARGET): $(OBJS) | |
27 | - $(CC) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS) | |
28 | + $(CXX) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS) | |
29 | ||
30 | debug:: | |
31 | $(MAKE) CFLAGS="-g -DDEBUG" | |
32 | @@ -116,13 +116,13 @@ | |
33 | $(CC) -c $(ALL_CFLAGS) $< | |
34 | ||
35 | .cc.o: Makefile | |
36 | - $(CC) -c $(ALL_CFLAGS) $< | |
37 | + $(CXX) -c $(ALL_CFLAGS) $< | |
38 | ||
39 | Makefile: Makefile.in | |
40 | CONFIG_FILES=./$@ CONFIG_HEADERS= $(SHELL) ./config.status | |
41 | ||
42 | cmd.o: cmd.cc cmd-def.h | |
43 | - $(CC) -c $(ALL_CFLAGS) $< | |
44 | + $(CXX) -c $(ALL_CFLAGS) $< | |
45 | cmd.cc: cmd.list | |
46 | gperf -aptCT -N in_word_set_cmdlist $? > $@ | |
47 | bool.cc:bool.list | |
48 | @@ -135,9 +135,13 @@ | |
49 | autoconf | |
50 | ||
51 | certificate:: | |
52 | - $(SSLTOP)/bin/req -new -x509 -out new.pem -nodes -days 365 | |
53 | - cat new.pem privkey.pem > $(etcdir)/bjorb.pem | |
54 | - @rm new.pem privkey.pem | |
55 | + (\ | |
56 | + [ -f $(PREFIX)/certs/bjorb.pem ] && exit 0; \ | |
57 | + cd $(PREFIX)/certs; \ | |
58 | + openssl req -new -x509 -nodes -days 365 -out bjorb.pem -keyout bjorb.pem; \ | |
59 | + ln -s bjorb.pem `openssl x509 -noout -hash < bjorb.pem`.0 ;\ | |
60 | + chmod 644 $(PREFIX)/certs/bjorb.pem; \ | |
61 | + ) | |
62 | ||
63 | install-bsd:: | |
64 | @if test -f /etc/rc.bjorb ; then chmod +w /etc/rc.bjorb; fi | |
65 | --- bjorb-0.5.5p1/src/../doc/sample/bjorb.conf.sample.orig Tue Jul 7 22:39:16 1998 | |
66 | +++ bjorb-0.5.5p1/src/../doc/sample/bjorb.conf.sample Tue Aug 25 14:17:58 1998 | |
67 | @@ -5,8 +5,8 @@ | |
68 | error_log /var/log/bjorb-err.log | |
69 | do_fork true | |
70 | deny_wait 0 | |
71 | -CA_cert_file /usr/local/etc/bjorb.pem | |
72 | -CA_cert_path /usr/local/etc/CA | |
86a2db5b | 73 | +CA_cert_file /etc/bjorb/bjorb.pem |
74 | +CA_cert_path /etc/bjorb/CA | |
a49f3e30 | 75 | max_connection 100 |
76 | spare_servers 1 | |
77 | ||
78 | --- bjorb-0.5.5p1/src/configure.in.orig Sun Feb 21 20:40:47 1999 | |
79 | +++ bjorb-0.5.5p1/src/configure.in Sun Dec 26 12:02:27 1999 | |
80 | @@ -16,6 +16,7 @@ | |
81 | prefix=$ac_default_prefix | |
82 | fi | |
83 | ssltop=$prefix/ssl | |
84 | +ssllib=$prefix/ssl | |
85 | ||
86 | dnl Checks for programs. | |
87 | AC_PROG_AWK | |
88 | @@ -86,6 +87,13 @@ | |
89 | ||
90 | AC_SUBST(ssltop) | |
91 | ||
92 | +# with SSL lib | |
93 | +AC_ARG_WITH(ssllib, | |
94 | +[ --with-ssllib=DIR specifies directory to put SSL libbary.], | |
95 | +ssllib=$with_ssllib) | |
96 | + | |
97 | +AC_SUBST(ssllib) | |
98 | + | |
99 | dnl Checks for libraries. | |
100 | ||
101 | # shared option | |
102 | @@ -100,12 +108,16 @@ | |
103 | ||
104 | # for USA_RESIDENT on FreeBSD | |
105 | if test X$disable_ssl = X; then | |
106 | - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ssltop/lib" | |
107 | + LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ssllib" | |
108 | export LD_LIBRARY_PATH | |
109 | ||
110 | - AC_CHECK_LIB(RSAglue, ERR_load_RSAREF_strings,,,-lcrypto -lssl) | |
111 | - AC_CHECK_LIB(rsaref, DES3_CBCInit) | |
112 | - ssllibs="-lssl -lcrypto" | |
113 | + AC_MSG_CHECKING([for RSAref library]) | |
114 | + saved_LIBS="-L$ssllib -lcrypto -lssl" | |
115 | + LIBS="$saved_LIBS -L${LOCALBASE}/lib -lRSAglue -lrsaref" | |
116 | + AC_TRY_LINK([], [], | |
117 | + [AC_MSG_RESULT(yes); ], | |
118 | + [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS") | |
119 | + ssllibs="$LIBS" | |
120 | fi | |
121 | ||
122 | deflib() | |
123 | --- bjorb-0.5.5p1/src/Config.cc.orig Mon Feb 22 04:07:51 1999 | |
124 | +++ bjorb-0.5.5p1/src/Config.cc Sun Jan 12 14:34:28 2003 | |
125 | @@ -334,7 +334,7 @@ | |
126 | int retval = 1; | |
127 | ||
128 | SOCKADDR_IN sa_client; | |
129 | - int addr_len = sizeof(SOCKADDR_IN); | |
130 | + unsigned int addr_len = sizeof(SOCKADDR_IN); | |
131 | ||
132 | #ifndef NO_DEBUG | |
133 | PUTERR(2, ("::accept() begin\n")); | |
134 | @@ -574,7 +574,7 @@ | |
135 | if (accept_port.getPortinfo()->isVerify()) { | |
136 | _SSL_set_verify(ssl, | |
137 | SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, | |
138 | - (int (*)(...))BjorbSSLVerifyCallback); | |
139 | + BjorbSSLVerifyCallback); | |
140 | } else { | |
141 | _SSL_set_verify(ssl, SSL_VERIFY_NONE, 0); | |
142 | } | |
143 | @@ -620,7 +620,7 @@ | |
144 | } else { | |
145 | _SSL_CTX_set_verify(ctx_connect, | |
146 | SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT, | |
147 | - (int (*)(...))BjorbSSLVerifyCallback); | |
148 | + BjorbSSLVerifyCallback); | |
149 | } | |
150 | ||
151 | ssl = _SSL_new(ctx_connect); | |
152 | --- bjorb-0.5.5p1/src/bool.cc.orig Mon Feb 22 03:40:47 1999 | |
153 | +++ bjorb-0.5.5p1/src/bool.cc Sun Jan 12 14:42:05 2003 | |
154 | @@ -1,6 +1,11 @@ | |
155 | /* C code produced by gperf version 2.1 (K&R C version) */ | |
156 | /* Command-line: gperf -aptCT -N in_word_set_boollist bool.list */ | |
157 | ||
158 | +#include "config.h" | |
159 | + | |
160 | +#ifdef HAVE_STRING_H | |
161 | +#include <string.h> | |
162 | +#endif /* HAVE_STRING_H */ | |
163 | ||
164 | #include "common.h" | |
165 | #include "bool.h" | |
166 | --- bjorb-0.5.5p1/src/cmd.cc.orig Mon Feb 22 03:40:47 1999 | |
167 | +++ bjorb-0.5.5p1/src/cmd.cc Sun Jan 12 14:40:41 2003 | |
168 | @@ -3,6 +3,11 @@ | |
169 | ||
170 | ||
171 | #include "config.h" | |
172 | + | |
173 | +#ifdef HAVE_STRING_H | |
174 | +#include <string.h> | |
175 | +#endif /* HAVE_STRING_H */ | |
176 | + | |
177 | #include "cmd.h" | |
178 | #include "Config.h" | |
179 | #include "cmd-def.h" | |
180 | --- bjorb-0.5.5p1/src/portinfo.cc.orig Mon Feb 22 03:40:47 1999 | |
181 | +++ bjorb-0.5.5p1/src/portinfo.cc Sun Jan 12 14:40:05 2003 | |
182 | @@ -1,3 +1,9 @@ | |
183 | +#include "config.h" | |
184 | + | |
185 | +#ifdef HAVE_STRING_H | |
186 | +#include <string.h> | |
187 | +#endif /* HAVE_STRING_H */ | |
188 | + | |
189 | #include "common.h" | |
190 | #include "portinfo.h" | |
191 | #include "token.h" | |
192 | --- bjorb-0.5.5p1/src/portoption.cc.orig Mon Feb 22 03:40:47 1999 | |
193 | +++ bjorb-0.5.5p1/src/portoption.cc Sun Jan 12 14:41:00 2003 | |
194 | @@ -3,6 +3,11 @@ | |
195 | ||
196 | ||
197 | #include "config.h" | |
198 | + | |
199 | +#ifdef HAVE_STRING_H | |
200 | +#include <string.h> | |
201 | +#endif /* HAVE_STRING_H */ | |
202 | + | |
203 | #include "Config.h" | |
204 | ||
205 | #define MIN_WORD_LENGTH 3 |