From 0236c9f13528b20c3bdb97af2ca7af1e960a0095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
Date: Wed, 27 Mar 2019 15:44:05 +0100
Subject: [PATCH] conserver: update to version 8.2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

version 8.2.4 (March 26, 2019):
        - Correct man page typo (Ed Maste <emaste@freebsd.org>)
        - Remove autotools generated files from repo and create with release
        - Better integration of Cirrus CI - FreeBSD, Linux, and MacOS
        - Moving README to markdown
        - Fix #12 - Remote infomation flags (i.e. "-x") cannot be filtered by console
        - Fix #8 - defaultaccess appears broken
        - Rename configure.in and use autoreconf
        - Better use of version.h and letting configure build things with versions

version 8.2.3 (March 17, 2019):
        - Correct 'impi' typo (Ed Maste <emaste@freebsd.org>)
        - Correct argument type passed to time() (Ed Maste <emaste@freebsd.org>)
        - Fix compilation without deprecated OpenSSL APIs (Rosen Penev <rosenp@gmail.com>)
        - Fix compilation without deprecated OpenSSL 1.1 APIs (Rosen Penev <rosenp@gmail.com>)
        - Fix #6 - clang "-Wstring-plus-int" warning (Bryan Stansell <bryan@conserver.com>)
        - configure.in: Add test for closefrom (Ed Maste <emaste@freebsd.org>)
        - regenerate autoconf files (Ed Maste <emaste@freebsd.org>)
        - Use closefrom if available (Ed Maste <emaste@freebsd.org>)
        - Correct typo (Ed Maste <emaste@freebsd.org>)
        - Add Cirrus-CI FreeBSD CI build config (Ed Maste <emaste@freebsd.org>)
        - off by one found by Ed Maste (Bryan Stansell <bryan@conserver.com>)

openwrt packaging:
 - removed upstreamed 010-openssl-deprecated.patch

Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 net/conserver/Makefile                             | 10 ++++------
 net/conserver/patches/010-openssl-deprecated.patch | 11 -----------
 2 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 net/conserver/patches/010-openssl-deprecated.patch

diff --git a/net/conserver/Makefile b/net/conserver/Makefile
index 7243f8818..93a6f12f3 100644
--- a/net/conserver/Makefile
+++ b/net/conserver/Makefile
@@ -8,15 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=conserver
-PKG_VERSION:=8.2.2
-PKG_RELEASE:=2
+PKG_VERSION:=8.2.4
+PKG_RELEASE:=1
 PKG_MAINTAINER:=Bjørn Mork <bjorn@mork.no>
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/conserver/conserver.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_SOURCE_URL:=https://codeload.github.com/conserver/conserver/tar.gz/v$(PKG_VERSION)?
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_MIRROR_HASH:=27d92e6c04e97cd0884774eace0b44f30087695927bcce8addc11dba9c090d7c
+PKG_HASH:=8d8b263d9531ebb827257bd67baf9200cac4fb7ffbe033122686e39ca42cddd6
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
diff --git a/net/conserver/patches/010-openssl-deprecated.patch b/net/conserver/patches/010-openssl-deprecated.patch
deleted file mode 100644
index 8e34d3f4e..000000000
--- a/net/conserver/patches/010-openssl-deprecated.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/conserver/cutil.h
-+++ b/conserver/cutil.h
-@@ -7,6 +7,8 @@
- #include <stdarg.h>
- #if HAVE_OPENSSL
- # include <openssl/ssl.h>
-+# include <openssl/bn.h>
-+# include <openssl/dh.h>
- # include <openssl/err.h>
- # if OPENSSL_VERSION_NUMBER < 0x10100000L
- #  define TLS_method SSLv23_method