main/ngircd: upgrade to 21

2 files changed, 5 insertions, 20 deletions

diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD
index 7e5b0e4209..27740a2276 100644
--- a/main/ngircd/APKBUILD
+++ b/main/ngircd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <larena@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ngircd
-pkgver=20.3
+pkgver=21
 pkgrel=0
 pkgdesc="Next Generation IRC Daemon"
 url="http://ngircd.barton.de/"
@@ -11,7 +11,6 @@ depends=""
 makedepends="openssl-dev zlib-dev linux-pam-dev"
 install="$pkgname.pre-install"
 source="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$pkgver.tar.gz
-        username.patch
         $pkgname.initd
         "
 _builddir="$srcdir"/$pkgname-$pkgver
@@ -23,7 +22,7 @@ prepare() {
                 esac
         done
 }
-        
+
 build() {
         cd "$_builddir"
         ./configure \
@@ -45,12 +44,9 @@ package() {
         install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-md5sums="224681726cf88120785fd05e0c314928  ngircd-20.3.tar.gz
-67645fbee1432b8bf21e57325d7cb50a  username.patch
+md5sums="cd5d9d0019c781834bb6ba1c1a2ad9e0  ngircd-21.tar.gz
 628548a938f27fedcb6797c427bf0035  ngircd.initd"
-sha256sums="55d7c74c6df790b11a68c07f39836d581965087efb618d3e9a6bec855364c2f9  ngircd-20.3.tar.gz
-2ffb140b61912e8993fc839431458a0379f6697c393f26fecd20f92b1101ccaf  username.patch
+sha256sums="0edbd41304186e43f9d907a7017b40520cc90c2ce29b1339bdcd7622fffe19a0  ngircd-21.tar.gz
 67d7427762ce9f97abe494448032912cdc45291df070afc80562b34c94b7915c  ngircd.initd"
-sha512sums="8bc36a66e893873fade6dcadb07bf561fb25156714ba30168cf2e399e50f4dd80592fd7fcdb6c8d1083fa7c5e839b0da3a27ed4ce2041a2c5ab2b9581def948c  ngircd-20.3.tar.gz
-a2b413c3e921b50714d2299ce63307ff7cd39aba997310c92a919ee9c8bcfbf933fac12b49010a044ec2ce6594ba3a3627dbdda9a2d922351db71bd91a0c2796  username.patch
+sha512sums="944332fabfb3ea98a789939c52ee0dd9b7eb9283ddf38a588012af5118f04cbdb0a768d7fcaab06aec9b5db40cd47ab125654ee652bebf350d6c8c809deadfe8  ngircd-21.tar.gz
 f74c9064aaef9957dcd6acd45bf107a6f74ffe618b96373308ba151dcbffb62ec9062ed956e5d57c7b46bca1dd22a7486f182640cc5ab607f3f8b39600d6506f  ngircd.initd"
diff --git a/main/ngircd/username.patch b/main/ngircd/username.patch
deleted file mode 100644
index d611b8b8cc..0000000000
--- a/main/ngircd/username.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/ngircd/irc-login.c.orig       2013-02-08 09:59:13.313191929 +0000
-+++ ./src/ngircd/irc-login.c    2013-02-08 09:59:53.153525988 +0000
-@@ -444,7 +444,7 @@
-                ptr = Req->argv[0];
-                while (*ptr) {
-                        if (!isalnum((int)*ptr) &&
--                           *ptr != '+' && *ptr != '-' &&
-+                           *ptr != '+' && *ptr != '-' && *ptr != '@' &&
-                            *ptr != '.' && *ptr != '_') {
-                                Conn_Close(Client_Conn(Client), NULL,
-                                           "Invalid user name", true);