Attachment #98334 for bug #137208

View | Details | Raw Unified | Return to bug 137208
Collapse All | Expand All




#

PORTNAME=	openvas-libraries
PORTVERSION=	2.0.3
PORTREVISION=	1
CATEGORIES=	security
MASTER_SITES=	http://wald.intevation.org/frs/download.php/600/

MAINTAINER=	cherry@trombik.org
COMMENT=	Libraries for OpenVAS

LIB_DEPENDS=	gnutls.26:${PORTSDIR}/security/gnutls

LDFLAGS+=	-L${LOCALBASE}/lib
CPPFLAGS+=	-I${LOCALBASE}/include
CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes


Lines 1-3 Link Here

(-)openvas-libraries/Makefile.common (-3 / +8 lines)
1	CONFIGURE_ARGS+= --includedir=${PREFIX}/include \	1	CONFIGURE_ARGS+=--includedir=${PREFIX}/include \
2	--localstatedir=${PREFIX}/openvas \	2	--libdir=${PREFIX}/lib \
3	--sharedstatedir=${PREFIX}/openvas/com	3	--localstatedir=${PREFIX}/openvas \
		4	--sharedstatedir=${PREFIX}/openvas/com
		5	LDFLAGS+= -L${LOCALBASE}/lib
		6	CFLAGS+= -I${PREFIX}/include
		7	CPPFLAGS+= -I${LOCALBASE}/include
		8	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

Lines 1-3 Link Here

(-)openvas-libraries/distinfo (-3 / +3 lines)
1	MD5 (openvas-libraries-1.0.1.tar.gz) = 59eff43239e05bed77f2b3e789e0110b	1	MD5 (openvas-libraries-2.0.3.tar.gz) = 9df63a63c1ea134e0218d7a8f2ffd288
2	SHA256 (openvas-libraries-1.0.1.tar.gz) = 6d423d82d6e71e519df79596d30fad6ffefd480ed8a0dd7282fb5b749cee72e3	2	SHA256 (openvas-libraries-2.0.3.tar.gz) = 9847e99b92bf2269c5157c69799de127fadcb83af19bfb7320c1c91036a6cc62
3	SIZE (openvas-libraries-1.0.1.tar.gz) = 312409	3	SIZE (openvas-libraries-2.0.3.tar.gz) = 482097





$FreeBSD$

--- configure.orig
+++ configure
@@ -8282,7 +8282,7 @@
     *) objformat=elf ;;
     esac
   fi
-  version_type=freebsd-$objformat
+  # recent FreeBSD only supports elf. objformat was removed from FreeBSD 7
+  version_type=freebsd-elf
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -12192,7 +12192,7 @@
     *) objformat=elf ;;
     esac
   fi
-  version_type=freebsd-$objformat
+  version_type=freebsd-elf
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -14764,7 +14764,7 @@
     *) objformat=elf ;;
     esac
   fi
-  version_type=freebsd-$objformat
+  version_type=freebsd-elf
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -17343,7 +17343,7 @@
     *) objformat=elf ;;
     esac
   fi
-  version_type=freebsd-$objformat
+  version_type=freebsd-elf
   case $version_type in
     freebsd-elf*)
       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
@@ -19078,7 +19078,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lresolv  $LIBS"
+LIBS="$LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19134,7 +19134,7 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; }
 if test $ac_cv_lib_resolv_dn_expand = yes; then
-  LIBS="-lresolv $LIBS"
+  LIBS="$LIBS"
 else
   { echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
 echo $ECHO_N "checking for __dn_expand in -lresolv... $ECHO_C" >&6; }
@@ -19142,7 +19142,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -19198,7 +19198,7 @@
 { echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6; }
 if test $ac_cv_lib_resolv___dn_expand = yes; then

 else
   { { echo "$as_me:$LINENO: error: you need to install resolve library with development files" >&5
 echo "$as_me: error: you need to install resolve library with development files" >&2;}
@@ -19298,11 +19298,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif

   ;
   return 0;
 }
@@ -23773,7 +23773,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS




honor CPPFLAGS and CFLAGS

$FreeBSD$

--- libopenvas/Makefile.orig
+++ libopenvas/Makefile
@@ -48,7 +48,7 @@
 CFLAGS+=-g -Wall
 INCLUDE = $(include) $(GLIB_CFLAGS) $(DEFS) -I../libopenvascommon
 CIPHER = -I../$(CIPHER_SUBDIR)
-COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS)
+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS)
 LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
 all : libopenvas.la
 
 plugutils.o : plugutils.c
-	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c plugutils.c
+	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c plugutils.c
 
 resolve.o : resolve.c resolve.h
-	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c resolve.c
+	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c resolve.c
 
 share_fd.o : share_fd.c 
-	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c share_fd.c
+	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c share_fd.c
 
 system.o : system.c system_internal.h
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c system.c 
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c system.c 
 
 arglists.o : arglists.c 
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c arglists.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c arglists.c
 
 network.o : network.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c network.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c network.c
 
 scanners_utils.o : scanners_utils.c scanners_utils.h
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c scanners_utils.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c scanners_utils.c
 
 ftp_funcs.o : ftp_funcs.c ftp_funcs.h
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ftp_funcs.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ftp_funcs.c
 www_funcs.o : www_funcs.c 
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c www_funcs.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c www_funcs.c
 	
 pcap.o : pcap.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c pcap.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c pcap.c
 
 hlst.o : hlst.c hlst.h
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c hlst.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c hlst.c
 
 ptycall.o : ptycall.c 
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ptycall.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ptycall.c
 
 harglists.o : harglists.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c harglists.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c harglists.c
 
 ids_send.o : ids_send.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c 
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ids_send.c 
 
 bpf_share.o: bpf_share.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c bpf_share.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c bpf_share.c
 
 rand.o: rand.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c rand.c
 
 popen.o: popen.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c popen.c
 
 services.o: services.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
 
 services1.o: services1.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
 
 proctitle.o: proctitle.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c proctitle.c
 
 store.o: store.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
 	
 	
 kb.o: kb.c
-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c kb.c
+	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c kb.c
 
 
 libopenvas.la: $(OBJS)

Lines 1-5 Link Here

(-)openvas-libraries/files/patch-libopenvas-pcap.c (-4 / +7 lines)
1	--- libopenvas/pcap.c.orig 2008-03-21 06:25:01.000000000 +0900	1
2	+++ libopenvas/pcap.c 2008-04-26 23:47:15.000000000 +0900	2	$FreeBSD$
		3
		4	--- libopenvas/pcap.c.orig
		5	+++ libopenvas/pcap.c
3	@@ -16,9 +16,7 @@	6	@@ -16,9 +16,7 @@
4	* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	7	* Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
5	*/	8	*/
Lines 7-16 Link Here
7	-#include <resolv.h>	10	-#include <resolv.h>
8	#include <pcap.h>	11	#include <pcap.h>
9	-#include <net/if.h>	12	-#include <net/if.h>
		13	#include <netinet/in.h>
10	#include <arpa/inet.h>	14	#include <arpa/inet.h>
11	#include <sys/ioctl.h>	15	#include <sys/ioctl.h>
12	#include <netdb.h>	16	@@ -29,6 +27,10 @@
13	@@ -28,6 +26,10 @@
14	#include <stdlib.h>	17	#include <stdlib.h>
15	#include <string.h>	18	#include <string.h>
16	#include <unistd.h>	19	#include <unistd.h>

Lines 1-11 Link Here

(-)openvas-libraries/files/patch-libopenvas-plugutils.c (-11 lines)
1	--- libopenvas/plugutils.c.orig 2008-04-26 22:03:11.000000000 +0900
2	+++ libopenvas/plugutils.c 2008-04-26 22:03:21.000000000 +0900
3	@@ -35,7 +35,7 @@
4	#include <unistd.h>
5	#include <errno.h>
6	#include <signal.h>
7	-#include <wait.h>
8	+#include <sys/wait.h>
9	#include <time.h>
10
11	#include "arglists.h"





$FreeBSD$

--- openvas-libraries.tmpl.in.orig
+++ openvas-libraries.tmpl.in
@@ -61,7 +61,8 @@
 DEBUG_SSL = @debug_ssl@
 
 # Some defines you may want to modify
-DEFS=@DEFS@ $(DEBUG_SSL) $(DEBUG)
+CPPFLAGS=@CPPFLAGS@
+DEFS=@DEFS@ $(CFLAGS) $(CPPFLAGS)
 LDFLAGS=@LDFLAGS@
+LDFLAGS=@LDFLAGS@
 
 # Your C compiler
 CC=@CC@




@comment $FreeBSD: ports/security/openvas-libraries/pkg-plist,v 1.1 2008/06/04 13:15:44 edwin Exp $
bin/libopenvas-config
lib/libopenvas.so.1
lib/libopenvas.so
lib/libopenvas.la
lib/libopenvas.a
lib/libopenvas_hg.so.1
lib/libopenvas_hg.so
lib/libopenvas_hg.la
lib/libopenvas_hg.a

include/openvas/hosts_gatherer.h
include/openvas/hg_utils.h
include/openvas/libopenvas.h
include/openvas/libvers.h
include/openvas/getopt.h
include/openvas/arglists.h
include/openvas/bpf_share.h
include/openvas/certificate.h
include/openvas/ftp_funcs.h
include/openvas/harglists.h
include/openvas/hash_table_file.h
include/openvas/hg_utils.h
include/openvas/hosts_gatherer.h
include/openvas/kb.h
include/openvas/libopenvas.h
include/openvas/libvers.h
include/openvas/network.h
include/openvas/ntp.h
include/openvas/nvti.h
include/openvas/openvas_auth.h
include/openvas/openvas_logging.h
include/openvas/openvas_server.h
include/openvas/openvas_ssh_login.h
include/openvas/pcap_openvas.h
include/openvas/plugutils.h
include/openvas/popen.h

include/openvas/store.h
include/openvas/system.h
include/openvas/www_funcs.h
lib/libopenvas.a
lib/libopenvas.la
lib/libopenvas.so
lib/libopenvas.so.2
lib/libopenvas_hg.a
lib/libopenvas_hg.la
lib/libopenvas_hg.so
lib/libopenvas_hg.so.2
@dirrm include/openvas

Return to bug 137208

Lines 6-24 Link Here

(-)openvas-libraries/Makefile (-6 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= openvas-libraries	8	PORTNAME= openvas-libraries
9	PORTVERSION= 1.0.1	9	PORTVERSION= 2.0.3
10	PORTREVISION= 1
11	CATEGORIES= security	10	CATEGORIES= security
12	MASTER_SITES= http://wald.intevation.org/frs/download.php/419/	11	MASTER_SITES= http://wald.intevation.org/frs/download.php/600/
13		12
14	MAINTAINER= cherry@trombik.org	13	MAINTAINER= cherry@trombik.org
15	COMMENT= Libraries for OpenVAS	14	COMMENT= Libraries for OpenVAS
16		15
17	LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls	16	LIB_DEPENDS= gnutls.26:${PORTSDIR}/security/gnutls
18		17
19	LDFLAGS+= -L${LOCALBASE}/lib
20	CPPFLAGS+= -I${LOCALBASE}/include
21	CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
22	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
23	USE_LDCONFIG= yes	19	USE_LDCONFIG= yes
24		20

Lines 1-16 Link Here

(-)openvas-libraries/files/patch-configure (-12 / +59 lines)
1	--- configure.orig 2008-03-27 03:57:28.000000000 +0900	1
2	+++ configure 2008-06-06 09:42:17.000000000 +0900	2	$FreeBSD$
3	@@ -6343,7 +6343,8 @@	3
4		4	--- configure.orig
5	freebsd*)	5	+++ configure
6	objformat=`test -x /usr/bin/objformat && /usr/bin/objformat \|\| echo aout`	6	@@ -8282,7 +8282,7 @@
		7	*) objformat=elf ;;
		8	esac
		9	fi
7	- version_type=freebsd-$objformat	10	- version_type=freebsd-$objformat
8	+ # recent FreeBSD only supports elf. objformat was removed from FreeBSD 7
9	+ version_type=freebsd-elf	11	+ version_type=freebsd-elf
10	case $version_type in	12	case $version_type in
11	freebsd-elf*)	13	freebsd-elf*)
12	library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'	14	library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
13	@@ -8136,7 +8137,7 @@	15	@@ -12192,7 +12192,7 @@
		16	*) objformat=elf ;;
		17	esac
		18	fi
		19	- version_type=freebsd-$objformat
		20	+ version_type=freebsd-elf
		21	case $version_type in
		22	freebsd-elf*)
		23	library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
		24	@@ -14764,7 +14764,7 @@
		25	*) objformat=elf ;;
		26	esac
		27	fi
		28	- version_type=freebsd-$objformat
		29	+ version_type=freebsd-elf
		30	case $version_type in
		31	freebsd-elf*)
		32	library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
		33	@@ -17343,7 +17343,7 @@
		34	*) objformat=elf ;;
		35	esac
		36	fi
		37	- version_type=freebsd-$objformat
		38	+ version_type=freebsd-elf
		39	case $version_type in
		40	freebsd-elf*)
		41	library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
		42	@@ -19078,7 +19078,7 @@
		43	echo $ECHO_N "(cached) $ECHO_C" >&6
		44	else
		45	ac_check_lib_save_LIBS=$LIBS
		46	-LIBS="-lresolv $LIBS"
		47	+LIBS="$LIBS"
		48	cat >conftest.$ac_ext <<_ACEOF
		49	/* confdefs.h. */
		50	_ACEOF
		51	@@ -19134,7 +19134,7 @@
		52	{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5
		53	echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6; }
		54	if test $ac_cv_lib_resolv_dn_expand = yes; then
		55	- LIBS="-lresolv $LIBS"
		56	+ LIBS="$LIBS"
		57	else
		58	{ echo "$as_me:$LINENO: checking for __dn_expand in -lresolv" >&5
		59	echo $ECHO_N "checking for __dn_expand in -lresolv... $ECHO_C" >&6; }
		60	@@ -19142,7 +19142,7 @@
14	echo $ECHO_N "(cached) $ECHO_C" >&6	61	echo $ECHO_N "(cached) $ECHO_C" >&6
15	else	62	else
16	ac_check_lib_save_LIBS=$LIBS	63	ac_check_lib_save_LIBS=$LIBS
Lines 19-25 Link Here
19	cat >conftest.$ac_ext <<_ACEOF	66	cat >conftest.$ac_ext <<_ACEOF
20	/* confdefs.h. */	67	/* confdefs.h. */
21	_ACEOF	68	_ACEOF
22	@@ -8192,7 +8193,7 @@	69	@@ -19198,7 +19198,7 @@
23	{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5	70	{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv___dn_expand" >&5
24	echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6; }	71	echo "${ECHO_T}$ac_cv_lib_resolv___dn_expand" >&6; }
25	if test $ac_cv_lib_resolv___dn_expand = yes; then	72	if test $ac_cv_lib_resolv___dn_expand = yes; then
Lines 28-34 Link Here
28	else	75	else
29	{ { echo "$as_me:$LINENO: error: you need to install resolve library with development files" >&5	76	{ { echo "$as_me:$LINENO: error: you need to install resolve library with development files" >&5
30	echo "$as_me: error: you need to install resolve library with development files" >&2;}	77	echo "$as_me: error: you need to install resolve library with development files" >&2;}
31	@@ -8290,11 +8291,11 @@	78	@@ -19298,11 +19298,11 @@
32	#ifdef __cplusplus	79	#ifdef __cplusplus
33	extern "C"	80	extern "C"
34	#endif	81	#endif
Lines 42-48 Link Here
42	;	89	;
43	return 0;	90	return 0;
44	}	91	}
45	@@ -12909,7 +12910,7 @@	92	@@ -23773,7 +23773,7 @@
46	echo $ECHO_N "(cached) $ECHO_C" >&6	93	echo $ECHO_N "(cached) $ECHO_C" >&6
47	else	94	else
48	ac_check_lib_save_LIBS=$LIBS	95	ac_check_lib_save_LIBS=$LIBS

Lines 1-105 Link Here

(-)openvas-libraries/files/patch-libopenvas-Makefile (-103 / +12 lines)
1	honor CPPFLAGS and CFLAGS
2		1
3	--- libopenvas/Makefile.orig 2008-04-27 17:29:09.000000000 +0900	2	$FreeBSD$
4	+++ libopenvas/Makefile 2008-04-27 17:29:32.000000000 +0900	3
5	@@ -46,76 +46,76 @@	4	--- libopenvas/Makefile.orig
6		5	+++ libopenvas/Makefile
7		6	@@ -48,7 +48,7 @@
8	getopt.o : getopt.c	7	CFLAGS+=-g -Wall
9	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt.c	8	INCLUDE = $(include) $(GLIB_CFLAGS) $(DEFS) -I../libopenvascommon
10	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c getopt.c	9	CIPHER = -I../$(CIPHER_SUBDIR)
11		10	-COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS)
12	getopt1.o : getopt1.c	11	+COMPILE = $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS)
13	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt1.c	12	LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS)
14	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c getopt1.c	13	all : libopenvas.la
15
16	plugutils.o : plugutils.c
17	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c plugutils.c
18	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c plugutils.c
19
20	resolve.o : resolve.c resolve.h
21	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c resolve.c
22	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c resolve.c
23
24	share_fd.o : share_fd.c
25	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c share_fd.c
26	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c share_fd.c
27
28	system.o : system.c system_internal.h
29	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c system.c
30	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c system.c
31
32	arglists.o : arglists.c
33	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c arglists.c
34	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c arglists.c
35
36	network.o : network.c
37	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c network.c
38	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c network.c
39
40	scanners_utils.o : scanners_utils.c scanners_utils.h
41	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c scanners_utils.c
42	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c scanners_utils.c
43
44	ftp_funcs.o : ftp_funcs.c ftp_funcs.h
45	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ftp_funcs.c
46	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ftp_funcs.c
47	www_funcs.o : www_funcs.c
48	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c www_funcs.c
49	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c www_funcs.c
50
51	pcap.o : pcap.c
52	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c pcap.c
53	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c pcap.c
54
55	hlst.o : hlst.c hlst.h
56	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c hlst.c
57	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c hlst.c
58
59	ptycall.o : ptycall.c
60	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ptycall.c
61	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ptycall.c
62
63	harglists.o : harglists.c
64	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c harglists.c
65	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c harglists.c
66
67	ids_send.o : ids_send.c
68	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c
69	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c ids_send.c
70
71	bpf_share.o: bpf_share.c
72	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c bpf_share.c
73	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c bpf_share.c
74
75	rand.o: rand.c
76	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c
77	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c rand.c
78
79	popen.o: popen.c
80	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c
81	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c popen.c
82
83	services.o: services.c
84	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
85	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
86
87	services1.o: services1.c
88	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
89	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
90
91	proctitle.o: proctitle.c
92	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c
93	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c proctitle.c
94
95	store.o: store.c
96	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
97	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
98
99
100	kb.o: kb.c
101	- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c kb.c
102	+ $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c kb.c
103
104		14
105	libopenvas.la: $(OBJS)

Lines 1-14 Link Here

(-)openvas-libraries/files/patch-openvas-libraries.tmpl.in (-8 / +9 lines)
1	honor CPPFLAGS and LDFLAGS	1
2	--- openvas-libraries.tmpl.in.orig 2008-03-21 06:00:30.000000000 +0900	2	$FreeBSD$
3	+++ openvas-libraries.tmpl.in 2008-04-27 17:27:45.000000000 +0900	3
4	@@ -62,8 +62,9 @@	4	--- openvas-libraries.tmpl.in.orig
		5	+++ openvas-libraries.tmpl.in
		6	@@ -61,7 +61,8 @@
5	DEBUG_SSL = @debug_ssl@	7	DEBUG_SSL = @debug_ssl@
6		8
7	# Some defines you may want to modify	9	# Some defines you may want to modify
		10	-DEFS=@DEFS@ $(DEBUG_SSL) $(DEBUG)
8	+CPPFLAGS=@CPPFLAGS@	11	+CPPFLAGS=@CPPFLAGS@
9	DEFS=@DEFS@ $(DEBUG_SSL) $(USE_CIPHER) $(DEBUG)	12	+DEFS=@DEFS@ $(CFLAGS) $(CPPFLAGS)
10	-LDFLAGS=	13	LDFLAGS=@LDFLAGS@
11	+LDFLAGS=@LDFLAGS@
12		14
13	# Your C compiler	15	# Your C compiler
14	CC=@CC@

Lines 1-25 Link Here

(-)openvas-libraries/pkg-plist (-16 / +20 lines)
1	@comment $FreeBSD: ports/security/openvas-libraries/pkg-plist,v 1.1 2008/06/04 13:15:44 edwin Exp $
2	bin/libopenvas-config	1	bin/libopenvas-config
3	lib/libopenvas.so.1
4	lib/libopenvas.so
5	lib/libopenvas.la
6	lib/libopenvas.a
7	lib/libopenvas_hg.so.1
8	lib/libopenvas_hg.so
9	lib/libopenvas_hg.la
10	lib/libopenvas_hg.a
11
12	include/openvas/hosts_gatherer.h
13	include/openvas/hg_utils.h
14	include/openvas/libopenvas.h
15	include/openvas/libvers.h
16	include/openvas/getopt.h
17	include/openvas/arglists.h	2	include/openvas/arglists.h
18	include/openvas/bpf_share.h	3	include/openvas/bpf_share.h
		4	include/openvas/certificate.h
19	include/openvas/ftp_funcs.h	5	include/openvas/ftp_funcs.h
20	include/openvas/harglists.h	6	include/openvas/harglists.h
		7	include/openvas/hash_table_file.h
		8	include/openvas/hg_utils.h
		9	include/openvas/hosts_gatherer.h
21	include/openvas/kb.h	10	include/openvas/kb.h
		11	include/openvas/libopenvas.h
		12	include/openvas/libvers.h
22	include/openvas/network.h	13	include/openvas/network.h
		14	include/openvas/ntp.h
		15	include/openvas/nvti.h
		16	include/openvas/openvas_auth.h
		17	include/openvas/openvas_logging.h
		18	include/openvas/openvas_server.h
		19	include/openvas/openvas_ssh_login.h
23	include/openvas/pcap_openvas.h	20	include/openvas/pcap_openvas.h
24	include/openvas/plugutils.h	21	include/openvas/plugutils.h
25	include/openvas/popen.h	22	include/openvas/popen.h
Lines 32-36 Link Here
32	include/openvas/store.h	29	include/openvas/store.h
33	include/openvas/system.h	30	include/openvas/system.h
34	include/openvas/www_funcs.h	31	include/openvas/www_funcs.h
35		32	lib/libopenvas.a
		33	lib/libopenvas.la
		34	lib/libopenvas.so
		35	lib/libopenvas.so.2
		36	lib/libopenvas_hg.a
		37	lib/libopenvas_hg.la
		38	lib/libopenvas_hg.so
		39	lib/libopenvas_hg.so.2
36	@dirrm include/openvas	40	@dirrm include/openvas