diff options
author | Sean Enck | 2018-04-15 12:46:14 -0400 |
---|---|---|
committer | Sean Enck | 2018-04-15 12:46:14 -0400 |
commit | d1bfcafb44a269eb800cb5d895251b0046efaef1 (patch) | |
tree | 4b39045da129e17a750160c38fd510c7665186c0 | |
parent | c7755d7ed9e1640fc5c8df528ed8bf09544fbb6f (diff) | |
download | aur-d1bfcafb44a269eb800cb5d895251b0046efaef1.tar.gz |
include a minor patch for spaces (github issue #240)
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | spaces-240.patch | 25 |
3 files changed, 34 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = oragono pkgdesc = A modern IRC server written in Go. pkgver = 0.11.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/oragono/oragono install = install arch = x86_64 @@ -16,12 +16,14 @@ pkgbase = oragono source = oragono.sysusers source = path.patch source = oragono.tmpfiles + source = spaces-240.patch sha256sums = SKIP sha256sums = SKIP sha256sums = d35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858 sha256sums = 7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4 sha256sums = be7b802fa047c94e4b714a9232cccd2d8f5db356fefd4c01bc970d5be23d4943 sha256sums = d56a8935891bc421683e48245786c9f8d9d4c449197de5f455ce7d7804907c7a + sha256sums = 21e9280caf4ddd4e940c49921a73b034b87d7c0dbfa4e8172a996df18853f63c pkgname = oragono @@ -2,7 +2,7 @@ pkgname=oragono pkgver=0.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="A modern IRC server written in Go." arch=('x86_64') url="https://github.com/oragono/oragono" @@ -15,13 +15,15 @@ source=("git+$url#tag=v$pkgver" "oragono.service" "oragono.sysusers" "path.patch" - "oragono.tmpfiles") + "oragono.tmpfiles" + "spaces-240.patch") sha256sums=('SKIP' 'SKIP' 'd35dd5205e3b607ee105a1252677d0607d0c35636ee3e6057275b5f13e555858' '7e214caa8bee053adac26a00a17ed732970e86665cbe31553b1d3d609f0a49b4' 'be7b802fa047c94e4b714a9232cccd2d8f5db356fefd4c01bc970d5be23d4943' - 'd56a8935891bc421683e48245786c9f8d9d4c449197de5f455ce7d7804907c7a') + 'd56a8935891bc421683e48245786c9f8d9d4c449197de5f455ce7d7804907c7a' + '21e9280caf4ddd4e940c49921a73b034b87d7c0dbfa4e8172a996df18853f63c') backup=('etc/oragono.conf') build() { export GOPATH=$(pwd)/.. @@ -31,6 +33,7 @@ build() { git config submodule.vendor.url $srcdir/oragono-vendor git submodule update patch -p1 < ../path.patch + patch -p1 < ../spaces-240.patch cd vendor/github.com/$pkgname rm -rf $pkgname mkdir -p $pkgname diff --git a/spaces-240.patch b/spaces-240.patch new file mode 100644 index 000000000000..e89ecd2fcd64 --- /dev/null +++ b/spaces-240.patch @@ -0,0 +1,25 @@ +diff --git a/irc/client.go b/irc/client.go +index d309102..0cafce8 100644 +--- a/irc/client.go ++++ b/irc/client.go +@@ -811,15 +811,15 @@ func (client *Client) SendRawMessage(message ircmsg.IrcMessage) error { + message = ircmsg.MakeMessage(nil, client.server.name, ERR_UNKNOWNERROR, "*", "Error assembling message for sending") + line, _ := message.Line() + +- // if we used the trailing hack, we need to strip the final space we appended earlier on +- if usedTrailingHack { +- line = line[:len(line)-3] + "\r\n" +- } +- + client.socket.Write(line) + return err + } + ++ // if we used the trailing hack, we need to strip the final space we appended earlier on ++ if usedTrailingHack { ++ line = line[:len(line)-3] + "\r\n" ++ } ++ + client.server.logger.Debug("useroutput", client.nick, " ->", strings.TrimRight(line, "\r\n")) + + client.socket.Write(line) |