Author: timb
Date: 2008-10-12 21:01:10 +0200 (Sun, 12 Oct 2008)
New Revision: 1520
Added:
trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.dirs
trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.install
trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.dirs
trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.install
Removed:
trunk/openvas-libnasl/packaging/debian/libopenvasnasl1-dev.install
trunk/openvas-libnasl/packaging/debian/libopenvasnasl1.install
Modified:
trunk/openvas-libnasl/ChangeLog
trunk/openvas-libnasl/packaging/debian/changelog
trunk/openvas-libnasl/packaging/debian/control
trunk/openvas-libnasl/packaging/debian/copyright
trunk/openvas-libnasl/packaging/debian/rules
Log:
New upstream release
Cleaned up the rules
Updated copyright
Modified: trunk/openvas-libnasl/ChangeLog
===================================================================
--- trunk/openvas-libnasl/ChangeLog 2008-10-12 18:40:04 UTC (rev 1519)
+++ trunk/openvas-libnasl/ChangeLog 2008-10-12 19:01:10 UTC (rev 1520)
@@ -6,6 +6,17 @@
(aclocal && libtoolize --copy --force) as libraries were
being created with *no* extension.
+ * packaging/debian/changelog: Updated.
+
+ * packaging/debian/copyright: Updated.
+
+ * packaging/debian/rules: Cleaned up.
+
+ * packaging/debian/libopenvasnasl2-dev.dirs,
+ packaging/debian/libopenvasnasl2-dev.install,
+ packaging/debian/libopenvasnasl2.dirs,
+ packaging/debian/libopenvasnasl2.install: Added.
+
2008-10-05 Tim Brown <[EMAIL PROTECTED]>
* nasl/nasl_cmd_exec.c: Fixed potential symlink attacks against fread,
Modified: trunk/openvas-libnasl/packaging/debian/changelog
===================================================================
--- trunk/openvas-libnasl/packaging/debian/changelog 2008-10-12 18:40:04 UTC
(rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/changelog 2008-10-12 19:01:10 UTC
(rev 1520)
@@ -1,3 +1,13 @@
+openvas-libnasl (2.0.0.beta1-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Refreshed auto* (aclocal && libtoolize --copy --force) as libraries were
+ being created with *no* extension
+ * Cleaned up the rules
+ * Updated copyright
+
+ -- Tim Brown <[EMAIL PROTECTED]> Sun, 12 Oct 2008 19:53:32 +0100
+
openvas-libnasl (1.0.1-1) unstable; urgency=low
* New upstream release
Modified: trunk/openvas-libnasl/packaging/debian/control
===================================================================
--- trunk/openvas-libnasl/packaging/debian/control 2008-10-12 18:40:04 UTC
(rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/control 2008-10-12 19:01:10 UTC
(rev 1520)
@@ -3,16 +3,17 @@
Priority: optional
Maintainer: Debian OpenVAS Maintainers <[EMAIL PROTECTED]>
Uploaders: Tim Brown <[EMAIL PROTECTED]>, Javier Fernandez-Sanguino Pen~a
<[EMAIL PROTECTED]>, Jan Wagner <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), autotools-dev, libopenvas1-dev (>= 1.0.2) ,
libgpgme11-dev (>= 1.1.5), bison, libpcap0.8-dev, libgcrypt11-dev, libgnutls-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libopenvas2-dev (>= 2.0.0) ,
libgpgme11-dev (>= 1.1.5), bison, libpcap0.8-dev, libgcrypt11-dev,
libgnutls-dev, libglib2.0-dev
Homepage: http://www.openvas.org/
Vcs-Browser:
http://wald.intevation.org/plugins/scmsvn/viewcvs.php/trunk/openvas-libnasl/packaging/debian/?root=openvas
Vcs-Svn:
https://svn.wald.intevation.org/svn/openvas/trunk/openvas-libnasl/packaging/debian/
Standards-Version: 3.8.0
-Package: libopenvasnasl1-dev
+Package: libopenvasnasl2-dev
Section: libdevel
Architecture: any
-Depends: libopenvasnasl1 (= ${binary:Version}), ${shlibs:Depends},
libopenvas1-dev (>= 1.0.2) , libgpgme11-dev (>= 1.1.5), libpcap0.8-dev,
libgcrypt11-dev, libgnutls-dev
+Depends: libopenvasnasl2 (= ${binary:Version}), ${shlibs:Depends},
libopenvas2-dev (>= 2.0.0) , libgpgme11-dev (>= 1.1.5), libpcap0.8-dev,
libgcrypt11-dev, libgnutls-dev
+Replaces: libopenvasnasl1-dev
Description: OpenVAS static libraries and headers
The OpenVAS Security Scanner is a security auditing tool. It makes
possible to test security modules in an attempt to find vulnerable
@@ -25,10 +26,11 @@
This package contains the required static libraries, headers, and
the openvas-config script.
-Package: libopenvasnasl1
+Package: libopenvasnasl2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libopenvasnasl1
Description: OpenVAS shared libraries
The OpenVAS Security Scanner is a security auditing tool. It makes
possible to test security modules in an attempt to find vulnerable
Modified: trunk/openvas-libnasl/packaging/debian/copyright
===================================================================
--- trunk/openvas-libnasl/packaging/debian/copyright 2008-10-12 18:40:04 UTC
(rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/copyright 2008-10-12 19:01:10 UTC
(rev 1520)
@@ -33,6 +33,11 @@
* Jan-Oliver Wagner <[EMAIL PROTECTED]>
* Andrew Tridgell
* Luke Kenneth Casson Leighton
+ * Bernhard Herzog <[EMAIL PROTECTED]>
+ * Chandrashekhar B <[EMAIL PROTECTED]>
+ * Javier Fernandez-Sanguino <[EMAIL PROTECTED]>
+ * Michael Wiegand <[EMAIL PROTECTED]>
+ * Tim Brown <[EMAIL PROTECTED]>
License:
Deleted: trunk/openvas-libnasl/packaging/debian/libopenvasnasl1-dev.install
===================================================================
--- trunk/openvas-libnasl/packaging/debian/libopenvasnasl1-dev.install
2008-10-12 18:40:04 UTC (rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/libopenvasnasl1-dev.install
2008-10-12 19:01:10 UTC (rev 1520)
@@ -1,8 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/*.la
-usr/share/man/man1/openvas-libnasl-config.1
-usr/share/man/man1/openvas-nasl.1
-usr/bin/openvas-libnasl-config
-usr/bin/openvas-nasl
Deleted: trunk/openvas-libnasl/packaging/debian/libopenvasnasl1.install
===================================================================
--- trunk/openvas-libnasl/packaging/debian/libopenvasnasl1.install
2008-10-12 18:40:04 UTC (rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/libopenvasnasl1.install
2008-10-12 19:01:10 UTC (rev 1520)
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
Added: trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.dirs
===================================================================
--- trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.dirs
2008-10-12 18:40:04 UTC (rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.dirs
2008-10-12 19:01:10 UTC (rev 1520)
@@ -0,0 +1,2 @@
+usr/lib
+usr/include
Added: trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.install
===================================================================
--- trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.install
2008-10-12 18:40:04 UTC (rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/libopenvasnasl2-dev.install
2008-10-12 19:01:10 UTC (rev 1520)
@@ -0,0 +1,8 @@
+usr/include/*
+usr/lib/lib*.a
+usr/lib/*.la
+usr/lib/lib*.so
+usr/share/man/man1/openvas-libnasl-config.1
+usr/share/man/man1/openvas-nasl.1
+usr/bin/openvas-libnasl-config
+usr/bin/openvas-nasl
Added: trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.dirs
===================================================================
--- trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.dirs 2008-10-12
18:40:04 UTC (rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.dirs 2008-10-12
19:01:10 UTC (rev 1520)
@@ -0,0 +1,2 @@
+usr/lib
+usr/share/doc/libopenvasnasl2
Added: trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.install
===================================================================
--- trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.install
2008-10-12 18:40:04 UTC (rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/libopenvasnasl2.install
2008-10-12 19:01:10 UTC (rev 1520)
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
Modified: trunk/openvas-libnasl/packaging/debian/rules
===================================================================
--- trunk/openvas-libnasl/packaging/debian/rules 2008-10-12 18:40:04 UTC
(rev 1519)
+++ trunk/openvas-libnasl/packaging/debian/rules 2008-10-12 19:01:10 UTC
(rev 1520)
@@ -1,64 +1,94 @@
#!/usr/bin/make -f
-# Derived from dh_make example.
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export DH_OPTIONS
-version := $(shell cat VERSION)
-tmp := $(CURDIR)/debian/tmp
-CFLAGS := -g -Wall -D_REENTRANT
-ifneq "$(findstring noopt,$(DEB_BUILD_OPTIONS))" ""
-CFLAGS += -O0
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
else
-CFLAGS += -O2
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
+
+
+
+# shared library versions, option 1
+version=2.0.5
+major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+config.status: configure
+ dh_testdir
+ # Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+ ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man
--infodir=\$${prefix}/share/info --localstatedir=/var CFLAGS="$(CFLAGS)"
LDFLAGS="-Wl,-z,defs"
+
+
build: build-stamp
build-stamp: config.status
dh_testdir
- $(MAKE) localstatedir=/var
+
+ # Add here commands to compile the package.
+ $(MAKE)
touch $@
-config.status: configure
- CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --mandir='$${prefix}/share/man' \
- --enable-static --enable-cipher
-
clean:
dh_testdir
dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
touch nasl.tmpl
[ ! -f Makefile ] || $(MAKE) distclean
- dh_clean build-stamp
+ rm -f config.sub config.guess
-install: DH_OPTIONS=
-install: build-stamp
+ dh_clean
+
+install: build
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) install DESTDIR=$(tmp)/
- dh_installdirs -plibopenvasnasl1-dev usr/share/doc/libopenvasnasl1
- dh_install --sourcedir=debian/tmp
- find debian/libopenvasnasl1/usr -type d -empty | xargs -r rmdir -p
--ignore-fail-on-non-empty
- find debian/libopenvasnasl1-dev/usr -type d -empty | xargs -r rmdir -p
--ignore-fail-on-non-empty
+ dh_installdirs
-binary-indep:
-# Nothing.
+ # Add here commands to install the package into debian/tmp
+ $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
-binary-arch: DH_OPTIONS=-a
-binary-arch: install
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
dh_testdir
dh_testroot
dh_installdocs
- ( cd debian/libopenvasnasl1-dev/usr/share/doc/ ; rm -rf
libopenvasnasl1-dev; ln -s libopenvasnasl1 libopenvasnasl1-dev; )
- dh_installchangelogs
-ifeq "$(findstring nostrip,$(DEB_BUILD_OPTIONS))" ""
+ dh_install --sourcedir=debian/tmp
+ ( cd debian/libopenvasnasl2-dev/usr/share/doc/ ; rm -rf
libopenvasnasl2-dev; ln -s libopenvasnasl2 libopenvasnasl2-dev; )
+ dh_installchangelogs ChangeLog
dh_strip
-endif
dh_compress
dh_fixperms
- dh_makeshlibs -V "libopenvasnasl1 (>= $(version))"
+ dh_makeshlibs -V
dh_installdeb
dh_shlibdeps
dh_gencontrol
_______________________________________________
Openvas-commits mailing list
[email protected]
http://lists.wald.intevation.org/mailman/listinfo/openvas-commits
