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

rm patch*.orig, spotted by Mark Patruck

Browse Source
This commit is contained in:
sthen 2021-11-02 20:26:29 +00:00
parent 9899cbcf42
commit 34cc1f307e
2 changed files with 0 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
telephony/asterisk/19/patches/patch-configure_ac.orig
View File

@ -1,101 +0,0 @@
$OpenBSD: patch-configure_ac.orig,v 1.1 2021/11/02 12:47:10 sthen Exp $
test for alpine-2.22's c-client and cope with API change.
parts borrowed from slackware patch for PHP with alpine-2.22.
last hunk: adapt to openbsd's lua directory naming
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -2120,6 +2120,67 @@ if test "${USE_IMAP_TK}" != "no"; then
[ac_cv_imap_tk="no"]
)
if test "${ac_cv_imap_tk}" = "no"; then
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM(
+ [#include <stdio.h>
+ #include <c-client/c-client.h>
+ void mm_searched (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_exists (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_expunged (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_flags (MAILSTREAM *stream,unsigned long number)
+ {
+ }
+ void mm_notify (MAILSTREAM *stream,char *string,long errflg)
+ {
+ }
+ void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+ {
+ }
+ void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
+ {
+ }
+ void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
+ {
+ }
+ void mm_log (char *string,long errflg)
+ {
+ }
+ void mm_dlog (char *string)
+ {
+ }
+ void mm_login (NETMBX *mb,char *user,char **pwd,long trial)
+ {
+ }
+ void mm_login_method (NETMBX *mb, char *user, void *pwd, long trial, char *method)
+ {
+ }
+ void mm_critical (MAILSTREAM *stream)
+ {
+ }
+ void mm_nocritical (MAILSTREAM *stream)
+ {
+ }
+ long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
+ {
+ }
+ void mm_fatal (char *string)
+ {
+ }],
+ [
+ mm_login_method(NULL, "", NULL, 0, "");
+ ]
+ )],
+ [ac_cv_imap_alpine2_22="yes" ac_cv_imap_tk="yes"],
+ [ac_cv_imap_alpine2_22="no"]
+ )
+ fi
+ if test "${ac_cv_imap_tk}" = "no"; then
imap_libs="-lcrypto -lssl -lc-client4"
LIBS="${saved_libs} ${imap_libs} "`echo ${imap_ldflags}`
AC_LINK_IFELSE(
@@ -2248,6 +2309,9 @@ if test "${USE_IMAP_TK}" != "no"; then
if test "${ac_cv_imap_tk2006}" = "yes"; then
AC_DEFINE([HAVE_IMAP_TK2006], 1, [Define if your system has the UW IMAP Toolkit c-client library version 2006 or greater.])
fi
+ if test "${ac_cv_imap_alpine2_22}" = "yes"; then
+ AC_DEFINE([HAVE_IMAP_ALPINE2_22], 1, [Define if your system has the c-client library from Alpine version 2.22 or greater.])
+ fi
else
AC_MSG_RESULT(no)
fi
@@ -2557,10 +2621,10 @@ fi
AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
- AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
+ AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua-${ver}/lua.h, [-lm])
if test "x${PBX_LUA}" = "x1" ; then
if test x"${LUA_DIR}" = x; then
- LUA_INCLUDE="${LUA_INCLUDE} -I/usr/include/lua${ver}"
+ LUA_INCLUDE="${LUA_INCLUDE} -I/usr/local/include/lua-${ver}"
else
LUA_INCLUDE="${LUA_INCLUDE} -I${LUA_DIR}/lua${ver}"
fi

23
telephony/asterisk/19/patches/patch-res_res_http_media_cache_c.orig
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-res_res_http_media_cache_c.orig,v 1.1 2021/11/02 12:47:10 sthen Exp $
Index: res/res_http_media_cache.c
--- res/res_http_media_cache.c.orig
+++ res/res_http_media_cache.c
@@ -152,7 +152,7 @@ static void bucket_file_set_expiration(struct ast_buck
}
/* Use 'now' if we didn't get an expiration time */
- snprintf(time_buf, sizeof(time_buf), "%30lu", actual_expires.tv_sec);
+ snprintf(time_buf, sizeof(time_buf), "%30llu", (long long)actual_expires.tv_sec);
ast_bucket_file_metadata_set(bucket_file, "__actual_expires", time_buf);
}
@@ -316,7 +316,7 @@ static int bucket_file_expired(struct ast_bucket_file
return 1;
}
- if (sscanf(metadata->value, "%lu", &expires.tv_sec) != 1) {
+ if (sscanf(metadata->value, "%llu", &expires.tv_sec) != 1) { /* XXX requires 64-bit time_t */
return 1;
}