View | Details | Raw Unified | Return to bug 131286 | Differences between
and this patch

Collapse All | Expand All

(-)libprelude/Makefile (-13 / +16 lines)
Lines 4-11 Link Here
4
# $FreeBSD: ports/security/libprelude/Makefile,v 1.58 2008/11/30 21:00:11 remko Exp $
4
# $FreeBSD: ports/security/libprelude/Makefile,v 1.58 2008/11/30 21:00:11 remko Exp $
5
5
6
PORTNAME=	libprelude
6
PORTNAME=	libprelude
7
PORTVERSION=	0.9.20.2
7
PORTVERSION=	0.9.21.2
8
PORTREVISION=	1
8
PORTREVISION=	2
9
CATEGORIES=	security
9
CATEGORIES=	security
10
MASTER_SITES=	http://www.prelude-ids.com/download/releases/%SUBDIR%/
10
MASTER_SITES=	http://www.prelude-ids.com/download/releases/%SUBDIR%/
11
MASTER_SITE_SUBDIR=	${PORTNAME} ${PORTNAME}/old
11
MASTER_SITE_SUBDIR=	${PORTNAME} ${PORTNAME}/old
Lines 22-28 Link Here
22
GNU_CONFIGURE=		yes
22
GNU_CONFIGURE=		yes
23
USE_LDCONFIG=		yes
23
USE_LDCONFIG=		yes
24
CONFIGURE_ARGS=	--localstatedir=/var \
24
CONFIGURE_ARGS=	--localstatedir=/var \
25
			--enable-gtk-doc=no
25
		--enable-gtk-doc=no \
26
		--with-html-dir=${PREFIX}/share/doc
26
27
27
MAN1=		prelude-admin.1
28
MAN1=		prelude-admin.1
28
PORTDOCS=	*
29
PORTDOCS=	*
Lines 31-36 Link Here
31
32
32
.if defined(WITH_PERL)
33
.if defined(WITH_PERL)
33
USE_PERL5=		yes
34
USE_PERL5=		yes
35
.include "${PORTSDIR}/Mk/bsd.perl.mk"
34
CONFIGURE_ARGS+=	--with-perl
36
CONFIGURE_ARGS+=	--with-perl
35
PLIST_SUB+=		WITH_PERL=""
37
PLIST_SUB+=		WITH_PERL=""
36
.else
38
.else
Lines 39-45 Link Here
39
.endif
41
.endif
40
42
41
.if defined(WITH_PYTHON)
43
.if defined(WITH_PYTHON)
42
USE_PYTHON=		2.3+
44
USE_PYTHON=     yes
45
.include "${PORTSDIR}/Mk/bsd.python.mk"
43
CONFIGURE_ARGS+=	--with-python
46
CONFIGURE_ARGS+=	--with-python
44
PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
47
PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
45
.else
48
.else
Lines 47-56 Link Here
47
PLIST_SUB+=		WITH_PYTHON="@comment "
50
PLIST_SUB+=		WITH_PYTHON="@comment "
48
.endif
51
.endif
49
52
50
.if !defined(NOPORTDOCS)
51
CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
52
.endif
53
54
.if ${ARCH} == "sparc64"
53
.if ${ARCH} == "sparc64"
55
BROKEN=		Does not compile
54
BROKEN=		Does not compile
56
.endif
55
.endif
Lines 60-83 Link Here
60
	${INSTALL} -d ${DOCSDIR}
59
	${INSTALL} -d ${DOCSDIR}
61
	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
60
	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
62
.endif
61
.endif
63
64
	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
62
	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
65
63
	@${INSTALL_DATA} ${WRKSRC}/client.conf \
64
	                ${PREFIX}/etc/prelude/default/client.conf-dist
65
	@${INSTALL_DATA} ${WRKSRC}/global.conf \
66
	                ${PREFIX}/etc/prelude/default/global.conf-dist
67
	@${INSTALL_DATA} ${WRKSRC}/tls.conf \
68
	                ${PREFIX}/etc/prelude/default/tls.conf-dist
69
	@${INSTALL_DATA} ${WRKSRC}/idmef-client.conf \
70
	                ${PREFIX}/etc/prelude/default/idmef-client.conf-dist
71
					
66
	@if [ ! -f ${PREFIX}/etc/prelude/default/client.conf ]; then \
72
	@if [ ! -f ${PREFIX}/etc/prelude/default/client.conf ]; then \
67
	   ${CP} -p ${PREFIX}/etc/prelude/default/client.conf-dist \
73
	   ${CP} -p ${PREFIX}/etc/prelude/default/client.conf-dist \
68
	      ${PREFIX}/etc/prelude/default/client.conf ; \
74
	      ${PREFIX}/etc/prelude/default/client.conf ; \
69
	fi
75
	fi
70
71
	@if [ ! -f ${PREFIX}/etc/prelude/default/global.conf ]; then \
76
	@if [ ! -f ${PREFIX}/etc/prelude/default/global.conf ]; then \
72
	   ${CP} -p ${PREFIX}/etc/prelude/default/global.conf-dist \
77
	   ${CP} -p ${PREFIX}/etc/prelude/default/global.conf-dist \
73
	      ${PREFIX}/etc/prelude/default/global.conf ; \
78
	      ${PREFIX}/etc/prelude/default/global.conf ; \
74
	fi
79
	fi
75
76
	@if [ ! -f ${PREFIX}/etc/prelude/default/idmef-client.conf ]; then \
80
	@if [ ! -f ${PREFIX}/etc/prelude/default/idmef-client.conf ]; then \
77
	   ${CP} -p ${PREFIX}/etc/prelude/default/idmef-client.conf-dist \
81
	   ${CP} -p ${PREFIX}/etc/prelude/default/idmef-client.conf-dist \
78
	      ${PREFIX}/etc/prelude/default/idmef-client.conf ; \
82
	      ${PREFIX}/etc/prelude/default/idmef-client.conf ; \
79
	fi
83
	fi
80
81
	@if [ ! -f ${PREFIX}/etc/prelude/default/tls.conf ]; then \
84
	@if [ ! -f ${PREFIX}/etc/prelude/default/tls.conf ]; then \
82
	   ${CP} -p ${PREFIX}/etc/prelude/default/tls.conf-dist \
85
	   ${CP} -p ${PREFIX}/etc/prelude/default/tls.conf-dist \
83
	      ${PREFIX}/etc/prelude/default/tls.conf ; \
86
	      ${PREFIX}/etc/prelude/default/tls.conf ; \
(-)libprelude/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (libprelude-0.9.20.2.tar.gz) = 4980065cc9fc7f8d6f0ca25e902b745d
1
MD5 (libprelude-0.9.21.2.tar.gz) = 767ea378580caab14ebb4df0ee5e4129
2
SHA256 (libprelude-0.9.20.2.tar.gz) = e6df8831fe9b8f12bd12cac92ac2a891b4dfaefedbb4e8c703a696272e188e06
2
SHA256 (libprelude-0.9.21.2.tar.gz) = cc8c05f0855bfea1e02bb938547a7be4d81465bfe2d89f180e3a17325978bf19
3
SIZE (libprelude-0.9.20.2.tar.gz) = 2407849
3
SIZE (libprelude-0.9.21.2.tar.gz) = 2484552
(-)libprelude/files/patch-Makefile.in (-68 / +13 lines)
Lines 1-68 Link Here
1
--- Makefile.in.orig	2008-09-09 04:55:27.000000000 -0400
1
--- Makefile.in.orig	2008-10-13 19:04:05.000000000 +0600
2
+++ Makefile.in	2008-09-09 04:55:27.000000000 -0400
2
+++ Makefile.in	2009-02-11 13:26:51.000000000 +0500
3
@@ -1174,61 +1174,10 @@
3
@@ -725,8 +725,8 @@
4
 	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR);
4
 target_vendor = @target_vendor@
5
 	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;
5
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --without-system-ltdl --enable-easy-bindings
6
 	$(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile;
6
 ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4
7
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf; then							\
7
-@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libltdl libmissing m4 src prelude-admin bindings docs tests
8
-		echo;														\
8
-@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings docs tests
9
-		echo "********************************************************************************";          		\
9
+@HAVE_SYSTEM_LIBLTDL_FALSE@SUBDIRS = libltdl libmissing m4 src prelude-admin bindings tests
10
-                echo;														\
10
+@HAVE_SYSTEM_LIBLTDL_TRUE@SUBDIRS = libmissing m4 src prelude-admin bindings tests
11
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf already exist...";					\
11
 DIST_SUBDIRS = $(SUBDIRS)
12
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist";		\
12
 EXTRA_DIST = HACKING.README LICENSE.README tls.conf
13
-                echo;														\
13
 bin_SCRIPTS = $(top_builddir)/libprelude-config
14
-                echo "********************************************************************************";			\
15
-		echo;														\
16
-		$(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist;		\
17
-        else															\
18
-                $(INSTALL) -m 644 $(top_builddir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;				\
19
-        fi
20
-
21
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf; then							\
22
-		echo;														\
23
-		echo "********************************************************************************";          		\
24
-                echo;														\
25
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf already exist...";					\
26
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist";		\
27
-                echo;														\
28
-                echo "********************************************************************************";			\
29
-		echo;														\
30
-		$(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist;		\
31
-        else															\
32
-                $(INSTALL) -m 644 $(top_builddir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;				\
33
-        fi															
34
-
35
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf; then						\
36
-		echo;														\
37
-		echo "********************************************************************************";          		\
38
-                echo;														\
39
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf already exist...";					\
40
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist";		\
41
-                echo;														\
42
-                echo "********************************************************************************";			\
43
-		echo;														\
44
-		$(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;\
45
-        else															\
46
-                $(INSTALL) -m 644 $(top_builddir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;			\
47
-        fi
48
-
49
-	@if test -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf; then								\
50
-		echo;														\
51
-		echo "********************************************************************************";          		\
52
-                echo;														\
53
-                echo "$(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf already exist...";						\
54
-                echo "Installing default configuration in $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist";			\
55
-                echo;														\
56
-                echo "********************************************************************************";			\
57
-		echo;														\
58
-		$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist;			\
59
-        else															\
60
-                $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;					\
61
-	fi
62
+	$(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf-dist;
63
+	$(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/global.conf-dist;
64
+	$(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/idmef-client.conf-dist;
65
+	$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/tls.conf-dist;
66
 
67
 uninstall-local:
68
 	rm -f $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default/client.conf
(-)libprelude/files/patch-libmissing_Makefile.in (-65 lines)
Lines 1-65 Link Here
1
--- libmissing/Makefile.in.orig	2008-09-09 04:55:25.000000000 -0400
2
+++ libmissing/Makefile.in	2008-09-09 04:55:25.000000000 -0400
3
@@ -686,7 +686,7 @@
4
 	sys/time.h-t time.h time.h-t unistd.h unistd.h-t wchar.h \
5
 	wchar.h-t wctype.h wctype.h-t
6
 MOSTLYCLEANDIRS = arpa netinet sys sys
7
-CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
8
+CLEANFILES = configmake.h configmake.h-t ref-add.sed \
9
 	ref-del.sed
10
 DISTCLEANFILES = 
11
 MAINTAINERCLEANFILES = 
12
@@ -709,8 +709,6 @@
13
 	vsnprintf.c
14
 libmissing_la_LDFLAGS = $(AM_LDFLAGS)
15
 LINK_WARNING_H = $(top_srcdir)/./link-warning.h
16
-charset_alias = $(DESTDIR)$(libdir)/charset.alias
17
-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
18
 all: $(BUILT_SOURCES)
19
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
20
 
21
@@ -1247,44 +1245,6 @@
22
 	} > $@-t
23
 	mv $@-t $@
24
 
25
-# We need the following in order to install a simple file in $(libdir)
26
-# which is shared with other installed packages. We use a list of referencing
27
-# packages so that "make uninstall" will remove the file if and only if it
28
-# is not used by another installed package.
29
-# On systems with glibc-2.1 or newer, the file is redundant, therefore we
30
-# avoid installing it.
31
-
32
-all-local: charset.alias ref-add.sed ref-del.sed
33
-install-exec-local: all-local
34
-	test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
35
-	if test -f $(charset_alias); then \
36
-	  sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
37
-	  $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
38
-	  rm -f $(charset_tmp) ; \
39
-	else \
40
-	  if test $(GLIBC21) = no; then \
41
-	    sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
42
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
43
-	    rm -f $(charset_tmp) ; \
44
-	  fi ; \
45
-	fi
46
-
47
-uninstall-local: all-local
48
-	if test -f $(charset_alias); then \
49
-	  sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
50
-	  if grep '^# Packages using this file: $$' $(charset_tmp) \
51
-	      > /dev/null; then \
52
-	    rm -f $(charset_alias); \
53
-	  else \
54
-	    $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
55
-	  fi; \
56
-	  rm -f $(charset_tmp); \
57
-	fi
58
-
59
-charset.alias: config.charset
60
-	rm -f t-$@ $@
61
-	$(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
62
-	mv t-$@ $@
63
 .sin.sed:
64
 	rm -f t-$@ $@
65
 	sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
(-)libprelude/pkg-plist (-8 / +2 lines)
Lines 59-80 Link Here
59
include/libprelude/prelude-thread.h
59
include/libprelude/prelude-thread.h
60
include/libprelude/prelude-timer.h
60
include/libprelude/prelude-timer.h
61
include/libprelude/prelude.h
61
include/libprelude/prelude.h
62
include/libprelude/variable.h
63
lib/libprelude.la
62
lib/libprelude.la
64
lib/libprelude.so
63
lib/libprelude.so
65
lib/libprelude.so.17
64
lib/libprelude.so.19
66
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
65
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
67
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
66
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
68
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs
67
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs
69
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so
68
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so
70
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude
69
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude
71
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeEasy.pm
72
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/.packlist
73
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.bs
74
%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.so
75
%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy
76
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
70
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
77
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.0.0-py%%PYTHON_VER%%.egg-info
71
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.9.21.2-py%%PYTHON_VER%%.egg-info
78
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
72
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
79
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
73
%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
80
share/aclocal/libprelude.m4
74
share/aclocal/libprelude.m4

Return to bug 131286