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

Update to gnugk-4.5.

Browse Source
This commit is contained in:
ajacoutot 2017-08-28 08:31:29 +00:00
parent c7c5374f32
commit 83120d5a3c
8 changed files with 53 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
net/gnugk/Makefile
View File

@ -1,19 +1,16 @@
# $OpenBSD: Makefile,v 1.71 2017/07/26 22:45:27 sthen Exp $
# $OpenBSD: Makefile,v 1.72 2017/08/28 08:31:29 ajacoutot Exp $
BROKEN-hppa= libpt.so.7.0: undefined reference to __sync_fetch_and_or_4
BROKEN-hppa= libpt.so.7.0: undefined reference to __sync_fetch_and_or_4
COMMENT= H.323 gatekeeper
COMMENT= H.323 gatekeeper
DISTNAME= gnugk-4.2-2
PKGNAME= gnugk-4.2.2
REVISION= 4
WRKDIST= ${WRKDIR}/gnugk-4.2
DISTNAME= gnugk-4.5
CATEGORIES= net telephony
CATEGORIES= net telephony
HOMEPAGE= http://www.gnugk.org/
HOMEPAGE= http://www.gnugk.org/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -22,47 +19,46 @@ WANTLIB += GeoIP SDL c crypto expat h323 kvm lber ldap ldap_r
WANTLIB += lua${MODLUA_VERSION} m netsnmp netsnmpagent netsnmpmibs pt pthread
WANTLIB += sasl2 ssh ssl ${COMPILER_LIBCXX} z
MODULES= lang/lua
MODULES= lang/lua
# uses luaL_newlib, lua_setglobal
MODLUA_VERSION= 5.2
MODLUA_VERSION=5.2
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openh323gk/}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openh323gk/}
BUILD_DEPENDS= databases/mariadb \
databases/postgresql
BUILD_DEPENDS= databases/mariadb \
databases/postgresql
LIB_DEPENDS= net/GeoIP \
net/h323plus \
net/net-snmp \
security/libssh
LIB_DEPENDS= net/GeoIP \
net/h323plus>=1.26.8 \
net/net-snmp \
security/libssh
ALL_TARGET= optshared
USE_GMAKE= Yes
NO_TEST= Yes
ALL_TARGET= optshared
USE_GMAKE= Yes
NO_TEST= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
OPENH323DIR=${LOCALBASE}/include/openh323 \
OPENH323MAKEDIR=${LOCALBASE}/share/openh323 \
PTLIBDIR=${LOCALBASE}/share/ptlib
CONFIGURE_ARGS= --disable-sqlite \
--disable-unixodbc \
--with-pgsql-include-dir=${LOCALBASE}/include/postgresql \
--with-lua-include-dir=${MODLUA_INCL_DIR} \
--with-lua-lib-dir=${LOCALBASE}/lib
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
OPENH323DIR=${LOCALBASE}/include/openh323 \
OPENH323MAKEDIR=${LOCALBASE}/share/openh323 \
PTLIBDIR=${LOCALBASE}/share/ptlib
CONFIGURE_ARGS= --disable-sqlite \
--disable-unixodbc \
--with-pgsql-include-dir=${LOCALBASE}/include/postgresql \
--with-lua-include-dir=${MODLUA_INCL_DIR} \
--with-lua-lib-dir=${LOCALBASE}/lib
# sync with net/h323plus
CONFIGURE_ARGS +=--disable-h46018
CONFIGURE_ARGS +=--disable-h46023
CONFIGURE_ARGS += --disable-h46018
CONFIGURE_ARGS += --disable-h46023
MAKE_ENV= VERBOSE=1
MAKE_FLAGS= PTLIB_LIBDIR=$$(pkg-config --variable libdir ptlib) \
OH323_LIBDIR=${LOCALBASE}/lib \
OBJDIR=.
MAKE_ENV= VERBOSE=1
MAKE_FLAGS= PTLIB_LIBDIR=$$(pkg-config --variable libdir ptlib) \
OH323_LIBDIR=${LOCALBASE}/lib \
OBJDIR=.
pre-configure:
sed -i.beforesubst 's,-llua,-llua${MODLUA_VERSION} -lm,g' ${WRKSRC}/configure

4
net/gnugk/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnugk-4.2-2.tar.gz) = gT/oe8G71joZaV6oMMldSk2V6KTfV+4KScbg8YcjWG0=
SIZE (gnugk-4.2-2.tar.gz) = 1257366
SHA256 (gnugk-4.5.tar.gz) = 2k66GtQlP1OwduIXMGffJHnNvMPnn9vtE6AUDPOnLkk=
SIZE (gnugk-4.5.tar.gz) = 1268673

4
net/gnugk/patches/patch-Toolkit_cxx
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Toolkit_cxx,v 1.1 2017/05/19 22:55:35 espie Exp $
$OpenBSD: patch-Toolkit_cxx,v 1.2 2017/08/28 08:31:29 ajacoutot Exp $
Index: Toolkit.cxx
--- Toolkit.cxx.orig
+++ Toolkit.cxx
@@ -18,6 +18,7 @@
@@ -19,6 +19,7 @@
#include <map>
#include <vector>
#include <cstdlib>

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

@ -1,7 +1,9 @@
$OpenBSD: patch-configure,v 1.21 2016/02/27 12:02:04 ajacoutot Exp $
--- configure.orig Mon Feb 1 12:59:04 2016
+++ configure Sat Feb 27 12:17:18 2016
@@ -5070,7 +5070,7 @@ else
$OpenBSD: patch-configure,v 1.22 2017/08/28 08:31:29 ajacoutot Exp $
Index: configure
--- configure.orig
+++ configure
@@ -5082,7 +5082,7 @@ else
fi

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

@ -1,9 +1,9 @@
$OpenBSD: patch-gk_cxx,v 1.5 2017/05/19 22:55:35 espie Exp $
$OpenBSD: patch-gk_cxx,v 1.6 2017/08/28 08:31:29 ajacoutot Exp $
Index: gk.cxx
--- gk.cxx.orig
+++ gk.cxx
@@ -22,6 +22,7 @@
@@ -23,6 +23,7 @@
#include <sys/resource.h>
#include <sys/mman.h>
#endif

22
net/gnugk/patches/patch-yasocket_cxx
View File

@ -1,11 +1,9 @@
$OpenBSD: patch-yasocket_cxx,v 1.2 2017/05/19 22:55:35 espie Exp $
http://openh323gk.cvs.sourceforge.net/viewvc/openh323gk/openh323gk/yasocket.cxx?r1=1.100&r2=1.101
$OpenBSD: patch-yasocket_cxx,v 1.3 2017/08/28 08:31:29 ajacoutot Exp $
Index: yasocket.cxx
--- yasocket.cxx.orig
+++ yasocket.cxx
@@ -20,6 +20,7 @@
@@ -21,6 +21,7 @@
#include "Toolkit.h"
#include "snmp.h"
#include "gk.h"
@ -13,19 +11,3 @@ Index: yasocket.cxx
#ifdef _WIN32
# ifndef SHUT_RDWR
@@ -636,7 +637,14 @@ int YaUDPSocket::os_recv(void * buf, int sz)
int YaUDPSocket::os_send(const void * buf, int sz)
{
- return ::sendto(os_handle, buf, sz, 0, (struct sockaddr *)&sendaddr, sizeof(sendaddr));
+ // must pass short len when sending to IPv4 address on Solaris 11, OpenBSD and NetBSD
+ // sizeof(sockaddr) would OK on Linux and FreeBSD
+ size_t addr_len = sizeof(sockaddr_in);
+#ifdef hasIPV6
+ if (((struct sockaddr*)&sendaddr)->sa_family == AF_INET6)
+ addr_len = sizeof(sockaddr_in6);
+#endif // hasIPV6
+ return ::sendto(os_handle, buf, sz, 0, (struct sockaddr *)&sendaddr, addr_len);
}
#else // LARGE_FDSET

3
net/gnugk/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.9 2011/10/26 17:00:06 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.10 2017/08/28 08:31:29 ajacoutot Exp $
@pkgpath net/gnugk,mysql
@pkgpath net/gnugk,pgsq
@newgroup _gnugk:586
@ -11,7 +11,6 @@ share/doc/gnugk/
share/doc/gnugk/identifiers.txt
share/doc/gnugk/keepalive.txt
share/doc/gnugk/known_bugs.txt
share/doc/gnugk/performance.txt
share/doc/gnugk/trace_levels.txt
share/examples/gnugk/
share/examples/gnugk/H46023.ini

4
net/gnugk/pkg/gnugk.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: gnugk.rc,v 1.3 2017/05/27 19:57:06 ajacoutot Exp $
# $OpenBSD: gnugk.rc,v 1.4 2017/08/28 08:31:29 ajacoutot Exp $
daemon="${TRUEPREFIX}/bin/gnugk"
daemon_flags="-t -c ${SYSCONFDIR}/gatekeeper.ini -u _gnugk -o /var/log/gnugk/gnugk.log"
@ -10,7 +10,7 @@ daemon_flags="-t -c ${SYSCONFDIR}/gatekeeper.ini -u _gnugk -o /var/log/gnugk/gnu
rc_bg=YES
rc_reload() {
echo reload | nc 127.0.0.1 7000
echo echo "reload\nexit" | nc 127.0.0.1 7000
}
rc_cmd $1