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
4 PUTERR(1, ("Generating a %d bit RSA private key\n", bits));
7 - EVP_MD *digest = EVP_md5();
8 + const EVP_MD *digest = EVP_md5();
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
20 exec_prefix = $(PREFIX)
21 sbindir = $(exec_prefix)/sbin
22 etcdir = $(exec_prefix)/etc
24 $(INSTALL_DATA) ../doc/sample/bjorb.conf.sample $(etcdir)/bjorb.conf.sample
27 - $(CC) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS)
28 + $(CXX) -o $(TARGET) $(ALL_LDFLAGS) $(OBJS) $(ALL_LIBS)
31 $(MAKE) CFLAGS="-g -DDEBUG"
33 $(CC) -c $(ALL_CFLAGS) $<
36 - $(CC) -c $(ALL_CFLAGS) $<
37 + $(CXX) -c $(ALL_CFLAGS) $<
40 CONFIG_FILES=./$@ CONFIG_HEADERS= $(SHELL) ./config.status
42 cmd.o: cmd.cc cmd-def.h
43 - $(CC) -c $(ALL_CFLAGS) $<
44 + $(CXX) -c $(ALL_CFLAGS) $<
46 gperf -aptCT -N in_word_set_cmdlist $? > $@
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
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; \
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
68 error_log /var/log/bjorb-err.log
71 -CA_cert_file /usr/local/etc/bjorb.pem
72 -CA_cert_path /usr/local/etc/CA
73 +CA_cert_file /etc/bjorb/bjorb.pem
74 +CA_cert_path /etc/bjorb/CA
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
81 prefix=$ac_default_prefix
86 dnl Checks for programs.
94 +[ --with-ssllib=DIR specifies directory to put SSL libbary.],
99 dnl Checks for libraries.
102 @@ -100,12 +108,16 @@
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
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")
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
128 SOCKADDR_IN sa_client;
129 - int addr_len = sizeof(SOCKADDR_IN);
130 + unsigned int addr_len = sizeof(SOCKADDR_IN);
133 PUTERR(2, ("::accept() begin\n"));
135 if (accept_port.getPortinfo()->isVerify()) {
137 SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
138 - (int (*)(...))BjorbSSLVerifyCallback);
139 + BjorbSSLVerifyCallback);
141 _SSL_set_verify(ssl, SSL_VERIFY_NONE, 0);
145 _SSL_CTX_set_verify(ctx_connect,
146 SSL_VERIFY_PEER|SSL_VERIFY_FAIL_IF_NO_PEER_CERT,
147 - (int (*)(...))BjorbSSLVerifyCallback);
148 + BjorbSSLVerifyCallback);
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
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 */
160 +#ifdef HAVE_STRING_H
162 +#endif /* HAVE_STRING_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
173 +#ifdef HAVE_STRING_H
175 +#endif /* HAVE_STRING_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
185 +#ifdef HAVE_STRING_H
187 +#endif /* HAVE_STRING_H */
190 #include "portinfo.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
199 +#ifdef HAVE_STRING_H
201 +#endif /* HAVE_STRING_H */
205 #define MIN_WORD_LENGTH 3