Upgrade to 2.3.0

7 files changed, 45 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 780e5f1aa875..e96ed6aa7f12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = lsyncd
 	pkgdesc = Live Syncing (Mirror) Daemon
-	pkgver = 2.2.3
-	pkgrel = 3
+	pkgver = 2.3.0
+	pkgrel = 1
 	url = https://github.com/axkibe/lsyncd
 	arch = i686
 	arch = x86_64
@@ -11,15 +11,13 @@ pkgbase = lsyncd
 	makedepends = cmake
 	depends = lua
 	depends = rsync
-	source = https://github.com/axkibe/lsyncd/archive/release-2.2.3.tar.gz
+	source = https://github.com/axkibe/lsyncd/archive/release-2.3.0.tar.gz
 	source = lsyncd.service
-	source = FindLua.cmake.patch
-	source = lua-compat-fix.patch
 	source = 0001-cmake-remove-fixed-setting-of-LUA_COMPILER-to-luac5..patch
-	sha256sums = 7bcd0f4ae126040bb078c482ff856c87e61c22472c23fa3071798dcb1dc388dd
+	source = 0002-lsyncd.h-define-_BSD_SOURCE-1-define-LUA_COMPAT_5_3.patch
+	sha256sums = 08a1bcab041fa5d4c777ae272c72ad9917442b6e654b14ffd1a82ba0cd45e4ef
 	sha256sums = 538072a4505abbdf8c4d16c9200810d4a2253f892a71fc16b5cd7f35ebe1ae57
-	sha256sums = 12fb0d853c9b1fe743e0de5c77b9df037a9026afffb8584ef36f8009ae6dc450
-	sha256sums = dfe8e359e28a28ee38fa76c3fea4378a5946305f08d1a25efe0e2f1448bdfc90
-	sha256sums = 08ba3aa767057e2b2ddf1fdb42e3452f8f1531e429e5d1a53ed60b61f7fe49da
+	sha256sums = e5e6731559c7a290323f5b4e1d74c7ebbfaae700509a760ed43080f7eda31c71
+	sha256sums = 2b383276d158337d2e81ea188e767888ffdc78c20e3fc6932621481075015524
 
 pkgname = lsyncd
diff --git a/0001-cmake-remove-fixed-setting-of-LUA_COMPILER-to-luac5..patch b/0001-cmake-remove-fixed-setting-of-LUA_COMPILER-to-luac5..patch
index 7115849902d0..11bc5d30861d 100644
--- a/0001-cmake-remove-fixed-setting-of-LUA_COMPILER-to-luac5..patch
+++ b/0001-cmake-remove-fixed-setting-of-LUA_COMPILER-to-luac5..patch
@@ -1,17 +1,17 @@
-From cabda7f527fb072df46a957a9972fac2164edaeb Mon Sep 17 00:00:00 2001
+From f1d2bdfebc1ed18dfab2fd58659c337395c31199 Mon Sep 17 00:00:00 2001
 From: Noel Kuntze <noel.kuntze@thermi.consulting>
-Date: Sun, 13 Feb 2022 00:35:36 +0100
-Subject: [PATCH] cmake: remove fixed setting of LUA_COMPILER to luac5.3
+Date: Sun, 10 Jul 2022 18:07:08 +0200
+Subject: [PATCH 1/2] cmake: remove fixed setting of LUA_COMPILER to luac5.3
 
 ---
  cmake/FindLua.cmake | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
-index 1f95bf9..b06f4d8 100644
+index 6628209..53333f3 100644
 --- a/cmake/FindLua.cmake
 +++ b/cmake/FindLua.cmake
-@@ -53,7 +53,7 @@ FIND_PROGRAM(LUA_EXECUTABLE
+@@ -54,7 +54,7 @@ FIND_PROGRAM(LUA_EXECUTABLE
  
  # Find the lua executable
  FIND_PROGRAM(LUA_COMPILER
@@ -21,5 +21,5 @@ index 1f95bf9..b06f4d8 100644
  
  # Find the lua header
 -- 
-2.35.1
+2.37.0
 
diff --git a/0002-lsyncd.h-define-_BSD_SOURCE-1-define-LUA_COMPAT_5_3.patch b/0002-lsyncd.h-define-_BSD_SOURCE-1-define-LUA_COMPAT_5_3.patch
new file mode 100644
index 000000000000..7149c6304e87
--- /dev/null
+++ b/0002-lsyncd.h-define-_BSD_SOURCE-1-define-LUA_COMPAT_5_3.patch
@@ -0,0 +1,24 @@
+From e6da3e24d0e80fa3e2065edc9bcbacd15807f6eb Mon Sep 17 00:00:00 2001
+From: Noel Kuntze <noel.kuntze@thermi.consulting>
+Date: Sun, 10 Jul 2022 18:08:58 +0200
+Subject: [PATCH 2/2] lsyncd.h: #define _BSD_SOURCE 1, #define LUA_COMPAT_5_3
+
+---
+ lsyncd.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lsyncd.h b/lsyncd.h
+index 9a4ec67..9ea6f72 100644
+--- a/lsyncd.h
++++ b/lsyncd.h
+@@ -19,6 +19,7 @@
+ 
+ #define LUA_COMPAT_ALL
+ #define LUA_COMPAT_5_1
++#define LUA_COMPAT_5_3
+ 
+ // includes needed for headerfile
+ #include "config.h"
+-- 
+2.37.0
+
diff --git a/FindLua.cmake.patch b/FindLua.cmake.patch
deleted file mode 100644
index babf26cd1324..000000000000
--- a/FindLua.cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff lsyncd-release-2.1.5.orig/cmake/FindLua.cmake lsyncd-release-2.1.5/cmake/FindLua.cmake
---- a/cmake/FindLua.cmake
-+++ b/cmake/FindLua.cmake
-@@ -36,7 +36,7 @@ SET(_POSSIBLE_LUA_INCLUDE include include/lua)
- #SET(_POSSIBLE_LUA_LIBRARY lua)
- 
- # Determine possible naming suffixes (there is no standard for this)
--SET(_POSSIBLE_SUFFIXES "52" "5.2" "-5.2" "53" "5.3" "-5.3" "")
-+SET(_POSSIBLE_SUFFIXES "54" "5.4" "-5.4" "53" "5.3" "-5.3" "52" "5.2" "-5.2" "")
- 
- # Set up possible search names and locations
- FOREACH(_SUFFIX ${_POSSIBLE_SUFFIXES})
diff --git a/PKGBUILD b/PKGBUILD
index 6a8de6977ef0..87def5e3954d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 ## Maintainer: Thermi <noel[ at ] familie-kuntze.de>
 # Submitter: nullie
 pkgname=lsyncd
-pkgver=2.2.3
-pkgrel=4
+pkgver=2.3.0
+pkgrel=1
 pkgdesc="Live Syncing (Mirror) Daemon"
 arch=('i686' 'x86_64')
 url="https://github.com/axkibe/lsyncd"
@@ -11,16 +11,14 @@ depends=('lua' 'rsync')
 makedepends=('asciidoc' 'lua' 'cmake')
 source=("https://github.com/axkibe/lsyncd/archive/release-$pkgver.tar.gz"
         "lsyncd.service"
-        "FindLua.cmake.patch"
-        "lua-compat-fix.patch"
         "0001-cmake-remove-fixed-setting-of-LUA_COMPILER-to-luac5..patch"
+        "0002-lsyncd.h-define-_BSD_SOURCE-1-define-LUA_COMPAT_5_3.patch"
         )
 
-sha256sums=('7bcd0f4ae126040bb078c482ff856c87e61c22472c23fa3071798dcb1dc388dd'
+sha256sums=('08a1bcab041fa5d4c777ae272c72ad9917442b6e654b14ffd1a82ba0cd45e4ef'
             '538072a4505abbdf8c4d16c9200810d4a2253f892a71fc16b5cd7f35ebe1ae57'
-            '12fb0d853c9b1fe743e0de5c77b9df037a9026afffb8584ef36f8009ae6dc450'
-            'dfe8e359e28a28ee38fa76c3fea4378a5946305f08d1a25efe0e2f1448bdfc90'
-            '08ba3aa767057e2b2ddf1fdb42e3452f8f1531e429e5d1a53ed60b61f7fe49da')
+            'e5e6731559c7a290323f5b4e1d74c7ebbfaae700509a760ed43080f7eda31c71'
+            '2b383276d158337d2e81ea188e767888ffdc78c20e3fc6932621481075015524')
 
 prepare() {
     cd "${pkgname}-release-${pkgver}"
@@ -42,7 +40,7 @@ package() {
     cd "${srcdir}/${pkgname}-release-${pkgver}/build"
     make DESTDIR="${pkgdir}" install
     # fix the path of the man page. Urgh.
-    install -D "${pkgdir}/usr/man/lsyncd.1" "${pkgdir}/usr/share/man/man1/lsyncd.1"
-    rm -rf "${pkgdir}/usr/man"
+    install -D "${pkgdir}/man1/lsyncd.1" "${pkgdir}/usr/share/man/man1/lsyncd.1"
+    rm -rf "${pkgdir}/man1"
     install -m 644 -D "${srcdir}/lsyncd.service" "${pkgdir}/usr/lib/systemd/system/lsyncd.service"
 }
diff --git a/configure-a2x-fix.patch b/configure-a2x-fix.patch
deleted file mode 100644
index cb3c4bf46eed..000000000000
--- a/configure-a2x-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -aur lsyncd-release-2.1.5.orig/configure.ac lsyncd-release-2.1.5/configure.ac
---- lsyncd-release-2.1.5.orig/configure.ac	2013-06-07 18:24:02.000000000 +0600
-+++ lsyncd-release-2.1.5/configure.ac	2014-03-04 13:24:15.390350812 +0600
-@@ -15,10 +15,10 @@
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
--#AC_PATH_PROG([A2X], [a2x], [no])
--#if test x${A2X} = xno ; then
--#	AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required])
--#fi
-+AC_PATH_PROG([A2X], [a2x], [no])
-+if test x${A2X} = xno ; then
-+	AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required])
-+fi
- 
- ###
- # Checks for Lua
diff --git a/lua-compat-fix.patch b/lua-compat-fix.patch
deleted file mode 100644
index 4842118b74fa..000000000000
--- a/lua-compat-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/lsyncd.h b/lsyncd.h
-index 9300a09..efda2fd 100644
---- a/lsyncd.h
-+++ b/lsyncd.h
-@@ -13,11 +13,13 @@
- 
- // some older machines need this to see pselect
- #define _DEFAULT_SOURCE 1
-+#define _BSD_SOURCE 1
- #define _XOPEN_SOURCE 700
- #define _DARWIN_C_SOURCE 1
- 
- #define LUA_COMPAT_ALL
- #define LUA_COMPAT_5_1
-+#define LUA_COMPAT_5_3
- 
- // includes needed for headerfile
- #include "config.h"