Merge remote branch 'clandmeter/master'

7 files changed, 56 insertions, 84 deletions

diff --git a/core/e2fsprogs/APKBUILD b/core/e2fsprogs/APKBUILD
index 282116e74a..11cae6403d 100644
--- a/core/e2fsprogs/APKBUILD
+++ b/core/e2fsprogs/APKBUILD
@@ -5,8 +5,8 @@ pkgrel=0
 pkgdesc="Standard Ext2/3/4 filesystem utilities"
 url="http://e2fsprogs.sourceforge.net"
 license="GPL LGPL MIT"
-depends="uclibc libuuid libcom_err"
-subpackages="$pkgname-dev $pkgname-doc libuuid libcom_err"
+depends="uclibc libuuid libcom_err libblkid"
+subpackages="$pkgname-dev $pkgname-doc libuuid libcom_err libblkid"
 source="http://downloads.sourceforge.net/sourceforge/e2fsprogs/e2fsprogs-$pkgver.tar.gz"
 
 build () { 
@@ -34,4 +34,10 @@ libcom_err() {
 	mv "$pkgdir"/lib/libcom_err* "$subpkgdir"/lib/
 }
 
+libblkid() {
+	depends="uclibc libuuid"
+	mkdir -p "$subpkgdir"/lib 
+	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
+}
+
 md5sums="59033388df36987d2b9c9bbf7e19bd57  e2fsprogs-1.41.4.tar.gz"
diff --git a/extra/clamav/APKBUILD b/extra/clamav/APKBUILD
index e86b66282a..7972c549d2 100644
--- a/extra/clamav/APKBUILD
+++ b/extra/clamav/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=clamav
-pkgver=0.94.2
-pkgrel=2
+pkgver=0.95.1
+pkgrel=0
 pkgdesc="An anti-virus toolkit for UNIX"
 url="http://www.clamav.net/"
 license="GPL"
@@ -15,13 +15,13 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	clamd.confd
 	freshclam.initd
 	freshclam.confd
-	clamav-0.94.2-nls.patch
+	clamav-0.95.1-nls.patch
 	$install"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
 
-	patch -p0 -i "$srcdir/clamav-0.94.2-nls.patch" || return 1
+	patch -p0 -i "$srcdir/clamav-0.95.1-nls.patch" || return 1
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
@@ -38,11 +38,11 @@ build() {
 	mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav
 }
 
-md5sums="1181e6d62341b84708f126cc353f7ebf  clamav-0.94.2.tar.gz
+md5sums="c802d4b372e455849cfcb0d776fc72d8  clamav-0.95.1.tar.gz
 04f32738c037c96c3fd2c4fa7781fc7a  clamd.initd
 e84205681f64c07af9ec5b6a3dd8bc38  clamd.confd
 fe3cfca9e1355183117936bea6fc6783  freshclam.initd
 e84205681f64c07af9ec5b6a3dd8bc38  freshclam.confd
-328a0c3449a6b516e443d7db5a0d4d01  clamav-0.94.2-nls.patch
+0d08fd29656bd4b018ecf8ce9706ac55  clamav-0.95.1-nls.patch
 275e05587e2da782781829a1862d57b1  clamav.pre-install
 ec4d600097a15e64dfb714e7739a1804  clamav.post-install"
diff --git a/extra/clamav/clamav-0.94.2-nls.patch b/extra/clamav/clamav-0.94.2-nls.patch
deleted file mode 100644
index 7e02a29d6d..0000000000
--- a/extra/clamav/clamav-0.94.2-nls.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Patch to disable nls (gettext) support for clamd. Taken from gentoo:
-http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/files/clamav-0.94-nls.patch?view=log
-
---- clamav-milter/clamav-milter.c	Fri Nov 21 22:24:41 2008
-+++ clamav-milter/clamav-milter.c	Mon Feb  2 09:30:14 2009
-@@ -113,6 +113,7 @@
- 
- #ifdef	C_LINUX
- #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
-+#ifdef ENABLE_NLS
- #include <libintl.h>
- #include <locale.h>
- 
-@@ -125,7 +126,8 @@
- #define	_(s)	s
- #define	N_(s)	s
- 
--#endif
-+#endif /* ENABLE_NLS */
-+#endif /* C_LINUX */
- 
- #ifdef	USE_SYSLOG
- #include <syslog.h>
-@@ -774,7 +776,7 @@
- 	else
- 		progname = "clamav-milter";
- 
--#ifdef	C_LINUX
-+#ifdef	ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- 	textdomain(progname);
---- configure.in	Wed Nov 26 12:15:08 2008
-+++ configure.in	Mon Feb  2 09:30:14 2009
-@@ -609,6 +609,14 @@
-     fi
- fi
- 
-+AC_ARG_ENABLE([nls],
-+               AC_HELP_STRING([--disable-nls], [disable NLS support]),
-+               [want_nls=$enableval], [want_nls=yes]
-+)
-+if test $want_nls = yes; then
-+       CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
-+fi
-+
- AC_ARG_ENABLE([ipv6],
- [  --disable-ipv6          disable IPv6 support],
- want_ipv6=$enableval, want_ipv6="yes")
---- shared/getopt.c	Fri Nov 21 22:24:42 2008
-+++ shared/getopt.c	Mon Feb  2 09:30:14 2009
-@@ -82,7 +82,7 @@
- 
- #ifndef _
- /* This is for other GNU distributions with internationalized messages.  */
--# if defined HAVE_LIBINTL_H || defined _LIBC
-+# if (defined(HAVE_LIBINTL_H) || defined(_LIBC)) && defined(ENABLE_NLS)
- #  include <libintl.h>
- #  ifndef _
- #   define _(msgid)	gettext (msgid)
---- shared/output.c	Tue Nov 25 20:11:00 2008
-+++ shared/output.c	Mon Feb  2 09:30:14 2009
-@@ -61,7 +61,7 @@
- pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
- 
--#ifdef  C_LINUX
-+#if defined(C_LINUX) && defined(ENABLE_NLS)
- #include <libintl.h>
- #include <locale.h>
- 
diff --git a/extra/clamav/clamav-0.95.1-nls.patch b/extra/clamav/clamav-0.95.1-nls.patch
new file mode 100644
index 0000000000..82ae88f576
--- /dev/null
+++ b/extra/clamav/clamav-0.95.1-nls.patch
@@ -0,0 +1,11 @@
+--- shared/output.c-orig	2009-04-04 10:17:42 +0000
++++ shared/output.c	2009-04-04 10:18:30 +0000
+@@ -67,7 +67,7 @@
+ pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
+ #endif
+ 
+-#ifdef  C_LINUX
++#if defined(C_LINUX) && defined(HAVE_LIBINTL_H)
+ #include <libintl.h>
+ #include <locale.h>
+
diff --git a/extra/irssi/APKBUILD b/extra/irssi/APKBUILD
index c0dcc72ddb..a396559405 100644
--- a/extra/irssi/APKBUILD
+++ b/extra/irssi/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="A modular textUI IRC client with IPv6 support"
 url="http://irssi.org/"
 license='GPL'
-depends="glib ncurses openssl"
+depends="glib ncurses ncurses-terminfo openssl"
 makedepends="glib-dev openssl-dev ncurses-dev perl-dev pkgconfig"
 source="http://irssi.org/files/irssi-${_pkgver}.tar.bz2"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-perl"
diff --git a/extra/nfs-utils/APKBUILD b/extra/nfs-utils/APKBUILD
index 6a5997f8ed..112cc58e78 100644
--- a/extra/nfs-utils/APKBUILD
+++ b/extra/nfs-utils/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=nfs-utils
 pkgver=1.1.5
-pkgrel=0
+pkgrel=1
 pkgdesc="kernel-mode NFS"
 url="http://nfs.sourceforge.net/"
 license="GPL"
-depends="uclibc portmap"
-makedepends="g++"
+depends="uclibc portmap libblkid"
+makedepends="e2fsprogs-dev g++"
 subpackages="$pkgname-doc"
 source="http://downloads.sourceforge.net/nfs/$pkgname-$pkgver.tar.bz2
 	nfs.initd
@@ -29,7 +29,7 @@ build() {
 		--infodir=/usr/share/info \
 		--without-tcp-wrappers \
 		--disable-nfsv4 \
-		--disable-uuid \
+		--enable-uuid \
 		--disable-gss \
 		--enable-mount \
 		--enable-nfsv3 \
diff --git a/extra/sysstat/APKBUILD b/extra/sysstat/APKBUILD
new file mode 100644
index 0000000000..4fb6a0f122
--- /dev/null
+++ b/extra/sysstat/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+pkgname=sysstat
+pkgver=9.0.2
+pkgrel=0
+pkgdesc="Performance monitoring tools for Linux"
+url="http://pagesperso-orange.fr/sebastien.godard/"
+license="GPL"
+depends="uclibc"
+makedepends=""
+subpackages="$pkgname-doc"
+source="http://pagesperso-orange.fr/sebastien.godard/sysstat-9.0.2.tar.gz"
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--disable-nls
+	make || return 1
+	make DESTDIR="$pkgdir" install
+
+}
+
+md5sums="80d255c64eb60e58d7e373ac070f8941  sysstat-9.0.2.tar.gz"