diff options
author | shannonjr <shannonjr> | 2006-01-29 15:54:04 +0000 |
---|---|---|
committer | shannonjr <shannonjr> | 2006-01-29 15:54:04 +0000 |
commit | ebdc829f57d7fbf6628cdddb0926117ebd90e3b8 (patch) | |
tree | 9d8fa9cc0720ab439491b3aa1998afb78c297f7d /security/libprelude/patches | |
parent | 11b29e0aa6fcbd515303770d42e2eefc7d10290f (diff) | |
download | pkgsrc-ebdc829f57d7fbf6628cdddb0926117ebd90e3b8.tar.gz |
Prelude is a hybrid IDS consisting of multiple
sensors, managers, and a display console. LibPrelude
is the glue that binds all aspects of Prelude together.
LibPrelude is a library which enables Prelude
components to communicate in a standard IDMEF method.
This is one of several new packages in the Prelude family.
Diffstat (limited to 'security/libprelude/patches')
-rw-r--r-- | security/libprelude/patches/patch-aa | 80 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ab | 21 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ac | 104 |
3 files changed, 205 insertions, 0 deletions
diff --git a/security/libprelude/patches/patch-aa b/security/libprelude/patches/patch-aa new file mode 100644 index 00000000000..8c9a6fd5807 --- /dev/null +++ b/security/libprelude/patches/patch-aa @@ -0,0 +1,80 @@ +$NetBSD: patch-aa,v 1.1.1.1 2006/01/29 15:54:04 shannonjr Exp $ + +--- prelude-adduser/prelude-adduser.c.orig 2005-06-26 05:41:44.000000000 -0600 ++++ prelude-adduser/prelude-adduser.c +@@ -43,6 +43,8 @@ + #include <gnutls/x509.h> + #include <gnutls/extra.h> + ++#include <fts.h> ++ + #include "common.h" + #include "config-engine.h" + #include "prelude-error.h" +@@ -886,6 +888,66 @@ static int del_cb(const char *filename, + } + + ++int ++ftw(const char *path, int (*fn)(const char *, const struct stat *, int), ++ int nfds) ++{ ++ char * const paths[2] = { (char *)path, NULL }; ++ FTSENT *cur; ++ FTS *ftsp; ++ int error = 0, fnflag, sverrno; ++ ++ /* XXX - nfds is currently unused */ ++ if (nfds < 1 || nfds > OPEN_MAX) { ++ errno = EINVAL; ++ return (-1); ++ } ++ ++ ftsp = fts_open(paths, FTS_LOGICAL | FTS_COMFOLLOW | FTS_NOCHDIR, NULL); ++ if (ftsp == NULL) ++ return (-1); ++ while ((cur = fts_read(ftsp)) != NULL) { ++ switch (cur->fts_info) { ++ case FTS_D: ++ fnflag = FTW_D; ++ break; ++ case FTS_DNR: ++ fnflag = FTW_DNR; ++ break; ++ case FTS_DP: ++ /* we only visit in preorder */ ++ continue; ++ case FTS_F: ++ case FTS_DEFAULT: ++ fnflag = FTW_F; ++ break; ++ case FTS_NS: ++ case FTS_NSOK: ++ case FTS_SLNONE: ++ fnflag = FTW_NS; ++ break; ++ case FTS_SL: ++ fnflag = FTW_SL; ++ break; ++ case FTS_DC: ++ errno = ELOOP; ++ /* FALLTHROUGH */ ++ default: ++ error = -1; ++ goto done; ++ } ++ error = fn(cur->fts_path, cur->fts_statp, fnflag); ++ if (error != 0) ++ break; ++ } ++done: ++ sverrno = errno; ++ if (fts_close(ftsp) != 0 && error == 0) ++ error = -1; ++ else ++ errno = sverrno; ++ return (error); ++} + + static void delete_dir(const char *dirname) + { diff --git a/security/libprelude/patches/patch-ab b/security/libprelude/patches/patch-ab new file mode 100644 index 00000000000..9325f98abf3 --- /dev/null +++ b/security/libprelude/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.1.1.1 2006/01/29 15:54:04 shannonjr Exp $ +--- src/tls-auth.c.orig Mon Jul 25 15:58:08 2005 ++++ src/tls-auth.c Mon Aug 15 12:38:00 2005 +@@ -165,6 +165,7 @@ int tls_auth_connection(prelude_client_p + int ret, fd; + void *cred; + gnutls_session session; ++ int cipher_list[2]; + + ret = prelude_client_profile_get_credentials(cp, &cred); + if ( ret < 0 ) +@@ -172,6 +173,9 @@ int tls_auth_connection(prelude_client_p + + gnutls_init(&session, GNUTLS_CLIENT); + gnutls_set_default_priority(session); ++ cipher_list[0] = GNUTLS_CIPHER_AES_128_CBC; ++ cipher_list[1] = 0; ++ gnutls_cipher_set_priority (session, cipher_list); + gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, cred); + + fd = prelude_io_get_fd(io); diff --git a/security/libprelude/patches/patch-ac b/security/libprelude/patches/patch-ac new file mode 100644 index 00000000000..46d1d5fb241 --- /dev/null +++ b/security/libprelude/patches/patch-ac @@ -0,0 +1,104 @@ +$NetBSD: patch-ac,v 1.1.1.1 2006/01/29 15:54:04 shannonjr Exp $ + +--- Makefile.in.orig 2005-12-13 12:36:41.000000000 -0700 ++++ Makefile.in +@@ -827,71 +827,71 @@ prelude-config.h: $(top_builddir)/config + # Spool directory for report saving is mode + + install-data-local: +- $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_spool_dir); +- $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir); +- $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default; +- $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/profile; +- @if test -f $(DESTDIR)$(prelude_config_dir)/default/client.conf; then \ ++ $(INSTALL) -d -m 755 $(prelude_spool_dir); ++ $(INSTALL) -d -m 755 $(prelude_config_dir); ++ $(INSTALL) -d -m 755 $(prelude_config_dir)/default; ++ $(INSTALL) -d -m 755 $(prelude_config_dir)/profile; ++ @if test -f $(prelude_config_dir)/default/client.conf; then \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- echo "$(DESTDIR)$(prelude_config_dir)/default/client.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist"; \ ++ echo "$(prelude_config_dir)/default/client.conf already exist..."; \ ++ echo "Installing default configuration in $(prelude_config_dir)/default/client.conf-dist"; \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist; \ ++ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(prelude_config_dir)/default/client.conf-dist; \ + else \ +- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default; \ ++ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(prelude_config_dir)/default; \ + fi + +- @if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then \ ++ @if test -f $(prelude_config_dir)/default/global.conf; then \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- echo "$(DESTDIR)$(prelude_config_dir)/default/global.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist"; \ ++ echo "$(prelude_config_dir)/default/global.conf already exist..."; \ ++ echo "Installing default configuration in $(prelude_config_dir)/default/global.conf-dist"; \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist; \ ++ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(prelude_config_dir)/default/global.conf-dist; \ + else \ +- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default; \ ++ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(prelude_config_dir)/default; \ + fi + +- @if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then \ ++ @if test -f $(prelude_config_dir)/default/idmef-client.conf; then \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- echo "$(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist"; \ ++ echo "$(prelude_config_dir)/default/idmef-client.conf already exist..."; \ ++ echo "Installing default configuration in $(prelude_config_dir)/default/idmef-client.conf-dist"; \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \ ++ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(prelude_config_dir)/default/idmef-client.conf-dist; \ + else \ +- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default; \ ++ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(prelude_config_dir)/default; \ + fi + +- @if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then \ ++ @if test -f $(prelude_config_dir)/default/tls.conf; then \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- echo "$(DESTDIR)$(prelude_config_dir)/default/tls.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist"; \ ++ echo "$(prelude_config_dir)/default/tls.conf already exist..."; \ ++ echo "Installing default configuration in $(prelude_config_dir)/default/tls.conf-dist"; \ + echo; \ + echo "********************************************************************************"; \ + echo; \ +- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist; \ ++ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(prelude_config_dir)/default/tls.conf-dist; \ + else \ +- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default; \ ++ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(prelude_config_dir)/default; \ + fi + + uninstall-local: +- rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf +- rm -f $(DESTDIR)$(prelude_config_dir)/default/global.conf +- rm -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf +- rm -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf ++ rm -f $(prelude_config_dir)/default/client.conf ++ rm -f $(prelude_config_dir)/default/global.conf ++ rm -f $(prelude_config_dir)/default/idmef-client.conf ++ rm -f $(prelude_config_dir)/default/tls.conf + # 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: |