Update psensor to version 1.1.4

4 files changed, 11 insertions, 59 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7c76df6bbaad..a2c04aa6dc87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun May  8 10:04:50 UTC 2016
+# Sat Jun  4 08:56:10 UTC 2016
 pkgbase = psensor
 	pkgdesc = A graphical hardware temperature monitor for Linux
-	pkgver = 1.1.3
-	pkgrel = 4
+	pkgver = 1.1.4
+	pkgrel = 1
 	url = http://wpitchoune.net/psensor
 	arch = i686
 	arch = x86_64
@@ -24,12 +24,10 @@ pkgbase = psensor
 	conflicts = libappindicator-activate-gtk2
 	conflicts = libappindicator-gtk2-ubuntu
 	conflicts = lib32-libappindicator-gtk2
-	source = http://wpitchoune.net/psensor/files/psensor-1.1.3.tar.gz
-	source = http://wpitchoune.net/psensor/files/psensor-1.1.3.tar.gz.asc
-	source = psensor-libmicrohttpd.patch
-	md5sums = c3a3c1dea4dbfe12bbfb8088b86c3d4f
+	source = http://wpitchoune.net/psensor/files/psensor-1.1.4.tar.gz
+	source = http://wpitchoune.net/psensor/files/psensor-1.1.4.tar.gz.asc
+	md5sums = 05253aa36d3e2c82d5f83dac01d23fb9
 	md5sums = SKIP
-	md5sums = 6d0414028c191c9c88f42dc765f3ecfd
 
 pkgname = psensor
 
diff --git a/.gitignore b/.gitignore
index 1f494c2abb54..05c6d4d4c97b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,3 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!psensor-libmicrohttpd.patch
diff --git a/PKGBUILD b/PKGBUILD
index ef90e3b523be..bc0591425cdf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Diogo Leal <estranho@diogoleal.com>
 
 pkgname=psensor
-pkgver=1.1.3
-pkgrel=4
+pkgver=1.1.4
+pkgrel=1
 pkgdesc="A graphical hardware temperature monitor for Linux"
 arch=('i686' 'x86_64')
 url="http://wpitchoune.net/psensor"
@@ -19,21 +19,13 @@ optdepends=('asciidoc: required to produce the HTML version of the FAQ'
 	'curl: required for remote monitoring'
 	'libgtop: required for CPU usage')
 conflicts=('libappindicator-gtk2' 'libappindicator-activate-gtk2' 'libappindicator-gtk2-ubuntu' 'lib32-libappindicator-gtk2')
-source=("http://wpitchoune.net/$pkgname/files/$pkgname-$pkgver.tar.gz"{,.asc}
-	"psensor-libmicrohttpd.patch")
-md5sums=('c3a3c1dea4dbfe12bbfb8088b86c3d4f'
-         'SKIP'
-         '6d0414028c191c9c88f42dc765f3ecfd')
+source=("http://wpitchoune.net/$pkgname/files/$pkgname-$pkgver.tar.gz"{,.asc})
+md5sums=('05253aa36d3e2c82d5f83dac01d23fb9'
+         'SKIP')
 validpgpkeys=('BB5213F337DAF58190686F07733A866882A3F5F6') # Jean-Philippe Orsini
 
-prepare() {
-	cd "$srcdir/$pkgname-$pkgver"
-	patch -Np1 -i "$srcdir/psensor-libmicrohttpd.patch"
-}
-
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
-	autoreconf --install
 	./configure --prefix=/usr
 	make
 }
diff --git a/psensor-libmicrohttpd.patch b/psensor-libmicrohttpd.patch
deleted file mode 100644
index b161bd491f1c..000000000000
--- a/psensor-libmicrohttpd.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- a/src/server/server.c
-+++ b/src/server/server.c
-@@ -192,8 +192,8 @@
- 	if (page) {
- 		*rp_code = MHD_HTTP_OK;
- 
--		resp = MHD_create_response_from_data(strlen(page), page,
--						     MHD_YES, MHD_NO);
-+		resp = MHD_create_response_from_buffer(strlen(page), page,
-+						     MHD_RESPMEM_MUST_FREE);
- 
- 		MHD_add_response_header(resp, MHD_HTTP_HEADER_CONTENT_TYPE,
- 					"application/json");
-@@ -223,8 +223,8 @@
- 
- 			if (!st.st_size) {
- 				fclose(file);
--				return MHD_create_response_from_data
--					(0, NULL, MHD_NO, MHD_NO);
-+				return MHD_create_response_from_buffer
-+					(0, NULL, MHD_RESPMEM_PERSISTENT);
- 			}
- 
- 			return MHD_create_response_from_callback
-@@ -263,10 +263,9 @@
- 	char *page = strdup(PAGE_NOT_FOUND);
- 	*rp_code = MHD_HTTP_NOT_FOUND;
- 
--	return MHD_create_response_from_data(strlen(page),
-+	return MHD_create_response_from_buffer(strlen(page),
- 					     page,
--					     MHD_YES,
--					     MHD_NO);
-+					     MHD_RESPMEM_MUST_FREE);
- }
- 
- static int cbk_http_request(void *cls,