Merge remote branch 'clandmeter/master'

10 files changed, 130 insertions, 135 deletions

diff --git a/main/clamav/APKBUILD b/main/clamav/APKBUILD
index fc5b194141..b59af1b953 100644
--- a/main/clamav/APKBUILD
+++ b/main/clamav/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=clamav
-pkgver=0.95.3
-pkgrel=1
+pkgver=0.96
+pkgrel=0
 pkgusers=clamav
 pkggroups=clamav
 pkgdesc="An anti-virus toolkit for UNIX"
@@ -21,48 +21,61 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	clamav.logrotate
 	"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	cd "$_builddir"
 
 	patch -p0 -i "$srcdir/clamav-0.95.1-nls.patch" || return 1
+}
+
+build() {
+	cd "$_builddir"
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/clamav \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--without-iconv
+		--without-iconv \
+		--disable-llvm
+	
 	make || return 1
+}
+
+package() {
+        cd "$_builddir"
+
 	make DESTDIR="$pkgdir" install
 
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"$pkgdir"/etc/clamav/clamd.conf
+        # Change /etc/clamd.conf to be usable out of the box
+        sed -i -e "s:^\(Example\):\# \1:" \
+                -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
+                -e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
+                -e "s:.*\(User\) .*:\1 clamav:" \
+                -e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+                -e "s:^\#\(LogTime\).*:\1 yes:" \
+                -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+                "$pkgdir"/etc/clamav/clamd.conf
 
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"$pkgdir"/etc/clamav/freshclam.conf
+        # Do the same for /etc/freshclam.conf
+        sed -i -e "s:^\(Example\):\# \1:" \
+                -e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+                -e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
+                -e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
+                -e "s:^\#\(NotifyClamd\).*:\1 /etc/clamav/clamd.conf:" \
+                -e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+                -e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
+                "$pkgdir"/etc/clamav/freshclam.conf
 
-	install -m755 -D "$srcdir"/clamd.initd "$pkgdir"/etc/init.d/clamd
-	install -m644 -D "$srcdir"/clamd.confd "$pkgdir"/etc/conf.d/clamd
+        install -m755 -D "$srcdir"/clamd.initd "$pkgdir"/etc/init.d/clamd
+        install -m644 -D "$srcdir"/clamd.confd "$pkgdir"/etc/conf.d/clamd
         install -m755 -D "$srcdir"/freshclam.initd "$pkgdir"/etc/init.d/freshclam
-	install -m644 -D "$srcdir"/freshclam.confd "$pkgdir"/etc/conf.d/freshclam
-	install -m644 -D "$srcdir"/clamav.logrotate "$pkgdir"/etc/logrotate.d/clamav
-	mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav
+        install -m644 -D "$srcdir"/freshclam.confd "$pkgdir"/etc/conf.d/freshclam
+        install -m644 -D "$srcdir"/clamav.logrotate "$pkgdir"/etc/logrotate.d/clamav
+        mkdir -p "$pkgdir"/var/run/clamav "$pkgdir"/var/log/clamav
 }
 
-md5sums="eaf9fccc3cc3567605a9732313652967  clamav-0.95.3.tar.gz
+md5sums="28ac7bec4cc03627a8e2d6e8647ee661  clamav-0.96.tar.gz
 d64432c463850663c5041c3097f3e903  clamd.initd
 567bc32b657dd7031b9b7beaa946203a  clamd.confd
 f4d1f415322905128dc27135566ad136  freshclam.initd
diff --git a/main/curl/APKBUILD b/main/curl/APKBUILD
index 380d934aa8..f868ab1954 100644
--- a/main/curl/APKBUILD
+++ b/main/curl/APKBUILD
@@ -1,18 +1,19 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=curl
-pkgver=7.19.7
-pkgrel=1
+pkgver=7.20.1
+pkgrel=0
 pkgdesc="An URL retrival utility and library"
 url="http://curl.haxx.se"
 license="MIT"
 depends=
 makedepends="zlib-dev openssl-dev"
-source="http://curl.osmirror.nl/download/curl-$pkgver.tar.bz2"
-
+source="http://curl.haxx.se/download/curl-$pkgver.tar.bz2"
 subpackages="$pkgname-doc $pkgname-dev"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--without-libidn \
@@ -21,8 +22,8 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-md5sums="79a8fbb2eed5464b97bdf94bee109380  curl-7.19.7.tar.bz2"
+md5sums="244b16b2a38c70e47130c8494b7371b9  curl-7.20.1.tar.bz2"
diff --git a/main/irssi/APKBUILD b/main/irssi/APKBUILD
index e20661c379..253c96ea9a 100644
--- a/main/irssi/APKBUILD
+++ b/main/irssi/APKBUILD
@@ -1,8 +1,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail.com>
 pkgname=irssi
-pkgver=0.8.14
-#_pkgver=0.8.14
-pkgrel=2
+pkgver=0.8.15
+pkgrel=0
 pkgdesc="A modular textUI IRC client with IPv6 support"
 url="http://irssi.org/"
 license='GPL'
@@ -11,8 +10,10 @@ 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"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
 build() {
-	cd "$srcdir/$pkgname-${pkgver}"
+	cd "$_builddir"
 
 	./configure --prefix=/usr \
 	--sysconfdir=/etc \
@@ -22,13 +23,24 @@ build() {
 	make DESTDIR="$pkgdir" install
 }
 
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
 perl() {
 	depends="$pkgname perl"
+	pkgdesc="Irssi perl support and scripts"
 	mkdir -p "$subpkgdir"/usr/share/irssi
 	mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi/
 	mkdir -p "$subpkgdir"/usr/lib/irssi
 	mv "$pkgdir"/usr/lib/irssi/modules "$subpkgdir"/usr/lib/irssi/
 	mv "$pkgdir"/usr/lib/perl5 "$subpkgdir"/usr/lib/
+	#need write permission when stripping
+	chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/TextUI/TextUI.so
+	chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/Irssi.so
+	chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/Irc/Irc.so
+	chmod +w "$subpkgdir"/usr/lib/perl5/core_perl/auto/Irssi/UI/UI.so
 }
 
-md5sums="00efe7638dd596d5930dfa2aeae87b3a  irssi-0.8.14.tar.bz2"
+md5sums="1dcb3f511b88df94b0c996f36668c7da  irssi-0.8.15.tar.bz2"
diff --git a/main/lftp/APKBUILD b/main/lftp/APKBUILD
index cf79f7615e..76f3869e33 100644
--- a/main/lftp/APKBUILD
+++ b/main/lftp/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=lftp
-pkgver=4.0.5
-pkgrel=1
+pkgver=4.0.7
+pkgrel=0
 pkgdesc="LFTP is sophisticated ftp/http client"
 url="http://lftp.yar.ru/"
 license="GPL"
@@ -11,8 +11,10 @@ makedepends="openssl-dev readline-dev ncurses-dev gettext-dev"
 subpackages="$pkgname-doc"
 source="http://ftp.yars.free.net/pub/source/lftp/lftp-${pkgver}.tar.bz2"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/lftp \
@@ -25,8 +27,8 @@ build() {
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-md5sums="5400cad5f91e131ac2ded7c24aea594c  lftp-4.0.5.tar.bz2"
+md5sums="a40e4518fc477c82ffcc5b04d9ff64ff  lftp-4.0.7.tar.bz2"
diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 4843af7ad0..6c314eb567 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter at gmail>
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=libxml2
-pkgver=2.7.6
-pkgrel=3
+pkgver=2.7.7
+pkgrel=0
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/"
 license="MIT"
@@ -10,8 +10,7 @@ depends=
 makedepends="zlib-dev python-dev"
 subpackages="$pkgname-doc $pkgname-dev py-$pkgname:py"
 source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
-	largefile64.patch
-	zlib.patch"
+	largefile64.patch"
 
 options="!strip"
 
@@ -46,6 +45,5 @@ py() {
 }
 
 
-md5sums="7740a8ec23878a2f50120e1faa2730f2  libxml2-2.7.6.tar.gz
-5ad4915665608ebfa5b89f7908467a72  largefile64.patch
-0365d5397164b8739219e56e5ca069d1  zlib.patch"
+md5sums="9abc9959823ca9ff904f1fbcf21df066  libxml2-2.7.7.tar.gz
+5ad4915665608ebfa5b89f7908467a72  largefile64.patch"
diff --git a/main/libxml2/zlib.patch b/main/libxml2/zlib.patch
deleted file mode 100644
index 4bf486d127..0000000000
--- a/main/libxml2/zlib.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From a7e79f28689c574e0bbef17f4cb3da00249181ff Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Tue, 19 Jan 2010 15:28:48 +0000
-Subject: libxml violates the zlib interface and crashes
-
-* xmlIO.c: remove an abuse of zlib API and use a clean interface
-  available in zlib >= 1.2.3
----
-diff --git a/xmlIO.c b/xmlIO.c
-index c03ac43..8fc00e3 100644
---- a/xmlIO.c
-+++ b/xmlIO.c
-@@ -2518,6 +2518,9 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- #ifdef HAVE_ZLIB_H
- 	if ((xmlInputCallbackTable[i].opencallback == xmlGzfileOpen) &&
- 		(strcmp(URI, "-") != 0)) {
-+#if defined(ZLIB_VERNUM) && ZLIB_VERNUM >= 0x1230
-+            ret->compressed = !gzdirect(context);
-+#else
- 	    if (((z_stream *)context)->avail_in > 4) {
- 	        char *cptr, buff4[4];
- 		cptr = (char *) ((z_stream *)context)->next_in;
-@@ -2529,6 +2532,7 @@ __xmlParserInputBufferCreateFilename(const char *URI, xmlCharEncoding enc) {
- 		    gzrewind(context);
- 		}
- 	    }
-+#endif
- 	}
- #endif
-     }
---
-cgit v0.8.3.1
diff --git a/main/ncftp/APKBUILD b/main/ncftp/APKBUILD
index 29ae619755..94b08e15e9 100644
--- a/main/ncftp/APKBUILD
+++ b/main/ncftp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=ncftp
-pkgver=3.2.3
-pkgrel=1
+pkgver=3.2.4
+pkgrel=0
 pkgdesc="A set of free application programs implementing FTP"
 url="http://www.ncftp.com/"
 license="custom"
@@ -11,19 +11,31 @@ install="$pkgname.post-install"
 source="ftp://ftp.$pkgname.com/$pkgname/$pkgname-$pkgver-src.tar.bz2"
 subpackages="$pkgname-doc $pkgname-bookmarks"
 
+_builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+	mkdir -p "$pkgdir"/usr/share || return 1
+}
+
 build () {
-	cd "${srcdir}/${pkgname}-${pkgver}" || return 1
-	install -d "${pkgdir}"/usr/share | return 1
+	cd "$_builddir" || return 1
+
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man || return 1
-	cd "${srcdir}/${pkgname}-${pkgver}"/libncftp
+	
+	cd "$_builddir"/libncftp
 	make shared || return 1
-	make PREFIX="${pkgdir}"/usr soinstall || return 1
-	cd "${srcdir}/${pkgname}-${pkgver}" || return 1
+	cd "$_builddir" || return 1
 	make || return 1
+}
+
+package() {
+	cd "$_builddir"/libncftp
+	make PREFIX="${pkgdir}"/usr soinstall || return 1
+	cd "$_builddir" || return 1
 	make DESTDIR="$pkgdir" install || return 1
-	install -D doc/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}"/LICENSE || return 1
+	install -D doc/LICENSE.txt "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE || return 1
 }
 
 bookmarks () {
@@ -32,4 +44,4 @@ bookmarks () {
 	mv "$pkgdir"/usr/bin/ncftpbookmarks "$subpkgdir"/usr/bin/ || return 1
 }
 
-md5sums="fac4aa169e1734e8d9617afd4a9b51e5  ncftp-3.2.3-src.tar.bz2"
+md5sums="216d6befdd7381b11ffdc8b6e0c1bd12  ncftp-3.2.4-src.tar.bz2"
diff --git a/main/net-snmp/APKBUILD b/main/net-snmp/APKBUILD
index 7ff3a8ace5..ad3462f865 100644
--- a/main/net-snmp/APKBUILD
+++ b/main/net-snmp/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=net-snmp
-pkgver=5.4.2.1
-pkgrel=4
+pkgver=5.5
+pkgrel=0
 pkgdesc="Simple Network Management Protocol"
 url="http://www.net-snmp.org/"
 license="GPL"
@@ -14,14 +14,17 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	snmpd.confd
 	snmptrapd.initd
 	snmptrapd.confd
-	CVE-2008-6123.patch
 	"
 
-build() {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -p0 -i ../CVE-2008-6123.patch || return 1
+_builddir="$srcdir/$pkgname-$pkgver"
 
+build() {
+	cd "$_builddir"
+	
 	export lt_cv_sys_max_cmd_len=8192
+	
+	#build fails on: libnetsnmpmibs.so: undefined reference to `pthread_create'
+	LDFLAGS="$LDFLAGS -lpthread"
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc/snmp \
@@ -40,16 +43,20 @@ build() {
 		--disable-embedded-perl
 		# embedded-perl seems to create TEXTREL's
 
-	make -j1 || return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"        
 	make -j1 DESTDIR="$pkgdir" install
 
-	install -m755 -D "$srcdir"/snmpd.initd "$pkgdir"/etc/init.d/snmpd
-	install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd
+        install -m755 -D "$srcdir"/snmpd.initd "$pkgdir"/etc/init.d/snmpd
+        install -m644 -D "$srcdir"/snmpd.confd "$pkgdir"/etc/conf.d/snmpd
         install -m755 -D "$srcdir"/snmptrapd.initd "$pkgdir"/etc/init.d/snmptrapd
-	install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd
-	install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example
-	mkdir -p "$pkgdir"/var/lib/net-snmp
-	find "$pkgdir" -name perllocal.pod -delete
+        install -m644 -D "$srcdir"/snmptrapd.confd "$pkgdir"/etc/conf.d/snmptrapd
+        install -m644 -D EXAMPLE.conf "$pkgdir"/etc/snmp/snmpd.conf.example
+        mkdir -p "$pkgdir"/var/lib/net-snmp
+        find "$pkgdir" -name perllocal.pod -delete
 }
 
 tools() {
@@ -58,9 +65,8 @@ tools() {
 }
 
 
-md5sums="984932520143f0c8bf7b7ce1fc9e1da1  net-snmp-5.4.2.1.tar.gz
+md5sums="5b2551e7bd024fbbee84dca22a5f13a1  net-snmp-5.5.tar.gz
 198a4a7b80557fa8112394df5ec9914e  snmpd.initd
 96510a2f3bc9f21648b03f7e8d76c0d3  snmpd.confd
 7ce3e9e880fc6313ae87eb000bae4bda  snmptrapd.initd
-363f7728a76bdfc46e29b7e1f5cf4950  snmptrapd.confd
-e8eac801c76e03bca7e7bf6b267b0d3d  CVE-2008-6123.patch"
+363f7728a76bdfc46e29b7e1f5cf4950  snmptrapd.confd"
diff --git a/main/net-snmp/CVE-2008-6123.patch b/main/net-snmp/CVE-2008-6123.patch
deleted file mode 100644
index b4b06f63e9..0000000000
--- a/main/net-snmp/CVE-2008-6123.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur snmplib.orig/snmpUDPDomain.c snmplib/snmpUDPDomain.c
---- snmplib.orig/snmpUDPDomain.c	2007-10-11 22:46:30.000000000 +0200
-+++ snmplib/snmpUDPDomain.c	2009-07-10 23:41:37.000000000 +0200
-@@ -104,12 +110,12 @@
- 	char tmp[64];
-         to = (struct sockaddr_in *) &(addr_pair->remote_addr);
-         if (to == NULL) {
--            sprintf(tmp, "UDP: [%s]->unknown",
-+            sprintf(tmp, "UDP: unknown->[%s]",
-                     inet_ntoa(addr_pair->local_addr));
-         } else {
--            sprintf(tmp, "UDP: [%s]->", inet_ntoa(addr_pair->local_addr));
--            sprintf(tmp + strlen(tmp), "[%s]:%hd",
-+            sprintf(tmp, "UDP: [%s]:%hu->",
-                     inet_ntoa(to->sin_addr), ntohs(to->sin_port));
-+            sprintf(tmp + strlen(tmp), "[%s]", inet_ntoa(addr_pair->local_addr));
-         }
-         return strdup(tmp);
-     }
diff --git a/main/unixodbc/APKBUILD b/main/unixodbc/APKBUILD
index 461f4d413e..48d2efe936 100644
--- a/main/unixodbc/APKBUILD
+++ b/main/unixodbc/APKBUILD
@@ -1,18 +1,20 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 pkgname=unixodbc
-pkgver=2.2.14
-pkgrel=2
+pkgver=2.3.0
+pkgrel=0
 pkgdesc="ODBC is an open specification to access Data Sources"
 url="http://www.unixodbc.org/"
 license="GPL2"
-depends="readline"
+depends=
 makedepends="readline-dev"
 subpackages="$pkgname-dev"
 source="http://www.unixodbc.org/unixODBC-${pkgver}.tar.gz"
 
+_builddir="$srcdir/unixODBC-$pkgver"
+
 build() {
-	cd "$srcdir/unixODBC-$pkgver"
+	cd "$_builddir"
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
@@ -24,9 +26,9 @@ build() {
 }
 
 package() {
-	cd "$srcdir/unixODBC-$pkgver"
+	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 
 }
 
-md5sums="f47c2efb28618ecf5f33319140a7acd0  unixODBC-2.2.14.tar.gz"
+md5sums="f2ad22cbdffe836c58987ed2332c2e99  unixODBC-2.3.0.tar.gz"