From 846508cfb22d5b41f2c98a6e5a08191fd8479153 Mon Sep 17 00:00:00 2001
From: mjl <mjl>
Date: Sat, 9 Oct 2004 14:01:03 +0000
Subject: Update pwlib to 1.8.2

The development site silently moved away from openh323.org without
even a notice on that page. That page still advertises 1.5.2 as the
latest version, even though development is alive and kicking and
is at 1.8.2 now. Oh well...
---
 devel/pwlib/patches/patch-aa | 45 ++++++++++++++++-----------------
 devel/pwlib/patches/patch-ab | 14 +++++------
 devel/pwlib/patches/patch-ai | 50 ++++++++++++++++--------------------
 devel/pwlib/patches/patch-ba | 23 ++++++++---------
 devel/pwlib/patches/patch-bb | 17 ++++++++++---
 devel/pwlib/patches/patch-bc | 60 --------------------------------------------
 devel/pwlib/patches/patch-bd | 16 ++++++++++++
 7 files changed, 90 insertions(+), 135 deletions(-)
 delete mode 100644 devel/pwlib/patches/patch-bc
 create mode 100644 devel/pwlib/patches/patch-bd

(limited to 'devel/pwlib/patches')

diff --git a/devel/pwlib/patches/patch-aa b/devel/pwlib/patches/patch-aa
index 3b1c57723aa..f2d8f95433a 100644
--- a/devel/pwlib/patches/patch-aa
+++ b/devel/pwlib/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
+$NetBSD: patch-aa,v 1.6 2004/10/09 14:01:03 mjl Exp $
 
---- make/unix.mak.orig	2003-07-25 00:01:42.000000000 +0200
-+++ make/unix.mak	2004-10-09 00:28:36.000000000 +0200
-@@ -66,13 +66,13 @@
+--- make/unix.mak.orig	2004-09-01 01:52:31.000000000 +0200
++++ make/unix.mak	2004-10-09 12:52:29.000000000 +0200
+@@ -122,13 +122,13 @@
  #
  
  ifndef PWLIBDIR
@@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  
  ###############################################################################
  #
-@@ -381,9 +381,9 @@
+@@ -427,9 +427,9 @@
  
  ifeq ($(OSTYPE),OpenBSD)
  
@@ -31,40 +31,39 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  
  LDLIBS		+= -lossaudio
  
-@@ -404,9 +404,9 @@
+@@ -444,13 +444,9 @@
  
  ifeq ($(OSTYPE),NetBSD)
  
 -ifeq ($(MACHTYPE),x86)
 -STDCCFLAGS	+= -m486
 -endif
-+# ifeq ($(MACHTYPE),x86)
-+# STDCCFLAGS	+= -m486
-+# endif
+-
+ LDLIBS		+= -lossaudio
+ 
+-STDCCFLAGS += -I$(UNIX_INC_DIR) -I$(PWLIBDIR)/include
++STDCCFLAGS += -I$(PWLIBDIR)/include
  
- ifndef OSRELASE
- OSRELEASE   := $(shell /sbin/sysctl -n kern.osrevision)
-@@ -853,7 +853,7 @@
+ # enable the USE_PTH line to compile using pth
+ # enable the USE_NATIVE_THREADS line to compile using native threads
+@@ -832,13 +828,14 @@
  endif
  
  ifeq ($(P_SHAREDLIB),1)
 -LIB_SUFFIX	= $(SHAREDLIBEXT)
 +LIB_SUFFIX	= la
+ LIB_TYPE	=
  else   
  LIB_SUFFIX	= a 
- ifndef DEBUG
-@@ -865,8 +865,9 @@
- LIB_TYPE	=
- endif
+-LIB_TYPE	= _s
++LIB_TYPE	= 
+ endif # P_SHAREDLIB
  
 +INSTALL_DIR = ${PREFIX}
  ifndef INSTALL_DIR
--INSTALL_DIR	= /usr/local
-+INSTALL_DIR	= /usr/pkg
+ INSTALL_DIR	= /usr/local
  endif
- 
- ifndef INSTALLBIN_DIR
-@@ -891,11 +892,11 @@
+@@ -865,11 +862,11 @@
  
  # Directories
  
@@ -80,7 +79,7 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  
  ifndef UNIX_SRC_DIR
  UNIX_SRC_DIR	= $(PWLIBDIR)/src/ptlib/unix
-@@ -904,7 +905,7 @@
+@@ -878,7 +875,7 @@
  PW_LIBDIR	= $(PWLIBDIR)/lib
  
  # set name of the PT library
@@ -89,7 +88,7 @@ $NetBSD: patch-aa,v 1.5 2004/10/08 22:31:02 mjl Exp $
  PTLIB_FILE	= lib$(PTLIB_BASE)$(LIB_TYPE).$(LIB_SUFFIX)
  PT_OBJBASE	= obj_$(PLATFORM_TYPE)_$(OBJDIR_SUFFIX)
  PT_OBJDIR	= $(PW_LIBDIR)/$(PT_OBJBASE)
-@@ -972,6 +973,6 @@
+@@ -946,6 +943,6 @@
  # add library directory to library path and include the library
  LDFLAGS		+= -L$(PW_LIBDIR)
  
diff --git a/devel/pwlib/patches/patch-ab b/devel/pwlib/patches/patch-ab
index 320eea08e00..cf9707bb9c0 100644
--- a/devel/pwlib/patches/patch-ab
+++ b/devel/pwlib/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2004/10/08 21:02:53 mjl Exp $
+$NetBSD: patch-ab,v 1.7 2004/10/09 14:01:03 mjl Exp $
 
---- make/lib.mak.orig	2003-07-29 14:33:34.000000000 +0200
-+++ make/lib.mak	2004-10-08 22:11:51.000000000 +0200
-@@ -187,22 +187,18 @@
+--- make/lib.mak.orig	2004-06-17 08:33:07.000000000 +0200
++++ make/lib.mak	2004-10-09 14:49:04.000000000 +0200
+@@ -200,22 +200,18 @@
      LD = $(CPLUS)
    endif
  
@@ -18,9 +18,9 @@ $NetBSD: patch-ab,v 1.6 2004/10/08 21:02:53 mjl Exp $
  	@echo SYSLIBS = $(SYSLIBS)
  	@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR) ; fi
 -	$(LD) $(LDSOOPTS) -o $(LIBDIR)/$(LIBNAME_PAT) $(LDFLAGS) $(EXTLIBS) $(OBJS) $(ENDLDLIBS)
-+	/usr/pkg/bin/libtool --tag=CXX --mode=link $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \
++	$(LIBTOOL) --tag=CXX --mode=link $(CPLUS) -o $(LIBDIR)/$(LIB_FILENAME) \
 +		$(OBJS:.o=.lo) $(EXTLIBS) $(ENDLDLIBS) -rpath $(INSTALLLIB_DIR) \
-+		-version-info $(MAJOR_VERSION):$(MINOR_VERSION)
++		-release $(MAJOR_VERSION).$(MINOR_VERSION).$(BUILD_NUMBER)
  
 -  install: $(LIBDIR)/$(LIBNAME_PAT)
 -	$(INSTALL) $(LIBDIR)/$(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_PAT)
@@ -28,7 +28,7 @@ $NetBSD: patch-ab,v 1.6 2004/10/08 21:02:53 mjl Exp $
 -	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MAJ)
 -	ln -sf $(LIBNAME_PAT) $(INSTALLLIB_DIR)/$(LIBNAME_MIN)
 +  install: $(LIBDIR)/$(LIB_FILENAME)
-+	/usr/pkg/bin/libtool --mode=install install $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
++	$(LIBTOOL) --mode=install install $(LIBDIR)/$(LIB_FILENAME) $(INSTALLLIB_DIR)/$(LIB_FILENAME)
  
  endif # P_SHAREDLIB
  
diff --git a/devel/pwlib/patches/patch-ai b/devel/pwlib/patches/patch-ai
index 069f4492c33..d82b1ef9d58 100644
--- a/devel/pwlib/patches/patch-ai
+++ b/devel/pwlib/patches/patch-ai
@@ -1,55 +1,49 @@
-$NetBSD: patch-ai,v 1.5 2004/10/09 06:49:23 mjl Exp $
+$NetBSD: patch-ai,v 1.6 2004/10/09 14:01:03 mjl Exp $
 
---- make/common.mak.orig	2003-07-29 13:25:23.000000000 +0200
-+++ make/common.mak	2004-10-09 04:17:05.000000000 +0200
-@@ -273,11 +273,11 @@
+--- make/common.mak.orig	2004-06-10 03:36:44.000000000 +0200
++++ make/common.mak	2004-10-09 12:52:56.000000000 +0200
+@@ -310,11 +310,11 @@
  #
  $(OBJDIR)/%.o : %.cxx 
  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
--	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c++ -c $< -o $@
-+	/usr/pkg/bin/libtool --tag=CXX --mode=compile $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
+-	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
  
  $(OBJDIR)/%.o : %.c 
  	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
 -	$(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c -c $< -o $@
-+	/usr/pkg/bin/libtool --tag=CC --mode=compile $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CC $(CC) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) -x c -c $< -o $@
  
  #
  # create list of object files 
-@@ -300,12 +300,12 @@
- $(DEPDIR)/%.dep : %.cxx 
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OBJDIR) > $@
--	$(CPLUS) $(STDCCFLAGS) -M $< >> $@
-+	/usr/pkg/bin/libtool --tag=CXX --mode=compile $(CPLUS) $(STDCCFLAGS) -M $< >> $@
- 
- $(DEPDIR)/%.dep : %.c 
- 	@if [ ! -d $(DEPDIR) ] ; then mkdir -p $(DEPDIR) ; fi
- 	@printf %s $(OBJDIR) > $@
--	$(CC) $(STDCCFLAGS) -M $< >> $@
-+	/usr/pkg/bin/libtool --tag=CC --mode=compile $(CC) $(STDCCFLAGS) -M $< >> $@
- 
- #
- # add in good files to delete
-@@ -344,7 +344,7 @@
+@@ -379,7 +379,7 @@
  # directory
  	@if [ ! -L $(OBJDIR)/lib ] ; then cd $(OBJDIR); ln -s $(PW_LIBDIR) lib; fi
  endif
 -	$(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
-+	/usr/pkg/bin/libtool --tag=CXX --mode=link $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
++	$(LIBTOOL) --mode=link --tag=CXX $(CPLUS) -o $@ $(CFLAGS) $(LDFLAGS) $(OBJS) $(LDLIBS) $(ENDLDLIBS) $(ENDLDFLAGS)
  ifeq ($(OSTYPE),VxWorks)
  	$(LD)   --split-by-reloc 65535 -r   $(OBJS) -o $@ 
  endif
-@@ -380,7 +380,7 @@
+@@ -405,7 +405,7 @@
  ifndef INSTALL_OVERRIDE
  
  install:	$(TARGET)
 -	$(INSTALL) $(TARGET) $(INSTALLBIN_DIR)
-+	/usr/pkg/bin/libtool --mode=install $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR)
++	$(LIBTOOL) --mode=install $(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALLBIN_DIR)
  endif
  
  # ifdef PROG
-@@ -451,7 +451,7 @@
+@@ -413,7 +413,7 @@
+ 
+ $(PWLIBDIR)/include/ptlib.h.gch: $(PWLIBDIR)/include/ptlib.h
+ 	@if [ ! -d $(OBJDIR) ] ; then mkdir -p $(OBJDIR) ; fi
+-	$(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
++	$(LIBTOOL) --mode=compile --tag=CXX $(CPLUS) $(STDCCFLAGS) $(OPTCCFLAGS) $(CFLAGS) $(STDCXXFLAGS) -x c++ -c $< -o $@
+ 
+ PCH	:= $(PWLIBDIR)/include/ptlib.h.gch
+ 
+@@ -481,7 +481,7 @@
  	@$(MAKE) DEBUG= libs
  
  libs ::
@@ -58,7 +52,7 @@ $NetBSD: patch-ai,v 1.5 2004/10/09 06:49:23 mjl Exp $
  
  else
  
-@@ -480,7 +480,7 @@
+@@ -510,7 +510,7 @@
  optlibs :: libs
  
  libs ::
diff --git a/devel/pwlib/patches/patch-ba b/devel/pwlib/patches/patch-ba
index 00177913344..df4c61cfb04 100644
--- a/devel/pwlib/patches/patch-ba
+++ b/devel/pwlib/patches/patch-ba
@@ -1,16 +1,13 @@
-$NetBSD: patch-ba,v 1.1 2004/10/08 21:02:54 mjl Exp $
+$NetBSD: patch-ba,v 1.2 2004/10/09 14:01:03 mjl Exp $
 
-Work around a C/C++ difference in openssl/dh.h
-
---- src/ptclib/pssl.cxx.orig	2004-10-08 19:13:06.000000000 +0200
-+++ src/ptclib/pssl.cxx	2004-10-08 19:43:28.000000000 +0200
-@@ -732,6 +732,9 @@
+--- src/ptclib/pssl.cxx.orig	2004-10-09 13:31:30.000000000 +0200
++++ src/ptclib/pssl.cxx	2004-10-09 13:33:39.000000000 +0200
+@@ -743,7 +743,7 @@
+     DH_free(dh);
  }
  
- 
-+#define d2i_DHparams_bio(bp,x) (DH *)ASN1_d2i_bio((char *(*)(...))DH_new, \
-+      (char *(*)(...))d2i_DHparams,(bp),(unsigned char **)(x))
-+
- BOOL PSSLDiffieHellman::Load(const PFilePath & dhFile,
-                              PSSLFileTypes fileType)
- {
+-#ifdef __BEOS__
++#if defined(__BEOS__) || defined(__NetBSD__)
+ // 2/21/04 Yuri Kiryanov - fix for compiler choke on BeOS for usage of
+ // SSL function d2i_DHparams_bio below in PSSLDiffieHellman::Load
+ #undef  d2i_DHparams_bio
diff --git a/devel/pwlib/patches/patch-bb b/devel/pwlib/patches/patch-bb
index 15e5db19f22..93c70a18a70 100644
--- a/devel/pwlib/patches/patch-bb
+++ b/devel/pwlib/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2004/10/08 21:02:54 mjl Exp $
+$NetBSD: patch-bb,v 1.2 2004/10/09 14:01:03 mjl Exp $
 
---- src/ptlib/unix/socket.cxx.orig	2004-10-08 19:49:23.000000000 +0200
-+++ src/ptlib/unix/socket.cxx	2004-10-08 19:50:36.000000000 +0200
-@@ -312,6 +312,7 @@
+--- src/ptlib/unix/socket.cxx.orig	2004-08-24 09:08:11.000000000 +0200
++++ src/ptlib/unix/socket.cxx	2004-10-09 13:40:31.000000000 +0200
+@@ -349,6 +349,7 @@
  #endif
  
  #if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_QNX)
@@ -10,3 +10,12 @@ $NetBSD: patch-bb,v 1.1 2004/10/08 21:02:54 mjl Exp $
  #include <sys/sysctl.h>
  #endif
  
+@@ -762,7 +763,7 @@
+ }
+ 
+ 
+-#if P_HAS_RECVMSG
++#if P_HAS_RECVMSG && P_HAS_PKTINFO
+ 
+ int PSocket::os_recvfrom(
+       void * buf,     // Data to be written as URGENT TCP data.
diff --git a/devel/pwlib/patches/patch-bc b/devel/pwlib/patches/patch-bc
deleted file mode 100644
index 4b71c46f129..00000000000
--- a/devel/pwlib/patches/patch-bc
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2004/10/09 06:48:39 mjl Exp $
-
-Fix CAN-2004-0097 vulnerability.
-From: %FreeBSD: /repoman/r/pcvs/ports/devel/pwlib/files/patch-src::ptclib::asner.cxx,v 1.1 2004/06/08 06:27:43 sobomax Exp %
-
---- src/ptclib/asnper.cxx	2004/06/03 14:44:43	1.1
-+++ src/ptclib/asnper.cxx	2004/06/03 14:50:35
-@@ -4926,6 +4926,11 @@
-     return -1;
- 
-   value += lower;
-+
-+  // clamp value to upper limit
-+  if (value > upper)
-+    value = upper;
-+
-   return 0;
- }
- 
-@@ -4970,7 +4975,13 @@
-     unsigned base;
-     if (!MultiBitDecode(CountBits(upper - lower + 1), base))
-       return -1;
--    return lower + base;   // 10.9.4.1
-+    len = lower + base;   // 10.9.4.1
-+
-+    // clamp value to upper limit
-+    if (len > upper)
-+      len = upper;
-+
-+    return len;
-   }
- 
-   if (upper < 65536)  // 10.9.3.3
-@@ -4981,13 +4992,20 @@
-   if (IsAtEnd())
-     return -1;
- 
--  if (SingleBitDecode() == 0)
--    return MultiBitDecode(7, len) ? 0 : -1;   // 10.9.3.6
-+  if (SingleBitDecode() == 0) {
-+    if (!MultiBitDecode(7, len))   // 10.9.3.6
-+      return -1;                // 10.9.3.8 unsupported
-+  }
-+  else if (SingleBitDecode() == 0) {
-+    if (!MultiBitDecode(14, len))    // 10.9.3.7
-+      return -1;  // 10.9.3.8 unsupported
-+  }
- 
--  if (SingleBitDecode() == 0)
--    return MultiBitDecode(14, len) ? 0 : -1;    // 10.9.3.7
-+  // clamp value to upper limit
-+  if (len > upper)
-+    len = upper;
- 
--  return -1;  // 10.9.3.8 unsupported
-+  return 0;
- }
- 
-
diff --git a/devel/pwlib/patches/patch-bd b/devel/pwlib/patches/patch-bd
new file mode 100644
index 00000000000..617d4b97358
--- /dev/null
+++ b/devel/pwlib/patches/patch-bd
@@ -0,0 +1,16 @@
+$NetBSD: patch-bd,v 1.1 2004/10/09 14:01:03 mjl Exp $
+
+--- include/ptlib/ipsock.h.orig	2004-10-09 13:10:10.000000000 +0200
++++ include/ptlib/ipsock.h	2004-10-09 13:47:49.000000000 +0200
+@@ -796,7 +796,11 @@
+       * @return TRUE if host is able to capture incoming address, else FALSE
+       */
+     BOOL SetCaptureReceiveToAddress()
++#if P_HAS_PKTINFO
+     { if (!SetOption(IP_PKTINFO, 1, SOL_IP)) return FALSE; catchReceiveToAddr = TRUE; return TRUE; }
++#else
++    { return FALSE; }
++#endif
+ 
+     /**
+       * return the interface address of the last incoming packet
-- 
cgit v1.2.3