aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2015-04-09 09:42:42 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-04-09 11:37:18 +0000
commitf186d60892f6cb4e49b0d4d861e602474b09d052 (patch)
tree0d17a945a980a2f50b673377ac514ae843007e8f
parent32345b63f764696b84965c26bf4fac1ce1284409 (diff)
downloadaports-f186d60892f6cb4e49b0d4d861e602474b09d052.tar.bz2
aports-f186d60892f6cb4e49b0d4d861e602474b09d052.tar.xz
main/znc: upgrade to 1.6.0
-rw-r--r--main/znc/APKBUILD15
-rw-r--r--main/znc/fix-strerror_r.patch11
2 files changed, 5 insertions, 21 deletions
diff --git a/main/znc/APKBUILD b/main/znc/APKBUILD
index e5653ae638..8832648e6b 100644
--- a/main/znc/APKBUILD
+++ b/main/znc/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=znc
-pkgver=1.4
-pkgrel=2
+pkgver=1.6.0
+pkgrel=0
pkgdesc="An advanced IRC bouncer"
url="http://znc.in"
arch="all"
@@ -16,7 +16,6 @@ pkgusers="$pkgname"
subpackages="$pkgname-dev $pkgname-doc $pkgname-extra $pkgname-modtcl
$pkgname-modperl"
source="http://znc.in/releases/znc-$pkgver.tar.gz
- fix-strerror_r.patch
$pkgname.initd
$pkgname.confd"
@@ -83,7 +82,6 @@ extra() {
_mv_mod \
autovoice.so \
block_motd.so \
- charset.so \
clearbufferonmsg.so \
ctcpflood.so \
flooddetach.so \
@@ -108,15 +106,12 @@ modperl() {
_mv_mod modperl modperl.so
}
-md5sums="630cb74db34d2d5451ba30b47869f6bb znc-1.4.tar.gz
-683043a298fcd79eda13a75a91f84c0b fix-strerror_r.patch
+md5sums="674d8c1277752dcc627b96e33a63376e znc-1.6.0.tar.gz
d46d465d75c526cd21ebee8bfaa4440b znc.initd
1817e134ec3fa6ec05d36d4995a5aaa5 znc.confd"
-sha256sums="86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52 znc-1.4.tar.gz
-06699125318a4caa88e04fa6031e8b0a5a87321720f352fbd63bd619c615401b fix-strerror_r.patch
+sha256sums="df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7 znc-1.6.0.tar.gz
9df9e738efca0e6ace045bdb6a1419082408119ba92c032566c6d4a61b1844b5 znc.initd
be3155e79e6ed13be88fbf9d99f6889b3ee8425837120c448c827b8302672063 znc.confd"
-sha512sums="0c33b05e8232084999812cbaa467dc7d37b80cafc1001b82e89c702b4303d8db9a27b948fe653e7090404eb1c66f5492f02f3524bc39efabade4be8bdb476671 znc-1.4.tar.gz
-c066fca1b97e7f5c4897221af6117c64492864f4800d755f0b285bc3df63faa34441625d2361dca4696461caaff0eccdd0ce8fdcf582df103f7caabd42f59ace fix-strerror_r.patch
+sha512sums="f645d9c947970e193ff9b230fa8ecc6a562a44ddf2a9d43019861deb2ef6ac166436ec556997160c5d5b9a48112068e36a108ec8f98f6d7cf0e1958a422283fc znc-1.6.0.tar.gz
0d1b9bf71cde1b803e9deddc64006528778dc628603bb4ba8cca17098dcb6b8fc34dcb43eca7de7dec61ce84832dd07d76c7ccb2d9175f859d5aee2a349e8045 znc.initd
352f18d64cbfbd5970c859f2ae2290c0ddafcbd8f1bb5d74f33976bc8388f65a75f8a9a73a093fbac12f2d243d4bcf74380bbb3aaab8d68f7bf4eab7ce3bea46 znc.confd"
diff --git a/main/znc/fix-strerror_r.patch b/main/znc/fix-strerror_r.patch
deleted file mode 100644
index 9e3355bc7e..0000000000
--- a/main/znc/fix-strerror_r.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- znc-1.2/src/Csocket.cpp.orig
-+++ znc-1.2/src/Csocket.cpp
-@@ -613,7 +613,7 @@
- return( strerror( iErrno ) );
- #else
- memset( pszBuff, '\0', uBuffLen );
--#if !defined( _GNU_SOURCE )
-+#if !defined( _GNU_SOURCE ) || !defined(__GLIBC__)
- if( strerror_r( iErrno, pszBuff, uBuffLen ) == 0 )
- return( pszBuff );
- #else