Commit ff511821 authored by Natanael Copa's avatar Natanael Copa
Browse files

main/ngircd: allow @ in username

ref #1608
parent 24db490f
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=ngircd pkgname=ngircd
pkgver=20 pkgver=20
pkgrel=0 pkgrel=1
pkgdesc="Next Generation IRC Daemon" pkgdesc="Next Generation IRC Daemon"
url="http://ngircd.barton.de/" url="http://ngircd.barton.de/"
arch="all" arch="all"
...@@ -11,6 +11,7 @@ depends= ...@@ -11,6 +11,7 @@ depends=
makedepends="openssl-dev zlib-dev linux-pam-dev" makedepends="openssl-dev zlib-dev linux-pam-dev"
install="$pkgname.pre-install" install="$pkgname.pre-install"
source="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$pkgver.tar.gz source="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$pkgver.tar.gz
username.patch
$pkgname.initd $pkgname.initd
" "
_builddir="$srcdir"/$pkgname-$pkgver _builddir="$srcdir"/$pkgname-$pkgver
...@@ -21,11 +22,6 @@ prepare() { ...@@ -21,11 +22,6 @@ prepare() {
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac esac
done done
# sed -i \
# -e "s:/usr/local/etc/ngircd.motd:/etc/ngircd/ngircd.motd:" \
# -e "s:;ServerUID = 65534:ServerUID = ngircd:" \
# -e "s:;ServerGID = 65534:ServerGID = nogroup:" \
# doc/sample-ngircd.conf
} }
build() { build() {
...@@ -47,4 +43,11 @@ package() { ...@@ -47,4 +43,11 @@ package() {
} }
md5sums="9cbafd07d5847a978a1112c72be8d147 ngircd-20.tar.gz md5sums="9cbafd07d5847a978a1112c72be8d147 ngircd-20.tar.gz
67645fbee1432b8bf21e57325d7cb50a username.patch
628548a938f27fedcb6797c427bf0035 ngircd.initd" 628548a938f27fedcb6797c427bf0035 ngircd.initd"
sha256sums="948b6ee9217bf0833958390513ba1ca2b2e8ddef809c226b889e7591f680c3d8 ngircd-20.tar.gz
2ffb140b61912e8993fc839431458a0379f6697c393f26fecd20f92b1101ccaf username.patch
67d7427762ce9f97abe494448032912cdc45291df070afc80562b34c94b7915c ngircd.initd"
sha512sums="7aef3e4ff78dda967e8bbae6248c45d78002f87960f42add49242dbb6d6252c469a595a41555d32ee77c0ad08ba282f69ed5a2171f79a720879b109801a52d6b ngircd-20.tar.gz
a2b413c3e921b50714d2299ce63307ff7cd39aba997310c92a919ee9c8bcfbf933fac12b49010a044ec2ce6594ba3a3627dbdda9a2d922351db71bd91a0c2796 username.patch
f74c9064aaef9957dcd6acd45bf107a6f74ffe618b96373308ba151dcbffb62ec9062ed956e5d57c7b46bca1dd22a7486f182640cc5ab607f3f8b39600d6506f ngircd.initd"
--- ./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);
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment