Update to version 0.4.3

4 files changed, 42 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5ff7e533a0d..31dbf1a413ee 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xd-torrent
 	pkgdesc = An I2P BitTorrent client
-	pkgver = 0.4.2
-	pkgrel = 2
+	pkgver = 0.4.3
+	pkgrel = 1
 	url = https://xd-torrent.github.io/
 	arch = x86_64
 	license = MIT
@@ -9,15 +9,17 @@ pkgbase = xd-torrent
 	depends = glibc
 	options = !lto
 	backup = etc/xd.conf
-	source = https://github.com/majestrate/XD/archive/v0.4.2/xd-torrent-0.4.2.tar.gz
+	source = https://github.com/majestrate/XD/archive/v0.4.3/xd-torrent-0.4.3.tar.gz
 	source = 010-xd-torrent-use-arch-ldflags.patch
+	source = 015-xd-torrent-makefile-fix-webui-target.patch
 	source = 020-xd-torrent-rename-service-paths.patch
 	source = 030-xd-torrent-service-hardening.patch
 	source = xd-torrent.sysusers
 	source = xd-torrent.tmpfiles
 	source = xd.conf
-	sha256sums = 77490f37ea979d559490611f874acbb618072e3685f15d7b6254bedfe31a0b03
-	sha256sums = 0eb00a6df35028549286fce92cb158d3c84ec49fad72e1e437de5b5e309719d2
+	sha256sums = 9ff34058e093208e22870253370d17d725dd3783a147c651fd0b9b9e6b51cafe
+	sha256sums = 57fe19f7092d257c11aba66757bc37382dc3d793f01417c8e3d463fabdbfa7e0
+	sha256sums = 1e1ae60af989131ba5cfb6a23c736f9e6a1557d830c93c0778e4cdaf224f4aaa
 	sha256sums = 6b3d959b55623c3f907be0e1c53c7092e9328cb0b10c336102d012d716438a14
 	sha256sums = 77f50344dc028eac9ee229faf2fcda4807b5fbe4872a23513c271dd0e4964e53
 	sha256sums = 5f2fb392c2fec68bb3861ece85b5bbdd4929c4ccccf3caeb835060213c309761
diff --git a/010-xd-torrent-use-arch-ldflags.patch b/010-xd-torrent-use-arch-ldflags.patch
index 2f5c25604e97..58baa1c7b8a0 100644
--- a/010-xd-torrent-use-arch-ldflags.patch
+++ b/010-xd-torrent-use-arch-ldflags.patch
@@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -43,10 +43,10 @@ build: $(CLI)
+@@ -47,10 +47,10 @@ build: $(CLI)
  
  
  $(XD): webui
@@ -13,7 +13,7 @@
  
  $(CLI): $(XD)
  	$(RM) $(CLI)
-@@ -81,7 +81,7 @@ webui: $(WEBUI_CORE)
+@@ -85,7 +85,7 @@ webui: $(WEBUI_CORE)
  	$(CP) $(WEB_FILES) $(REPO)/lib/rpc/assets/
  
  no-webui:
diff --git a/015-xd-torrent-makefile-fix-webui-target.patch b/015-xd-torrent-makefile-fix-webui-target.patch
new file mode 100644
index 000000000000..8764529de8de
--- /dev/null
+++ b/015-xd-torrent-makefile-fix-webui-target.patch
@@ -0,0 +1,26 @@
+--- a/Makefile
++++ b/Makefile
+@@ -46,10 +46,10 @@ CLI ?= XD-CLI$(BINEXT)
+ build: $(CLI)
+ 
+ 
+-$(XD): webui
++$(XD): $(WEBUI_CORE)
+ 	$(GO) build -a -ldflags "-X xd/lib/version.Git=$(GIT_VERSION) -linkmode external -extldflags '${LDFLAGS}'" -tags='$(TAGS)' -o $(XD)
+ 
+-dev: webui
++dev: $(WEBUI_CORE)
+ 	$(GO) build -race -v -a -ldflags "-X xd/lib/version.Git=$(GIT_VERSION) -linkmode external -extldflags '${LDFLAGS}'" -tags='$(TAGS)' -o $(XD)
+ 
+ $(CLI): $(XD)
+@@ -80,9 +80,9 @@ $(WEBUI_LOGO):
+ 
+ $(WEBUI_CORE): $(WEBUI_LOGO)
+ 	$(MAKE) -C $(WEBUI)
++	$(CP) $(WEB_FILES) $(REPO)/lib/rpc/assets/
+ 
+ webui: $(WEBUI_CORE)
+-	$(CP) $(WEB_FILES) $(REPO)/lib/rpc/assets/
+ 
+ no-webui:
+ 	$(GO) build -ldflags "-X xd/lib/version.Git=$(GIT_VERSION) -linkmode external -extldflags '${LDFLAGS}'" -o $(XD)
diff --git a/PKGBUILD b/PKGBUILD
index 7d472e33428f..8b7764d4d453 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 pkgname=xd-torrent
-pkgver=0.4.2
-pkgrel=2
+pkgver=0.4.3
+pkgrel=1
 pkgdesc='An I2P BitTorrent client'
 arch=('x86_64')
 url='https://xd-torrent.github.io/'
@@ -12,14 +12,16 @@ makedepends=('go')
 backup=('etc/xd.conf')
 source=("https://github.com/majestrate/XD/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
         '010-xd-torrent-use-arch-ldflags.patch'
+        '015-xd-torrent-makefile-fix-webui-target.patch'
         '020-xd-torrent-rename-service-paths.patch'
         '030-xd-torrent-service-hardening.patch'
         'xd-torrent.sysusers'
         'xd-torrent.tmpfiles'
         'xd.conf')
 options=('!lto')
-sha256sums=('77490f37ea979d559490611f874acbb618072e3685f15d7b6254bedfe31a0b03'
-            '0eb00a6df35028549286fce92cb158d3c84ec49fad72e1e437de5b5e309719d2'
+sha256sums=('9ff34058e093208e22870253370d17d725dd3783a147c651fd0b9b9e6b51cafe'
+            '57fe19f7092d257c11aba66757bc37382dc3d793f01417c8e3d463fabdbfa7e0'
+            '1e1ae60af989131ba5cfb6a23c736f9e6a1557d830c93c0778e4cdaf224f4aaa'
             '6b3d959b55623c3f907be0e1c53c7092e9328cb0b10c336102d012d716438a14'
             '77f50344dc028eac9ee229faf2fcda4807b5fbe4872a23513c271dd0e4964e53'
             '5f2fb392c2fec68bb3861ece85b5bbdd4929c4ccccf3caeb835060213c309761'
@@ -28,6 +30,7 @@ sha256sums=('77490f37ea979d559490611f874acbb618072e3685f15d7b6254bedfe31a0b03'
 
 prepare() {
     patch -d "XD-${pkgver}" -Np1 -i "${srcdir}/010-xd-torrent-use-arch-ldflags.patch"
+    patch -d "XD-${pkgver}" -Np1 -i "${srcdir}/015-xd-torrent-makefile-fix-webui-target.patch"
     patch -d "XD-${pkgver}" -Np1 -i "${srcdir}/020-xd-torrent-rename-service-paths.patch"
     patch -d "XD-${pkgver}" -Np1 -i "${srcdir}/030-xd-torrent-service-hardening.patch"
 }