community/gvm: updated srcurl, renamed package from openvas-manager

9 files changed, 14 insertions, 15 deletions

diff --git a/community/openvas-manager/000-sys-siglist.patch b/community/gvm/000-sys-siglist.patch
index b741078d83..b741078d83 100644
--- a/community/openvas-manager/000-sys-siglist.patch
+++ b/community/gvm/000-sys-siglist.patch
diff --git a/community/openvas-manager/001-sys-siglist.patch b/community/gvm/001-sys-siglist.patch
index 7978f0550f..7978f0550f 100644
--- a/community/openvas-manager/001-sys-siglist.patch
+++ b/community/gvm/001-sys-siglist.patch
diff --git a/community/openvas-manager/002-fortify-source.patch b/community/gvm/002-fortify-source.patch
index 539fa7eef5..539fa7eef5 100644
--- a/community/openvas-manager/002-fortify-source.patch
+++ b/community/gvm/002-fortify-source.patch
diff --git a/community/openvas-manager/003-sqlite-insert.patch b/community/gvm/003-sqlite-insert.patch
index da51fa496a..da51fa496a 100644
--- a/community/openvas-manager/003-sqlite-insert.patch
+++ b/community/gvm/003-sqlite-insert.patch
diff --git a/community/openvas-manager/APKBUILD b/community/gvm/APKBUILD
index 43109b453a..2f8cd79cc3 100644
--- a/community/openvas-manager/APKBUILD
+++ b/community/gvm/APKBUILD
@@ -1,10 +1,8 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
-pkgname=openvas-manager
-_pkgname=openvasmd
+pkgname=gvm
 pkgver=7.0.2
-_pkgid=2448
-pkgrel=2
+pkgrel=3
 pkgdesc="A layer between the OpenVAS Scanner and various client applications"
 url="http://www.openvas.org/"
 arch="all"
@@ -15,10 +13,11 @@ makedepends="cmake gvm-libs-dev sqlite-dev
 	gpgme-dev libgcrypt-dev graphviz"
 checkdepends="cppcheck"
 subpackages="$pkgname-doc"
-source="http://wald.intevation.org/frs/download.php/$_pkgid/$pkgname-${pkgver}.tar.gz
-	$_pkgname.initd
-	$_pkgname.confd
-	$_pkgname.logrotate
+replaces="openvas-manager"
+source="$pkgname-$pkgver.tar.gz::https://github.com/greenbone/$pkgname/archive/v$pkgver.tar.gz
+	$pkgname.initd
+	$pkgname.confd
+	$pkgname.logrotate
 	000-sys-siglist.patch
 	backport-r29476.patch"
 builddir="$srcdir"/$pkgname-$pkgver
@@ -41,14 +40,14 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
-	install -Dm644 "$srcdir/$_pkgname.logrotate" "$pkgdir/etc/logrotate.d/$_pkgname"
-	install -Dm755 "$srcdir/$_pkgname.initd" "$pkgdir/etc/init.d/$_pkgname"
-	install -Dm755 "$srcdir/$_pkgname.confd" "$pkgdir/etc/conf.d/$_pkgname"
+	install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
+	install -Dm755 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
 }
 
-sha512sums="82b35b8bfcfbc781acabec71133d87352887a1e51e4af5a757c0f0a8b3eb86c37137022fdac693cc8802971c2628b52b900b1ec2af3c6434c3e2401bdbd8bfe2  openvas-manager-7.0.2.tar.gz
-932ba8dd818faf5158472da4d1305c6f6c84834334721aa358e2e9f1d7419cdd6e366f4e9ea9b19412e00010f919dc9155346ed0566eca533e973abe80f3ee67  openvasmd.initd
-5946db68bb5f7b3bf7cbae208a0fea6c9e023631d9fcd610539d2cf7c6290c8f7c2f55e0b4c7011c2263584b9eb42c7eae07db338917e8cc49acb63eb3950e1f  openvasmd.confd
-a86f156ca822b7b9844dc1cb1cb65c0d2bc146fa4dde64fec851b13b3eaa54fd984946b9336a2ffd0efbaf1c2053ab417067519fb18b807c5c1ce66cf1ee4a9b  openvasmd.logrotate
+sha512sums="52792822768c1f145a3ecc63511db15c143b43b644733b627bbcde77c1d126e623d421392cd3bd7d4a16fb1517857393178963a26f0f6afd57c93df766daa786  gvm-7.0.2.tar.gz
+932ba8dd818faf5158472da4d1305c6f6c84834334721aa358e2e9f1d7419cdd6e366f4e9ea9b19412e00010f919dc9155346ed0566eca533e973abe80f3ee67  gvm.initd
+5946db68bb5f7b3bf7cbae208a0fea6c9e023631d9fcd610539d2cf7c6290c8f7c2f55e0b4c7011c2263584b9eb42c7eae07db338917e8cc49acb63eb3950e1f  gvm.confd
+a86f156ca822b7b9844dc1cb1cb65c0d2bc146fa4dde64fec851b13b3eaa54fd984946b9336a2ffd0efbaf1c2053ab417067519fb18b807c5c1ce66cf1ee4a9b  gvm.logrotate
 f4ce7cb1fc4f34e5679f9e1005cf2ea57cbb3b5807910d5d44cea9499f2ff780feac6b93d1a66d5533106414f60631b274d993b281e4bd5089cd7827d08a5306  000-sys-siglist.patch
 90d71203566d282b83c480440300805f46fb93bccde67e905f020d3e651d20b55040bdd4692c1ce12a47e7384b1e10c196a5e3d857afc752b8b4f66238b0e57b  backport-r29476.patch"
diff --git a/community/openvas-manager/backport-r29476.patch b/community/gvm/backport-r29476.patch
index 8fa21c4128..8fa21c4128 100644
--- a/community/openvas-manager/backport-r29476.patch
+++ b/community/gvm/backport-r29476.patch
diff --git a/community/openvas-manager/openvasmd.confd b/community/gvm/gvm.confd
index 261836037d..261836037d 100644
--- a/community/openvas-manager/openvasmd.confd
+++ b/community/gvm/gvm.confd
diff --git a/community/openvas-manager/openvasmd.initd b/community/gvm/gvm.initd
index d0045d5b2e..d0045d5b2e 100644
--- a/community/openvas-manager/openvasmd.initd
+++ b/community/gvm/gvm.initd
diff --git a/community/openvas-manager/openvasmd.logrotate b/community/gvm/gvm.logrotate
index 69cfa26b19..69cfa26b19 100644
--- a/community/openvas-manager/openvasmd.logrotate
+++ b/community/gvm/gvm.logrotate