Bump up libtins 4.1-1

3 files changed, 17 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 94eea170adc9..dde990f38abf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = lib32-libtins
 	pkgdesc = A high-level, multiplatform C++ network packet sniffing and crafting library (32-bit) version
-	pkgver = 4.0
+	pkgver = 4.1
 	pkgrel = 1
 	url = http://libtins.github.io/
 	arch = x86_64
@@ -10,10 +10,10 @@ pkgbase = lib32-libtins
 	depends = lib32-openssl
 	depends = libtins
 	options = !libtool
-	source = https://github.com/mfontanini/libtins/archive/v4.0.tar.gz
+	source = https://github.com/mfontanini/libtins/archive/v4.1.tar.gz
 	source = 0001-Set-where-find-and-install-32-bits-libraries.patch
-	sha256sums = 2a758d1bed51760bbd57fcaa00610534e0cc3a6d55d91983724e5f46739d66b8
-	sha256sums = cda02bbdf6edf95b6adaef57b1c4122dae26932c8ff4465e00183b0403a85e34
+	sha256sums = 81a0ae1e04499b25984b2833579d33c4a78ff4513e9a14176c574e855163f7a5
+	sha256sums = df7f2f7fd956e91b5feaa825562db4212c727fe836fe29abdcae0ed549c6c7b5
 
 pkgname = lib32-libtins
 
diff --git a/0001-Set-where-find-and-install-32-bits-libraries.patch b/0001-Set-where-find-and-install-32-bits-libraries.patch
index 78177f05e1bb..487bf681e7cf 100644
--- a/0001-Set-where-find-and-install-32-bits-libraries.patch
+++ b/0001-Set-where-find-and-install-32-bits-libraries.patch
@@ -1,29 +1,18 @@
-From 6a07e64fd13fe35499d9e7b3dbaf968a201652a6 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Javier=20Ti=C3=A1?= <javier.tia@gmail.com>
-Date: Mon, 1 Feb 2016 06:38:30 -0600
-Subject: [PATCH] Set where find and install 32-bits libraries
-
----
- CMakeLists.txt               | 2 +-
- cmake/Modules/FindPCAP.cmake | 2 +-
- src/CMakeLists.txt           | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7ddffe1..79f40a5 100644
+index 11d3aae..32fcc27 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -135,7 +135,7 @@ CONFIGURE_FILE(
+@@ -232,7 +232,7 @@ CONFIGURE_FILE(
  )
  
- # Support for pkg-config
--SET(CMAKE_INSTALL_LIBDIR lib)
-+SET(CMAKE_INSTALL_LIBDIR lib32)
- SET(pkgconfig_prefix      ${CMAKE_INSTALL_PREFIX})
- SET(pkgconfig_exec_prefix ${CMAKE_INSTALL_PREFIX})
- SET(pkgconfig_libdir      ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR})
+ IF (NOT CMAKE_INSTALL_LIBDIR)
+-    SET(CMAKE_INSTALL_LIBDIR lib)
++    SET(CMAKE_INSTALL_LIBDIR lib32)
+ ENDIF()
+ # The library output directory
+ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake
-index ecc32fb..c01fa76 100644
+index 388b30b..ce7a569 100644
 --- a/cmake/Modules/FindPCAP.cmake
 +++ b/cmake/Modules/FindPCAP.cmake
 @@ -29,7 +29,7 @@ find_path(PCAP_INCLUDE_DIR
@@ -35,20 +24,3 @@ index ecc32fb..c01fa76 100644
  
  # On x64 windows, we should look also for the .lib at /lib/x64/
  # as this is the default path for the WinPcap developer's pack
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 66b8c50..cfdae02 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,7 +75,7 @@ SET_TARGET_PROPERTIES(tins PROPERTIES VERSION ${LIBTINS_VERSION} SOVERSION ${LIB
- INSTALL( 
-     TARGETS tins
-     EXPORT libtinsTargets
--    LIBRARY DESTINATION lib
--    ARCHIVE DESTINATION lib
-+    LIBRARY DESTINATION lib32
-+    ARCHIVE DESTINATION lib32
-     COMPONENT dev
- )
--- 
-2.7.0
-
diff --git a/PKGBUILD b/PKGBUILD
index deb23ec5d143..6be3aa12fa75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Javier Tiá <javier.tia at gmail dot com>
 
 pkgname=lib32-libtins
-pkgver=4.0
+pkgver=4.1
 pkgrel=1
 pkgdesc="A high-level, multiplatform C++ network packet sniffing and crafting library (32-bit) version"
 arch=('x86_64')
@@ -15,8 +15,8 @@ source=(
   "0001-Set-where-find-and-install-32-bits-libraries.patch"
 )
 
-sha256sums=('2a758d1bed51760bbd57fcaa00610534e0cc3a6d55d91983724e5f46739d66b8'
-            'cda02bbdf6edf95b6adaef57b1c4122dae26932c8ff4465e00183b0403a85e34')
+sha256sums=('81a0ae1e04499b25984b2833579d33c4a78ff4513e9a14176c574e855163f7a5'
+            'df7f2f7fd956e91b5feaa825562db4212c727fe836fe29abdcae0ed549c6c7b5')
 
 prepare() {
   cd "${srcdir}"/libtins-${pkgver}
@@ -40,4 +40,4 @@ package() {
   rm -R "${pkgdir}"/usr/{CMake,include}/
 }
 
-# vim:set ft=sh ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et: