ocserv: updated to 0.10.4

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 8e0eac766db3b635b4db17d39ea1b16418b88f87..9925d340b4a62727ed2431b2858a1594ecb632f2 100644 (file)
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
-PKG_VERSION:=0.10.3
-PKG_RELEASE:=2
+PKG_VERSION:=0.10.4
+PKG_RELEASE:=1
 
 PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/ocserv/
-PKG_MD5SUM:=36c947a4e37484487844dc1c977ca870
+PKG_MD5SUM:=6df31778642320ea7b90f314c4c9a897
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/ocserv/patches/001-correct-session-expiration.patch b/net/ocserv/patches/001-correct-session-expiration.patch
deleted file mode 100644 (file)
index b0c596b..0000000
--- a/net/ocserv/patches/001-correct-session-expiration.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/sec-mod-auth.c b/src/sec-mod-auth.c
-index 4ee6f57..2fc02b5 100644
---- a/src/sec-mod-auth.c
-+++ b/src/sec-mod-auth.c
-@@ -500,7 +500,7 @@ int handle_sec_auth_session_close(int cfd, sec_mod_st *sec, const SecAuthSession
-                               (pack_func) cli_stats_msg__pack);
-       }
- 
--      if (e->status != PS_AUTH_COMPLETED) {
-+      if (e->status < PS_AUTH_COMPLETED) {
-               seclog(sec, LOG_DEBUG, "session close received in unauthenticated client %s "SESSION_STR"!", e->auth_info.username, e->auth_info.psid);
-               return send_msg(e, cfd, SM_CMD_AUTH_CLI_STATS, &rep,
-                               (pack_size_func) cli_stats_msg__get_packed_size,
-@@ -604,7 +604,7 @@ int handle_sec_auth_stats_cmd(sec_mod_st * sec, const CliStatsMsg * req)
-               e->stats.uptime = req->uptime;
- 
-       if (req->has_invalidate_cookie && req->invalidate_cookie != 0) {
--              seclog(sec, LOG_INFO, "invalidating session user '%s' "SESSION_STR,
-+              seclog(sec, LOG_INFO, "invalidating session of user '%s' "SESSION_STR,
-                       e->auth_info.username, e->auth_info.psid);
-               e->status = PS_AUTH_USER_TERM;
-       }