openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

resolve the gethostbyname_r issue the more general way

master
Dr. Ralf S. Engelschall 19 years ago
parent
05dad5a2b7
commit
e3b1245484
2 changed files with 38 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      asterisk/asterisk.patch
  2. 2
      asterisk/asterisk.spec

77
asterisk/asterisk.patch
Unescape View File

@ -1,6 +1,6 @@
Index: Makefile
--- Makefile.orig 2006-09-06 22:09:10 +0200
+++ Makefile 2006-09-13 07:53:22 +0200
+++ Makefile 2006-09-15 07:54:50 +0200
@@ -47,14 +47,14 @@
#K6OPT = -DK6OPT
@ -143,7 +143,7 @@ Index: Makefile
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
Index: agi/Makefile
--- agi/Makefile.orig 2006-03-28 22:22:05 +0200
+++ agi/Makefile 2006-09-13 07:53:22 +0200
+++ agi/Makefile 2006-09-15 07:54:50 +0200
@@ -20,9 +20,7 @@
LIBS=-lsocket -lnsl ../strcompat.o
endif
@ -157,7 +157,7 @@ Index: agi/Makefile
Index: app_conference/Makefile
--- app_conference/Makefile.orig 2005-10-27 19:53:35 +0200
+++ app_conference/Makefile 2006-09-13 07:53:52 +0200
+++ app_conference/Makefile 2006-09-15 07:54:50 +0200
@@ -20,10 +20,10 @@
INSTALL_PREFIX := /opt/horizon
INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/lib/asterisk/modules
@ -229,7 +229,7 @@ Index: app_conference/Makefile
# cp conf.conf /etc/asterisk/
Index: app_conference/app_conference.h
--- app_conference/app_conference.h.orig 2005-12-16 23:31:58 +0100
+++ app_conference/app_conference.h 2006-09-13 07:53:22 +0200
+++ app_conference/app_conference.h 2006-09-15 07:54:50 +0200
@@ -33,6 +33,7 @@
#include <asterisk/channel.h>
#include <asterisk/file.h>
@ -253,7 +253,7 @@ Index: app_conference/app_conference.h
//
Index: app_conference/conference.c
--- app_conference/conference.c.orig 2005-10-27 19:53:35 +0200
+++ app_conference/conference.c 2006-09-13 07:53:22 +0200
+++ app_conference/conference.c 2006-09-15 07:54:50 +0200
@@ -568,7 +568,6 @@
conf->memberlist = NULL ;
@ -282,7 +282,7 @@ Index: app_conference/conference.c
Index: apps/Makefile
--- apps/Makefile.orig 2006-04-30 15:38:22 +0200
+++ apps/Makefile 2006-09-13 07:53:22 +0200
+++ apps/Makefile 2006-09-15 07:54:50 +0200
@@ -54,16 +54,11 @@
APPS+=app_osplookup.so
endif
@ -306,7 +306,7 @@ Index: apps/Makefile
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
Index: asterisk-addons-1.2.4/Makefile
--- asterisk-addons-1.2.4/Makefile.orig 2005-12-02 00:14:28 +0100
+++ asterisk-addons-1.2.4/Makefile 2006-09-13 07:53:22 +0200
+++ asterisk-addons-1.2.4/Makefile 2006-09-15 07:54:50 +0200
@@ -27,17 +27,9 @@
#
# MySQL stuff... Autoconf anyone??
@ -330,7 +330,7 @@ Index: asterisk-addons-1.2.4/Makefile
Index: asterisk.c
--- asterisk.c.orig 2006-08-22 00:34:26 +0200
+++ asterisk.c 2006-09-13 07:53:22 +0200
+++ asterisk.c 2006-09-15 07:54:50 +0200
@@ -1902,9 +1902,9 @@
} else if (!strcasecmp(v->name, "astspooldir")) {
ast_copy_string(ast_config_AST_SPOOL_DIR, v->value, sizeof(ast_config_AST_SPOOL_DIR));
@ -344,7 +344,7 @@ Index: asterisk.c
ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR));
Index: build_tools/make_defaults_h
--- build_tools/make_defaults_h.orig 2005-06-20 19:26:08 +0200
+++ build_tools/make_defaults_h 2006-09-13 07:53:22 +0200
+++ build_tools/make_defaults_h 2006-09-15 07:54:50 +0200
@@ -14,7 +14,7 @@
#define AST_LOG_DIR "${INSTALL_PATH}${ASTLOGDIR}"
#define AST_AGI_DIR "${INSTALL_PATH}${AGI_DIR}"
@ -356,7 +356,7 @@ Index: build_tools/make_defaults_h
#define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
Index: cdr/Makefile
--- cdr/Makefile.orig 2006-04-30 16:27:56 +0200
+++ cdr/Makefile 2006-09-13 07:53:22 +0200
+++ cdr/Makefile 2006-09-15 07:54:50 +0200
@@ -20,10 +20,8 @@
CFLAGS+=-fPIC
endif
@ -372,7 +372,7 @@ Index: cdr/Makefile
#This works for even old (2.96) versions of gcc and provides a small boost either way.
Index: channels/Makefile
--- channels/Makefile.orig 2006-08-17 23:57:19 +0200
+++ channels/Makefile 2006-09-13 07:53:22 +0200
+++ channels/Makefile 2006-09-15 07:54:50 +0200
@@ -21,9 +21,7 @@
#CHANNEL_LIBS+=chan_modem.so chan_modem_aopen.so chan_modem_bestdata.so
endif
@ -386,7 +386,7 @@ Index: channels/Makefile
PTLIB=-lpt_OpenBSD_x86_r
Index: channels/chan_h323.c
--- channels/chan_h323.c.orig 2006-08-30 20:59:44 +0200
+++ channels/chan_h323.c 2006-09-13 07:53:22 +0200
+++ channels/chan_h323.c 2006-09-15 07:54:50 +0200
@@ -31,6 +31,7 @@
* \ingroup channel_drivers
*/
@ -397,7 +397,7 @@ Index: channels/chan_h323.c
#include <sys/param.h>
Index: channels/chan_iax2.c
--- channels/chan_iax2.c.orig 2006-09-06 17:55:20 +0200
+++ channels/chan_iax2.c 2006-09-13 07:53:22 +0200
+++ channels/chan_iax2.c 2006-09-15 07:54:50 +0200
@@ -2606,7 +2606,7 @@
struct ast_variable *var;
struct ast_variable *tmp;
@ -422,7 +422,7 @@ Index: channels/chan_iax2.c
} else if (!strcasecmp(tmp->name, "port")) {
Index: channels/chan_sip.c
--- channels/chan_sip.c.orig 2006-09-09 14:14:03 +0200
+++ channels/chan_sip.c 2006-09-13 07:53:22 +0200
+++ channels/chan_sip.c 2006-09-15 07:54:50 +0200
@@ -12250,7 +12250,7 @@
int obproxyfound=0;
int found=0;
@ -447,7 +447,7 @@ Index: channels/chan_sip.c
} else if (realtime && !strcasecmp(v->name, "name"))
Index: channels/chan_skinny.c
--- channels/chan_skinny.c.orig 2006-08-30 20:59:44 +0200
+++ channels/chan_skinny.c 2006-09-13 07:53:22 +0200
+++ channels/chan_skinny.c 2006-09-15 07:54:50 +0200
@@ -99,7 +99,7 @@
#define htolel(x) (x)
#define htoles(x) (x)
@ -459,7 +459,7 @@ Index: channels/chan_skinny.c
(((x) & 0x00ff) << 8))
Index: codecs/Makefile
--- codecs/Makefile.orig 2005-11-29 19:24:39 +0100
+++ codecs/Makefile 2006-09-13 07:53:22 +0200
+++ codecs/Makefile 2006-09-15 07:54:50 +0200
@@ -28,45 +28,16 @@
LIBG723B=g723.1b/libg723b.a
endif
@ -512,7 +512,7 @@ Index: codecs/Makefile
codec_adpcm.so codec_ulaw.so codec_alaw.so codec_a_mu.so \
Index: codecs/gsm/src/short_term.c
--- codecs/gsm/src/short_term.c.orig 2005-11-29 19:24:39 +0100
+++ codecs/gsm/src/short_term.c 2006-09-13 07:53:22 +0200
+++ codecs/gsm/src/short_term.c 2006-09-15 07:54:50 +0200
@@ -373,7 +373,6 @@
word * LARpp_j_1 = S->LARpp[ S->j ^= 1 ];
@ -523,7 +523,7 @@ Index: codecs/gsm/src/short_term.c
# define FILTER (* (S->fast \
Index: codecs/lpc10/analys.c
--- codecs/lpc10/analys.c.orig 2005-11-29 19:24:39 +0100
+++ codecs/lpc10/analys.c 2006-09-13 07:53:22 +0200
+++ codecs/lpc10/analys.c 2006-09-15 07:54:50 +0200
@@ -32,7 +32,7 @@
#include "f2c.h"
@ -535,7 +535,7 @@ Index: codecs/lpc10/analys.c
/*:ref: preemp_ 14 5 6 6 4 6 6 */
Index: formats/Makefile
--- formats/Makefile.orig 2005-11-29 19:24:39 +0100
+++ formats/Makefile 2006-09-13 07:53:22 +0200
+++ formats/Makefile 2006-09-15 07:54:50 +0200
@@ -29,9 +29,7 @@
FORMAT_LIBS+=format_ogg_vorbis.so
endif
@ -549,7 +549,7 @@ Index: formats/Makefile
Index: formats/msgsm.h
--- formats/msgsm.h.orig 2005-11-29 19:24:39 +0100
+++ formats/msgsm.h 2006-09-13 07:53:22 +0200
+++ formats/msgsm.h 2006-09-15 07:54:50 +0200
@@ -562,6 +562,7 @@
xmc[46] = sr & 0x7; sr >>= 3;
xmc[47] = sr & 0x7; sr >>= 3;
@ -560,7 +560,7 @@ Index: formats/msgsm.h
xmc[50] = sr & 0x7; sr >>= 3;
Index: frame.c
--- frame.c.orig 2006-07-31 06:06:16 +0200
+++ frame.c 2006-09-13 07:53:22 +0200
+++ frame.c 2006-09-15 07:54:50 +0200
@@ -1055,7 +1055,7 @@
{
switch(buf & TYPE_MASK) {
@ -572,7 +572,7 @@ Index: frame.c
return 4;
Index: funcs/Makefile
--- funcs/Makefile.orig 2005-11-29 19:24:39 +0100
+++ funcs/Makefile 2006-09-13 07:53:22 +0200
+++ funcs/Makefile 2006-09-15 07:54:50 +0200
@@ -40,9 +40,7 @@
CFLAGS+=-fPIC
endif
@ -586,7 +586,7 @@ Index: funcs/Makefile
Index: funcs/func_strings.c
--- funcs/func_strings.c.orig 2006-03-21 18:45:56 +0100
+++ funcs/func_strings.c 2006-09-13 07:53:22 +0200
+++ funcs/func_strings.c 2006-09-15 07:54:50 +0200
@@ -169,7 +169,7 @@
epochi = tv.tv_sec;
}
@ -598,7 +598,7 @@ Index: funcs/func_strings.c
format = "%c";
Index: pbx/Makefile
--- pbx/Makefile.orig 2005-11-29 19:24:39 +0100
+++ pbx/Makefile 2006-09-13 07:53:22 +0200
+++ pbx/Makefile 2006-09-15 07:54:50 +0200
@@ -14,9 +14,7 @@
PBX_LIBS=pbx_config.so pbx_spool.so pbx_dundi.so pbx_loopback.so pbx_realtime.so \
pbx_ael.so
@ -612,7 +612,7 @@ Index: pbx/Makefile
#PBX_LIBS+=$(shell $(CROSS_COMPILE_BIN)gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so")
Index: res/Makefile
--- res/Makefile.orig 2005-11-29 19:24:39 +0100
+++ res/Makefile 2006-09-13 07:53:22 +0200
+++ res/Makefile 2006-09-15 07:54:50 +0200
@@ -36,10 +36,8 @@
endif
endif
@ -628,7 +628,7 @@ Index: res/Makefile
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
Index: res/res_features.c
--- res/res_features.c.orig 2006-08-02 01:07:06 +0200
+++ res/res_features.c 2006-09-13 07:53:22 +0200
+++ res/res_features.c 2006-09-15 07:54:50 +0200
@@ -505,13 +505,13 @@
if (touch_monitor) {
len = strlen(touch_monitor) + 50;
@ -647,7 +647,7 @@ Index: res/res_features.c
for( x = 0; x < strlen(args); x++)
Index: rtp.c
--- rtp.c.orig 2006-09-01 19:35:06 +0200
+++ rtp.c 2006-09-13 07:53:22 +0200
+++ rtp.c 2006-09-15 07:54:50 +0200
@@ -962,8 +962,10 @@
rtp->us.sin_port = htons(x);
rtp->us.sin_addr = addr;
@ -662,7 +662,7 @@ Index: rtp.c
(!rtp->rtcp || !bind(rtp->rtcp->s, (struct sockaddr *)&rtp->rtcp->us, sizeof(rtp->rtcp->us))))
Index: say.c
--- say.c.orig 2005-11-29 19:24:39 +0100
+++ say.c 2006-09-13 07:53:22 +0200
+++ say.c 2006-09-15 07:54:50 +0200
@@ -3133,7 +3133,7 @@
time_t beg_today;
@ -854,22 +854,19 @@ Index: say.c
beg_today = now.tv_sec - (tmnow.tm_hour * 3600) - (tmnow.tm_min * 60) - (tmnow.tm_sec);
Index: utils.c
--- utils.c.orig 2006-07-12 15:54:10 +0200
+++ utils.c 2006-09-13 07:53:22 +0200
@@ -58,7 +58,10 @@
static char base64[64];
static char b2a[256];
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#endif
+#if (defined(__FreeBSD__) && __FreeBSD_version < 601104) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__)
+++ utils.c 2006-09-15 07:55:37 +0200
@@ -63,6 +63,8 @@
/* duh? ERANGE value copied from web... */
#define ERANGE 34
#undef gethostbyname
+#undef gethostbyname_r
+#define gethostbyname_r __ast_gethostbyname_r
AST_MUTEX_DEFINE_STATIC(__mutex);
Index: utils/Makefile
--- utils/Makefile.orig 2005-11-29 19:24:39 +0100
+++ utils/Makefile 2006-09-13 07:53:22 +0200
+++ utils/Makefile 2006-09-15 07:54:50 +0200
@@ -16,17 +16,15 @@
#
CFLAGS+=-DNO_AST_MM

2
asterisk/asterisk.spec
Unescape View File

@ -40,7 +40,7 @@ Class: EVAL
Group: Network
License: GPL
Version: %{V_asterisk}
Release: 20060913
Release: 20060915
# list of sources
Source0: ftp://ftp.digium.com/pub/asterisk/releases/asterisk-%{V_asterisk}.tar.gz

Write Preview
Loading…
Cancel
Save