Menu
▾
▴
benson-commit — Benson Commit Mailing List
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(27) |
Jul
(24) |
Aug
(64) |
Sep
(15) |
Oct
(72) |
Nov
(28) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(72) |
Feb
(58) |
Mar
(33) |
Apr
(3) |
May
(5) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(29) |
Dec
(12) |
| 2003 |
Jan
(37) |
Feb
(44) |
Mar
(13) |
Apr
(23) |
May
(9) |
Jun
(3) |
Jul
|
Aug
(7) |
Sep
(33) |
Oct
(30) |
Nov
(31) |
Dec
(11) |
| 2004 |
Jan
(4) |
Feb
(35) |
Mar
(14) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bob T. <bt...@us...> - 2001-08-16 20:04:31
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv5215
Modified Files:
config.h configure configure.in
Log Message:
Many changes to the configure stuff to make it go on solaris, and others
Index: config.h
===================================================================
RCS file: /cvsroot/benson/benson3/config.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** config.h 2001/08/13 02:26:45 1.1
--- config.h 2001/08/16 20:04:27 1.2
***************
*** 24,37 ****
/* Define if you have the `nsl' library (-lnsl). */
! /* #undef HAVE_LIBNSL */
/* Define if you have the `socket' library (-lsocket). */
! /* #undef HAVE_LIBSOCKET */
/* Define if you have the `ssl' library (-lssl). */
! #define HAVE_LIBSSL 1
/* Define if you have the `w' library (-lw). */
! /* #undef HAVE_LIBW */
/* Define if you have the <openssl/ssl.h> header file. */
--- 24,37 ----
/* Define if you have the `nsl' library (-lnsl). */
! #define HAVE_LIBNSL 1
/* Define if you have the `socket' library (-lsocket). */
! #define HAVE_LIBSOCKET 1
/* Define if you have the `ssl' library (-lssl). */
! /* #undef HAVE_LIBSSL */
/* Define if you have the `w' library (-lw). */
! #define HAVE_LIBW 1
/* Define if you have the <openssl/ssl.h> header file. */
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure 2001/08/16 17:25:29 1.5
--- configure 2001/08/16 20:04:27 1.6
***************
*** 7488,7498 ****
fi;
! CPPFLAGS="$CPPFLAGS -I$ssl_dir/include"
! LDFLAGS="$LDFLAGS -L$ssl_dir/lib"
for ac_header in openssl/ssl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:7496: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
[...1361 lines suppressed...]
{ (exit 1); exit 1; }; }
--- 9140,9144 ----
else
# /dev/null tree
! { { echo "$as_me:9142: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 9254,9258 ****
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9256: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
--- 9257,9261 ----
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9259: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** configure.in 2001/08/16 17:25:29 1.5
--- configure.in 2001/08/16 20:04:27 1.6
***************
*** 42,47 ****
AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg], use_profile=$enableval, use_profile=no)
! CPPFLAGS="$CPPFLAGS -I$ssl_dir/include"
! LDFLAGS="$LDFLAGS -L$ssl_dir/lib"
AC_CHECK_HEADERS(openssl/ssl.h)
--- 42,50 ----
AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg], use_profile=$enableval, use_profile=no)
! if test X"$with_ssl" != Xno; then
! CPPFLAGS="$CPPFLAGS -I$ssl_dir/include"
! LDFLAGS="$LDFLAGS -R$ssl_dir/lib -L$ssl_dir/lib"
! LIBS="$LIBS -lssl -lcrypto"
! fi
AC_CHECK_HEADERS(openssl/ssl.h)
***************
*** 56,60 ****
AC_CHECK_LIB(ld, open)
AC_CHECK_LIB(w, open)
! AC_CHECK_LIB(ssl, open)
AC_PATH_PROG(sedpath, sed)
AC_PATH_PROG(trpath, tr)
--- 59,63 ----
AC_CHECK_LIB(ld, open)
AC_CHECK_LIB(w, open)
! AC_CHECK_LIB(ssl, SSL_library_init)
AC_PATH_PROG(sedpath, sed)
AC_PATH_PROG(trpath, tr)
|
|
From: Bob T. <bt...@us...> - 2001-08-16 17:25:37
|
Update of /cvsroot/benson/benson3 In directory usw-pr-cvs1:/tmp/cvs-serv21258 Modified Files: configure configure.in Log Message: Ok, fixed it for real this time Index: configure =================================================================== RCS file: /cvsroot/benson/benson3/configure,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** configure 2001/08/16 15:23:04 1.4 --- configure 2001/08/16 17:25:29 1.5 *************** *** 7488,7492 **** fi; ! CFLAGS="$CFLAGS -I$ssl_dir/include" LDFLAGS="$LDFLAGS -L$ssl_dir/lib" --- 7488,7492 ---- fi; ! CPPFLAGS="$CPPFLAGS -I$ssl_dir/include" LDFLAGS="$LDFLAGS -L$ssl_dir/lib" Index: configure.in =================================================================== RCS file: /cvsroot/benson/benson3/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** configure.in 2001/08/16 15:23:04 1.4 --- configure.in 2001/08/16 17:25:29 1.5 *************** *** 42,46 **** AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg], use_profile=$enableval, use_profile=no) ! CFLAGS="$CFLAGS -I$ssl_dir/include" LDFLAGS="$LDFLAGS -L$ssl_dir/lib" --- 42,46 ---- AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg], use_profile=$enableval, use_profile=no) ! CPPFLAGS="$CPPFLAGS -I$ssl_dir/include" LDFLAGS="$LDFLAGS -L$ssl_dir/lib" |
|
From: Bob T. <bt...@us...> - 2001-08-16 15:23:08
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv26114
Modified Files:
configure configure.in
Log Message:
Added some help for the configure ssl stuff
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure 2001/08/13 02:20:57 1.3
--- configure 2001/08/16 15:23:04 1.4
***************
*** 7488,7495 ****
fi;
for ac_header in openssl/ssl.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
! echo "$as_me:7493: checking for $ac_header" >&5
echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
if eval "test \"\${$as_ac_Header+set}\" = set"; then
--- 7488,7498 ----
fi;
[...1317 lines suppressed...]
{ (exit 1); exit 1; }; }
--- 9137,9141 ----
else
# /dev/null tree
! { { echo "$as_me:9139: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 9251,9255 ****
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9253: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
--- 9254,9258 ----
if test x"$ac_file" != x-; then
if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
! { echo "$as_me:9256: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configure.in 2001/08/13 02:20:57 1.3
--- configure.in 2001/08/16 15:23:04 1.4
***************
*** 42,45 ****
--- 42,48 ----
AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg], use_profile=$enableval, use_profile=no)
+ CFLAGS="$CFLAGS -I$ssl_dir/include"
+ LDFLAGS="$LDFLAGS -L$ssl_dir/lib"
+
AC_CHECK_HEADERS(openssl/ssl.h)
AC_CHECK_HEADERS(signal.h)
|
|
From: Bob T. <bt...@us...> - 2001-08-14 04:24:00
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv8539/src
Modified Files:
ssl.c
Log Message:
Made some changes, need to work on the password code, and actually linking the perl code in
Index: ssl.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/ssl.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ssl.c 2001/08/14 04:11:02 1.3
--- ssl.c 2001/08/14 04:23:57 1.4
***************
*** 1,4 ****
--- 1,5 ----
#include "benson/benson.h"
+ static char *pass;
BIO *bio_err=0;
***************
*** 21,29 ****
}
! int password_cb(char *buf, int size, int rwflag, void *password)
{
! strncpy(buf, (char *)(password), size);
! buf[size - 1] = '\0';
! return(strlen(buf));
}
--- 22,32 ----
}
! int password_cb(char *buf, int num, int rwflag, void *password)
{
! if(num<strlen(pass)+1)
! return (0);
!
! strcpy(buf,pass);
! return(strlen(pass));
}
***************
*** 60,64 ****
SSL_CTX *ctx;
struct ssl_password *ssl_pw = malloc(sizeof(struct ssl_password));
!
if(!bio_err) {
SSL_library_init();
--- 63,67 ----
SSL_CTX *ctx;
struct ssl_password *ssl_pw = malloc(sizeof(struct ssl_password));
! pass=password;
if(!bio_err) {
SSL_library_init();
|
|
From: Bob T. <bt...@us...> - 2001-08-14 04:11:06
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv5197/src
Modified Files:
Makefile.am Makefile.in ssl.c
Added Files:
bensond.c network.c
Log Message:
Adding the beginning of the bensond daemon
--- NEW FILE: bensond.c ---
#include "benson/benson.h"
int main(int argc, char *argv[], char *env[])
{
int sock, s;
BIO *sbio;
SSL_CTX *ctx;
SSL *ssl;
int r;
pid_t pid;
ctx=initialize_ctx(KEYFILE,PASSWORD);
load_dh_params(ctx,DHFILE);
generate_eph_rsa_key(ctx);
sock = bn_tcp_listen();
while(1) {
if((s=accept(sock,0,0))<0)
err_exit("accept() failed");
if(pid=fork()) {
close(s);
}
else {
sbio=BIO_new_socket(s,BIO_NOCLOSE);
ssl=SSL_new(ctx);
SSL_set_bio(ssl,sbio,sbio);
if((r=SSL_accept(ssl)<=0))
berr_exit("SSL accept error");
}
}
destroy_ctx(ctx);
exit(0);
}
--- NEW FILE: network.c ---
#include "benson/benson.h"
int bn_tcp_listen(void)
{
int sock;
struct sockaddr_in sin;
int val=1;
if((sock=socket(AF_INET,SOCK_STREAM,0))<0)
err_exit("Couldn't make socket()");
memset(&sin,0,sizeof(sin));
sin.sin_addr.s_addr=INADDR_ANY;
sin.sin_family=AF_INET;
sin.sin_port=htons(4433);
setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&val,sizeof(val));
if(bind(sock,(struct sockaddr *)&sin, sizeof(sin))<0)
berr_exit("Couldn't bind()");
listen(sock,5);
return (sock);
}
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am 2001/08/13 02:20:57 1.3
--- Makefile.am 2001/08/14 04:11:02 1.4
***************
*** 1,4 ****
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c
INCLUDES = -I@top_srcdir@/include
--- 1,7 ----
+ sbin_PROGRAMS = bensond
+ bensond_SOURCES = bensond.c
+ bensond_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c network.c
INCLUDES = -I@top_srcdir@/include
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in 2001/08/13 02:20:57 1.3
--- Makefile.in 2001/08/14 04:11:02 1.4
***************
*** 84,90 ****
uniqpath = @uniqpath@
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c
INCLUDES = -I@top_srcdir@/include
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 84,93 ----
uniqpath = @uniqpath@
+ sbin_PROGRAMS = bensond
+ bensond_SOURCES = bensond.c
+ bensond_LDADD = libbenson.la
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c network.c
INCLUDES = -I@top_srcdir@/include
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 102,106 ****
X_PRE_LIBS = @X_PRE_LIBS@
libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- 105,115 ----
X_PRE_LIBS = @X_PRE_LIBS@
libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo network.lo
! sbin_PROGRAMS = bensond$(EXEEXT)
! PROGRAMS = $(sbin_PROGRAMS)
!
! bensond_OBJECTS = bensond.$(OBJEXT)
! bensond_DEPENDENCIES = libbenson.la
! bensond_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
***************
*** 115,121 ****
TAR = tar
GZIP_ENV = --best
! DEP_FILES = .deps/shm_wrapper.P .deps/ssl.P
! SOURCES = $(libbenson_la_SOURCES)
! OBJECTS = $(libbenson_la_OBJECTS)
all: all-redirect
--- 124,131 ----
TAR = tar
GZIP_ENV = --best
! DEP_FILES = .deps/bensond.P .deps/network.P .deps/shm_wrapper.P \
! .deps/ssl.P
! SOURCES = $(libbenson_la_SOURCES) $(bensond_SOURCES)
! OBJECTS = $(libbenson_la_OBJECTS) $(bensond_OBJECTS)
all: all-redirect
***************
*** 196,199 ****
--- 206,238 ----
$(LINK) -rpath $(libdir) $(libbenson_la_LDFLAGS) $(libbenson_la_OBJECTS) $(libbenson_la_LIBADD) $(LIBS)
+ mostlyclean-sbinPROGRAMS:
+
+ clean-sbinPROGRAMS:
+ -test -z "$(sbin_PROGRAMS)" || rm -f $(sbin_PROGRAMS)
+
+ distclean-sbinPROGRAMS:
+
+ maintainer-clean-sbinPROGRAMS:
+
+ install-sbinPROGRAMS: $(sbin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(sbindir)
+ @list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ else :; fi; \
+ done
+
+ uninstall-sbinPROGRAMS:
+ @$(NORMAL_UNINSTALL)
+ list='$(sbin_PROGRAMS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+ done
+
+ bensond$(EXEEXT): $(bensond_OBJECTS) $(bensond_DEPENDENCIES)
+ @rm -f bensond$(EXEEXT)
+ $(LINK) $(bensond_LDFLAGS) $(bensond_OBJECTS) $(bensond_LDADD) $(LIBS)
+
tags: TAGS
***************
*** 285,289 ****
installcheck-am:
installcheck: installcheck-am
! install-exec-am: install-libLTLIBRARIES
install-exec: install-exec-am
--- 324,328 ----
installcheck-am:
installcheck: installcheck-am
! install-exec-am: install-libLTLIBRARIES install-sbinPROGRAMS
install-exec: install-exec-am
***************
*** 294,305 ****
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
! uninstall-am: uninstall-libLTLIBRARIES
uninstall: uninstall-am
! all-am: Makefile $(LTLIBRARIES)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
! $(mkinstalldirs) $(DESTDIR)$(libdir)
--- 333,344 ----
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
! uninstall-am: uninstall-libLTLIBRARIES uninstall-sbinPROGRAMS
uninstall: uninstall-am
! all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
! $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir)
***************
*** 314,330 ****
maintainer-clean-generic:
mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
! mostlyclean-generic
mostlyclean: mostlyclean-am
! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
! clean-depend clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-libLTLIBRARIES distclean-compile \
! distclean-libtool distclean-tags distclean-depend \
! distclean-generic clean-am
-rm -f libtool
--- 353,370 ----
maintainer-clean-generic:
mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \
! mostlyclean-libtool mostlyclean-sbinPROGRAMS \
! mostlyclean-tags mostlyclean-depend mostlyclean-generic
mostlyclean: mostlyclean-am
! clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \
! clean-sbinPROGRAMS clean-tags clean-depend \
! clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-libLTLIBRARIES distclean-compile \
! distclean-libtool distclean-sbinPROGRAMS distclean-tags \
! distclean-depend distclean-generic clean-am
-rm -f libtool
***************
*** 333,338 ****
maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
! maintainer-clean-tags maintainer-clean-depend \
! maintainer-clean-generic distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
--- 373,379 ----
maintainer-clean-am: maintainer-clean-libLTLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \
! maintainer-clean-sbinPROGRAMS maintainer-clean-tags \
! maintainer-clean-depend maintainer-clean-generic \
! distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
***************
*** 345,356 ****
distclean-compile clean-compile maintainer-clean-compile \
mostlyclean-libtool distclean-libtool clean-libtool \
! maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
! clean-tags maintainer-clean-tags distdir mostlyclean-depend \
! distclean-depend clean-depend maintainer-clean-depend info-am info \
! dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
! install-exec install-data-am install-data install-am install \
! uninstall-am uninstall all-redirect all-am all installdirs \
! mostlyclean-generic distclean-generic clean-generic \
! maintainer-clean-generic clean mostlyclean distclean maintainer-clean
--- 386,400 ----
distclean-compile clean-compile maintainer-clean-compile \
mostlyclean-libtool distclean-libtool clean-libtool \
! maintainer-clean-libtool mostlyclean-sbinPROGRAMS \
! distclean-sbinPROGRAMS clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS \
! uninstall-sbinPROGRAMS install-sbinPROGRAMS tags mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir \
! mostlyclean-depend distclean-depend clean-depend \
! maintainer-clean-depend info-am info dvi-am dvi check check-am \
! installcheck-am installcheck install-exec-am install-exec \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
Index: ssl.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/ssl.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ssl.c 2001/08/13 02:20:57 1.2
--- ssl.c 2001/08/14 04:11:02 1.3
***************
*** 8,11 ****
--- 8,17 ----
}
+ int err_exit(char *string)
+ {
+ fprintf(stderr,"%s\n",string);
+ exit(0);
+ }
+
int berr_exit(char *string)
{
***************
*** 22,25 ****
--- 28,57 ----
}
+ void load_dh_params(SSL_CTX *ctx, char *file)
+ {
+ DH *ret=0;
+ BIO *bio;
+
+ if((bio=BIO_new_file(file,"r")) == NULL)
+ berr_exit("Couldn't open DH file");
+
+ ret=PEM_read_bio_DHparams(bio,NULL,NULL,NULL);
+ BIO_free(bio);
+ if(SSL_CTX_set_tmp_dh(ctx,ret)<0)
+ berr_exit("Couldn't set DH parameters");
+ }
+
+ void generate_eph_rsa_key(SSL_CTX *ctx)
+ {
+ RSA *rsa;
+
+ rsa=RSA_generate_key(512,RSA_F4,NULL,NULL);
+
+ if(!SSL_CTX_set_tmp_rsa(ctx,rsa))
+ berr_exit("Couldn't set RSA key");
+
+ RSA_free(rsa);
+ }
+
SSL_CTX *initialize_ctx(char *keyfile,char *password)
***************
*** 44,49 ****
ssl_pw->password=password;
! ssl_pw->length=length(password);
! SSL_CTX_set_default_password_cb(ctx, password_cb);
if(!(SSL_CTX_use_PrivateKey_file(ctx,keyfile,SSL_FILETYPE_PEM)))
berr_exit("Couldn't read key file");
--- 76,81 ----
ssl_pw->password=password;
! ssl_pw->length=strlen(password);
! SSL_CTX_set_default_passwd_cb(ctx, password_cb);
if(!(SSL_CTX_use_PrivateKey_file(ctx,keyfile,SSL_FILETYPE_PEM)))
berr_exit("Couldn't read key file");
|
|
From: Bob T. <bt...@us...> - 2001-08-14 04:11:05
|
Update of /cvsroot/benson/benson3/include/benson
In directory usw-pr-cvs1:/tmp/cvs-serv5197/include/benson
Modified Files:
benson.h ssl.h
Added Files:
network.h
Log Message:
Adding the beginning of the bensond daemon
--- NEW FILE: network.h ---
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netdb.h>
#include <fcntl.h>
Index: benson.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/benson.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** benson.h 2001/08/13 02:20:57 1.1
--- benson.h 2001/08/14 04:11:01 1.2
***************
*** 5,12 ****
--- 5,15 ----
#include "benson/shm_wrapper.h"
#include "benson/ssl.h"
+ #include "benson/network.h"
+ #define PASSWORD "password"
#define CA_LIST "root.pem"
#define RANDOM "random.pem"
#define KEYFILE "key.pem"
+ #define DHFILE "dh1024.pem"
#endif /* __benson_h */
Index: ssl.h
===================================================================
RCS file: /cvsroot/benson/benson3/include/benson/ssl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ssl.h 2001/08/13 02:20:57 1.1
--- ssl.h 2001/08/14 04:11:01 1.2
***************
*** 6,10 ****
struct ssl_password {
char *password;
! int length;
};
--- 6,10 ----
struct ssl_password {
char *password;
! size_t length;
};
|
|
From: Bob T. <bt...@us...> - 2001-08-13 02:26:47
|
Update of /cvsroot/benson/benson3 In directory usw-pr-cvs1:/tmp/cvs-serv26639 Added Files: config.h config.h.in Log Message: Added the autoheader silliness in --- NEW FILE: config.h --- /* config.h. Generated automatically by configure. */ /* config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if you have the <dlfcn.h> header file. */ #define HAVE_DLFCN_H 1 /* Define if you have the <errno.h> header file. */ #define HAVE_ERRNO_H 1 /* Define if you have the `compat' library (-lcompat). */ /* #undef HAVE_LIBCOMPAT */ /* Define if you have the `dl' library (-ldl). */ #define HAVE_LIBDL 1 /* Define if you have the `dld' library (-ldld). */ /* #undef HAVE_LIBDLD */ /* Define if you have the `ld' library (-lld). */ /* #undef HAVE_LIBLD */ /* Define if you have the `m' library (-lm). */ #define HAVE_LIBM 1 /* Define if you have the `nsl' library (-lnsl). */ /* #undef HAVE_LIBNSL */ /* Define if you have the `socket' library (-lsocket). */ /* #undef HAVE_LIBSOCKET */ /* Define if you have the `ssl' library (-lssl). */ #define HAVE_LIBSSL 1 /* Define if you have the `w' library (-lw). */ /* #undef HAVE_LIBW */ /* Define if you have the <openssl/ssl.h> header file. */ #define HAVE_OPENSSL_SSL_H 1 /* Define if you have the <signal.h> header file. */ #define HAVE_SIGNAL_H 1 /* Define if you have the <sys/shm.h> header file. */ #define HAVE_SYS_SHM_H 1 /* Define if you have the <sys/stat.h> header file. */ #define HAVE_SYS_STAT_H 1 /* Name of package */ #define PACKAGE "benson" /* Version number of package */ #define VERSION "3.0" /* Define if the X Window System is missing or not being used. */ /* #undef X_DISPLAY_MISSING */ --- NEW FILE: config.h.in --- /* config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H /* Define if you have the <errno.h> header file. */ #undef HAVE_ERRNO_H /* Define if you have the `compat' library (-lcompat). */ #undef HAVE_LIBCOMPAT /* Define if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL /* Define if you have the `dld' library (-ldld). */ #undef HAVE_LIBDLD /* Define if you have the `ld' library (-lld). */ #undef HAVE_LIBLD /* Define if you have the `m' library (-lm). */ #undef HAVE_LIBM /* Define if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL /* Define if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET /* Define if you have the `ssl' library (-lssl). */ #undef HAVE_LIBSSL /* Define if you have the `w' library (-lw). */ #undef HAVE_LIBW /* Define if you have the <openssl/ssl.h> header file. */ #undef HAVE_OPENSSL_SSL_H /* Define if you have the <signal.h> header file. */ #undef HAVE_SIGNAL_H /* Define if you have the <sys/shm.h> header file. */ #undef HAVE_SYS_SHM_H /* Define if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H /* Name of package */ #undef PACKAGE /* Version number of package */ #undef VERSION /* Define if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING |
|
From: Bob T. <bt...@us...> - 2001-08-13 02:21:00
|
Update of /cvsroot/benson/benson3/src In directory usw-pr-cvs1:/tmp/cvs-serv25733/src Modified Files: Makefile.am Makefile.in shm_wrapper.c ssl.c Removed Files: benson.h shm_wrapper.h ssl.h Log Message: Performed a little housekeeping Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.am 2001/08/12 22:40:34 1.2 --- Makefile.am 2001/08/13 02:20:57 1.3 *************** *** 2,3 **** --- 2,4 ---- libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0 libbenson_la_SOURCES = shm_wrapper.c ssl.c + INCLUDES = -I@top_srcdir@/include Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.in 2001/08/12 22:40:34 1.2 --- Makefile.in 2001/08/13 02:20:57 1.3 *************** *** 77,82 **** --- 77,84 ---- VERSION = @VERSION@ perlpath = @perlpath@ + pythonpath = @pythonpath@ sedpath = @sedpath@ sortpath = @sortpath@ + tclpath = @tclpath@ trpath = @trpath@ uniqpath = @uniqpath@ *************** *** 85,88 **** --- 87,91 ---- libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0 libbenson_la_SOURCES = shm_wrapper.c ssl.c + INCLUDES = -I@top_srcdir@/include mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = Index: shm_wrapper.c =================================================================== RCS file: /cvsroot/benson/benson3/src/shm_wrapper.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** shm_wrapper.c 2001/08/12 21:20:41 1.1.1.1 --- shm_wrapper.c 2001/08/13 02:20:57 1.2 *************** *** 1,3 **** ! #include "shm_wrapper.h" int --- 1,3 ---- ! #include "benson/benson.h" int Index: ssl.c =================================================================== RCS file: /cvsroot/benson/benson3/src/ssl.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ssl.c 2001/08/12 22:40:34 1.1 --- ssl.c 2001/08/13 02:20:57 1.2 *************** *** 1,3 **** ! #include "benson.h" BIO *bio_err=0; --- 1,3 ---- ! #include "benson/benson.h" BIO *bio_err=0; --- benson.h DELETED --- --- shm_wrapper.h DELETED --- --- ssl.h DELETED --- |
|
From: Bob T. <bt...@us...> - 2001-08-13 02:21:00
|
Update of /cvsroot/benson/benson3/include/benson
In directory usw-pr-cvs1:/tmp/cvs-serv25733/include/benson
Added Files:
benson.h shm_wrapper.h ssl.h
Log Message:
Performed a little housekeeping
--- NEW FILE: benson.h ---
#ifndef __benson_h
#define __benson_h
#include <signal.h>
#include "benson/shm_wrapper.h"
#include "benson/ssl.h"
#define CA_LIST "root.pem"
#define RANDOM "random.pem"
#define KEYFILE "key.pem"
#endif /* __benson_h */
--- NEW FILE: shm_wrapper.h ---
#ifndef __shm_wrapper_h
#define __shm_wrapper_h
#include <sys/shm.h>
#include <sys/stat.h>
#include <errno.h>
int bn_shmget(key_t key, size_t size, int flags);
void * bn_shmat(int id, const void *shmadd, int flags);
void bn_shmdt(const void *shmaddr);
void bn_shmctl(int id, int cmd, struct shmid_ds *buff);
#endif /* __shm_wrapper_h */
--- NEW FILE: ssl.h ---
#ifndef __benson_ssl_h
#define __benson_ssl_h
#include <openssl/ssl.h>
struct ssl_password {
char *password;
int length;
};
extern BIO *bio_err;
SSL_CTX *initialize_ctx(char *keyfile, char *password);
void destroy_ctx(SSL_CTX *ctx);
#endif /* __benson_ssl_h */
|
|
From: Bob T. <bt...@us...> - 2001-08-13 02:21:00
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv25733
Modified Files:
Makefile.am Makefile.in acinclude.m4 aclocal.m4 configure
configure.in
Log Message:
Performed a little housekeeping
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.am 2001/08/12 21:19:43 1.1.1.1
--- Makefile.am 2001/08/13 02:20:57 1.2
***************
*** 1 ****
! SUBDIRS=src
--- 1 ----
! SUBDIRS = src include
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.in 2001/08/12 21:20:16 1.1.1.1
--- Makefile.in 2001/08/13 02:20:57 1.2
***************
*** 77,86 ****
VERSION = @VERSION@
perlpath = @perlpath@
sedpath = @sedpath@
sortpath = @sortpath@
trpath = @trpath@
uniqpath = @uniqpath@
! SUBDIRS = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 77,88 ----
VERSION = @VERSION@
perlpath = @perlpath@
+ pythonpath = @pythonpath@
sedpath = @sedpath@
sortpath = @sortpath@
+ tclpath = @tclpath@
trpath = @trpath@
uniqpath = @uniqpath@
! SUBDIRS = src include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/benson/benson3/acinclude.m4,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** acinclude.m4 2001/08/12 21:20:41 1.1.1.1
--- acinclude.m4 2001/08/13 02:20:57 1.2
***************
*** 1,27 ****
! AC_DEFUN(FIND_PERL, [
! AC_PATH_PROG(sedpath, "sed")
! AC_PATH_PROG(perlpath, "perl")
! AC_MSG_CHECKING(version)
! PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
! AC_MSG_RESULT($PERL_VERSION)
! AC_MSG_CHECKING(for Perl compile flags)
! PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
! if test "_$PERL_CFLAGS" = _ ; then
! AC_MSG_RESULT([not found, building without Perl.])
! perl=no
! exit
! else
! PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! if test "$system" = "Linux"; then
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! fi
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
! AC_MSG_RESULT(ok)
! CFLAGS="$CFLAGS $PERL_CFLAGS"
! LIBS="$LIBS $PERL_LDFLAGS"
! AC_DEFINE(USE_PERL)
! fi
! ])
--- 1 ----
! k
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/benson/benson3/aclocal.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** aclocal.m4 2001/08/12 23:43:04 1.3
--- aclocal.m4 2001/08/13 02:20:57 1.4
***************
*** 11,41 ****
dnl PARTICULAR PURPOSE.
! AC_DEFUN(FIND_PERL, [
! AC_PATH_PROG(sedpath, "sed")
! AC_PATH_PROG(perlpath, "perl")
! AC_MSG_CHECKING(version)
! PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
! AC_MSG_RESULT($PERL_VERSION)
! AC_MSG_CHECKING(for Perl compile flags)
! PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
! if test "_$PERL_CFLAGS" = _ ; then
! AC_MSG_RESULT([not found, building without Perl.])
! perl=no
! exit
! else
! PERL_LDFLAGS=`$perlpath -MExtUtils::Embed -e ldopts | $sedpath 's/-lgdbm //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-ldb //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lndbm //'`
! if test "$system" = "Linux"; then
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lnsl //'`
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lposix //'`
! fi
! PERL_LDFLAGS=`echo $PERL_LDFLAGS |$sedpath 's/-lc //'`
! AC_MSG_RESULT(ok)
! CFLAGS="$CFLAGS $PERL_CFLAGS"
! LIBS="$LIBS $PERL_LDFLAGS"
! AC_DEFINE(USE_PERL)
! fi
! ])
# Do all the work for Automake. This macro actually does too much --
--- 11,15 ----
dnl PARTICULAR PURPOSE.
! k
# Do all the work for Automake. This macro actually does too much --
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure 2001/08/12 23:43:04 1.2
--- configure 2001/08/13 02:20:57 1.3
***************
*** 261,264 ****
--- 261,265 ----
ac_unique_file="src/shm_wrapper.c"
+ ac_unique_file="src/shm_wrapper.c"
# Initialize some variables set by options.
***************
*** 809,812 ****
--- 810,816 ----
--with-pic try to use only PIC/non-PIC objects default=use both
[...6102 lines suppressed...]
+ case $as_mkdir_dir in
+ # Skip DOS drivespec
+ ?:) as_incr_dir=$as_mkdir_dir ;;
+ *)
+ as_incr_dir=$as_incr_dir/$as_mkdir_dir
+ test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+ ;;
+ esac
+ done; }
+
+ fi
+ rm -f $ac_file
+ mv $tmp/config.h $ac_file
+ fi
+ else
+ cat $tmp/config.h
+ rm -f $tmp/config.h
+ fi
done
EOF
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** configure.in 2001/08/12 23:43:04 1.2
--- configure.in 2001/08/13 02:20:57 1.3
***************
*** 1,4 ****
AC_INIT(src/shm_wrapper.c)
! AC_PREREQ(2.13)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(benson,3.0)
--- 1,5 ----
AC_INIT(src/shm_wrapper.c)
! AC_CONFIG_SRCDIR([src/shm_wrapper.c])
! AC_PREREQ(2.52)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE(benson,3.0)
***************
*** 6,9 ****
--- 7,11 ----
AC_PROG_INSTALL
AM_PROG_LIBTOOL
+ AC_CONFIG_HEADERS(config.h)
MAJOR_VERSION=3
***************
*** 31,36 ****
AC_SUBST(HAVE_X11)
HAVE_X11=$have_x
! AC_PREREQ(2.9)
AC_ARG_WITH(ssl, [ --with-ssl=dir Find SSL libraries for SSL/TLS support below dir],ssl_dir=$withval, with_ssl=no)
AC_ARG_ENABLE(debug, [ --enable-debug Compile using -g], use_debug=$enableval,use_debug=no)
--- 33,41 ----
AC_SUBST(HAVE_X11)
HAVE_X11=$have_x
! AC_PREREQ(2.52)
+ AC_ARG_WITH(perl, [ --with-perl=dir Find Perl libraries for Perl support below dir],perl_dir=$withval, with_perl=no)
+ AC_ARG_WITH(python, [ --with-python=dir Find Python libraries for Python support below dir],python_dir=$withval, with_python=no)
+ AC_ARG_WITH(tcl, [ --with-tcl=dir Find TCL libraries for TCL support below dir],tcl_dir=$withval, with_tcl=no)
AC_ARG_WITH(ssl, [ --with-ssl=dir Find SSL libraries for SSL/TLS support below dir],ssl_dir=$withval, with_ssl=no)
AC_ARG_ENABLE(debug, [ --enable-debug Compile using -g], use_debug=$enableval,use_debug=no)
***************
*** 38,41 ****
--- 43,47 ----
AC_CHECK_HEADERS(openssl/ssl.h)
+ AC_CHECK_HEADERS(signal.h)
AC_CHECK_HEADERS(sys/shm.h)
AC_CHECK_HEADERS(sys/stat.h)
***************
*** 52,56 ****
AC_PATH_PROG(uniqpath, uniq)
AC_PATH_PROG(sortpath, sort)
! AC_PATH_PROG(perlpath, "perl")
AC_MSG_CHECKING(version)
PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
--- 58,64 ----
AC_PATH_PROG(uniqpath, uniq)
AC_PATH_PROG(sortpath, sort)
!
! if test X"$with_perl" = Xyes; then
! AC_PATH_PROG(perlpath, "perl")
AC_MSG_CHECKING(version)
PERL_VERSION=`$perlpath -e "print $]" | sed s/\\\.// | sed s/00/./g`
***************
*** 74,80 ****
CFLAGS="$CFLAGS $PERL_CFLAGS"
LIBS="$LIBS $PERL_LDFLAGS"
- AC_DEFINE(USE_PERL)
fi
! AC_OUTPUT(Makefile src/Makefile)
--- 82,128 ----
CFLAGS="$CFLAGS $PERL_CFLAGS"
LIBS="$LIBS $PERL_LDFLAGS"
fi
+ fi
+
+
+ if test X"$with_python" = Xyes; then
+ AC_PATH_PROG(pythonpath, "python")
+ AC_MSG_CHECKING(for Python compile flags)
+ AC_MSG_RESULT([not found, building without Python.])
+ fi
+
+ if test X"$with_tcl" = Xyes; then
+ AC_PATH_PROG(tclpath, "tclsh")
+ AC_MSG_CHECKING(version)
+ TCL_VERSION=`echo 'puts "$tcl_version"' | $tclpath`
+ if test "_$TCL_VERSION" = _ ; then
+ AC_MSG_RESULT([version not found, building without Tcl.])
+ else
+ AC_MSG_RESULT($TCL_VERSION)
+ fi
+ AC_MSG_CHECKING(for Tcl compile flags)
+ TCL_CFLAGS="-I/usr/include/"
+ TCL_LDFLAGS="-L/usr/lib/ -ltcl$TCL_VERSION"
+ CFLAGS="$CFLAGS $TCL_CFLAGS"
+ LIBS="$LIBS $TCL_LDFLAGS"
+ AC_MSG_RESULT(ok)
+ # AC_MSG_RESULT([not found, building without Tcl.])
+ fi
+
+ LIBS=`echo "$LIBS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
+ CFLAGS=`echo $CFLAGS | $sedpath 's/\-g //g'`
+ CFLAGS=`echo "$CFLAGS" | tr ' ' '\n' | sort | uniq | tr '\n' ' '`
+
+ if test X"$use_debug" = Xyes; then
+ CFLAGS="$CFLAGS -g"
+ fi
+
+ if test X"$use_profile" = Xyes; then
+ CFLAGS="$CFLAGS -pg"
+ fi
+
+
! #AC_CONFIG_FILES([Makefile include/Makefile src/Makefile])
! AC_OUTPUT([Makefile include/Makefile src/Makefile])
|
|
From: Bob T. <bt...@us...> - 2001-08-13 02:21:00
|
Update of /cvsroot/benson/benson3/include
In directory usw-pr-cvs1:/tmp/cvs-serv25733/include
Added Files:
Makefile.am Makefile.in
Log Message:
Performed a little housekeeping
--- NEW FILE: Makefile.am ---
include_HEADERS = benson/benson.h benson/shm_wrapper.h benson/ssl.h
install-exec-local:
# automake won't make the benson directory in prefix/include/
# so it's all up to us.
$(mkinstalldirs) $(DESTDIR)$(includedir)/benson; \
$(mkinstalldirs) $(DESTDIR)$(includedir);
--- NEW FILE: Makefile.in ---
# Makefile.in generated automatically by automake 1.4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
INSTALL_DATA = @INSTALL_DATA@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
transform = @program_transform_name@
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
AS = @AS@
CC = @CC@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
LIBTOOL = @LIBTOOL@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
MAKEINFO = @MAKEINFO@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
perlpath = @perlpath@
pythonpath = @pythonpath@
sedpath = @sedpath@
sortpath = @sortpath@
tclpath = @tclpath@
trpath = @trpath@
uniqpath = @uniqpath@
include_HEADERS = benson/benson.h benson/shm_wrapper.h benson/ssl.h
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
HEADERS = $(include_HEADERS)
DIST_COMMON = Makefile.am Makefile.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
TAR = tar
GZIP_ENV = --best
all: all-redirect
.SUFFIXES:
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(includedir)
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \
done
uninstall-includeHEADERS:
@$(NORMAL_UNINSTALL)
list='$(include_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(includedir)/$$p; \
done
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP)
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
here=`pwd` && cd $(srcdir) \
&& mkid -f$$here/ID $$unique $(LISP)
TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS)'; \
unique=`for i in $$list; do echo $$i; done | \
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
|| (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
clean-tags:
distclean-tags:
-rm -f TAGS ID
maintainer-clean-tags:
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
subdir = include
distdir: $(DISTFILES)
here=`cd $(top_builddir) && pwd`; \
top_distdir=`cd $(top_distdir) && pwd`; \
distdir=`cd $(distdir) && pwd`; \
cd $(top_srcdir) \
&& $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|| cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
info-am:
info: info-am
dvi-am:
dvi: dvi-am
check-am: all-am
check: check-am
installcheck-am:
installcheck: installcheck-am
install-exec-am: install-exec-local
install-exec: install-exec-am
install-data-am: install-includeHEADERS
install-data: install-data-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
uninstall-am: uninstall-includeHEADERS
uninstall: uninstall-am
all-am: Makefile $(HEADERS)
all-redirect: all-am
install-strip:
$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
installdirs:
$(mkinstalldirs) $(DESTDIR)$(includedir)
mostlyclean-generic:
clean-generic:
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
mostlyclean-am: mostlyclean-tags mostlyclean-generic
mostlyclean: mostlyclean-am
clean-am: clean-tags clean-generic mostlyclean-am
clean: clean-am
distclean-am: distclean-tags distclean-generic clean-am
-rm -f libtool
distclean: distclean-am
maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
distclean-am
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
.PHONY: uninstall-includeHEADERS install-includeHEADERS tags \
mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
distdir info-am info dvi-am dvi check check-am installcheck-am \
installcheck install-exec-local install-exec-am install-exec \
install-data-am install-data install-am install uninstall-am uninstall \
all-redirect all-am all installdirs mostlyclean-generic \
distclean-generic clean-generic maintainer-clean-generic clean \
mostlyclean distclean maintainer-clean
install-exec-local:
# automake won't make the benson directory in prefix/include/
# so it's all up to us.
$(mkinstalldirs) $(DESTDIR)$(includedir)/benson; \
$(mkinstalldirs) $(DESTDIR)$(includedir);
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
|
|
From: Bob T. <bt...@us...> - 2001-08-13 02:19:31
|
Update of /cvsroot/benson/benson3/include/benson In directory usw-pr-cvs1:/tmp/cvs-serv25543/benson Log Message: Directory /cvsroot/benson/benson3/include/benson added to the repository |
|
From: Bob T. <bt...@us...> - 2001-08-13 02:19:13
|
Update of /cvsroot/benson/benson3/include In directory usw-pr-cvs1:/tmp/cvs-serv25496/include Log Message: Directory /cvsroot/benson/benson3/include added to the repository |
|
From: Bob T. <bt...@us...> - 2001-08-12 23:43:08
|
Update of /cvsroot/benson/benson3
In directory usw-pr-cvs1:/tmp/cvs-serv4178
Modified Files:
AUTHORS aclocal.m4 configure configure.in
Log Message:
Modified the configure environment and added some checks
Index: AUTHORS
===================================================================
RCS file: /cvsroot/benson/benson3/AUTHORS,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** AUTHORS 2001/08/12 21:20:16 1.1.1.1
--- AUTHORS 2001/08/12 23:43:04 1.2
***************
*** 0 ****
--- 1 ----
+ Bob Tribit <bt...@tr...>
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/benson/benson3/aclocal.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** aclocal.m4 2001/08/12 22:45:31 1.2
--- aclocal.m4 2001/08/12 23:43:04 1.3
***************
*** 1,3 ****
! dnl ./aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
--- 1,3 ----
! dnl aclocal.m4 generated automatically by aclocal 1.4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson3/configure,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** configure 2001/08/12 21:20:34 1.1.1.1
--- configure 2001/08/12 23:43:04 1.2
***************
*** 800,803 ****
--- 800,805 ----
--enable-fast-install=PKGS optimize for fast installation default=yes
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-debug Compile using -g
+ --enable-profiling Compile using -pg
Optional Packages:
***************
*** 807,810 ****
--- 809,813 ----
[...5545 lines suppressed...]
{ (exit 1); exit 1; }; }
--- 8864,8868 ----
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
! test -f "$f" || { { echo "$as_me:8866: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
***************
*** 8602,8606 ****
else
# /dev/null tree
! { { echo "$as_me:8604: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
--- 8877,8881 ----
else
# /dev/null tree
! { { echo "$as_me:8879: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson3/configure.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** configure.in 2001/08/12 21:19:43 1.1.1.1
--- configure.in 2001/08/12 23:43:04 1.2
***************
*** 33,36 ****
--- 33,44 ----
AC_PREREQ(2.9)
+ AC_ARG_WITH(ssl, [ --with-ssl=dir Find SSL libraries for SSL/TLS support below dir],ssl_dir=$withval, with_ssl=no)
+ AC_ARG_ENABLE(debug, [ --enable-debug Compile using -g], use_debug=$enableval,use_debug=no)
+ AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg], use_profile=$enableval, use_profile=no)
+
+ AC_CHECK_HEADERS(openssl/ssl.h)
+ AC_CHECK_HEADERS(sys/shm.h)
+ AC_CHECK_HEADERS(sys/stat.h)
+ AC_CHECK_HEADERS(errno.h)
AC_CHECK_LIB(compat, open)
AC_CHECK_LIB(socket, open)
***************
*** 39,42 ****
--- 47,51 ----
AC_CHECK_LIB(ld, open)
AC_CHECK_LIB(w, open)
+ AC_CHECK_LIB(ssl, open)
AC_PATH_PROG(sedpath, sed)
AC_PATH_PROG(trpath, tr)
|
|
From: Bob T. <bt...@us...> - 2001-08-12 22:45:34
|
Update of /cvsroot/benson/benson3/src In directory usw-pr-cvs1:/tmp/cvs-serv26056/src Modified Files: ssl.h Log Message: The latest and greatest stuff Index: ssl.h =================================================================== RCS file: /cvsroot/benson/benson3/src/ssl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** ssl.h 2001/08/12 22:40:34 1.1 --- ssl.h 2001/08/12 22:45:31 1.2 *************** *** 14,16 **** void destroy_ctx(SSL_CTX *ctx); ! #endif --- 14,16 ---- void destroy_ctx(SSL_CTX *ctx); ! #endif /* __benson_ssl_h */ |
|
From: Bob T. <bt...@us...> - 2001-08-12 22:45:34
|
Update of /cvsroot/benson/benson3 In directory usw-pr-cvs1:/tmp/cvs-serv26056 Modified Files: aclocal.m4 Log Message: The latest and greatest stuff Index: aclocal.m4 =================================================================== RCS file: /cvsroot/benson/benson3/aclocal.m4,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** aclocal.m4 2001/08/12 21:19:51 1.1.1.1 --- aclocal.m4 2001/08/12 22:45:31 1.2 *************** *** 1,3 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. --- 1,3 ---- ! dnl ./aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. |
|
From: Bob T. <bt...@us...> - 2001-08-12 22:40:37
|
Update of /cvsroot/benson/benson3/src
In directory usw-pr-cvs1:/tmp/cvs-serv25091
Modified Files:
Makefile.am Makefile.in benson.h
Added Files:
ssl.c ssl.h
Log Message:
Added some of the SSL code
--- NEW FILE: ssl.c ---
#include "benson.h"
BIO *bio_err=0;
static void sigpipe_handle(int x);
static void sigpipe_handle(int x) {
}
int berr_exit(char *string)
{
BIO_printf(bio_err,"%s\n",string);
ERR_print_errors(bio_err);
exit(0);
}
int password_cb(char *buf, int size, int rwflag, void *password)
{
strncpy(buf, (char *)(password), size);
buf[size - 1] = '\0';
return(strlen(buf));
}
SSL_CTX *initialize_ctx(char *keyfile,char *password)
{
SSL_METHOD *meth;
SSL_CTX *ctx;
struct ssl_password *ssl_pw = malloc(sizeof(struct ssl_password));
if(!bio_err) {
SSL_library_init();
SSL_load_error_strings();
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
}
signal(SIGPIPE,sigpipe_handle);
meth=SSLv3_method();
ctx=SSL_CTX_new(meth);
if(!(SSL_CTX_use_certificate_file(ctx,keyfile,SSL_FILETYPE_PEM)))
berr_exit("Couldn't read certificate file");
ssl_pw->password=password;
ssl_pw->length=length(password);
SSL_CTX_set_default_password_cb(ctx, password_cb);
if(!(SSL_CTX_use_PrivateKey_file(ctx,keyfile,SSL_FILETYPE_PEM)))
berr_exit("Couldn't read key file");
if(!(SSL_CTX_load_verify_locations(ctx,CA_LIST,0)))
berr_exit("Couldn't read CA list");
SSL_CTX_set_verify_depth(ctx,1);
if(!(RAND_load_file(RANDOM,1024*1024)))
berr_exit("Couldn't load randomness");
return ctx;
}
void destroy_ctx(SSL_CTX *ctx)
{
SSL_CTX_free(ctx);
}
--- NEW FILE: ssl.h ---
#ifndef __benson_ssl_h
#define __benson_ssl_h
#include <openssl/ssl.h>
struct ssl_password {
char *password;
int length;
};
extern BIO *bio_err;
SSL_CTX *initialize_ctx(char *keyfile, char *password);
void destroy_ctx(SSL_CTX *ctx);
#endif
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.am,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.am 2001/08/12 21:20:41 1.1.1.1
--- Makefile.am 2001/08/12 22:40:34 1.2
***************
*** 1,3 ****
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c
--- 1,3 ----
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Makefile.in 2001/08/12 21:20:41 1.1.1.1
--- Makefile.in 2001/08/12 22:40:34 1.2
***************
*** 84,88 ****
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
--- 84,88 ----
lib_LTLIBRARIES = libbenson.la
libbenson_la_LDFLAGS = -no-undefined -version-info 3:0:0
! libbenson_la_SOURCES = shm_wrapper.c ssl.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
***************
*** 99,103 ****
X_PRE_LIBS = @X_PRE_LIBS@
libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--- 99,103 ----
X_PRE_LIBS = @X_PRE_LIBS@
libbenson_la_LIBADD =
! libbenson_la_OBJECTS = shm_wrapper.lo ssl.lo
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
***************
*** 112,116 ****
TAR = tar
GZIP_ENV = --best
! DEP_FILES = .deps/shm_wrapper.P
SOURCES = $(libbenson_la_SOURCES)
OBJECTS = $(libbenson_la_OBJECTS)
--- 112,116 ----
TAR = tar
GZIP_ENV = --best
! DEP_FILES = .deps/shm_wrapper.P .deps/ssl.P
SOURCES = $(libbenson_la_SOURCES)
OBJECTS = $(libbenson_la_OBJECTS)
Index: benson.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/benson.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** benson.h 2001/08/12 21:20:41 1.1.1.1
--- benson.h 2001/08/12 22:40:34 1.2
***************
*** 2,6 ****
--- 2,12 ----
#define __benson_h
+ #include <signal.h>
#include "shm_wrapper.h"
+ #include "ssl.h"
+
+ #define CA_LIST "root.pem"
+ #define RANDOM "random.pem"
+ #define KEYFILE "key.pem"
#endif /* __benson_h */
|
|
From: Bob T. <bt...@us...> - 2001-08-12 21:20:45
|
Update of /cvsroot/benson/benson3 In directory usw-pr-cvs1:/tmp/cvs-serv7539 Log Message: Initial benson load. Status: Vendor Tag: newportal Release Tags: initial N benson3/configure.in N benson3/Makefile.am N benson3/aclocal.m4 N benson3/install-sh N benson3/mkinstalldirs N benson3/missing N benson3/config.guess N benson3/config.sub N benson3/ltmain.sh N benson3/INSTALL N benson3/COPYING N benson3/stamp-h.in N benson3/Makefile.in N benson3/NEWS N benson3/README N benson3/AUTHORS N benson3/ChangeLog N benson3/configure N benson3/ltconfig N benson3/acinclude.m4 N benson3/doc/design.txt N benson3/src/shm_wrapper.c N benson3/src/shm_wrapper.h N benson3/src/Makefile.in N benson3/src/benson.h N benson3/src/Makefile.am No conflicts created by this import ***** Bogus filespec: - ***** Bogus filespec: Imported ***** Bogus filespec: sources |
|
From: Bob T. <bt...@us...> - 2001-07-28 01:41:46
|
Update of /cvsroot/benson/benson2/src/modules/Benson
In directory usw-pr-cvs1:/tmp/cvs-serv22237
Modified Files:
Benson.pm Queue_util.cc
Log Message:
Updated the documentation and protected the higher C++ calls, in Benson.pm
Index: Benson.pm
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Benson.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** Benson.pm 2001/07/04 01:22:36 1.6
--- Benson.pm 2001/07/28 01:41:42 1.7
***************
*** 33,37 ****
my ($self) = shift;
my %args = @_;
! my $rc = $self->ack(identity => $args{identity});
return $rc;
}
--- 33,55 ----
my ($self) = shift;
my %args = @_;
! my $rc;
! my $require = 0;
!
! foreach my $param (keys %args) {
! if($param eq "forwarder") {
! $self->{forwarder} = $args{forwarder};
! }
! if($param eq "identity") {
! if(defined $args{identity}) {
! $required = 1;
! }
! }
! }
!
! if($required) {
! $rc = $self->ack(identity => $args{identity});
! } else {
! die "Usage: Benson::clear(identity => \"value\")\n";
! }
return $rc;
}
***************
*** 40,45 ****
my ($self) = shift;
my %args = @_;
! my $rc = $self->update_status(identity => $args{identity},
status => "acknowledge:log");
return $rc;
}
--- 58,81 ----
my ($self) = shift;
my %args = @_;
! my $rc;
! my $required = 0;
!
! foreach my $param (keys %args) {
! if($param eq "forwarder") {
! $self->{forwarder} = $args{forwarder};
! }
! if($param eq "identity") {
! if(defined $args{identity}) {
! $required = 1;
! }
! }
! }
!
! if($required) {
! $rc = $self->update_status(identity => $args{identity},
status => "acknowledge:log");
+ } else {
+ die "Usage: Benson::acknowledge(identity => \"value\")\n";
+ }
return $rc;
}
***************
*** 63,76 ****
modules, that are yet to be defined.
=head1 API USAGE
use Benson;
! my $queue = new Benson;
=head1 SUBMIT
! $queue->submit(forwarder => "collector.company.com",
! agent => "agent.company.com",
severity => "warning",
subsystem => "filesystem",
--- 99,116 ----
modules, that are yet to be defined.
+ NOTE: The forwarder hash key is now optional (vs. required) for the
+ submit, acknowledge, alert_list, acknowledge, update_status, and
+ increment_count methods.
+
=head1 API USAGE
use Benson;
! my $queue = new Benson(forwarder => "collector.company.com",
! port => "9021);
=head1 SUBMIT
! $queue->submit(agent => "agent.company.com",
severity => "warning",
subsystem => "filesystem",
Index: Queue_util.cc
===================================================================
RCS file: /cvsroot/benson/benson2/src/modules/Benson/Queue_util.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Queue_util.cc 2001/07/15 02:00:55 1.4
--- Queue_util.cc 2001/07/28 01:41:42 1.5
***************
*** 16,20 ****
CORBA::Object_var obj =
orb->bind("IDL:newportal.com/Queue:1.0", fargv[1]);
- cerr << "CORBA binding object: " << obj << endl;
if(CORBA::is_nil (obj)) {
--- 16,19 ----
|
|
From: Bob T. <bt...@us...> - 2001-07-17 01:58:03
|
Update of /cvsroot/benson/benson2/src/modules In directory usw-pr-cvs1:/tmp/cvs-serv25751/src/modules Modified Files: Makefile.in Log Message: Added special aweful good configure.in Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson2/src/modules/Makefile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** Makefile.in 2001/06/03 23:33:40 1.4 --- Makefile.in 2001/07/17 01:57:59 1.5 *************** *** 1,3 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. --- 1,3 ---- ! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. |
|
From: Bob T. <bt...@us...> - 2001-07-17 01:58:02
|
Update of /cvsroot/benson/benson2/src In directory usw-pr-cvs1:/tmp/cvs-serv25751/src Modified Files: Makefile.in Log Message: Added special aweful good configure.in Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson2/src/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile.in 2001/06/03 23:33:40 1.5 --- Makefile.in 2001/07/17 01:57:59 1.6 *************** *** 1,3 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. --- 1,3 ---- ! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. |
|
From: Bob T. <bt...@us...> - 2001-07-17 01:58:02
|
Update of /cvsroot/benson/benson2/src/scripts In directory usw-pr-cvs1:/tmp/cvs-serv25751/src/scripts Modified Files: Makefile.in Log Message: Added special aweful good configure.in Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson2/src/scripts/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** Makefile.in 2001/06/03 23:33:40 1.6 --- Makefile.in 2001/07/17 01:57:59 1.7 *************** *** 1,3 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. --- 1,3 ---- ! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. |
|
From: Bob T. <bt...@us...> - 2001-07-17 01:58:02
|
Update of /cvsroot/benson/benson2/src/perl In directory usw-pr-cvs1:/tmp/cvs-serv25751/src/perl Modified Files: Makefile.in Log Message: Added special aweful good configure.in Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson2/src/perl/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile.in 2001/06/03 23:33:40 1.5 --- Makefile.in 2001/07/17 01:57:59 1.6 *************** *** 1,3 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. --- 1,3 ---- ! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. |
|
From: Bob T. <bt...@us...> - 2001-07-17 01:58:02
|
Update of /cvsroot/benson/benson2/src/corba In directory usw-pr-cvs1:/tmp/cvs-serv25751/src/corba Modified Files: Makefile.in Log Message: Added special aweful good configure.in Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson2/src/corba/Makefile.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** Makefile.in 2001/06/03 23:33:40 1.5 --- Makefile.in 2001/07/17 01:57:59 1.6 *************** *** 1,3 **** ! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. --- 1,3 ---- ! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. |
|
From: Bob T. <bt...@us...> - 2001-07-17 01:58:02
|
Update of /cvsroot/benson/benson2
In directory usw-pr-cvs1:/tmp/cvs-serv25751
Modified Files:
Makefile.in aclocal.m4 config.h.in configure configure.in
Log Message:
Added special aweful good configure.in
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson2/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.in 2001/06/03 23:33:40 1.4
--- Makefile.in 2001/07/17 01:57:58 1.5
***************
*** 1,3 ****
! # Makefile.in generated automatically by automake 1.4-p2 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
--- 1,3 ----
! # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
***************
*** 111,115 ****
cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--- 111,115 ----
cd $(srcdir) && $(ACLOCAL)
! config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/benson/benson2/aclocal.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** aclocal.m4 2001/06/03 23:33:40 1.6
--- aclocal.m4 2001/07/17 01:57:58 1.7
***************
*** 1,3 ****
! dnl aclocal.m4 generated automatically by aclocal 1.4-p2
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
--- 1,3 ----
! dnl aclocal.m4 generated automatically by aclocal 1.4-p4
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
Index: config.h.in
===================================================================
RCS file: /cvsroot/benson/benson2/config.h.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** config.h.in 2001/06/06 15:57:44 1.4
--- config.h.in 2001/07/17 01:57:58 1.5
***************
*** 1,3 ****
! /* config.h.in. Generated automatically from configure.in by autoheader. */
/* Define if the X Window System is missing or not being used. */
--- 1,3 ----
! /* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
/* Define if the X Window System is missing or not being used. */
Index: configure
===================================================================
RCS file: /cvsroot/benson/benson2/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** configure 2001/06/03 23:33:40 1.7
--- configure 2001/07/17 01:57:58 1.8
***************
*** 6262,6266 ****
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
! :
fi
--- 6262,6268 ----
if test "${enable_debug+set}" = set; then
enableval="$enable_debug"
! use_debug=$enableval
! else
! use_debug=no
fi
***************
*** 6268,6278 ****
if test "${enable_profile+set}" = set; then
enableval="$enable_profile"
! :
fi
-
echo $ac_n "checking for open in -lcompat""... $ac_c" 1>&6
! echo "configure:6277: checking for open in -lcompat" >&5
ac_lib_var=`echo compat'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 6270,6281 ----
if test "${enable_profile+set}" = set; then
enableval="$enable_profile"
! use_profile=$enableval
! else
! use_profile=no
fi
echo $ac_n "checking for open in -lcompat""... $ac_c" 1>&6
! echo "configure:6280: checking for open in -lcompat" >&5
ac_lib_var=`echo compat'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 6282,6286 ****
LIBS="-lcompat $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6285 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 6285,6289 ----
LIBS="-lcompat $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6288 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 6293,6297 ****
; return 0; }
EOF
! if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 6296,6300 ----
; return 0; }
EOF
! if { (eval echo configure:6299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 6321,6325 ****
echo $ac_n "checking for open in -lsocket""... $ac_c" 1>&6
! echo "configure:6324: checking for open in -lsocket" >&5
ac_lib_var=`echo socket'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 6324,6328 ----
echo $ac_n "checking for open in -lsocket""... $ac_c" 1>&6
! echo "configure:6327: checking for open in -lsocket" >&5
ac_lib_var=`echo socket'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 6329,6333 ****
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6332 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 6332,6336 ----
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6335 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 6340,6344 ****
; return 0; }
EOF
! if { (eval echo configure:6343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 6343,6347 ----
; return 0; }
EOF
! if { (eval echo configure:6346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 6368,6372 ****
echo $ac_n "checking for open in -ldl""... $ac_c" 1>&6
! echo "configure:6371: checking for open in -ldl" >&5
ac_lib_var=`echo dl'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 6371,6375 ----
echo $ac_n "checking for open in -ldl""... $ac_c" 1>&6
! echo "configure:6374: checking for open in -ldl" >&5
ac_lib_var=`echo dl'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 6376,6380 ****
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6379 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 6379,6383 ----
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6382 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 6387,6391 ****
; return 0; }
EOF
! if { (eval echo configure:6390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 6390,6394 ----
; return 0; }
EOF
! if { (eval echo configure:6393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 6415,6419 ****
echo $ac_n "checking for open in -ldld""... $ac_c" 1>&6
! echo "configure:6418: checking for open in -ldld" >&5
ac_lib_var=`echo dld'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 6418,6422 ----
echo $ac_n "checking for open in -ldld""... $ac_c" 1>&6
! echo "configure:6421: checking for open in -ldld" >&5
ac_lib_var=`echo dld'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 6423,6427 ****
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6426 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 6426,6430 ----
LIBS="-ldld $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6429 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 6434,6438 ****
; return 0; }
EOF
! if { (eval echo configure:6437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 6437,6441 ----
; return 0; }
EOF
! if { (eval echo configure:6440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 6462,6466 ****
echo $ac_n "checking for open in -lld""... $ac_c" 1>&6
! echo "configure:6465: checking for open in -lld" >&5
ac_lib_var=`echo ld'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 6465,6469 ----
echo $ac_n "checking for open in -lld""... $ac_c" 1>&6
! echo "configure:6468: checking for open in -lld" >&5
ac_lib_var=`echo ld'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 6470,6474 ****
LIBS="-lld $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6473 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 6473,6477 ----
LIBS="-lld $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6476 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 6481,6485 ****
; return 0; }
EOF
! if { (eval echo configure:6484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 6484,6488 ----
; return 0; }
EOF
! if { (eval echo configure:6487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 6509,6513 ****
echo $ac_n "checking for open in -lw""... $ac_c" 1>&6
! echo "configure:6512: checking for open in -lw" >&5
ac_lib_var=`echo w'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 6512,6516 ----
echo $ac_n "checking for open in -lw""... $ac_c" 1>&6
! echo "configure:6515: checking for open in -lw" >&5
ac_lib_var=`echo w'_'open | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
***************
*** 6517,6521 ****
LIBS="-lw $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6520 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
--- 6520,6524 ----
LIBS="-lw $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 6523 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
***************
*** 6528,6532 ****
; return 0; }
EOF
! if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
--- 6531,6535 ----
; return 0; }
EOF
! if { (eval echo configure:6534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
***************
*** 6558,6562 ****
set dummy sed; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6561: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_sedpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6561,6565 ----
set dummy sed; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6564: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_sedpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6593,6597 ****
set dummy tr; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6596: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_trpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6596,6600 ----
set dummy tr; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6599: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_trpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6628,6632 ****
set dummy uniq; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6631: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_uniqpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6631,6635 ----
set dummy uniq; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6634: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_uniqpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6663,6667 ****
set dummy sort; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6666: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_sortpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6666,6670 ----
set dummy sort; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6669: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_sortpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6704,6708 ****
if test "x$with_mico" != "xno" ; then
echo $ac_n "checking for mico-setup.sh""... $ac_c" 1>&6
! echo "configure:6707: checking for mico-setup.sh" >&5
if test "x$MICOVERSION" != "x" && test "x$MICODIR" != "x" ; then
echo "$ac_t""already loaded" 1>&6
--- 6707,6711 ----
if test "x$with_mico" != "xno" ; then
echo $ac_n "checking for mico-setup.sh""... $ac_c" 1>&6
! echo "configure:6710: checking for mico-setup.sh" >&5
if test "x$MICOVERSION" != "x" && test "x$MICODIR" != "x" ; then
echo "$ac_t""already loaded" 1>&6
***************
*** 6744,6748 ****
echo "$ac_t""$mico_setup_sh" 1>&6
echo $ac_n "checking contents of MICO config""... $ac_c" 1>&6
! echo "configure:6747: checking contents of MICO config" >&5
#
# mico_config unsets prefix and exec_prefix
--- 6747,6751 ----
echo "$ac_t""$mico_setup_sh" 1>&6
echo $ac_n "checking contents of MICO config""... $ac_c" 1>&6
! echo "configure:6750: checking contents of MICO config" >&5
#
# mico_config unsets prefix and exec_prefix
***************
*** 6761,6765 ****
if test "x$have_mico" = "xyes" ; then
echo $ac_n "checking MICO version""... $ac_c" 1>&6
! echo "configure:6764: checking MICO version" >&5
echo "$ac_t""$MICOVERSION" 1>&6
--- 6764,6768 ----
if test "x$have_mico" = "xyes" ; then
echo $ac_n "checking MICO version""... $ac_c" 1>&6
! echo "configure:6767: checking MICO version" >&5
echo "$ac_t""$MICOVERSION" 1>&6
***************
*** 6780,6784 ****
if test "x$have_mico" = "xyes" ; then
echo $ac_n "checking for CORBA.h""... $ac_c" 1>&6
! echo "configure:6783: checking for CORBA.h" >&5
if test "x" = "x" ; then
--- 6783,6787 ----
if test "x$have_mico" = "xyes" ; then
echo $ac_n "checking for CORBA.h""... $ac_c" 1>&6
! echo "configure:6786: checking for CORBA.h" >&5
if test "x" = "x" ; then
***************
*** 6819,6823 ****
echo $ac_n "checking for libmico${MICOVERSION}${TCL_SHLIB_SUFFIX}""... $ac_c" 1>&6
! echo "configure:6822: checking for libmico${MICOVERSION}${TCL_SHLIB_SUFFIX}" >&5
if test "xmico_lib" = "x" ; then
--- 6822,6826 ----
echo $ac_n "checking for libmico${MICOVERSION}${TCL_SHLIB_SUFFIX}""... $ac_c" 1>&6
! echo "configure:6825: checking for libmico${MICOVERSION}${TCL_SHLIB_SUFFIX}" >&5
if test "xmico_lib" = "x" ; then
***************
*** 6853,6857 ****
echo "$ac_t""not found" 1>&6
echo $ac_n "checking for libmico${MICOVERSION}.a""... $ac_c" 1>&6
! echo "configure:6856: checking for libmico${MICOVERSION}.a" >&5
if test "xmico_lib" = "x" ; then
--- 6856,6860 ----
echo "$ac_t""not found" 1>&6
echo $ac_n "checking for libmico${MICOVERSION}.a""... $ac_c" 1>&6
! echo "configure:6859: checking for libmico${MICOVERSION}.a" >&5
if test "xmico_lib" = "x" ; then
***************
*** 6893,6897 ****
echo $ac_n "checking whether we must use MiniSTL""... $ac_c" 1>&6
! echo "configure:6896: checking whether we must use MiniSTL" >&5
cat > conftest.c <<EOF
#include <CORBA.h>
--- 6896,6900 ----
echo $ac_n "checking whether we must use MiniSTL""... $ac_c" 1>&6
! echo "configure:6899: checking whether we must use MiniSTL" >&5
cat > conftest.c <<EOF
#include <CORBA.h>
***************
*** 6912,6916 ****
fi
echo $ac_n "checking for mico-ld""... $ac_c" 1>&6
! echo "configure:6915: checking for mico-ld" >&5
if test "x" = "x" ; then
--- 6915,6919 ----
fi
echo $ac_n "checking for mico-ld""... $ac_c" 1>&6
! echo "configure:6918: checking for mico-ld" >&5
if test "x" = "x" ; then
***************
*** 6950,6954 ****
fi
echo $ac_n "checking MICO dependencies""... $ac_c" 1>&6
! echo "configure:6953: checking MICO dependencies" >&5
micodeps=
for item in `grep -- -l $mico_ld | tr '"' ' '` ; do
--- 6953,6957 ----
fi
echo $ac_n "checking MICO dependencies""... $ac_c" 1>&6
! echo "configure:6956: checking MICO dependencies" >&5
micodeps=
for item in `grep -- -l $mico_ld | tr '"' ' '` ; do
***************
*** 6962,6966 ****
set dummy "idl"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6965: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_idl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 6965,6969 ----
set dummy "idl"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:6968: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_idl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 6996,7000 ****
echo $ac_n "checking for ird""... $ac_c" 1>&6
! echo "configure:6999: checking for ird" >&5
if test "x" = "x" ; then
--- 6999,7003 ----
echo $ac_n "checking for ird""... $ac_c" 1>&6
! echo "configure:7002: checking for ird" >&5
if test "x" = "x" ; then
***************
*** 7035,7039 ****
echo $ac_n "checking for ssliiop support""... $ac_c" 1>&6
! echo "configure:7038: checking for ssliiop support" >&5
if test "x$ssliiop" = "x" ; then
echo "$ac_t""not found" 1>&6
--- 7038,7042 ----
echo $ac_n "checking for ssliiop support""... $ac_c" 1>&6
! echo "configure:7041: checking for ssliiop support" >&5
if test "x$ssliiop" = "x" ; then
echo "$ac_t""not found" 1>&6
***************
*** 7079,7083 ****
set dummy "omniidl"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:7082: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_idl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 7082,7086 ----
set dummy "omniidl"; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:7085: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_idl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7129,7133 ****
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:7132: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_perlpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
--- 7132,7136 ----
set dummy perl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:7135: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_perlpath'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
***************
*** 7162,7166 ****
echo $ac_n "checking for Perl compile flags""... $ac_c" 1>&6
! echo "configure:7165: checking for Perl compile flags" >&5
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
--- 7165,7169 ----
echo $ac_n "checking for Perl compile flags""... $ac_c" 1>&6
! echo "configure:7168: checking for Perl compile flags" >&5
PERL_CFLAGS=`$perlpath -MExtUtils::Embed -e ccopts 2>/dev/null`
if test "_$PERL_CFLAGS" = _ ; then
***************
*** 7188,7197 ****
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7191: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7196 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
--- 7191,7200 ----
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:7194: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 7199 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
***************
*** 7216,7220 ****
; return 0; }
EOF
! if { (eval echo configure:7219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
--- 7219,7223 ----
; return 0; }
EOF
! if { (eval echo configure:7222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
***************
*** 7245,7252 ****
fi
! if test "x$debug" = "x"; then
! CXXFLAGS=`echo $CXXFLAGS | $sedpath 's/\-g //g'`
! else
CXXFLAGS="$CXXFLAGS -g"
fi
--- 7248,7259 ----
fi
! CXXFLAGS=`echo $CXXFLAGS | $sedpath 's/\-g //g'`
!
! if test X"$use_debug" = Xyes; then
CXXFLAGS="$CXXFLAGS -g"
+ fi
+
+ if test X"$use_profile" = Xyes; then
+ CXXFLAGS="$CXXFLAGS -pg"
fi
Index: configure.in
===================================================================
RCS file: /cvsroot/benson/benson2/configure.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** configure.in 2001/06/03 23:33:40 1.6
--- configure.in 2001/07/17 01:57:58 1.7
***************
*** 38,45 ****
AC_ARG_WITH(omniorb, [ --with-omniorb=dir Find omniORB installation below dir],omni_dir=$withval, with_omni=no)
AC_ARG_WITH(ssliiop, [ --with-ssl=dir Find SSL libraries for SSLIIOP support below dir],ssl_dir=$withval, with_ssl=no)
! AC_ARG_ENABLE(debug, [ --enable-debug Compile using -g])
! AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg])
-
AC_CHECK_LIB(compat, open)
AC_CHECK_LIB(socket, open)
--- 38,44 ----
AC_ARG_WITH(omniorb, [ --with-omniorb=dir Find omniORB installation below dir],omni_dir=$withval, with_omni=no)
AC_ARG_WITH(ssliiop, [ --with-ssl=dir Find SSL libraries for SSLIIOP support below dir],ssl_dir=$withval, with_ssl=no)
! AC_ARG_ENABLE(debug, [ --enable-debug Compile using -g], use_debug=$enableval, use_debug=no)
! AC_ARG_ENABLE(profile, [ --enable-profiling Compile using -pg], use_profile=$enableval, use_profile=no)
AC_CHECK_LIB(compat, open)
AC_CHECK_LIB(socket, open)
***************
*** 86,93 ****
fi
! if test "x$debug" = "x"; then
! CXXFLAGS=`echo $CXXFLAGS | $sedpath 's/\-g //g'`
! else
CXXFLAGS="$CXXFLAGS -g"
fi
--- 85,96 ----
fi
! CXXFLAGS=`echo $CXXFLAGS | $sedpath 's/\-g //g'`
!
! if test X"$use_debug" = Xyes; then
CXXFLAGS="$CXXFLAGS -g"
+ fi
+
+ if test X"$use_profile" = Xyes; then
+ CXXFLAGS="$CXXFLAGS -pg"
fi
|
