mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-22 00:35:15 +00:00
Code Issues Releases Activity

- Update to 0.11.2 release

Browse Source 
- Remove unneeded patch (applied upstream)

Changelog: http://www.infradead.org/ocserv/changelog.html

Approved by:	junovitch (mentor)
Differential Revision:	D6122
This commit is contained in:
Carlos J. Puga Medina 2016-04-28 20:27:15 +00:00
parent 2b3b35620c
commit 591ec4af87
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=414238
3 changed files with 3 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ocserv/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ocserv
PORTVERSION= 0.11.1
PORTVERSION= 0.11.2
CATEGORIES= net security
MASTER_SITES= ftp://ftp.infradead.org/pub/ocserv/

4
net/ocserv/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ocserv-0.11.1.tar.xz) = 2e083903277ab5f2e5869d2eb3721f0313522edf2ad2c4b844869826d690a5c6
SIZE (ocserv-0.11.1.tar.xz) = 739800
SHA256 (ocserv-0.11.2.tar.xz) = fd9d21ca8105bedd66fddbf727a8188184333509cc30e14fb80e2b4a6ef58170
SIZE (ocserv-0.11.2.tar.xz) = 747240

72
net/ocserv/files/patch-src_main.c
View File

@ -1,72 +0,0 @@
--- src/main.c.orig 2016-03-06 11:14:35 UTC
+++ src/main.c
@@ -77,7 +77,7 @@ static void listen_watcher_cb (EV_P_ ev_
int syslog_open = 0;
sigset_t sig_default_set;
-struct ev_loop *loop;
+struct ev_loop *loop = NULL;
/* EV watchers */
ev_io ctl_watcher;
@@ -147,8 +147,9 @@ int y;
#elif defined(IP_RECVDSTADDR) /* *BSD */
if (family == AF_INET) {
y = 1;
- if (setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR,
- (const void *)&y, sizeof(y)) < 0)
+ if (family == AF_INET &&
+ setsockopt(fd, IPPROTO_IP, IP_RECVDSTADDR,
+ (const void *)&y, sizeof(y)) < 0)
perror("setsockopt(IP_RECVDSTADDR) failed");
}
#endif
@@ -661,13 +662,15 @@ void clear_lists(main_server_st *s)
ctl_handler_deinit(s);
main_ban_db_deinit(s);
- /* clear libev state */
- ev_io_stop (loop, &ctl_watcher);
- ev_io_stop (loop, &sec_mod_watcher);
- ev_child_stop (loop, &child_watcher);
- ev_timer_stop(loop, &maintainance_watcher);
- /* free memory by the event loop */
- ev_loop_destroy (loop);
+ if (loop) {
+ /* clear libev state */
+ ev_io_stop (loop, &ctl_watcher);
+ ev_io_stop (loop, &sec_mod_watcher);
+ ev_child_stop (loop, &child_watcher);
+ ev_timer_stop(loop, &maintainance_watcher);
+ /* free memory by the event loop */
+ ev_loop_destroy (loop);
+ }
}
/* A UDP fd will not be forwarded to worker process before this number of
@@ -1165,12 +1168,6 @@ int main(int argc, char** argv)
memset(&creds, 0, sizeof(creds));
- loop = EV_DEFAULT;
- if (loop == NULL) {
- fprintf(stderr, "could not initialise libev\n");
- exit(1);
- }
-
/* main pool */
main_pool = talloc_init("main");
if (main_pool == NULL) {
@@ -1253,6 +1250,12 @@ int main(int argc, char** argv)
exit(1);
}
+ loop = EV_DEFAULT;
+ if (loop == NULL) {
+ fprintf(stderr, "could not ititialise libev\n");
+ exit(1);
+ }
+
mslog(s, NULL, LOG_INFO, "initialized %s", PACKAGE_STRING);
/* chdir to our chroot directory, to allow opening the sec-mod