Attachment 87704 Details for Bug 124331 – openvas-libraries-1.0.1_1.patch

[patch] openvas-libraries-1.0.1_1.patch

openvas-libraries-1.0.1_1.patch (text/plain), 9.77 KB, created by Tomoyuki Sakurai on 2008-06-06 02:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomoyuki Sakurai

Created: 2008-06-06 02:50:01 UTC

Size: 9.77 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/security/openvas-libraries/Makefile /usr/home/cherry/svk/ports/security/openvas-libraries/Makefile
>--- /usr/ports/security/openvas-libraries/Makefile	2008-06-04 22:15:44.000000000 +0900
>+++ /usr/home/cherry/svk/ports/security/openvas-libraries/Makefile	2008-06-06 10:39:38.000000000 +0900
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	openvas-libraries
> PORTVERSION=	1.0.1
>+PORTREVISION=	1
> CATEGORIES=	security
> MASTER_SITES=	http://wald.intevation.org/frs/download.php/419/
> 
>@@ -16,12 +17,13 @@
> 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
> 
> MAN1=		libopenvas-config.1
> 
>-.include "${.CURDIR}/../../security/openvas-server/Makefile.common"
>+.include "${.CURDIR}/../../security/openvas-libraries/Makefile.common"
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/security/openvas-libraries/Makefile.common /usr/home/cherry/svk/ports/security/openvas-libraries/Makefile.common
>--- /usr/ports/security/openvas-libraries/Makefile.common	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/home/cherry/svk/ports/security/openvas-libraries/Makefile.common	2008-06-06 10:18:22.000000000 +0900
>@@ -0,0 +1,4 @@
>+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include \
>+					--localstatedir=${PREFIX}/openvas \
>+					--sharedstatedir=${PREFIX}/openvas/com \
>+					--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>diff -ruN --exclude=CVS /usr/ports/security/openvas-libraries/files/patch-configure /usr/home/cherry/svk/ports/security/openvas-libraries/files/patch-configure
>--- /usr/ports/security/openvas-libraries/files/patch-configure	2008-06-04 22:15:44.000000000 +0900
>+++ /usr/home/cherry/svk/ports/security/openvas-libraries/files/patch-configure	2008-06-06 10:18:22.000000000 +0900
>@@ -1,6 +1,16 @@
> --- configure.orig	2008-03-27 03:57:28.000000000 +0900
>-+++ configure	2008-04-26 22:00:22.000000000 +0900
>-@@ -8136,7 +8136,7 @@
>++++ configure	2008-06-06 09:42:17.000000000 +0900
>+@@ -6343,7 +6343,8 @@
>+ 
>+ freebsd*)
>+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
>+-  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}.so$versuffix ${libname}${release}.so $libname.so'
>+@@ -8136,7 +8137,7 @@
>    echo $ECHO_N "(cached) $ECHO_C" >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
>@@ -9,7 +19,7 @@
>  cat >conftest.$ac_ext <<_ACEOF
>  /* confdefs.h.  */
>  _ACEOF
>-@@ -8192,7 +8192,7 @@
>+@@ -8192,7 +8193,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
>@@ -18,7 +28,7 @@
>  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;}
>-@@ -8290,11 +8290,11 @@
>+@@ -8290,11 +8291,11 @@
>  #ifdef __cplusplus
>  extern "C"
>  #endif
>@@ -32,7 +42,7 @@
>    ;
>    return 0;
>  }
>-@@ -12909,7 +12909,7 @@
>+@@ -12909,7 +12910,7 @@
>    echo $ECHO_N "(cached) $ECHO_C" >&6
>  else
>    ac_check_lib_save_LIBS=$LIBS
>diff -ruN --exclude=CVS /usr/ports/security/openvas-libraries/files/patch-libopenvas-Makefile /usr/home/cherry/svk/ports/security/openvas-libraries/files/patch-libopenvas-Makefile
>--- /usr/ports/security/openvas-libraries/files/patch-libopenvas-Makefile	1970-01-01 09:00:00.000000000 +0900
>+++ /usr/home/cherry/svk/ports/security/openvas-libraries/files/patch-libopenvas-Makefile	2008-06-06 10:18:22.000000000 +0900
>@@ -0,0 +1,105 @@
>+honor CPPFLAGS and CFLAGS
>+
>+--- libopenvas/Makefile.orig	2008-04-27 17:29:09.000000000 +0900
>++++ libopenvas/Makefile	2008-04-27 17:29:32.000000000 +0900
>+@@ -46,76 +46,76 @@
>+ 
>+ 
>+ getopt.o : getopt.c
>+-	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt.c
>++	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c getopt.c
>+ 
>+ getopt1.o : getopt1.c
>+-	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt1.c
>++	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CPPFLAGS) $(CFLAGS) -c getopt1.c
>+ 
>+ 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)
>diff -ruN --exclude=CVS /usr/ports/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in /usr/home/cherry/svk/ports/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in
>--- /usr/ports/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in	2008-06-04 22:15:44.000000000 +0900
>+++ /usr/home/cherry/svk/ports/security/openvas-libraries/files/patch-openvas-libraries.tmpl.in	2008-06-06 10:18:22.000000000 +0900
>@@ -1,11 +1,14 @@
>---- openvas-libraries.tmpl.in.orig	2008-04-26 22:46:43.000000000 +0900
>-+++ openvas-libraries.tmpl.in	2008-04-26 22:47:03.000000000 +0900
>-@@ -45,7 +45,7 @@
>+honor CPPFLAGS and LDFLAGS
>+--- openvas-libraries.tmpl.in.orig	2008-03-21 06:00:30.000000000 +0900
>++++ openvas-libraries.tmpl.in	2008-04-27 17:27:45.000000000 +0900
>+@@ -62,8 +62,9 @@
>+ DEBUG_SSL = @debug_ssl@
>  
>- libsdir=${rootdir}/libs
>- top_builddir = @PWDD@
>--include= -I. -I$(rootdir)/include
>-+include= -I. -I$(rootdir)/include -I$(includedir)
>- lib_dir=@libdir@
>- USE_CIPHER=@cipher_cflags@
>- INSTALL=@INSTALL@
>+ # Some defines you may want to modify
>++CPPFLAGS=@CPPFLAGS@
>+ DEFS=@DEFS@ $(DEBUG_SSL) $(USE_CIPHER) $(DEBUG)
>+-LDFLAGS=
>++LDFLAGS=@LDFLAGS@
>+ 
>+ # Your C compiler
>+ CC=@CC@

Actions: View | Diff

Attachments on bug 124331: 87704