Stefan Fiedler:

18 years ago · b7aabed428
5 changed files with 11 additions and 163 deletions
--- a/package/kasc/openh323/gcc34.patch.openh323
+++ b/package/kasc/openh323/gcc34.patch.openh323
@ -1,39 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kasc/openh323/gcc34.patch.openh323
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- openh323/include/gkserver.h	2004-02-15 03:36:30.000000000 +0000
 +++ openh323-patch/include/gkserver.h	2004-07-17 18:44:40.000000000 +0000
@@ -427,7 +427,7 @@
     H225_RegistrationConfirm & rcf;
     H225_RegistrationReject  & rrj;
 
 -  protected:
 +//  protected:
     virtual Response OnHandlePDU();
 };
 
@@ -491,7 +491,7 @@
 
     PString alternateSecurityID;
 
 -  protected:
 +//  protected:
     virtual Response OnHandlePDU();
 };
 
--- a/package/kasc/openh323/openh323.conf
+++ b/package/kasc/openh323/openh323.conf
@ -1,4 +1,3 @@

 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@ -25,39 +24,15 @@ var_append makeopt " " "opt"
 var_append makeinstopt " " "PREFIX=$root/$prefix"

 openh323_preconf() {
   export PWLIBDIR=$builddir/pwlib-$pwlib_version
   export OPENH323DIR=$builddir/openh323-$ver
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWLIBDIR/lib:$OPENH323DIR/lib
   if [[ $xsrctar = *pwlib* ]] ; then
        if pkginstalled openldap; then
            var_append configprefix ' ' \
                   'CPPFLAGS="-I${pkg_openldap_prefix}/include"'
            var_append configprefix ' ' \
                   'LDFLAGS="-L${pkg_openldap_prefix}/lib"'
            var_append confopt ' ' '--enable-openldap' 
        fi
        var_append confopt ' ' '--enable-plugins'
   fi
 }

 openh323_premake() {
   if [[ $xsrctar = *pwlib* ]] ; then
        pkginstalled openldap && var_append makeopt ' ' 'CFLAGS="-I${pkg_openldap_prefix}/include"'
   fi
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPENH323DIR/lib
 }

 openh323_inmake() {
   if [[ $xsrctar = *pwlib* ]] ; then
 	rm -rf $libdir/libpt.so $root/$prefix/include/ptclib \
 	$root/$prefix/include/ptlib
   fi
   if [[ $xsrctar = *openh323* ]] ; then
 	rm -f $libdir/libopenh323.so
   fi
 }

 hook_add preconf 3 openh323_preconf
 hook_add premake 3 openh323_premake
 hook_add inmake 3 openh323_inmake

 var_remove GCC3_WRAPPER_INSERT " " "-fstack-protector"
--- a/package/kasc/openh323/openh323.desc
+++ b/package/kasc/openh323/openh323.desc
@ -21,32 +21,13 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 [I] Multi-platform class library + Open H.323 lib
 [I] Open H.323 library

 [T] PWLib is a moderately large class library that has its genesis many 
 [T] years ago as a method to product applications to run on both 
 [T] Microsoft Windows and Unix X-Windows systems. It also was to have a 
 [T] Macintosh port as well but this never eventuated.
 [T]
 [T] Since then the system has grown to having quite good application to 
 [T] areas other than mere Windows GUI portability. Classes for I/O 
 [T] portability, multi-threading portability, aid in producing unix 
 [T] daemons and NT services portably and all sorts of internet protocols 
 [T] were added over the years.
 [T]
 [T] All this over and above basic "container" classes such as arrays, 
 [T] linear lists, sorted lists (RB Tree) and dictionaries (hash tables) 
 [T] which were all created before STL became the answer to all our prayers. 
 [T] Unfortunately, due to intertia and the GNU C++ inadequate support of 
 [T] templates, this library will probably not be ported to STL in the near 
 [T] future.
 [T] 
 [T] The library was used extensively for all our in-house products. Then 
 [T] we decided to support the open H323 project by throwing in some of the 
 [T] code written for one of our products. Thus, required PWLib so it got 
 [T] thrown into the open source world as well.
 [T] The OpenH323 project aims to create a full featured, interoperable, Open
 [T] Source implementation of the ITU H.323 teleconferencing protocol that can
 [T] be used by personal developers and commercial users without charge.

 [U] http://www.openh323.org/
 [U] http://openh323.sourceforge.net/

 [A] Equivalence Pty Ltd (http://www.equival.com)
 [M] Kai Schwenzfeier <niteblade@gmx.net>
@ -55,12 +36,7 @@

 [L] MPL
 [S] Stable
 [V] 1.15.6
 [O] pwlib_version=1.8.7
 [P] X -?---5---9 181.500

 [SRC] .

 [D] 3709615263 pwlib-1.8.7.tar.gz http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/
 [D] 4092747602 openh323-1.15.6.tar.gz http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/
 [V] 1.18.0
 [P] X -?---5---9 180.750

 [D] 1991688181 openh323-v1_18_0-src-tar.gz http://mesh.dl.sourceforge.net/sourceforge/openh323/
--- a/package/kasc/openh323/openssl-hotfix.patch.pwlib
+++ b/package/kasc/openh323/openssl-hotfix.patch.pwlib
@ -1,64 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/kasc/openh323/openssl-hotfix.patch.pwlib
 # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./src/ptclib/pssl.cxx.orig	2005-07-25 14:03:17.000000000 +0200
 +++ ./src/ptclib/pssl.cxx	2005-07-25 14:03:54.000000000 +0200
@@ -297,14 +297,14 @@
 
 PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
 {
 -  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyData, keySize);
 +  key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyData, keySize);
 }
 
 
 PSSLPrivateKey::PSSLPrivateKey(const PBYTEArray & keyData)
 {
   const BYTE * keyPtr = keyData;
 -  key = d2i_AutoPrivateKey(NULL, (BYTE **)&keyPtr, keyData.GetSize());
 +  key = d2i_AutoPrivateKey(NULL, (const BYTE **)&keyPtr, keyData.GetSize());
 }
 
 
@@ -472,14 +472,14 @@
 
 PSSLCertificate::PSSLCertificate(const BYTE * certData, PINDEX certSize)
 {
 -  certificate = d2i_X509(NULL, (unsigned char **)&certData, certSize);
 +  certificate = d2i_X509(NULL, (const unsigned char **)&certData, certSize);
 }
 
 
 PSSLCertificate::PSSLCertificate(const PBYTEArray & certData)
 {
   const BYTE * certPtr = certData;
 -  certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
 +  certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
 }
 
 
@@ -489,7 +489,7 @@
   PBase64::Decode(certStr, certData);
   if (certData.GetSize() > 0) {
     const BYTE * certPtr = certData;
 -    certificate = d2i_X509(NULL, (unsigned char **)&certPtr, certData.GetSize());
 +    certificate = d2i_X509(NULL, (const unsigned char **)&certPtr, certData.GetSize());
   }
   else
     certificate = NULL;
--- a/package/public/pwlib/pwlib.desc
+++ b/package/public/pwlib/pwlib.desc
@ -46,7 +46,7 @@
 [T] code written for one of our products. Thus, required PWLib so it got 
 [T] thrown into the open source world as well.

 [U] http://www.openh323.org/
 [U] http://openh323.sourceforge.net/

 [A] Equivalence Pty Ltd (http://www.equival.com)
 [M] The ROCK Linux Project 
@ -58,5 +58,5 @@
 [V] 1.10.2
 [P] X -?---5---9 180.500

 [D] 4192333637 pwlib-v1_10_2-src.tar.gz http://dl.sourceforge.net/openh323/
 [D] 4192333637 pwlib-v1_10_2-src.tar.gz http://mesh.dl.sourceforge.net/openh323/