From 5ce8cb10047286c5736213cb2737c3436ad42422 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 2 Mar 2012 12:07:22 +0000 Subject: main/ngircd: allow longer client usernames This breaks the RFC but makes sense when using pam. --- main/ngircd/APKBUILD | 30 ++++++++++++++++++++---------- main/ngircd/client_user_len.patch | 11 +++++++++++ 2 files changed, 31 insertions(+), 10 deletions(-) create mode 100644 main/ngircd/client_user_len.patch diff --git a/main/ngircd/APKBUILD b/main/ngircd/APKBUILD index 1489bbf02..98708eb31 100644 --- a/main/ngircd/APKBUILD +++ b/main/ngircd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=ngircd pkgver=18 -pkgrel=2 +pkgrel=3 pkgdesc="Next Generation IRC Daemon" url="http://ngircd.barton.de/" arch="all" @@ -11,17 +11,26 @@ depends= makedepends="openssl-dev zlib-dev linux-pam-dev" install="$pkgname.pre-install" source="ftp://ftp.berlios.de/pub/$pkgname/$pkgname-$pkgver.tar.gz + client_user_len.patch $pkgname.initd " - +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + 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() { - cd "$srcdir"/$pkgname-$pkgver - 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 - + cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc/ngircd \ --mandir=/usr/share/man \ @@ -33,10 +42,11 @@ build() { } package() { - cd "$srcdir"/$pkgname-$pkgver + cd "$_builddir" make DESTDIR="$pkgdir" install || return 1 install -Dm755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname } md5sums="4958c8b2d128cf3e9888af3f782892a1 ngircd-18.tar.gz +28b810151fd16c716ed685fc8ac72441 client_user_len.patch 628548a938f27fedcb6797c427bf0035 ngircd.initd" diff --git a/main/ngircd/client_user_len.patch b/main/ngircd/client_user_len.patch new file mode 100644 index 000000000..f2e564e71 --- /dev/null +++ b/main/ngircd/client_user_len.patch @@ -0,0 +1,11 @@ +--- ./src/ngircd/defines.h.orig ++++ ./src/ngircd/defines.h +@@ -40,7 +40,7 @@ + * section 1.2.1 */ + #define CLIENT_NICK_LEN 32 /* Maximum nick name length */ + #define CLIENT_PASS_LEN 21 /* Max. password length */ +-#define CLIENT_USER_LEN 10 /* Max. length of user name ("login") ++#define CLIENT_USER_LEN 64 /* Max. length of user name ("login") + see RFC 2812, section 1.2.1 */ + #define CLIENT_NAME_LEN 32 /* Max. length of "real names" */ + #define CLIENT_HOST_LEN 64 /* Max. host name length */ -- cgit v1.2.3