diff options
Diffstat (limited to 'community/ircii-pana')
| -rw-r--r-- | community/ircii-pana/PKGBUILD | 62 | ||||
| -rw-r--r-- | community/ircii-pana/bitchx-1.1-open_missing_mode.patch | 22 |
2 files changed, 57 insertions, 27 deletions
diff --git a/community/ircii-pana/PKGBUILD b/community/ircii-pana/PKGBUILD index ebbd841a0..376391591 100644 --- a/community/ircii-pana/PKGBUILD +++ b/community/ircii-pana/PKGBUILD @@ -1,52 +1,60 @@ -# $Id: PKGBUILD 22406 2010-07-21 18:30:48Z jlichtblau $ +# $Id: PKGBUILD 68217 2012-03-19 12:39:02Z lfleischer $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@seznam.cz> # inspired by Gentoo: http://kambing.ui.edu/gentoo-portage/net-irc/bitchx/files/ pkgname=ircii-pana pkgver=1.1 -pkgrel=4 -pkgdesc="A console-based IRC client - AKA BitchX." +pkgrel=5 +pkgdesc='A console-based IRC client - AKA BitchX.' arch=('i686' 'x86_64') -url="http://www.bitchx.org" +url='http://www.bitchx.org' license=('GPL2') depends=('ncurses') makedepends=('patch') -source=(http://downloads.sourceforge.net/bitchx/${pkgname}-${pkgver}-final.tar.gz \ - bitchx-${pkgver}-gcc43.diff \ - bitchx-${pkgver}-inline.diff \ - bitchx-${pkgver}-freenode.diff \ - bitchx-${pkgver}-latin1.diff \ - bitchx-${pkgver}-64bit.diff) +source=("http://downloads.sourceforge.net/bitchx/${pkgname}-${pkgver}-final.tar.gz" \ + "bitchx-${pkgver}-gcc43.diff" \ + "bitchx-${pkgver}-inline.diff" \ + "bitchx-${pkgver}-freenode.diff" \ + "bitchx-${pkgver}-latin1.diff" \ + "bitchx-${pkgver}-64bit.diff" + "bitchx-${pkgver}-open_missing_mode.patch") md5sums=('611d2dda222f00c10140236f4c331572' 'e1efc5e52658e6651918e07a116bce18' '4824ffd55d51099dd9ee035f4b78d6bf' '741e91dd6267d3436c43756429342217' '9316105f23a67a9bb7ecfc7485dcd098' - 'c86f7758db7f438d726fd447dd4a83b0') + 'c86f7758db7f438d726fd447dd4a83b0' + 'a80f431488bf3e0e9f0d650d23a08aba') build() { - cd ${srcdir}/BitchX + cd "${srcdir}/BitchX" - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-gcc43.diff || return 1 - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-inline.diff || return 1 - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-freenode.diff || return 1 - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-latin1.diff || return 1 + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-gcc43.diff" + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-inline.diff" + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-freenode.diff" + patch -Np1 -i "${srcdir}/bitchx-${pkgver}-latin1.diff" - if [ "$CARCH" == "x86_64" ] ; then - patch -Np1 -i ${srcdir}/bitchx-${pkgver}-64bit.diff || return 1 - fi + # add build fix (needed when building with "-D_FORTIFY_SOURCE=2") + patch -Np0 -i "${srcdir}/bitchx-${pkgver}-open_missing_mode.patch" + + [ "$CARCH" == "x86_64" ] && patch -Np1 -i "${srcdir}/bitchx-${pkgver}-64bit.diff" ./configure --prefix=/usr - make || return 1 - make prefix=${pkgdir}/usr install + make +} + +package() { + cd "${srcdir}/BitchX" + + make prefix="${pkgdir}/usr" install -#we don't want to link to ${pkgdir}, correcting it then - cd ${pkgdir}/usr/bin || return 1 - rm -f BitchX && ln -s BitchX-${pkgver}-final BitchX || return 1 + # we don't want to link to ${pkgdir}, correcting it then + cd "${pkgdir}/usr/bin" + rm -f BitchX && ln -s "BitchX-${pkgver}-final" BitchX -#correcting man page - rm -rf ${pkgdir}/usr/man || return 1 - install -D -m644 ${srcdir}/BitchX/doc/BitchX.1 ${pkgdir}/usr/share/man/man1/BitchX.1 || return 1 + # correcting man page + rm -rf "${pkgdir}/usr/man" + install -Dm644 "${srcdir}/BitchX/doc/BitchX.1" "${pkgdir}/usr/share/man/man1/BitchX.1" } diff --git a/community/ircii-pana/bitchx-1.1-open_missing_mode.patch b/community/ircii-pana/bitchx-1.1-open_missing_mode.patch new file mode 100644 index 000000000..3ae432979 --- /dev/null +++ b/community/ircii-pana/bitchx-1.1-open_missing_mode.patch @@ -0,0 +1,22 @@ +--- source/commands2.c.orig 2012-03-19 13:10:06.802575691 +0100 ++++ source/commands2.c 2012-03-19 13:10:26.401100927 +0100 +@@ -2575,7 +2575,7 @@ unsigned short port = 0; + { + char buf[BIG_BUFFER_SIZE+1]; + sprintf(buf, socket_path, port); +- if ((u = open(buf, O_CREAT|O_WRONLY)) != -1) ++ if ((u = open(buf, O_CREAT|O_WRONLY, 0644)) != -1) + { + chmod(buf, SOCKMODE); + chown(buf, getuid(), getgid()); +--- source/dcc.c.orig 2012-03-19 13:18:43.390562273 +0100 ++++ source/dcc.c 2012-03-19 13:17:23.729859849 +0100 +@@ -2273,7 +2273,7 @@ char *nick; + tmp = m_strdup(new->filename); + if (!(fullname = expand_twiddle(tmp))) + malloc_strcpy(&fullname, tmp); +- if ((new->file = open(fullname, O_WRONLY | O_CREAT | O_BINARY)) != -1) ++ if ((new->file = open(fullname, O_WRONLY | O_CREAT | O_BINARY, 0644)) != -1) + { + if ((new = dcc_create(nick, new->filename, passwd, 0, port? atol(port) : 0, DCC_REFILEREAD, (tdcc?DCC_TDCC:0) | DCC_TWOCLIENTS|DCC_OFFER, start_dcc_get))) + new->blocksize = blocksize; |