diff options
author | hasso <hasso> | 2009-08-23 18:56:34 +0000 |
---|---|---|
committer | hasso <hasso> | 2009-08-23 18:56:34 +0000 |
commit | 9f7eb26558088d9c1ba7082debdef941512d9981 (patch) | |
tree | d85360780cc4b0747739ec277ee990f090105a51 /security/libprelude/patches | |
parent | 8e407297aad61a177288ce9fa0ecff574da753dd (diff) | |
download | pkgsrc-9f7eb26558088d9c1ba7082debdef941512d9981.tar.gz |
Update to 0.9.24. No normal upstream changelog except git log. Splitted up
the package to the base (with c++ bindings) and scripting languages bindings.
All hard work done by Rumko <rumcic at gmail.com>.
Diffstat (limited to 'security/libprelude/patches')
-rw-r--r-- | security/libprelude/patches/patch-aa | 21 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ac | 13 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ad | 21 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ae | 10 | ||||
-rw-r--r-- | security/libprelude/patches/patch-af | 19 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ag | 22 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ah | 13 | ||||
-rw-r--r-- | security/libprelude/patches/patch-ai | 22 |
8 files changed, 115 insertions, 26 deletions
diff --git a/security/libprelude/patches/patch-aa b/security/libprelude/patches/patch-aa index 215a0e86081..aa8b48fd33d 100644 --- a/security/libprelude/patches/patch-aa +++ b/security/libprelude/patches/patch-aa @@ -1,17 +1,17 @@ -$NetBSD: patch-aa,v 1.7 2009/02/10 21:11:13 joerg Exp $ +$NetBSD: patch-aa,v 1.8 2009/08/23 18:56:34 hasso Exp $ ---- Makefile.in.orig 2008-04-24 04:50:26.000000000 -0600 -+++ Makefile.in -@@ -559,7 +559,7 @@ infodir = @infodir@ +--- Makefile.in.orig 2009-07-08 16:37:14 +0200 ++++ Makefile.in 2009-07-20 00:38:41 +0200 +@@ -865,7 +865,7 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ -localedir = @localedir@ +localedir = @prefix@/share/locale localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ -@@ -1099,71 +1099,14 @@ prelude-config.h: $(top_builddir)/config + lt_ECHO = @lt_ECHO@ + ltdl_LIBOBJS = @ltdl_LIBOBJS@ +@@ -1525,71 +1525,13 @@ # Spool directory for report saving is mode install-data-local: @@ -85,7 +85,6 @@ $NetBSD: patch-aa,v 1.7 2009/02/10 21:11:13 joerg Exp $ - 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 -+ - # 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: + + dist-hook: + @if test -d "$(srcdir)/.git"; then \ diff --git a/security/libprelude/patches/patch-ac b/security/libprelude/patches/patch-ac new file mode 100644 index 00000000000..bc94e926a66 --- /dev/null +++ b/security/libprelude/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.7 2009/08/23 18:56:34 hasso Exp $ + +--- src/Makefile.in.orig 2008-12-12 15:49:25 +0100 ++++ src/Makefile.in 2008-12-12 15:49:32 +0100 +@@ -183,7 +183,7 @@ + libprelude_la_OBJECTS = $(am_libprelude_la_OBJECTS) + libprelude_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(libprelude_la_LDFLAGS) $(LDFLAGS) -o $@ ++ $(libprelude_la_LDFLAGS) $(LDFLAGS) $(LIBMULTITHREAD) -o $@ + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles diff --git a/security/libprelude/patches/patch-ad b/security/libprelude/patches/patch-ad index 6dafcc4c813..adc27478d51 100644 --- a/security/libprelude/patches/patch-ad +++ b/security/libprelude/patches/patch-ad @@ -1,13 +1,14 @@ -$NetBSD: patch-ad,v 1.5 2007/09/15 08:30:51 joerg Exp $ +$NetBSD: patch-ad,v 1.6 2009/08/23 18:56:34 hasso Exp $ ---- src/prelude-failover.c.orig 2007-09-15 08:00:29.000000000 +0000 -+++ src/prelude-failover.c -@@ -381,7 +381,7 @@ static int get_failover_data_filename_an - - while ( (de = readdir(dir)) && ret != 1 ) { +From Till Dörges on the prelude-devel ML. + +--- libprelude-config.in.orig 2009-07-21 00:31:43 +0200 ++++ libprelude-config.in 2009-07-21 00:31:58 +0200 +@@ -70,6 +70,7 @@ + ;; -- if ( de->d_reclen <= 4 || ! isdigit(de->d_name[4]) ) -+ if (! isdigit(de->d_name[4]) ) - continue; + --ldflags) ++ echo "-Wl,-rpath -Wl,@libdir@" + ;; - if ( strncmp(de->d_name, "data", 4) != 0 || strchr(de->d_name, '.') ) + --c++) diff --git a/security/libprelude/patches/patch-ae b/security/libprelude/patches/patch-ae index 26c844ee5ac..f8bd5faacc7 100644 --- a/security/libprelude/patches/patch-ae +++ b/security/libprelude/patches/patch-ae @@ -1,13 +1,13 @@ -$NetBSD: patch-ae,v 1.1 2008/04/28 10:52:40 shannonjr Exp $ +$NetBSD: patch-ae,v 1.2 2009/08/23 18:56:34 hasso Exp $ --- configure.orig 2008-04-25 07:08:22.000000000 -0600 +++ configure @@ -44961,7 +44961,7 @@ fi - { echo "$as_me:$LINENO: checking for cpu-specific compiler flags" >&5 - echo $ECHO_N "checking for cpu-specific compiler flags... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for cpu-specific compiler flags" >&5 + $as_echo_n "checking for cpu-specific compiler flags... " >&6; } -if test "$host_cpu" == "x86_64" && test $enable_static = "yes"; then +if test "$host_cpu" = "x86_64" && test $enable_static = "yes"; then - { echo "$as_me:$LINENO: result: x86_64/static: adding -fPIC" >&5 - echo "${ECHO_T}x86_64/static: adding -fPIC" >&6; } + { $as_echo "$as_me:$LINENO: result: x86_64/static: adding -fPIC" >&5 + $as_echo "x86_64/static: adding -fPIC" >&6; } diff --git a/security/libprelude/patches/patch-af b/security/libprelude/patches/patch-af new file mode 100644 index 00000000000..822a2270362 --- /dev/null +++ b/security/libprelude/patches/patch-af @@ -0,0 +1,19 @@ +$NetBSD: patch-af,v 1.1 2009/08/23 18:56:34 hasso Exp $ + +--- src/include/prelude-plugin.h.orig 2009-07-21 11:20:33 +0200 ++++ src/include/prelude-plugin.h 2009-07-21 11:20:43 +0200 +@@ -55,14 +55,6 @@ + + + +-/* +- * Hack for plugin preloading, +- * without having the end program depend on ltdl. +- */ +-#ifdef PRELUDE_APPLICATION_USE_LIBTOOL2 +-# define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols +-#endif +- + extern const void *lt_preloaded_symbols[]; + + #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \ diff --git a/security/libprelude/patches/patch-ag b/security/libprelude/patches/patch-ag new file mode 100644 index 00000000000..23afa25f369 --- /dev/null +++ b/security/libprelude/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1 2009/08/23 18:56:34 hasso Exp $ + +--- bindings/lua/Makefile.in.orig 2009-07-24 19:26:18 +0300 ++++ bindings/lua/Makefile.in 2009-07-24 19:27:20 +0300 +@@ -194,7 +194,7 @@ am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' + am__installdirs = "$(DESTDIR)$(PreludeEasydir)" + LTLIBRARIES = $(PreludeEasy_LTLIBRARIES) +-@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la ++@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/../.buildlink/lib/libpreludecpp.la + am__PreludeEasy_la_SOURCES_DIST = PreludeEasy.cxx + @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@am_PreludeEasy_la_OBJECTS = \ + @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@ PreludeEasy.lo +@@ -860,7 +860,7 @@ top_srcdir = @top_srcdir@ + @HAVE_EASY_BINDINGS_TRUE@EXTRA_DIST = libpreludecpp-lua.i PreludeEasy.cxx + @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@AM_CPPFLAGS = -I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include @LUA_CFLAGS@ -I@top_srcdir@/libmissing -I@top_builddir@/libmissing + @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_LDFLAGS = -module -avoid-version @LUA_LIBS@ +-@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la ++@HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludecpp.la + @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_la_SOURCES = PreludeEasy.cxx + @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasydir = $(libdir) + @HAVE_EASY_BINDINGS_TRUE@@HAVE_LUA_TRUE@PreludeEasy_LTLIBRARIES = PreludeEasy.la diff --git a/security/libprelude/patches/patch-ah b/security/libprelude/patches/patch-ah new file mode 100644 index 00000000000..c85c460e8df --- /dev/null +++ b/security/libprelude/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2009/08/23 18:56:34 hasso Exp $ + +--- bindings/perl/Makefile.PL.in.orig 2009-07-24 19:55:09 +0300 ++++ bindings/perl/Makefile.PL.in 2009-07-24 19:58:01 +0300 +@@ -6,7 +6,7 @@ use Cwd "abs_path"; + + my %attributs = (NAME => 'PreludeEasy', + INC => '-I@top_srcdir@ -I@top_builddir@/src/include -I@top_srcdir@/src/include -I@top_builddir@/src/libprelude-error -I@top_srcdir@/bindings/c++/include -I@top_srcdir@/libmissing -I@top_builddir@/libmissing', +- LIBS => ["-L@top_builddir@/src/.libs -lprelude -L@top_builddir@/bindings/c++/.libs -lpreludecpp", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ], ++ LIBS => ["-L@top_builddir@/../.buildlink/lib -lprelude -lpreludecpp", "-L$ENV{LIBDIR} -lprelude @LIBPRELUDE_LIBS@ @LIBADD_DL@ @LTLIBTHREAD@" ], + LDDLFLAGS => "-L@top_builddir@/src/.libs $Config{lddlflags}"); + + if ( abs_path("@top_srcdir@") ne abs_path("@top_builddir@") ) { diff --git a/security/libprelude/patches/patch-ai b/security/libprelude/patches/patch-ai new file mode 100644 index 00000000000..9a64aaf9a74 --- /dev/null +++ b/security/libprelude/patches/patch-ai @@ -0,0 +1,22 @@ +$NetBSD: patch-ai,v 1.1 2009/08/23 18:56:34 hasso Exp $ + +--- bindings/ruby/Makefile.in.orig 2009-07-24 20:01:14 +0300 ++++ bindings/ruby/Makefile.in 2009-07-24 20:02:07 +0300 +@@ -195,7 +195,7 @@ am__base_list = \ + am__installdirs = "$(DESTDIR)$(rbexecdir)" + LTLIBRARIES = $(rbexec_LTLIBRARIES) + am__DEPENDENCIES_1 = +-@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la \ ++@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_DEPENDENCIES = $(top_builddir)/../.buildlink/lib/libpreludecpp.la \ + @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@ $(am__DEPENDENCIES_1) + @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@nodist_PreludeEasy_la_OBJECTS = PreludeEasy_la-PreludeEasy.lo + PreludeEasy_la_OBJECTS = $(nodist_PreludeEasy_la_OBJECTS) +@@ -860,7 +860,7 @@ top_srcdir = @top_srcdir@ + @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@rbexec_LTLIBRARIES = PreludeEasy.la + @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_CPPFLAGS = $(RUBY_INCLUDES) $(RUBY_CCFLAGS) -I@top_builddir@ -I$(top_srcdir)/src/include -I$(top_builddir)/src/include -I@top_builddir@/src/libprelude-error -I$(top_srcdir)/bindings/c++/include -I@top_srcdir@/libmissing -I@top_builddir@/libmissing + @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_LDFLAGS = -module -avoid-version +-@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/bindings/c++/.libs/libpreludecpp.la $(RUBY_LIBS) ++@HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@PreludeEasy_la_LIBADD = $(top_builddir)/../.buildlink/lib/libpreludecpp.la $(RUBY_LIBS) + @HAVE_EASY_BINDINGS_TRUE@@HAVE_RUBY_TRUE@nodist_PreludeEasy_la_SOURCES = PreludeEasy.cxx + all: all-am + |