From e4aabbb60710901fb208c3a5516a67aee2e02f35 Mon Sep 17 00:00:00 2001 From: Francesco Colista Date: Thu, 18 Aug 2016 12:25:51 +0000 Subject: Revert "community/openvas-cli: moved from testing" This reverts commit 3bc8f4ab96a4d4d196c40d6fab40367396d3f17b. --- community/openvas-cli/001-fortify-source.patch | 16 --------- community/openvas-cli/APKBUILD | 47 -------------------------- testing/openvas-cli/001-fortify-source.patch | 16 +++++++++ testing/openvas-cli/APKBUILD | 47 ++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 63 deletions(-) delete mode 100644 community/openvas-cli/001-fortify-source.patch delete mode 100644 community/openvas-cli/APKBUILD create mode 100644 testing/openvas-cli/001-fortify-source.patch create mode 100644 testing/openvas-cli/APKBUILD diff --git a/community/openvas-cli/001-fortify-source.patch b/community/openvas-cli/001-fortify-source.patch deleted file mode 100644 index 49a9cdfd97..0000000000 --- a/community/openvas-cli/001-fortify-source.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index db7cb9b..3681573 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -190,9 +190,9 @@ configure_file (VERSION.in VERSION) - ## Program - - if (MINGW) -- set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2") -+ set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") - else (MINGW) -- set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector") -+ set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector") - set (LINKER_HARDENING_FLAGS "-Wl,-z,relro -Wl,-z,now") - endif (MINGW) - diff --git a/community/openvas-cli/APKBUILD b/community/openvas-cli/APKBUILD deleted file mode 100644 index 970fbfec54..0000000000 --- a/community/openvas-cli/APKBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Contributor: Francesco Colista -# Maintainer: Francesco Colista -pkgname=openvas-cli -pkgver=1.4.4 -pkgrel=0 -_pkgid=2332 -pkgdesc="The OpenVAS Command-Line Interface" -url="http://www.openvas.org" -arch="all" -license="GPL" -depends="" -depends_dev="" -makedepends="$depends_dev openvas-libraries-dev cmake doxygen xmltoman" -install="" -subpackages="$pkgname-doc" -source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz - 001-fortify-source.patch" - -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} - -build() { - cd "$_builddir" - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \ - -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var . - make -} - -package() { - cd "$_builddir" - make DESTDIR="$pkgdir/" install -} - -md5sums="2a47515f388b4866a1ed072f2d9cc9d8 openvas-cli-1.4.4.tar.gz -df30d7613d69e24afa633d50ce7cae7f 001-fortify-source.patch" -sha256sums="1e882037fa4738ec7c3dddd9d72e4db7eaa64c7c91170453b4ed283fa8c92705 openvas-cli-1.4.4.tar.gz -079c24e87f85d5a1bee0d3b36adba09dca30d525fe0a9ad7b84dc46c18c9d4f8 001-fortify-source.patch" -sha512sums="9533beaa7daf38fd57c6c6e934d6d30b5ee5ec0b1f47ca3a131583260e5cbb9794bc3d3ff634f9548999fe62658a906d67875e703e5dfec59df18086cf721d07 openvas-cli-1.4.4.tar.gz -979714b5625b87ec559be6d7520152c713b5455a401e50350b5c342b3769cfa83946a31dd963300cb0b0276fdc28f27ea66854563bec1a744322b6c268202935 001-fortify-source.patch" diff --git a/testing/openvas-cli/001-fortify-source.patch b/testing/openvas-cli/001-fortify-source.patch new file mode 100644 index 0000000000..49a9cdfd97 --- /dev/null +++ b/testing/openvas-cli/001-fortify-source.patch @@ -0,0 +1,16 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index db7cb9b..3681573 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -190,9 +190,9 @@ configure_file (VERSION.in VERSION) + ## Program + + if (MINGW) +- set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2") ++ set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2") + else (MINGW) +- set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -D_FORTIFY_SOURCE=2 -fstack-protector") ++ set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector") + set (LINKER_HARDENING_FLAGS "-Wl,-z,relro -Wl,-z,now") + endif (MINGW) + diff --git a/testing/openvas-cli/APKBUILD b/testing/openvas-cli/APKBUILD new file mode 100644 index 0000000000..970fbfec54 --- /dev/null +++ b/testing/openvas-cli/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: Francesco Colista +# Maintainer: Francesco Colista +pkgname=openvas-cli +pkgver=1.4.4 +pkgrel=0 +_pkgid=2332 +pkgdesc="The OpenVAS Command-Line Interface" +url="http://www.openvas.org" +arch="all" +license="GPL" +depends="" +depends_dev="" +makedepends="$depends_dev openvas-libraries-dev cmake doxygen xmltoman" +install="" +subpackages="$pkgname-doc" +source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz + 001-fortify-source.patch" + +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + local i + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done +} + +build() { + cd "$_builddir" + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONFDIR=/etc -DLOCALSTATEDIR=/var . + make +} + +package() { + cd "$_builddir" + make DESTDIR="$pkgdir/" install +} + +md5sums="2a47515f388b4866a1ed072f2d9cc9d8 openvas-cli-1.4.4.tar.gz +df30d7613d69e24afa633d50ce7cae7f 001-fortify-source.patch" +sha256sums="1e882037fa4738ec7c3dddd9d72e4db7eaa64c7c91170453b4ed283fa8c92705 openvas-cli-1.4.4.tar.gz +079c24e87f85d5a1bee0d3b36adba09dca30d525fe0a9ad7b84dc46c18c9d4f8 001-fortify-source.patch" +sha512sums="9533beaa7daf38fd57c6c6e934d6d30b5ee5ec0b1f47ca3a131583260e5cbb9794bc3d3ff634f9548999fe62658a906d67875e703e5dfec59df18086cf721d07 openvas-cli-1.4.4.tar.gz +979714b5625b87ec559be6d7520152c713b5455a401e50350b5c342b3769cfa83946a31dd963300cb0b0276fdc28f27ea66854563bec1a744322b6c268202935 001-fortify-source.patch" -- cgit v1.2.3