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

Major update to gnugk-2.3.5.

Browse Source
This commit is contained in:
ajacoutot 2011-10-26 17:00:06 +00:00
parent d9d235f03e
commit 145db17fcd
7 changed files with 72 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
net/gnugk/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.18 2011/09/16 11:13:38 espie Exp $
# $OpenBSD: Makefile,v 1.19 2011/10/26 17:00:06 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= H.323 gatekeeper
DISTNAME= gnugk-2.3.2
REVISION= 1
DISTNAME= gnugk-2.3.5
CATEGORIES= net telephony
@ -19,56 +18,51 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += SDL avutil c crypto expat h323 lber ldap ldap_r m pt
WANTLIB += pthread sasl2 ssh ssl stdc++
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=openh323gk/}
WANTLIB= SDL avutil c crypto expat lber ldap ldap_r m \
pt pthread sasl2 ssl stdc++ h323>=3 sqlite3>=12
LIB_DEPENDS= net/h323plus \
BUILD_DEPENDS= databases/mysql \
databases/postgresql \
databases/sqlite3
LIB_DEPENDS= net/h323plus \
security/libssh
USE_GMAKE= Yes
USE_GROFF= Yes
ALL_TARGET= optshared addpasswd
ALL_TARGET= optshared # XXX gkdefault
NO_REGRESS= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-radius \
--enable-sqlite \
--enable-mysql \
--enable-pgsql \
--enable-h46023 \
--disable-h46018 \
--disable-firebird \
--disable-unixodbc
MAKE_ENV+= CC=${CC} CPLUS=${CXX} \
STDCCFLAGS="${STDCCFLAGS} -I${LOCALBASE}/include/openh323" \
SYSLIBDIR=`ptlib-config --libdir`
FLAVORS= mysql pgsql
FLAVOR?=
.if ${FLAVOR:L:Mmysql}
WANTLIB+= z mysqlclient>=18
LIB_DEPENDS+= databases/mysql
CONFIGURE_ARGS+=--enable-mysql
.else
CONFIGURE_ARGS+=--disable-mysql
.endif
.if ${FLAVOR:L:Mpgsql}
WANTLIB += pq>=5
LIB_DEPENDS+= databases/postgresql
CONFIGURE_ARGS+=--enable-pgsql \
--with-pgsql-lib-dir=${LOCALBASE}/lib \
--disable-unixodbc \
--with-pgsql-include-dir=${LOCALBASE}/include/postgresql
.else
CONFIGURE_ARGS+=--disable-pgsql
.endif
# patented
CONFIGURE_ARGS += --disable-h46018
MAKE_ENV= CC=${CC} CPLUS=${CXX} \
STDCCFLAGS="${STDCCFLAGS} -I${LOCALBASE}/include/openh323" \
INSTALLBIN_DIR=${WRKINST}${TRUEPREFIX}/bin
pre-configure:
${SUBST_CMD} ${WRKSRC}/docs/gnugk.1
perl -pi -e "s,!!LOCALBASE!!,${LOCALBASE},g" ${WRKSRC}/configure
post-build:
cd ${WRKSRC}/addpasswd && \
OBJDIR=. \
SYSLIBDIR=`ptlib-config --libdir` \
PTLIBDIR=`ptlib-config --ptlibdir` ${MAKE_PROGRAM}
post-install:
${INSTALL_MAN_DIR} ${PREFIX}/man/man1/
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnugk/
@ -76,5 +70,7 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/docs/gnugk.1 ${PREFIX}/man/man1/
${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/gnugk/
cp ${WRKSRC}/etc/* ${PREFIX}/share/examples/gnugk/
${INSTALL_PROGRAM} ${WRKSRC}/addpasswd/addpasswd \
${PREFIX}/bin/addpasswd
.include <bsd.port.mk>

10
net/gnugk/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnugk-2.3.2.tar.gz) = 7fAONvRx3URhgpoihjELfA==
RMD160 (gnugk-2.3.2.tar.gz) = SYUNcMVdsqNtmlSklBNIKbHDO1I=
SHA1 (gnugk-2.3.2.tar.gz) = jt/pL84aarZ9VFbHBaB+ySc/DQ0=
SHA256 (gnugk-2.3.2.tar.gz) = im+HQqFFKYg3WQvCNDA+O3RVd28dgYMy6o0eJX/sWqw=
SIZE (gnugk-2.3.2.tar.gz) = 1338957
MD5 (gnugk-2.3.5.tar.gz) = uNbPi6BOIQKBnzx+/6VoHw==
RMD160 (gnugk-2.3.5.tar.gz) = Dxb6GvsjHDTjgg6d5K5JuyWGEr8=
SHA1 (gnugk-2.3.5.tar.gz) = ptOvWALimQk6poHN94LZCOkaBLU=
SHA256 (gnugk-2.3.5.tar.gz) = 3fSZN7a5DjwZREMAm9g2m1UylQYgPc2gVqokubjziR8=
SIZE (gnugk-2.3.5.tar.gz) = 1036121

21
net/gnugk/patches/patch-Makefile_in
View File

@ -1,21 +0,0 @@
$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@
-OPTCCFLAGS = -O2
+OPTCCFLAGS =
# special dependency to ensure version.cxx is rebuilt each time gnugk is recompiled
# so the proper build timestamp is included
@@ -132,7 +132,7 @@ doc:
install: install-addpasswd
-install-addpasswd: addpasswd
+install-addpasswd:
$(INSTALL) $(OBJDIR)/addpasswd $(INSTALLBIN_DIR)
static:

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

@ -1,16 +1,20 @@
$OpenBSD: patch-configure,v 1.7 2010/05/03 19:32:14 ajacoutot Exp $
--- configure.orig Sun Nov 8 22:43:34 2009
+++ configure Mon May 3 21:19:10 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
$OpenBSD: patch-configure,v 1.8 2011/10/26 17:00:06 ajacoutot Exp $
--- configure.orig Wed Jul 20 13:21:19 2011
+++ configure Tue Oct 25 19:16:17 2011
@@ -3633,9 +3633,9 @@ fi
echo "PWLib prefix set to $PWLIBDIR"
@@ -3969,7 +3969,7 @@ else
if test "${HAS_OPENH323_VERSIONFILE:-unset}" != "unset"; then
OPENH323_VERSION_FILE=${OPENH323MAKEDIR}/../../include/openh323/openh323buildopts.h
- OPENH323_MAJOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MAJOR | cut -f2 -d' '`
- OPENH323_MINOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MINOR | cut -f2 -d' '`
- OPENH323_BUILD_NUMBER=`cat ${OPENH323_VERSION_FILE} | grep "OPENH323_BUILD " | cut -f2 -d' '`
+ OPENH323_MAJOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MAJOR | cut -f3 -d' '`
+ OPENH323_MINOR_VERSION=`cat ${OPENH323_VERSION_FILE} | grep OPENH323_MINOR | cut -f3 -d' '`
+ OPENH323_BUILD_NUMBER=`cat ${OPENH323_VERSION_FILE} | grep "OPENH323_BUILD " | cut -f3 -d' '`
fi
fi
fi
@@ -3689,7 +3689,7 @@ else
fi
@ -18,8 +22,8 @@ $OpenBSD: patch-configure,v 1.7 2010/05/03 19:32:14 ajacoutot Exp $
+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
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No H.460 support available" >&5
@@ -3721,7 +3721,7 @@ else
fi
@ -27,22 +31,4 @@ $OpenBSD: patch-configure,v 1.7 2010/05/03 19:32:14 ajacoutot Exp $
+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
@@ -4568,7 +4568,7 @@ $as_echo_n "checking for PQconnectdb in -lpq... " >&6;
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 ${PGSQL_LIBS}"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -4605,7 +4605,7 @@ $as_echo "$ac_try_echo") >&5
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
- PGSQL_LIBS="-lpq -lcrypt ${PGSQL_LIBS}"
+ PGSQL_LIBS="-lpq ${PGSQL_LIBS}"
PGSQL_LDFLAGS="-L$try"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No H.460 support available" >&5

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

@ -1,6 +1,6 @@
$OpenBSD: patch-docs_gnugk_1,v 1.3 2009/01/17 11:42:03 ajacoutot Exp $
--- docs/gnugk.1.orig Wed Dec 20 10:39:43 2006
+++ docs/gnugk.1 Fri Apr 27 15:55:05 2007
$OpenBSD: patch-docs_gnugk_1,v 1.4 2011/10/26 17:00:06 ajacoutot Exp $
--- docs/gnugk.1.orig Tue Jan 18 16:01:24 2011
+++ docs/gnugk.1 Tue Jul 26 16:23:54 2011
@@ -79,7 +79,7 @@ Write trace log to the specified file.
Set trace verbosity. The more -t you add, the more verbose to output. For example, use -ttttt to set the trace level to 5.
.El
@ -8,5 +8,5 @@ $OpenBSD: patch-docs_gnugk_1,v 1.3 2009/01/17 11:42:03 ajacoutot Exp $
-.Pa /etc/gatekeeper.ini
+.Pa ${SYSCONFDIR}/gatekeeper.ini
.Sh AUTHORS
The current project coordinator is
The project coordinator is
.Em Jan Willamowius

14
net/gnugk/patches/patch-pwlib_compat_h
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-pwlib_compat_h,v 1.3 2010/05/26 14:33:01 ajacoutot Exp $
--- pwlib_compat.h.orig Tue Jan 19 13:00:21 2010
+++ pwlib_compat.h Wed May 26 15:57:44 2010
@@ -156,4 +156,17 @@
#endif
$OpenBSD: patch-pwlib_compat_h,v 1.4 2011/10/26 17:00:06 ajacoutot Exp $
--- pwlib_compat.h.orig Wed Jul 20 13:26:53 2011
+++ pwlib_compat.h Tue Jul 26 16:23:54 2011
@@ -170,6 +170,19 @@
#endif
#endif
+#ifdef P_OPENBSD
@ -18,4 +18,6 @@ $OpenBSD: patch-pwlib_compat_h,v 1.3 2010/05/26 14:33:01 ajacoutot Exp $
+ #endif
+#endif
+
#endif
#if OPENH323_MAJOR == 1
#if OPENH323_MINOR >= 19
#if OPENH323_MINOR == 19

8
net/gnugk/pkg/PLIST
View File

@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.8 2011/05/11 09:01:26 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.9 2011/10/26 17:00:06 ajacoutot Exp $
@pkgpath net/gnugk,mysql
@pkgpath net/gnugk,pgsq
@newgroup _gnugk:586
@newuser _gnugk:586:586:daemon:Gatekeeper Daemon:/var/empty:/sbin/nologin
@extraunexec rm -rf /var/log/gnugk/*
@ -10,7 +12,6 @@ share/doc/gnugk/identifiers.txt
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/trace_levels.txt
share/examples/gnugk/
share/examples/gnugk/H46023.ini
@ -42,6 +43,7 @@ share/examples/gnugk/status.ini
share/examples/gnugk/syslog.ini
share/examples/gnugk/uri.ini
share/examples/gnugk/vqueue.ini
@rcscript ${RCDIR}/gnugk
@owner _gnugk
@sample /var/log/gnugk/
@owner
@rcscript ${RCDIR}/gnugk