Update to 2.1.1

3 files changed, 14 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ae9cac0005d..0bbf3bbe862e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = re
 	pkgdesc = Portable library for real-time communications
-	pkgver = 2.0.1
+	pkgver = 2.1.1
 	pkgrel = 1
 	url = https://github.com/baresip/re
 	arch = i686
@@ -9,10 +9,9 @@ pkgbase = re
 	license = BSD
 	depends = openssl
 	depends = zlib
-	source = re-2.0.1.tar.gz::https://github.com/baresip/re/archive/v2.0.1.tar.gz
+	source = re-2.1.1.tar.gz::https://github.com/baresip/re/archive/v2.1.1.tar.gz
 	source = re-flags.patch
-	sha256sums = 43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
-	sha256sums = fb1c3db52d49953dbc689b105b3bf90c86ddbde44fbe2cfcf2f271c02e48d36b
+	sha256sums = 6da4026a0ae1af9c5c679b9ee896e74d7696d1160e3cee6446324b6f836484df
+	sha256sums = d269af3a87305cef303069cc1287be0b504c2bcf48160866fa05e7951d38f2f7
 
 pkgname = re
-
diff --git a/PKGBUILD b/PKGBUILD
index 3866801bc6e5..7c638813174e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Dmitrij D. Czarkoff <czarkoff at gmail dot com>
 
 pkgname=re
-pkgver=2.0.1
+pkgver=2.1.1
 pkgrel=1
 pkgdesc="Portable library for real-time communications"
 arch=('i686' 'x86_64' 'armv6h')
@@ -13,8 +13,8 @@ license=('BSD')
 depends=('openssl' 'zlib')
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/baresip/re/archive/v${pkgver}.tar.gz"
         "re-flags.patch")
-sha256sums=('43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed'
-            'fb1c3db52d49953dbc689b105b3bf90c86ddbde44fbe2cfcf2f271c02e48d36b')
+sha256sums=('6da4026a0ae1af9c5c679b9ee896e74d7696d1160e3cee6446324b6f836484df'
+            'd269af3a87305cef303069cc1287be0b504c2bcf48160866fa05e7951d38f2f7')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -29,5 +29,4 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -Dm644 docs/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
diff --git a/re-flags.patch b/re-flags.patch
index 821d3305f21c..54b17cff342a 100644
--- a/re-flags.patch
+++ b/re-flags.patch
@@ -1,12 +1,11 @@
-diff -Naur re-0.6.0.orig/Makefile re-0.6.0/Makefile
---- re-0.6.0.orig/Makefile	2019-01-22 21:09:25.991849231 -0500
-+++ re-0.6.0/Makefile	2019-01-22 21:11:11.580636432 -0500
-@@ -65,7 +65,7 @@
+--- re-2.1.1.orig/Makefile	2022-03-12 15:42:35.000000000 +0900
++++ re-2.1.1/Makefile	2022-03-28 14:55:41.972025186 +0900
+@@ -87,7 +87,7 @@
  
- $(SHARED): $(OBJS)
+ $(SHARED): $(OBJS) libre.pc
  	@echo "  LD      $@"
--	@$(LD) $(LFLAGS) $(SH_LFLAGS) $^ $(LIBS) -o $@
-+	@$(LD) $(LDFLAGS) $(LFLAGS) $(SH_LFLAGS) $^ $(LIBS) -o $@
+-	$(HIDE)$(LD) $(LFLAGS) $(SH_LFLAGS) $(OBJS) $(LIBS) -o $@
++	$(HIDE)$(LD) $(LDFLAGS) $(LFLAGS) $(SH_LFLAGS) $(OBJS) $(LIBS) -o $@
  
  
- $(STATIC): $(OBJS)
+ $(STATIC): $(OBJS) libre.pc