1

[alpine-devel] [PATCH] Fixing dependencies and removing patch

Jeff Bilyk
Details
Message ID
<1282684262-6603-1-git-send-email-jbilyk@gmail.com>
Sender timestamp
1282684262
DKIM signature
missing
Download raw message
Patch: +12 -18
Fixed build and run dependencies.  Removed patch since it's not needed.
---
 testing/nagios-plugins/APKBUILD |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/testing/nagios-plugins/APKBUILD b/testing/nagios-plugins/APKBUILD
index e2da9de..f3cb4b4 100644
--- a/testing/nagios-plugins/APKBUILD
+++ b/testing/nagios-plugins/APKBUILD
@@ -1,26 +1,16 @@
-# Maintainer: Jeff Bilyk <jbilyk at gmail>
+# Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=nagios-plugins
 pkgver=1.4.15
-pkgrel=0
+pkgrel=1
 pkgdesc="Plugins for Nagios to check services on hosts"
 url="http://nagiosplugins.org"
 license="GPL-2"
-depends="nagios freeradius-client"
-makedepends="uclibc-dev net-snmp-tools openssl-dev fping openldap-dev openssh libpq"
-source="http://downloads.sourceforge.net/nagiosplug/$pkgname-$pkgver.tar.gz
-001-busybox-tweaks.patch"
+depends="nagios fping net-snmp-tools bind-tools"
+makedepends="net-snmp-tools openssl-dev openldap-dev mysql-dev postgresql-dev libpq"
+source="http://downloads.sourceforge.net/nagiosplug/$pkgname-$pkgver.tar.gz"
 pkgusers="nagios"
 pkggroups="nagios"
 
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	for i in "$srcdir"/*.patch; do
-		[ -f "$i" ] || continue
-		msg "Applying $i"
-		patch -p1 -i "$i" || return 1
-	done
-}
-
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
@@ -29,7 +19,12 @@ build() {
 		--infodir=/usr/share/info \
 		--bindir=/usr/sbin \
 		--libexecdir=/usr/lib/nagios/plugins \
-		--localstatedir=/var/nagios
+		--localstatedir=/var/nagios \
+		--with-ps-command="/bin/ps" \
+		--with-ps-format="%d %s %s %s" \
+		--with-ps-varlist="&procpid,&procuid,&procpcpu,procprog" \
+		--with-ps-cols=4 \
+		--with-ping-command="/bin/ping -c %d %s"
 	make all || return 1
 }
 
@@ -38,5 +33,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="56abd6ade8aa860b38c4ca4a6ac5ab0d  nagios-plugins-1.4.15.tar.gz
-4bb975da57d5e9077968a39a5ab258df  001-busybox-tweaks.patch"
+md5sums="56abd6ade8aa860b38c4ca4a6ac5ab0d  nagios-plugins-1.4.15.tar.gz"
-- 
1.7.2.1



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<1282740029.15870.67.camel@ncopa-desktop.nor.wtbts.net>
In-Reply-To
<1282684262-6603-1-git-send-email-jbilyk@gmail.com> (view parent)
Sender timestamp
1282740029
DKIM signature
missing
Download raw message
On Tue, 2010-08-24 at 21:11 +0000, Jeff Bilyk wrote:
> Fixed build and run dependencies.  Removed patch since it's not needed.
> ---
>  testing/nagios-plugins/APKBUILD |   30 ++++++++++++------------------
>  1 files changed, 12 insertions(+), 18 deletions(-)

Applied thanks!

Thanks for using git send-email. Should make my job easier.

ps. please include package name in "subject" (first line) in the commit
message



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---