From 11d1f9380da7b8e87f54221d58b356302d08650e Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Tue, 23 Mar 2010 21:14:45 +0000 Subject: [PATCH] Major update to gnugk-2.3.1. --- net/gnugk/Makefile | 10 +++-- net/gnugk/distinfo | 10 ++--- net/gnugk/patches/patch-Makefile_in | 10 ++--- net/gnugk/patches/patch-configure | 53 +++++++++++++------------- net/gnugk/patches/patch-pwlib_compat_h | 43 ++++++++++----------- net/gnugk/pkg/PLIST | 6 +-- 6 files changed, 65 insertions(+), 67 deletions(-) diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile index cb7e9ecedbe..a059f6d694f 100644 --- a/net/gnugk/Makefile +++ b/net/gnugk/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2009/01/17 14:14:14 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2010/03/23 21:14:45 ajacoutot Exp $ SHARED_ONLY= Yes COMMENT= H.323 gatekeeper -DISTNAME= gnugk-2.2.8 -PKGNAME= ${DISTNAME}p0 +DISTNAME= gnugk-2.3.1 CATEGORIES= net telephony HOMEPAGE= http://www.gnugk.org/ @@ -23,7 +22,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openh323gk/} WANTLIB= SDL avutil c crypto expat lber ldap ldap_r m \ pt pthread sasl2 ssl stdc++ -LIB_DEPENDS= h323.>=2::net/openh323 \ +LIB_DEPENDS= h323.>=3::net/h323plus \ sqlite3.>=12::databases/sqlite3 USE_GMAKE= Yes @@ -33,6 +32,8 @@ NO_REGRESS= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS= --enable-radius \ --enable-sqlite \ + --enable-h46023 \ + --disable-h46018 \ --disable-firebird \ --disable-unixodbc @@ -62,6 +63,7 @@ CONFIGURE_ARGS+=--disable-pgsql pre-configure: ${SUBST_CMD} ${WRKSRC}/docs/gnugk.1 + perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/configure post-install: ${INSTALL_MAN_DIR} ${PREFIX}/man/man1/ diff --git a/net/gnugk/distinfo b/net/gnugk/distinfo index e50f2f16bd1..d2de47bb0b5 100644 --- a/net/gnugk/distinfo +++ b/net/gnugk/distinfo @@ -1,5 +1,5 @@ -MD5 (gnugk-2.2.8.tar.gz) = Z7FBTI52UiMNCCy1nhVNbw== -RMD160 (gnugk-2.2.8.tar.gz) = owUJDHIoo1zEIQER63Gkoebiz1c= -SHA1 (gnugk-2.2.8.tar.gz) = 4h+77CgYBFx+xH6gt4rypsC8A5Y= -SHA256 (gnugk-2.2.8.tar.gz) = ex+8M73ejIql9CcBGjtazHgEp8RwcMOHM2VxK9z+I+M= -SIZE (gnugk-2.2.8.tar.gz) = 1282055 +MD5 (gnugk-2.3.1.tar.gz) = UepqYe5ywQx+mFNrAx79Bg== +RMD160 (gnugk-2.3.1.tar.gz) = ZMo+di76zWmRabxVGJifB2/ZXYE= +SHA1 (gnugk-2.3.1.tar.gz) = /DoAlLN2AvQPbvOaPCCR6lW+i2c= +SHA256 (gnugk-2.3.1.tar.gz) = xyxdp5Q698vEBR5oPT3UqnVefUSCUrSl6tMV/1uCtuk= +SIZE (gnugk-2.3.1.tar.gz) = 1311320 diff --git a/net/gnugk/patches/patch-Makefile_in b/net/gnugk/patches/patch-Makefile_in index 085c9d76755..b76208ddc28 100644 --- a/net/gnugk/patches/patch-Makefile_in +++ b/net/gnugk/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.2 2008/04/03 07:18:08 ajacoutot Exp $ ---- Makefile.in.orig Tue Dec 18 14:40:24 2007 -+++ Makefile.in Wed Apr 2 16:01:45 2008 -@@ -111,7 +111,7 @@ STDCCFLAGS = $(temp_STDCCFLAGS) +$OpenBSD: patch-Makefile_in,v 1.3 2010/03/23 21:14:45 ajacoutot Exp $ +--- Makefile.in.orig Mon Jun 8 16:11:03 2009 ++++ Makefile.in Sat Jan 30 14:07:40 2010 +@@ -116,7 +116,7 @@ STDCCFLAGS = $(temp_STDCCFLAGS) # GK version infomation STDCCFLAGS += -DMAJOR_VERSION=@GNUGK_MAJOR_VERSION@ -DMINOR_VERSION=@GNUGK_MINOR_VERSION@ -DBUILD_NUMBER=@GNUGK_BUILD_NUMBER@ @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.2 2008/04/03 07:18:08 ajacoutot Exp $ # special dependency to ensure version.cxx is rebuilt each time gnugk is recompiled # so the proper build timestamp is included -@@ -127,7 +127,7 @@ doc: +@@ -132,7 +132,7 @@ doc: install: install-addpasswd diff --git a/net/gnugk/patches/patch-configure b/net/gnugk/patches/patch-configure index e79f7e006c3..2dcd0e9e63b 100644 --- a/net/gnugk/patches/patch-configure +++ b/net/gnugk/patches/patch-configure @@ -1,29 +1,30 @@ -$OpenBSD: patch-configure,v 1.5 2009/01/17 11:42:03 ajacoutot Exp $ ---- configure.orig Sat Jan 17 11:34:07 2009 -+++ configure Sat Jan 17 11:35:26 2009 -@@ -4300,9 +4300,15 @@ echo $ECHO_N "checking for PQconnectdb in -lpq... $ECH +$OpenBSD: patch-configure,v 1.6 2010/03/23 21:14:45 ajacoutot Exp $ +--- configure.orig Sun Nov 8 22:43:34 2009 ++++ configure Sat Jan 30 14:23:41 2010 +@@ -3541,7 +3541,7 @@ if test "${PWLIBDIR:-unset}" = "unset" ; then + echo "Cannot find ptlib-config - please install and try again" + exit + fi +- PWLIBDIR=`$PTLIB_CONFIG --pwlibdir` ++ PWLIBDIR=`$PTLIB_CONFIG --ptlibdir` + fi - old_LIBS="$LIBS" - -+ if test `uname -s` = OpenBSD ; then -+ CRYPTO_LIBS="-lcrypto" -+ else -+ CRYPTO_LIBS="-lcrypt" -+ fi -+ - for try in /usr/lib /usr/local/lib /usr/local/pgsql/lib $pgsql_lib_dir; do - if test -d $try; then -- LIBS="$old_LIBS -L$try -lpq -lcrypt ${PGSQL_LIBS}" -+ LIBS="$old_LIBS -L$try -lpq ${CRYPTO_LIBS} ${PGSQL_LIBS}" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4336,7 +4342,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then -- PGSQL_LIBS="-lpq -lcrypt ${PGSQL_LIBS}" -+ PGSQL_LIBS="-lpq ${CRYPTO_LIBS} ${PGSQL_LIBS}" - PGSQL_LDFLAGS="-L$try" + echo "PWLib prefix set to $PWLIBDIR" +@@ -3969,7 +3969,7 @@ else + fi +-H460SUPPORT=`cat ${OPENH323DIR}/include/openh323buildopts.h | grep 'define H323_H460'` ++H460SUPPORT=`cat !!LOCALBASE!!/include/openh323/openh323buildopts.h | grep 'define H323_H460'` + if test "${H460SUPPORT:-unset}" = "unset" ; then + if test "x${h46018}" != "xno" ; then + { $as_echo "$as_me:$LINENO: result: No H.460 support available" >&5 +@@ -4003,7 +4003,7 @@ else + fi + + +-H460SUPPORT=`cat ${OPENH323DIR}/include/openh323buildopts.h | grep 'define H323_H460'` ++H460SUPPORT=`cat !!LOCALBASE!!/include/openh323/openh323buildopts.h | grep 'define H323_H460'` + if test "${H460SUPPORT:-unset}" = "unset" ; then + if test "x${h46023}" != "xno" ; then + { $as_echo "$as_me:$LINENO: result: No H.460 support available" >&5 diff --git a/net/gnugk/patches/patch-pwlib_compat_h b/net/gnugk/patches/patch-pwlib_compat_h index 2865121abb1..d76bb534180 100644 --- a/net/gnugk/patches/patch-pwlib_compat_h +++ b/net/gnugk/patches/patch-pwlib_compat_h @@ -1,24 +1,21 @@ -$OpenBSD: patch-pwlib_compat_h,v 1.1 2009/01/17 11:42:03 ajacoutot Exp $ ---- pwlib_compat.h.orig Sat Jan 17 11:47:00 2009 -+++ pwlib_compat.h Sat Jan 17 11:48:13 2009 -@@ -103,10 +103,6 @@ - /////////////////////////////////////////////// +$OpenBSD: patch-pwlib_compat_h,v 1.2 2010/03/23 21:14:45 ajacoutot Exp $ +--- pwlib_compat.h.orig Fri Aug 28 16:44:29 2009 ++++ pwlib_compat.h Sat Jan 30 14:07:40 2010 +@@ -144,4 +144,17 @@ + #endif + #endif - // OpenH323 version matching --#ifdef H323_H460 -- #define hasH460 1 // H460 support --#endif -- - #if OPENH323_MAJOR == 1 - #if OPENH323_MINOR >= 19 - #if OPENH323_MINOR == 19 -@@ -115,6 +111,9 @@ - #endif - #if OPENH323_BUILD > 4 - #define h323pluslib 1 // Indicate H323plus Library -+ #ifdef H323_H460 -+ #define hasH460 1 // H460 support -+ #endif - #define h323v6 1 // Version 6 features - #endif - #else // h323plus v1.20 ++#ifdef P_OPENBSD ++ #ifndef hasPConfigArray ++ #define hasPConfigArray 1 ++ #endif ++ ++ #ifndef h323pluslib ++ #define h323pluslib 1 ++ #ifdef H323_H460 ++ #define hasH460 1 ++ #endif ++ #endif ++#endif ++ + #endif diff --git a/net/gnugk/pkg/PLIST b/net/gnugk/pkg/PLIST index 88008b4ac39..0ace46c1c47 100644 --- a/net/gnugk/pkg/PLIST +++ b/net/gnugk/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2009/01/17 11:42:03 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.7 2010/03/23 21:14:45 ajacoutot Exp $ @newgroup _gnugk:586 @newuser _gnugk:586:586:daemon:Gatekeeper Daemon:/var/empty:/sbin/nologin @bin bin/addpasswd @@ -10,9 +10,9 @@ share/doc/gnugk/keepalive.txt share/doc/gnugk/known_bugs.txt share/doc/gnugk/performance.txt share/doc/gnugk/pwlib_bugs.txt -share/doc/gnugk/radauth.txt share/doc/gnugk/trace_levels.txt share/examples/gnugk/ +share/examples/gnugk/H46023.ini share/examples/gnugk/child.ini share/examples/gnugk/clirw.ini share/examples/gnugk/complete.ini @@ -26,11 +26,9 @@ share/examples/gnugk/gnugk.ini @group share/examples/gnugk/h350.ini share/examples/gnugk/ipauth.ini -share/examples/gnugk/mysql.ini share/examples/gnugk/nat.ini share/examples/gnugk/neighbor.ini share/examples/gnugk/odbc.ini -share/examples/gnugk/p2pnat.ini share/examples/gnugk/proxy.ini share/examples/gnugk/qos.ini share/examples/gnugk/radacct.ini