soju: Bump to 0.6.0
This commit is contained in:
parent
c71402577e
commit
26166284a7
|
@ -1,16 +1,24 @@
|
|||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -20,10 +20,10 @@
|
||||
install:
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/$(BINDIR)
|
||||
mkdir -p $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
|
||||
- mkdir -p $(DESTDIR)/etc/soju
|
||||
- mkdir -p $(DESTDIR)/var/lib/soju
|
||||
+ mkdir -p $(DESTDIR)$(PREFIX)/etc/soju
|
||||
+ mkdir -p $(DESTDIR)$(PREFIX)/var/lib/soju
|
||||
cp -f soju sojuctl $(DESTDIR)$(PREFIX)/$(BINDIR)
|
||||
cp -f doc/soju.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
|
||||
- [ -f $(DESTDIR)/etc/soju/config ] || cp -f config.in $(DESTDIR)/etc/soju/config
|
||||
+ cp -f config.in $(DESTDIR)$(PREFIX)/etc/soju/config
|
||||
@@ -5,10 +5,10 @@
|
||||
PREFIX ?= /usr/local
|
||||
BINDIR ?= bin
|
||||
MANDIR ?= share/man
|
||||
-SYSCONFDIR ?= /etc
|
||||
-RUNDIR ?= /run
|
||||
+SYSCONFDIR = @TERMUX_PREFIX@/etc
|
||||
+RUNDIR = @TERMUX_PREFIX@/var/run
|
||||
|
||||
.PHONY: soju sojuctl clean install
|
||||
-sharedstatedir := /var/lib
|
||||
+sharedstatedir := @TERMUX_PREFIX@/var/lib
|
||||
config_path := $(SYSCONFDIR)/soju/config
|
||||
admin_socket_path := $(RUNDIR)/soju/admin
|
||||
goflags := $(GOFLAGS) -ldflags=" \
|
||||
@@ -36,6 +36,6 @@
|
||||
mkdir -p $(DESTDIR)$(sharedstatedir)/soju
|
||||
cp -f $(commands) $(DESTDIR)$(PREFIX)/$(BINDIR)
|
||||
cp -f $(man_pages) $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
|
||||
- [ -f $(DESTDIR)$(config_path) ] || cp -f config.in $(DESTDIR)$(config_path)
|
||||
+ cp -f config.in $(DESTDIR)$(config_path)
|
||||
|
||||
.PHONY: soju sojudb sojuctl clean install
|
||||
|
|
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://git.sr.ht/~emersion/soju
|
|||
TERMUX_PKG_DESCRIPTION="A user-friendly IRC bouncer"
|
||||
TERMUX_PKG_LICENSE="AGPL-V3"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=0.5.2
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_VERSION=0.6.0
|
||||
TERMUX_PKG_SRCURL=https://git.sr.ht/~emersion/soju/refs/download/v${TERMUX_PKG_VERSION}/soju-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=243e97e89d1ab9db0757b4d9e2181bf9602bf1ca277aba665417ea788ef82d9b
|
||||
TERMUX_PKG_SHA256=11275b6edf53ae811011b4e9c3f325e901c31986e46c390c841c3add114cb9aa
|
||||
TERMUX_PKG_BUILD_IN_SRC=true
|
||||
TERMUX_PKG_EXTRA_MAKE_ARGS="PREFIX=$TERMUX_PREFIX"
|
||||
|
||||
|
|
|
@ -0,0 +1,11 @@
|
|||
--- a/config/config.go
|
||||
+++ b/config/config.go
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
var (
|
||||
DefaultPath string
|
||||
- DefaultUnixAdminPath = "/run/soju/admin"
|
||||
+ DefaultUnixAdminPath = "@TERMUX_PREFIX@/var/run/soju/admin"
|
||||
)
|
||||
|
||||
type IPSet []*net.IPNet
|
Loading…
Reference in New Issue