cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnugk-3.5.

Browse Source
This commit is contained in:
ajacoutot 2014-01-03 06:21:04 +00:00
parent b228dc4dcb
commit 855134bb0b
6 changed files with 17 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/gnugk/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.36 2013/10/02 10:47:06 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2014/01/03 06:21:04 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= H.323 gatekeeper
V= 3.4
V= 3.5
DISTNAME= gnugk-${V}
REVISION= 3
WRKDIST= ${WRKDIR}/gnugk-${V}

4
net/gnugk/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnugk-3.4.tar.gz) = dkDzOCYFNLF9uz/tqjcVtQ2shwTzVS9gS9hNcjvHGms=
SIZE (gnugk-3.4.tar.gz) = 1110806
SHA256 (gnugk-3.5.tar.gz) = 6rbHkh51XspNT0py1BI3V2h3sMIxq+cxaC3NlIiKHqU=
SIZE (gnugk-3.5.tar.gz) = 1213498

8
net/gnugk/patches/patch-ProxyChannel_cxx
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-ProxyChannel_cxx,v 1.2 2013/09/20 09:21:00 ajacoutot Exp $
$OpenBSD: patch-ProxyChannel_cxx,v 1.3 2014/01/03 06:21:04 ajacoutot Exp $
http://openh323gk.cvs.sourceforge.net/viewvc/openh323gk/openh323gk/ProxyChannel.cxx?r1=1.877&r2=1.878
--- ProxyChannel.cxx.orig Fri Sep 20 09:02:15 2013
+++ ProxyChannel.cxx Fri Sep 20 09:01:48 2013
@@ -57,6 +57,10 @@
--- ProxyChannel.cxx.orig Thu Jan 2 11:21:12 2014
+++ ProxyChannel.cxx Fri Jan 3 07:01:23 2014
@@ -59,6 +59,10 @@
#include "h235/h235crypto.h"
#endif

18
net/gnugk/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.13 2013/05/14 15:01:57 ajacoutot Exp $
--- configure.orig Sun Feb 24 17:35:19 2013
+++ configure Tue May 14 16:50:04 2013
@@ -3730,7 +3730,7 @@ else
$OpenBSD: patch-configure,v 1.14 2014/01/03 06:21:04 ajacoutot Exp $
--- configure.orig Thu Jan 2 13:27:20 2014
+++ configure Fri Jan 3 07:02:38 2014
@@ -3733,7 +3733,7 @@ else
fi
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.13 2013/05/14 15:01:57 ajacoutot Exp $
if test "${H460SUPPORT:-unset}" = "unset" ; then
if test "x${h46017}" != "xno" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No H.460 support available" >&5
@@ -3762,7 +3762,7 @@ else
@@ -3765,7 +3765,7 @@ else
fi
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.13 2013/05/14 15:01:57 ajacoutot Exp $
if test "${H460SUPPORT:-unset}" = "unset" ; then
if test "x${h46018}" != "xno" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No H.460 support available" >&5
@@ -3794,7 +3794,7 @@ else
@@ -3797,7 +3797,7 @@ else
fi
@ -28,12 +28,12 @@ $OpenBSD: patch-configure,v 1.13 2013/05/14 15:01:57 ajacoutot Exp $
if test "${H460SUPPORT:-unset}" = "unset" ; then
if test "x${h46023}" != "xno" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No H.460 support available" >&5
@@ -4587,7 +4587,7 @@ $as_echo_n "checking for ssh_handle_key_exchange()/ssh
@@ -4590,7 +4590,7 @@ $as_echo_n "checking for ssh_handle_key_exchange()/ssh
for try in /usr/lib /usr/local/lib $libssh_lib_dir; do
if test -d $try; then
- LIBS="$old_LIBS -lssh -lcrypto -lz -lrt"
+ LIBS="$old_LIBS -lssh -lcrypto -lz"
- LIBS="$old_LIBS -L$try -lssh -lcrypto -lz -lrt"
+ LIBS="$old_LIBS -L$try -lssh -lcrypto -lz"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
extern ssh_handle_key_exchange(); extern ssh_blocking_flush();

142
net/gnugk/patches/patch-docs_gnugk_1
View File

@ -1,142 +0,0 @@
$OpenBSD: patch-docs_gnugk_1,v 1.8 2013/09/24 08:25:17 bentley Exp $
--- docs/gnugk.1.orig Thu Aug 23 07:09:29 2012
+++ docs/gnugk.1 Tue Sep 24 02:06:40 2013
@@ -2,16 +2,16 @@
.\"
.\" gnugk.1
.\"
-.\" Author:
-.\" Jan Willamowius <jan@willamowius.de>
-.\" Man page Composer:
+.\" Author:
+.\" Jan Willamowius <jan@willamowius.de>
+.\" Man page Composer:
.\" Ivan Lopez <ivan.n.lopez@gmail.com>
.\"
-.\" Created: Tue May 15 2005
+.\" Created: Tue May 15 2005
.\"
.\"
.Dd August 7, 2011
-.Dt GNUGK 1
+.Dt GNUGK 1
.Os
.Sh NAME
.Nm gnugk
@@ -30,64 +30,85 @@
.Op Fl -pid Ar filename
.Op Fl -core Ar n
.Sh DESCRIPTION
-.Bl -tag -width Ds
-The GNU Gatekeeper is an open-source project that implements a H.323 gatekeeper. A H.323 gatekeeper controls all H.323 clients in its zone. It allows you, among other things, to register devices, make calls, perform AAA (Authentication, Authorization and Auditing), manage configurations at runtime and traverse NAT.
-.El
+The GNU Gatekeeper is an open-source project that implements a H.323 gatekeeper.
+A H.323 gatekeeper controls all H.323 clients in its zone.
+It allows you, among other things, to register devices, make calls, perform AAA (Authentication, Authorization and Auditing), manage configurations at runtime and traverse NAT.
.Sh OPTIONS
+The behavior of the gatekeeper is determined through command line options and the configuration file.
+Some command line options may override settings found in the configuration file.
+For example, the option
+.Fl l
+overrides the setting
+.Dq TimeToLive
+in the configuration file.
+Almost every option has a short and a long format, e.g.,
+.Fl c
+is the same as
+.Fl -config .
.Bl -tag -width Ds
-The behavior of the gatekeeper is determined through command line options and the configuration file. Some command line options may override settings found in the configuration file. For example, the option
-.Em -l
-overrides the setting "TimeToLive" in the configuration file.
-Almost every option has a short and a long format, e.g.,
-.Em -c
-is the same as
-.Em --config.
.It Fl h -help
- Show all available options and quit the program.
+Show all available options and quit the program.
.It Fl c -config Ar filename
-Specify the configuration file to use.
+Specify the configuration file to use.
.It Fl s -section Ar section
-Specify which main section to use in the configuration file. The default is
-.Em [Gatekeeper::Main].
+Specify which main section to use in the configuration file.
+The default is
+.Em [Gatekeeper::Main] .
.It Fl l -timetolive Ar n
-Specify the time-to-live timer (in seconds) for endpoint registration. This overrides the setting "TimeToLive" in the configuration file. A detailed explanation can be found in the manual.
+Specify the time-to-live timer (in seconds) for endpoint registration.
+This overrides the setting
+.Dq TimeToLive
+in the configuration file.
+A detailed explanation can be found in the manual.
.It Fl b -bandwidth Ar n
-Specify the total bandwidth available for the gatekeeper. Without specifying this option, bandwidth management is disabled by default.
+Specify the total bandwidth available for the gatekeeper.
+Without specifying this option, bandwidth management is disabled by default.
.It Fl -pid Ar filename
-Specify the pid file. Only valid for Unix version.
+Specify the pid file.
+Only valid for Unix version.
.It Fl u -user Ar name
-Run the gatekeeper process as this user. Only valid for Unix versions.
+Run the gatekeeper process as this user.
+Only valid for Unix versions.
.It Fl -core Ar n
-(Unix only) Enable writing core dump files when the application crashes. A core dump file will not exceed n bytes in size. A special constant "unlimited" may also be specified.
+(Unix only) Enable writing core dump files when the application crashes.
+A core dump file will not exceed n bytes in size.
+A special constant
+.Dq unlimited
+may also be specified.
.El
.Ss Gatekeeper Mode
+The options in this subsection override the settings in the [RoutedMode] section of the configuration file.
.Bl -tag -width Ds
-The options in this subsection override the settings in the [RoutedMode] section of the configuration file.
.It Fl d -direct
-Use direct endpoint call signaling.
+Use direct endpoint call signaling.
.It Fl r -routed
-Use gatekeeper routed call signaling.
+Use gatekeeper routed call signaling.
.It Fl rr -h245routed
-Use gatekeeper routed call signaling and H.245 control channel.
+Use gatekeeper routed call signaling and H.245 control channel.
.El
.Ss Debug Information
.Bl -tag -width Ds
.It Fl o -output Ar filename
Write trace log to the specified file.
.It Fl t -trace
-Set trace verbosity. The more \-t you add, the more verbose to output. For example, use \-ttttt to set the trace level to 5.
+Set trace verbosity.
+The more
+.Fl t
+you add, the more verbose to output.
+For example, use
+.Fl ttttt
+to set the trace level to 5.
.El
.Sh FILES
-.Pa /etc/gatekeeper.ini
+.Pa ${SYSCONFDIR}/gatekeeper.ini
.Sh AUTHORS
-The project coordinator is
-.Em Jan Willamowius
-<jan@willamowius.de>
+The project coordinator is
+.An Jan Willamowius Aq Mt jan@willamowius.de .
.Sh SEE ALSO
.Xr gatekeeper.ini 5 (and HTML manual)
.Pp
-http://www.gnugk.org/ (project homepage)
+.Lk http://www.gnugk.org/ "Project homepage"
.Pp
-http://www.gnugk.org/gnugk-manual.html (manual for latest release)
+.Lk http://www.gnugk.org/gnugk-manual.html "Manual for latest release"
.Pp
-http://www.willamowius.com/gnugk-support.html (commercial support)
+.Lk http://www.willamowius.com/gnugk-support.html "Commercial support"

26
net/gnugk/patches/patch-gk_cxx
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-gk_cxx,v 1.3 2013/09/20 11:53:47 ajacoutot Exp $
http://openh323gk.cvs.sourceforge.net/viewvc/openh323gk/openh323gk/gk.cxx?r1=1.253&r2=1.254&view=patch
--- gk.cxx.orig Thu Sep 19 15:27:22 2013
+++ gk.cxx Fri Sep 20 13:52:23 2013
@@ -1481,8 +1481,6 @@ void Gatekeeper::Main()
// let's go
RasSrv->Run();
- //HouseKeeping();
-
// graceful shutdown
cerr << "\nShutting down gatekeeper . . . ";
@@ -1494,6 +1492,10 @@ void Gatekeeper::Main()
SetConsoleCtrlHandler((PHANDLER_ROUTINE)WinCtrlHandlerProc, FALSE);
FreeConsole();
#endif // _WIN32
+
+#ifdef P_OPENBSD
+ _exit(0); // skip exit handlers, will hang on OpenBSD 5.3
+#endif
}
namespace {