diff options
| -rw-r--r-- | testing/openvas-cli/001-fortify-source.patch | 15 | ||||
| -rw-r--r-- | testing/openvas-cli/APKBUILD | 18 |
2 files changed, 18 insertions, 15 deletions
diff --git a/testing/openvas-cli/001-fortify-source.patch b/testing/openvas-cli/001-fortify-source.patch index caab6920efe..49a9cdfd974 100644 --- a/testing/openvas-cli/001-fortify-source.patch +++ b/testing/openvas-cli/001-fortify-source.patch @@ -1,13 +1,16 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index aae0c0e..1c4cc7d 100644 +index db7cb9b..3681573 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -202,7 +202,7 @@ configure_file (VERSION.in VERSION) +@@ -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 -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 -Wl,-z,relro -Wl,-z,now") -+ set (HARDENING_FLAGS "-Wformat -Wformat-security -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector -Wl,-z,relro -Wl,-z,now") +- 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) - set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Werror") diff --git a/testing/openvas-cli/APKBUILD b/testing/openvas-cli/APKBUILD index f35dccf3762..970fbfec548 100644 --- a/testing/openvas-cli/APKBUILD +++ b/testing/openvas-cli/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=openvas-cli -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=0 -_pkgid=2209 +_pkgid=2332 pkgdesc="The OpenVAS Command-Line Interface" url="http://www.openvas.org" arch="all" @@ -13,7 +13,7 @@ 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 +source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-$pkgver.tar.gz 001-fortify-source.patch" _builddir="$srcdir"/$pkgname-$pkgver @@ -39,9 +39,9 @@ package() { make DESTDIR="$pkgdir/" install } -md5sums="827fc66fe351fb81ea2d6fb42d9353bf openvas-cli-1.4.3.tar.gz -e68124db28f32ee8ffeb22333c070090 001-fortify-source.patch" -sha256sums="69b9b31c0391f6a7e2d1e6fe7f18616c8cfaac570a665192ccbdeae6da0f5978 openvas-cli-1.4.3.tar.gz -9c5d09524cd01c0a2646fb7caafd6c944e7b2c539b7af1a5de02f68b4f296006 001-fortify-source.patch" -sha512sums="a85c754612b8f8102aa1ccf0af72f3266758c4873f7c346004b4f6794bfa8e562dbe14009ae04a2792978354454fa75f8a912bc13a83bce3604ff00019c363e3 openvas-cli-1.4.3.tar.gz -81c1a3951889a811afadf82d118e2694614076fa4471c6d3c11c1d1fe07144edf7c60c2b8f74a7dd5f06acdcd4235382b27a5e0d0f2a1b1d701cad29127c70b2 001-fortify-source.patch" +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" |