ocserv: updated to 0.8.1

diff --git a/net/ocserv/Makefile b/net/ocserv/Makefile
index 5b43a16d38be5b872929c328de12db8d9beb5148..9bca60e3a6f6aec6e1dd4a9b54e445ce986136c0 100644 (file)
--- a/net/ocserv/Makefile
+++ b/net/ocserv/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ocserv
-PKG_VERSION:=0.8.0
-PKG_RELEASE:=3
+PKG_VERSION:=0.8.1
+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:=6383535a21f8eecfb1bbb7f7ac99c41f
+PKG_MD5SUM:=9a2eeafbe018128460df0729096b20c6
 
 PKG_LICENSE:=GPLv3
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/ocserv/patches/0001-native-endianess.patch b/net/ocserv/patches/0001-native-endianess.patch
deleted file mode 100644 (file)
index 0afd8a3..0000000
--- a/net/ocserv/patches/0001-native-endianess.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/src/main-ctl-unix.c b/src/main-ctl-unix.c
-index b4da5eb..90d604f 100644
---- a/src/main-ctl-unix.c
-+++ b/src/main-ctl-unix.c
-@@ -629,7 +629,7 @@ static void ctl_handle_commands(main_server_st * s)
-               }
-               goto cleanup;
-       }
--      length = (buffer[2] << 8) | buffer[1];
-+      memcpy(&length, &buffer[1], 2);
-       buffer_size = ret - 3;
- 
-       if (length != buffer_size) {
-diff --git a/src/occtl-unix.c b/src/occtl-unix.c
-index 183825d..0c1b3e1 100644
---- a/src/occtl-unix.c
-+++ b/src/occtl-unix.c
-@@ -83,15 +83,14 @@ int send_cmd(struct unix_ctx *ctx, unsigned cmd, const void *data,
-       struct iovec iov[2];
-       unsigned iov_len = 1;
-       int e, ret;
--      unsigned length = 0;
-+      uint16_t length = 0;
-       void *packed = NULL;
- 
-       if (get_size)
-               length = get_size(data);
- 
-       header[0] = cmd;
--      header[1] = length;
--      header[2] = length >> 8;
-+      memcpy(&header[1], &length, 2);
- 
-       iov[0].iov_base = header;
-       iov[0].iov_len = 3;
-@@ -145,7 +144,7 @@ int send_cmd(struct unix_ctx *ctx, unsigned cmd, const void *data,
-                       goto fail;
-               }
- 
--              length = (header[2] << 8) | header[1];
-+              memcpy(&length, &header[1], 2);
- 
-               rep->data_size = length;
-               rep->data = talloc_size(ctx, length);
-diff --git a/src/sec-mod.c b/src/sec-mod.c
-index 15ee32a..c3d4bad 100644
---- a/src/sec-mod.c
-+++ b/src/sec-mod.c
-@@ -354,6 +354,7 @@ void sec_mod_server(void *main_pool, struct cfg_st *config, const char *socket_f
-       unsigned cmd, length;
-       unsigned i, buffer_size;
-       uint8_t *buffer, *tpool;
-+      uint16_t l16;
-       struct pin_st pins;
-       int sd;
-       sec_mod_st *sec;
-@@ -538,10 +539,11 @@ void sec_mod_server(void *main_pool, struct cfg_st *config, const char *socket_f
-               }
- 
-               cmd = buffer[0];
--              length = buffer[1] | buffer[2] << 8;
-+              memcpy(&l16, &buffer[1], 2);
-+              length = l16;
- 
-               if (length > buffer_size - 4) {
--                      seclog(LOG_INFO, "too big message");
-+                      seclog(LOG_INFO, "too big message (%d)", length);
-                       goto cont;
-               }
-