Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2014Q1

Browse Source
This commit is contained in:
Lionel Sambuc
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
comms/asterisk/Makefile
View File

@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.94 2013/06/16 22:10:13 jnemeth Exp $
# $NetBSD: Makefile,v 1.104 2014/02/12 23:17:37 tron Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
DISTNAME= asterisk-11.4.0
DISTNAME= asterisk-11.7.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
PKGREVISION= 5
PKGREVISION= 1
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -37,6 +37,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --without-gtk2
# XXX remove when lang/lua gets builtin.mk
CONFIGURE_ARGS+= --without-lua
#JMN doesn't build properly on NetBSD, remove when -current is fixed
CONFIGURE_ARGS+= --without-srtp
INSTALL_TARGET= install samples
INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE}
@@ -134,12 +136,18 @@ SUBST_SED.configs+= -e "s|/usr/local/man|${ASTMANDIR}|"
SUBST_SED.configs+= -e "s|/usr/local|${PREFIX}|"
SUBST_SED.configs+= -e "s|/var|${VARBASE}|"
# XXX gross hack, remove when atomics properly implemented
.if (${OPSYS} == "NetBSD")
# XXX gross hack, remove when atomics properly implemented
SUBST_CLASSES+= atomics
SUBST_STAGE.atomics= post-configure
SUBST_FILES.atomics= include/asterisk/autoconfig.h
SUBST_SED.atomics= -e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|"
# XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else
SUBST_CLASSES+= pktinfo
SUBST_STAGE.pktinfo= post-configure
SUBST_FILES.pktinfo= include/asterisk/autoconfig.h
SUBST_SED.pktinfo= -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
.endif
RCD_SCRIPTS= asterisk
@@ -206,7 +214,7 @@ post-patch:
post-install:
# check sounds directory for current versions when upgrading package
${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.23.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
@@ -232,6 +240,7 @@ post-install:
cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/libuuid/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"

13
comms/asterisk/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2013/06/14 04:26:55 jnemeth Exp $
@comment $NetBSD: PLIST,v 1.7 2014/03/11 14:04:59 jperkin Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -377,14 +377,14 @@ libdata/asterisk/phoneprov/000000000000.cfg
libdata/asterisk/phoneprov/polycom.xml
libdata/asterisk/phoneprov/polycom_line.xml
libdata/asterisk/phoneprov/snom-mac.xml
libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23
libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24
libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
libdata/asterisk/sounds/en/1-yes-2-no.gsm
libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24
libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24
libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24
libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
libdata/asterisk/sounds/en/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
@@ -2305,6 +2305,8 @@ libexec/agi-bin/eagi-sphinx-test
libexec/agi-bin/eagi-test
libexec/agi-bin/jukebox.agi
${PLIST.webvmail}libexec/cgi-bin/vmail
man/man8/astdb2bdb.8
man/man8/astdb2sqlite3.8
man/man8/asterisk.8
man/man8/astgenkey.8
man/man8/autosupport.8
@@ -3079,7 +3081,6 @@ share/examples/asterisk/users.conf
share/examples/asterisk/voicemail.conf
share/examples/asterisk/vpb.conf
share/examples/asterisk/xmpp.conf
share/examples/rc.d/asterisk
${PLIST.webvmail}share/httpd/htdocs/_asterisk/animlogo.gif
${PLIST.webvmail}share/httpd/htdocs/_asterisk/play.gif
@pkgdir libdata/asterisk/keys

32
comms/asterisk/distinfo
View File

@@ -1,17 +1,22 @@
$NetBSD: distinfo,v 1.57 2013/06/14 04:26:55 jnemeth Exp $
$NetBSD: distinfo,v 1.62 2014/01/07 11:07:03 jnemeth Exp $
SHA1 (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 8ec0d10834c87a2bff58f23d961c67f16a26d01a
RMD160 (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 00f44e59e3c4258b52594787b30da6a81c662aa8
Size (asterisk-11.4.0/asterisk-11.4.0.tar.gz) = 30651949 bytes
SHA1 (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
RMD160 (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
Size (asterisk-11.4.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
SHA1 (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = 25182857b97478fd44783e41eb28e08a87c19ac8
RMD160 (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = f2d96f9bfa648216038f8de66f91179a09b490f1
Size (asterisk-11.7.0/asterisk-11.7.0.tar.gz) = 34779538 bytes
SHA1 (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
RMD160 (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
Size (asterisk-11.7.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
SHA1 (patch-apps_app__confbridge.c) = c815905994355a19c32e8e3e2eb5dc9f1679eb29
SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
SHA1 (patch-apps_app__followme.c) = a54e08d0dd0b6ff12281d4b7b8447707c1cbe20a
SHA1 (patch-apps_app__queue.c) = 5bdb602a709060a1ffca688830930f1ca6bc5841
SHA1 (patch-apps_app__meetme.c) = 73485931d63b6482aa549ee73ed6a72ec0e5f9a0
SHA1 (patch-apps_app__queue.c) = 9d78c6fdaaf7f583f3af8972d32ed3b2c3e67d41
SHA1 (patch-apps_app__skel.c) = e661a53b61d36343c54be7ad9ea6cde6cb10f180
SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
SHA1 (patch-apps_confbridge_conf__config__parser.c) = 42d5a6e2ce837111d06fa9154c7f66403cb83553
SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
SHA1 (patch-channels_chan__motif.c) = db6c97ba02a441633338d492032d78cd86f094f5
SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
SHA1 (patch-configure) = 88619fe9072ff69ed8da0a1917ac3852d10998a4
SHA1 (patch-configure.ac) = 2fdae524cfc95f152b86a32405b80f6edae6fa20
@@ -22,20 +27,29 @@ SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea2
SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
SHA1 (patch-include_asterisk_lock.h) = 8147210ae994f95a1d730beb85a6488dc9653cc4
SHA1 (patch-include_asterisk_strings.h) = fc5987a98429ca470f7e9bdcf170d49b0c1f3407
SHA1 (patch-include_asterisk_utils.h) = bb606542498d65268a59aa12e1116ccf3e592135
SHA1 (patch-main_Makefile) = 5f9238a528d2b96777e17a4ac6d3e7876dfffb98
SHA1 (patch-main_acl.c) = 1eac532a15127c25981d2db9462a8ccce2c58620
SHA1 (patch-main_asterisk.c) = df7bcdaeb2fc90f9fdc1b16388fbb5cf7eba141c
SHA1 (patch-main_config__options.c) = e49a946da99546684e8988ca4301bcacbb415987
SHA1 (patch-main_features.c) = 1c11207c60ce53c1101141e07ae04d0ddb838450
SHA1 (patch-main_manager.c) = 4ca84daac55a39a04c49e018e8b036b92e9b7117
SHA1 (patch-main_format.c) = a6d446c3de883cf3ef768d03d39e8d8db068b750
SHA1 (patch-main_http.c) = 1d3d6b47d1ced22faf79fb17c56e7a3067b7c892
SHA1 (patch-main_manager.c) = 754c77f373bff93cbd33e907823effc12824dd45
SHA1 (patch-main_named__acl.c) = 48c23ed0e558299679bbfc9e564383f9f7dd181f
SHA1 (patch-main_netsock.c) = 015796266b9806425180c9bb05a1907116ef086d
SHA1 (patch-main_sched.c) = 73759369470b575e73ca78f9cff096ebb477c9b1
SHA1 (patch-main_stdtime_localtime.c) = 1a5fe07f174fc81d1a59e08a8e5768e99ec46da1
SHA1 (patch-main_udptl.c) = 260586e4203b4bf51737ba171cbfe57621de8728
SHA1 (patch-main_utils.c) = e509c0ea81624b7404a535a3e8be563ce58039f6
SHA1 (patch-pbx_pbx__dundi.c) = 2823c48d64d2b96abb5cf627045d17282629521b
SHA1 (patch-res_pjproject_aconfigure) = 0095894c5daac2dec6a9ec745c0ecb8d46c0b73a
SHA1 (patch-res_pjproject_aconfigure.ac) = cbabe4a5f1888e180c93404324ddb96728dc20b9
SHA1 (patch-res_pjproject_build.symbian_makedef.sh) = 37781fe307564ad827e9be67f507f84230ebf299
SHA1 (patch-res_res__xmpp.c) = 5296a4f7454e432592a058939c7b0f2e328d53e2
SHA1 (patch-sounds_Makefile) = 792c2e25e1c8334fe8c9038b8b630376a5894c31
SHA1 (patch-tests_test__abstract__jb.c) = 42cfa303fc2e399aa9fe3bebf51464d0776e171c
SHA1 (patch-tests_test__config.c) = fa049dc1fedb8a0c898afa6848406d191acb54d3
SHA1 (patch-tests_test__locale.c) = e8419bed77d4787356adf8bc81893bea2adb48f4
SHA1 (patch-utils_Makefile) = e776da1fe1233a1f6933256f530f3bfff026de25
SHA1 (patch-utils_db1-ast_include_db.h) = 94ec413fe6a6154d65c43bdde2b26644d8bb5dac

18
comms/asterisk/patches/patch-apps_app__confbridge.c Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-apps_app__confbridge.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- apps/app_confbridge.c.orig 2013-03-04 20:03:09.000000000 +0000
+++ apps/app_confbridge.c
@@ -2137,10 +2137,12 @@ static char *complete_confbridge_name(co
return res;
}
+RAII_DECL(struct conference_bridge *, bridge, ao2_cleanup);
+
static char *complete_confbridge_participant(const char *bridge_name, const char *line, const char *word, int pos, int state)
{
int which = 0;
- RAII_VAR(struct conference_bridge *, bridge, NULL, ao2_cleanup);
+ RAII_VAR(struct conference_bridge *, bridge, NULL);
struct conference_bridge tmp;
struct conference_bridge_user *participant;
char *res = NULL;

137
comms/asterisk/patches/patch-apps_app__meetme.c Normal file
View File

@@ -0,0 +1,137 @@
$NetBSD: patch-apps_app__meetme.c,v 1.1 2013/12/23 01:34:03 jnemeth Exp $
--- apps/app_meetme.c.orig 2013-09-13 13:48:34.000000000 +0000
+++ apps/app_meetme.c
@@ -5001,6 +5001,8 @@ static int user_chan_cb(void *obj, void
/*! \brief The MeetMeadmin application
+RAII_DECL(struct ast_conf_user *, eject_user, ao2_cleanup);
+
MeetMeAdmin(confno, command, caller) */
static int admin_exec(struct ast_channel *chan, const char *data) {
char *params;
@@ -5082,7 +5084,7 @@ static int admin_exec(struct ast_channel
case 101: /* e: Eject last user*/
{
int max_no = 0;
- RAII_VAR(struct ast_conf_user *, eject_user, NULL, ao2_cleanup);
+ RAII_VAR(struct ast_conf_user *, eject_user, NULL);
ao2_callback(cnf->usercontainer, OBJ_NODATA, user_max_cmp, &max_no);
eject_user = ao2_find(cnf->usercontainer, &max_no, 0);
@@ -5840,10 +5842,13 @@ static void answer_trunk_chan(struct ast
ast_indicate(chan, -1);
}
+RAII_DECL(struct sla_station *, station, ao2_cleanup);
+RAII_DECL(struct sla_trunk_ref *, trunk_ref, ao2_cleanup);
+
static void *run_station(void *data)
{
- RAII_VAR(struct sla_station *, station, NULL, ao2_cleanup);
- RAII_VAR(struct sla_trunk_ref *, trunk_ref, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_station *, station, NULL);
+ RAII_VAR(struct sla_trunk_ref *, trunk_ref, NULL);
struct ast_str *conf_name = ast_str_create(16);
struct ast_flags64 conf_flags = { 0 };
struct ast_conference *conf;
@@ -6004,12 +6009,14 @@ static struct sla_ringing_trunk *sla_cho
return ringing_trunk;
}
+RAII_DECL(struct sla_trunk_ref *, s_trunk_ref, ao2_cleanup);
+
static void sla_handle_dial_state_event(void)
{
struct sla_ringing_station *ringing_station;
AST_LIST_TRAVERSE_SAFE_BEGIN(&sla.ringing_stations, ringing_station, entry) {
- RAII_VAR(struct sla_trunk_ref *, s_trunk_ref, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_trunk_ref *, s_trunk_ref, NULL);
struct sla_ringing_trunk *ringing_trunk = NULL;
struct run_station_args args;
enum ast_dial_result dial_res;
@@ -6222,7 +6229,7 @@ static struct sla_trunk_ref *sla_find_tr
static int sla_check_station_delay(struct sla_station *station,
struct sla_ringing_trunk *ringing_trunk)
{
- RAII_VAR(struct sla_trunk_ref *, trunk_ref, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_trunk_ref *, trunk_ref, NULL);
unsigned int delay = UINT_MAX;
int time_left, time_elapsed;
@@ -6633,8 +6640,8 @@ static void *dial_trunk(void *data)
char conf_name[MAX_CONFNUM];
struct ast_conference *conf;
struct ast_flags64 conf_flags = { 0 };
- RAII_VAR(struct sla_trunk_ref *, trunk_ref, args->trunk_ref, ao2_cleanup);
- RAII_VAR(struct sla_station *, station, args->station, ao2_cleanup);
+ RAII_VAR(struct sla_trunk_ref *, trunk_ref, args->trunk_ref);
+ RAII_VAR(struct sla_station *, station, args->station);
int caller_is_saved;
struct ast_party_caller caller;
int last_state = 0;
@@ -6781,8 +6788,8 @@ static struct sla_trunk_ref *sla_choose_
static int sla_station_exec(struct ast_channel *chan, const char *data)
{
char *station_name, *trunk_name;
- RAII_VAR(struct sla_station *, station, NULL, ao2_cleanup);
- RAII_VAR(struct sla_trunk_ref *, trunk_ref, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_station *, station, NULL);
+ RAII_VAR(struct sla_trunk_ref *, trunk_ref, NULL);
char conf_name[MAX_CONFNUM];
struct ast_flags64 conf_flags = { 0 };
struct ast_conference *conf;
@@ -7000,12 +7007,14 @@ AST_APP_OPTIONS(sla_trunk_opts, BEGIN_OP
AST_APP_OPTION_ARG('M', SLA_TRUNK_OPT_MOH, SLA_TRUNK_OPT_ARG_MOH_CLASS),
END_OPTIONS );
+RAII_DECL(struct sla_trunk *, trunk, ao2_cleanup);
+
static int sla_trunk_exec(struct ast_channel *chan, const char *data)
{
char conf_name[MAX_CONFNUM];
struct ast_conference *conf;
struct ast_flags64 conf_flags = { 0 };
- RAII_VAR(struct sla_trunk *, trunk, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_trunk *, trunk, NULL);
struct sla_ringing_trunk *ringing_trunk;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(trunk_name);
@@ -7101,7 +7110,7 @@ static int sla_trunk_exec(struct ast_cha
static enum ast_device_state sla_state(const char *data)
{
char *buf, *station_name, *trunk_name;
- RAII_VAR(struct sla_station *, station, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_station *, station, NULL);
struct sla_trunk_ref *trunk_ref;
enum ast_device_state res = AST_DEVICE_INVALID;
@@ -7262,7 +7271,7 @@ static void sla_trunk_destructor(void *o
static int sla_build_trunk(struct ast_config *cfg, const char *cat)
{
- RAII_VAR(struct sla_trunk *, trunk, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_trunk *, trunk, NULL);
struct ast_variable *var;
const char *dev;
int existing_trunk = 0;
@@ -7351,7 +7360,7 @@ static int sla_build_trunk(struct ast_co
*/
static void sla_add_trunk_to_station(struct sla_station *station, struct ast_variable *var)
{
- RAII_VAR(struct sla_trunk *, trunk, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_trunk *, trunk, NULL);
struct sla_trunk_ref *trunk_ref = NULL;
struct sla_station_ref *station_ref;
char *trunk_name, *options, *cur;
@@ -7435,7 +7444,7 @@ static void sla_add_trunk_to_station(str
static int sla_build_station(struct ast_config *cfg, const char *cat)
{
- RAII_VAR(struct sla_station *, station, NULL, ao2_cleanup);
+ RAII_VAR(struct sla_station *, station, NULL);
struct ast_variable *var;
const char *dev;
int existing_station = 0;

36
comms/asterisk/patches/patch-apps_app__queue.c
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
$NetBSD: patch-apps_app__queue.c,v 1.3 2013/12/23 01:34:03 jnemeth Exp $
--- apps/app_queue.c.orig 2013-01-09 00:03:40.000000000 +0000
--- apps/app_queue.c.orig 2013-09-12 00:02:37.000000000 +0000
+++ apps/app_queue.c
@@ -4717,7 +4717,7 @@ static int wait_our_turn(struct queue_en
@@ -4735,7 +4735,7 @@ static int wait_our_turn(struct queue_en
if ((status = get_member_status(qe->parent, qe->max_penalty, qe->min_penalty, qe->parent->leavewhenempty))) {
*reason = QUEUE_LEAVEEMPTY;
@@ -11,7 +11,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
leave_queue(qe);
break;
}
@@ -4957,12 +4957,12 @@ static void send_agent_complete(const st
@@ -4975,12 +4975,12 @@ static void send_agent_complete(const st
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -27,7 +27,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
}
@@ -5005,9 +5005,9 @@ static void queue_transfer_fixup(void *d
@@ -5023,9 +5023,9 @@ static void queue_transfer_fixup(void *d
int callcompletedinsl = qtds->callcompletedinsl;
struct ast_datastore *datastore;
@@ -39,8 +39,8 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
+ (intmax_t) (time(NULL) - callstart), qe->opos);
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
@@ -5524,7 +5524,7 @@ static int try_calling(struct queue_ent
@@ -5542,7 +5542,7 @@ static int try_calling(struct queue_ent
} else if (ast_check_hangup(qe->chan)) {
/* Caller must have hung up just before being connected */
ast_log(LOG_NOTICE, "Caller was about to talk to agent on %s but the caller hungup.\n", ast_channel_name(peer));
@@ -49,7 +49,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
record_abandoned(qe);
ast_autoservice_chan_hangup_peer(qe->chan, peer);
ao2_ref(member, -1);
@@ -5573,8 +5573,8 @@ static int try_calling(struct queue_ent
@@ -5591,8 +5591,8 @@ static int try_calling(struct queue_ent
/* if setqueueentryvar is defined, make queue entry (i.e. the caller) variables available to the channel */
/* use pbx_builtin_setvar to set a load of variables with one call */
if (qe->parent->setqueueentryvar) {
@@ -60,7 +60,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
@@ -5791,8 +5791,8 @@ static int try_calling(struct queue_ent
@@ -5809,8 +5809,8 @@ static int try_calling(struct queue_ent
}
}
qe->handled++;
@@ -71,7 +71,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
if (ast_channel_cdr(qe->chan)) {
struct ast_cdr *cdr;
@@ -5846,12 +5846,12 @@ static int try_calling(struct queue_ent
@@ -5864,12 +5864,12 @@ static int try_calling(struct queue_ent
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
@@ -87,7 +87,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_copy_string(oldcontext, ast_channel_context(qe->chan), sizeof(oldcontext));
ast_copy_string(oldexten, ast_channel_exten(qe->chan), sizeof(oldexten));
@@ -5883,17 +5883,17 @@ static int try_calling(struct queue_ent
@@ -5901,17 +5901,17 @@ static int try_calling(struct queue_ent
/* detect a blind transfer */
if (!(ast_channel_softhangup_internal_flag(qe->chan) | ast_channel_softhangup_internal_flag(peer)) && (strcasecmp(oldcontext, ast_channel_context(qe->chan)) || strcasecmp(oldexten, ast_channel_exten(qe->chan)))) {
@@ -111,19 +111,19 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
+ (intmax_t) (callstart - qe->start), (intmax_t) (time(NULL) - callstart), qe->opos);
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), AGENT);
}
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
@@ -7070,8 +7070,8 @@ check_turns:
if ((tds = ast_channel_datastore_find(qe->chan, &queue_transfer_info, NULL))) {
@@ -7088,8 +7088,8 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
- ast_queue_log(args.queuename, ast_channel_uniqueid(chan),"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld",
- ast_queue_log(args.queuename, ast_channel_uniqueid(chan),"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld",
- qe.pos, qe.opos, (long) time(NULL) - qe.start);
+ ast_queue_log(args.queuename, ast_channel_uniqueid(chan),"NONE", "EXITWITHTIMEOUT", "%d|%d|%jd",
+ ast_queue_log(args.queuename, ast_channel_uniqueid(chan),"NONE", "EXITWITHTIMEOUT", "%d|%d|%jd",
+ qe.pos, qe.opos, (intmax_t) time(NULL) - qe.start);
break;
}
@@ -7115,7 +7115,7 @@ check_turns:
@@ -7133,7 +7133,7 @@ check_turns:
if ((status = get_member_status(qe.parent, qe.max_penalty, qe.min_penalty, qe.parent->leavewhenempty))) {
record_abandoned(&qe);
reason = QUEUE_LEAVEEMPTY;
@@ -132,7 +132,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
res = 0;
break;
}
@@ -7137,7 +7137,7 @@ check_turns:
@@ -7155,7 +7155,7 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
@@ -141,7 +141,7 @@ $NetBSD: patch-apps_app__queue.c,v 1.2 2013/05/05 01:32:35 jnemeth Exp $
break;
}
@@ -7165,8 +7165,8 @@ stop:
@@ -7183,8 +7183,8 @@ stop:
if (!qe.handled) {
record_abandoned(&qe);
ast_queue_log(args.queuename, ast_channel_uniqueid(chan), "NONE", "ABANDON",

54
comms/asterisk/patches/patch-apps_app__skel.c Normal file
View File

@@ -0,0 +1,54 @@
$NetBSD: patch-apps_app__skel.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- apps/app_skel.c.orig 2012-06-07 20:32:07.000000000 +0000
+++ apps/app_skel.c
@@ -315,13 +315,17 @@ static void play_files_helper(struct ast
}
}
+RAII_DECL(struct skel_config *, cfg, ao2_cleanup);
+RAII_DECL(struct skel_level *, level, ao2_cleanup);
+RAII_DECL(struct skel_current_game *, game, ao2_cleanup);
+
static int app_exec(struct ast_channel *chan, const char *data)
{
int win = 0;
uint32_t guesses;
- RAII_VAR(struct skel_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct skel_level *, level, NULL, ao2_cleanup);
- RAII_VAR(struct skel_current_game *, game, NULL, ao2_cleanup);
+ RAII_VAR(struct skel_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct skel_level *, level, NULL);
+ RAII_VAR(struct skel_current_game *, game, NULL);
char *parse, *opts[OPTION_ARG_ARRAY_SIZE];
struct ast_flags flags;
AST_DECLARE_APP_ARGS(args,
@@ -459,8 +463,8 @@ static void *skel_level_find(struct ao2_
*/
static void *skel_find_or_create_state(const char *category)
{
- RAII_VAR(struct skel_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct skel_level *, level, NULL, ao2_cleanup);
+ RAII_VAR(struct skel_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct skel_level *, level, NULL);
if (!cfg || !cfg->levels || !(level = ao2_find(cfg->levels, category, OBJ_KEY))) {
return skel_state_alloc(category);
}
@@ -531,7 +535,7 @@ error:
static char *handle_skel_show_config(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct skel_config *, cfg, NULL, ao2_cleanup);
+ RAII_VAR(struct skel_config *, cfg, NULL);
switch(cmd) {
case CLI_INIT:
@@ -591,7 +595,7 @@ static char *handle_skel_show_games(stru
static char *handle_skel_show_levels(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct skel_config *, cfg, NULL, ao2_cleanup);
+ RAII_VAR(struct skel_config *, cfg, NULL);
struct ao2_iterator iter;
struct skel_level *level;

125
comms/asterisk/patches/patch-apps_confbridge_conf__config__parser.c Normal file
View File

@@ -0,0 +1,125 @@
$NetBSD: patch-apps_confbridge_conf__config__parser.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- apps/confbridge/conf_config_parser.c.orig 2013-02-26 15:24:35.000000000 +0000
+++ apps/confbridge/conf_config_parser.c
@@ -613,6 +613,8 @@ static int add_menu_entry(struct conf_me
return 0;
}
+RAII_DECL(struct confbridge_cfg *, cfg, ao2_cleanup);
+
static char *complete_user_profile_name(const char *line, const char *word, int pos, int state)
{
int which = 0;
@@ -620,7 +622,7 @@ static char *complete_user_profile_name(
int wordlen = strlen(word);
struct ao2_iterator i;
struct user_profile *u_profile = NULL;
- RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle), ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle));
if (!cfg) {
return NULL;
@@ -644,7 +646,7 @@ static char *handle_cli_confbridge_show_
{
struct ao2_iterator it;
struct user_profile *u_profile;
- RAII_VAR(struct confbridge_cfg *, cfg, NULL, ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, NULL);
switch (cmd) {
case CLI_INIT:
@@ -770,7 +772,7 @@ static char *complete_bridge_profile_nam
int wordlen = strlen(word);
struct ao2_iterator i;
struct bridge_profile *b_profile = NULL;
- RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle), ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle));
if (!cfg) {
return NULL;
@@ -794,7 +796,7 @@ static char *handle_cli_confbridge_show_
{
struct ao2_iterator it;
struct bridge_profile *b_profile;
- RAII_VAR(struct confbridge_cfg *, cfg, NULL, ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, NULL);
switch (cmd) {
case CLI_INIT:
@@ -936,7 +938,7 @@ static char *complete_menu_name(const ch
int wordlen = strlen(word);
struct ao2_iterator i;
struct conf_menu *menu = NULL;
- RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle), ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle));
if (!cfg) {
return NULL;
@@ -960,7 +962,7 @@ static char *handle_cli_confbridge_show_
{
struct ao2_iterator it;
struct conf_menu *menu;
- RAII_VAR(struct confbridge_cfg *, cfg, NULL, ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, NULL);
switch (cmd) {
case CLI_INIT:
@@ -989,10 +991,12 @@ static char *handle_cli_confbridge_show_
return CLI_SUCCESS;
}
+RAII_DECL(struct conf_menu *, menu, ao2_cleanup);
+
static char *handle_cli_confbridge_show_menu(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct conf_menu *, menu, NULL, ao2_cleanup);
- RAII_VAR(struct confbridge_cfg *, cfg, NULL, ao2_cleanup);
+ RAII_VAR(struct conf_menu *, menu, NULL);
+ RAII_VAR(struct confbridge_cfg *, cfg, NULL);
struct conf_menu_entry *menu_entry = NULL;
struct conf_menu_action *menu_action = NULL;
@@ -1285,10 +1289,13 @@ static int menu_option_handler(const str
return 0;
}
+RAII_DECL(struct user_profile *, user_profile, ao2_cleanup);
+RAII_DECL(struct bridge_profile *, bridge_profile, ao2_cleanup);
+
static int verify_default_profiles(void)
{
- RAII_VAR(struct user_profile *, user_profile, NULL, ao2_cleanup);
- RAII_VAR(struct bridge_profile *, bridge_profile, NULL, ao2_cleanup);
+ RAII_VAR(struct user_profile *, user_profile, NULL);
+ RAII_VAR(struct bridge_profile *, bridge_profile, NULL);
struct confbridge_cfg *cfg = aco_pending_config(&cfg_info);
if (!cfg) {
@@ -1400,7 +1407,7 @@ const struct user_profile *conf_find_use
struct user_profile *tmp2;
struct ast_datastore *datastore = NULL;
struct func_confbridge_data *b_data = NULL;
- RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle), ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle));
if (!cfg) {
return NULL;
@@ -1454,7 +1461,7 @@ const struct bridge_profile *conf_find_b
struct bridge_profile *tmp2;
struct ast_datastore *datastore = NULL;
struct func_confbridge_data *b_data = NULL;
- RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle), ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle));
if (!cfg) {
return NULL;
@@ -1558,7 +1565,7 @@ int conf_set_menu_to_user(const char *me
{
struct conf_menu *menu;
struct conf_menu_entry *menu_entry = NULL;
- RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle), ao2_cleanup);
+ RAII_VAR(struct confbridge_cfg *, cfg, ao2_global_obj_ref(cfg_handle));
if (!cfg) {
return -1;

32
comms/asterisk/patches/patch-channels_chan__motif.c Normal file
View File

@@ -0,0 +1,32 @@
$NetBSD: patch-channels_chan__motif.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- channels/chan_motif.c.orig 2012-12-09 01:22:56.000000000 +0000
+++ channels/chan_motif.c
@@ -337,11 +337,14 @@ static struct jingle_endpoint_state *jin
return state;
}
+RAII_DECL(struct jingle_config *, cfg, ao2_cleanup);
+RAII_DECL(struct jingle_endpoint *, endpoint, ao2_cleanup);
+
/*! \brief State find/create function */
static struct jingle_endpoint_state *jingle_endpoint_state_find_or_create(const char *category)
{
- RAII_VAR(struct jingle_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct jingle_endpoint *, endpoint, NULL, ao2_cleanup);
+ RAII_VAR(struct jingle_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct jingle_endpoint *, endpoint, NULL);
if (!cfg || !cfg->endpoints || !(endpoint = jingle_endpoint_find(cfg->endpoints, category))) {
return jingle_endpoint_state_create();
@@ -1729,8 +1732,8 @@ static int jingle_hangup(struct ast_chan
/*! \brief Function called by core to create a new outgoing Jingle session */
static struct ast_channel *jingle_request(const char *type, struct ast_format_cap *cap, const struct ast_channel *requestor, const char *data, int *cause)
{
- RAII_VAR(struct jingle_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct jingle_endpoint *, endpoint, NULL, ao2_cleanup);
+ RAII_VAR(struct jingle_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct jingle_endpoint *, endpoint, NULL);
char *dialed, target[200] = "";
struct ast_xmpp_buddy *buddy;
struct jingle_session *session;

18
comms/asterisk/patches/patch-include_asterisk_utils.h Normal file
View File

@@ -0,0 +1,18 @@
$NetBSD: patch-include_asterisk_utils.h,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- include/asterisk/utils.h.orig 2013-04-30 13:46:53.000000000 +0000
+++ include/asterisk/utils.h
@@ -926,10 +926,9 @@ char *ast_utils_which(const char *binary
* }
* \encode
*/
-#define RAII_VAR(vartype, varname, initval, dtor) \
- /* Prototype needed due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=36774 */ \
- auto void _dtor_ ## varname (vartype * v); \
- void _dtor_ ## varname (vartype * v) { dtor(*v); } \
+#define RAII_DECL(vartype, varname, dtor) \
+ static void _dtor_ ## varname (vartype * v) { dtor(*v); }
+#define RAII_VAR(vartype, varname, initval) \
vartype varname __attribute__((cleanup(_dtor_ ## varname))) = (initval)
#endif /* _ASTERISK_UTILS_H */

48
comms/asterisk/patches/patch-main_config__options.c Normal file
View File

@@ -0,0 +1,48 @@
$NetBSD: patch-main_config__options.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- main/config_options.c.orig 2012-10-02 01:27:19.000000000 +0000
+++ main/config_options.c
@@ -343,8 +343,10 @@ static int is_preload(struct aco_file *f
return 0;
}
+RAII_DECL(void *, new_item, ao2_cleanup);
+
static int process_category(struct ast_config *cfg, struct aco_info *info, struct aco_file *file, const char *cat, int preload) {
- RAII_VAR(void *, new_item, NULL, ao2_cleanup);
+ RAII_VAR(void *, new_item, NULL);
struct aco_type *type;
/* For global types, field is the global option struct. For non-global, it is the container for items.
* We do not grab a reference to these objects, as the info already holds references to them. This
@@ -556,9 +558,12 @@ end:
ao2_cleanup(info->internal->pending);
return res;
}
+
+RAII_DECL(struct aco_option *, opt, ao2_cleanup);
+
int aco_process_var(struct aco_type *type, const char *cat, struct ast_variable *var, void *obj)
{
- RAII_VAR(struct aco_option *, opt, aco_option_find(type, var->name), ao2_cleanup);
+ RAII_VAR(struct aco_option *, opt, aco_option_find(type, var->name));
if (opt && opt->deprecated && !ast_strlen_zero(opt->aliased_to)) {
const char *alias = ast_strdupa(opt->aliased_to);
ast_log(LOG_WARNING, "At line %d of %s option '%s' is deprecated. Use '%s' instead\n", var->lineno, var->file, var->name, alias);
@@ -682,6 +687,8 @@ void aco_info_destroy(struct aco_info *i
}
}
+RAII_DECL(struct ast_variable *, var, ast_variables_destroy);
+
int aco_set_defaults(struct aco_type *type, const char *category, void *obj)
{
struct aco_option *opt;
@@ -690,7 +697,7 @@ int aco_set_defaults(struct aco_type *ty
iter = ao2_iterator_init(type->internal->opts, 0);
while ((opt = ao2_iterator_next(&iter))) {
- RAII_VAR(struct ast_variable *, var, NULL, ast_variables_destroy);
+ RAII_VAR(struct ast_variable *, var, NULL);
if (ast_strlen_zero(opt->default_val)) {
ao2_ref(opt, -1);

17
comms/asterisk/patches/patch-main_format.c Normal file
View File

@@ -0,0 +1,17 @@
$NetBSD: patch-main_format.c,v 1.1 2013/12/23 01:34:03 jnemeth Exp $
--- main/format.c.orig 2013-06-12 02:25:23.000000000 +0000
+++ main/format.c
@@ -914,9 +914,11 @@ int init_framer(void)
return 0;
}
+RAII_DECL(struct ast_format_list *, entry, ao2_cleanup);
+
static int format_list_add_custom(struct ast_format_list *new)
{
- RAII_VAR(struct ast_format_list *, entry, NULL, ao2_cleanup);
+ RAII_VAR(struct ast_format_list *, entry, NULL);
if (!(entry = ao2_alloc(sizeof(*entry), NULL))) {
return -1;
}

22
comms/asterisk/patches/patch-main_http.c Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-main_http.c,v 1.1 2013/12/23 01:34:03 jnemeth Exp $
--- main/http.c.orig 2013-08-21 17:07:06.000000000 +0000
+++ main/http.c
@@ -1014,6 +1014,8 @@ static void add_redirect(const char *val
AST_RWLIST_UNLOCK(&uri_redirects);
}
+RAII_DECL(struct ast_sockaddr *, addrs, ast_free);
+
static int __ast_http_load(int reload)
{
struct ast_config *cfg;
@@ -1024,7 +1026,7 @@ static int __ast_http_load(int reload)
struct http_uri_redirect *redirect;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
uint32_t bindport = DEFAULT_PORT;
- RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free);
+ RAII_VAR(struct ast_sockaddr *, addrs, NULL);
int num_addrs = 0;
int http_tls_was_enabled = 0;

21
comms/asterisk/patches/patch-main_manager.c
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-main_manager.c,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
$NetBSD: patch-main_manager.c,v 1.2 2013/08/08 00:45:10 jnemeth Exp $
--- main/manager.c.orig 2012-10-17 19:22:46.000000000 +0000
--- main/manager.c.orig 2013-05-13 14:26:57.000000000 +0000
+++ main/manager.c
@@ -1827,7 +1827,7 @@ static char *handle_showmanconn(struct a
@@ -1850,7 +1850,7 @@ static char *handle_showmanconn(struct a
struct mansession_session *session;
time_t now = time(NULL);
#define HSMCONN_FORMAT1 " %-15.15s %-55.55s %-10.10s %-10.10s %-8.8s %-8.8s %-5.5s %-5.5s\n"
@@ -11,7 +11,7 @@ $NetBSD: patch-main_manager.c,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
int count = 0;
struct ao2_iterator i;
@@ -1848,7 +1848,7 @@ static char *handle_showmanconn(struct a
@@ -1871,7 +1871,7 @@ static char *handle_showmanconn(struct a
i = ao2_iterator_init(sessions, 0);
while ((session = ao2_iterator_next(&i))) {
ao2_lock(session);
@@ -20,3 +20,16 @@ $NetBSD: patch-main_manager.c,v 1.1 2012/12/11 08:22:49 jnemeth Exp $
count++;
ao2_unlock(session);
unref_mansession(session);
@@ -7203,9 +7203,11 @@ static char *handle_manager_show_events(
return CLI_SUCCESS;
}
+RAII_DECL(struct ao2_container *, events, ao2_cleanup);
+
static char *handle_manager_show_event(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct ao2_container *, events, NULL, ao2_cleanup);
+ RAII_VAR(struct ao2_container *, events, NULL);
struct ao2_iterator it_events;
struct ast_xml_doc_item *item, *temp;
int length;

60
comms/asterisk/patches/patch-main_named__acl.c Normal file
View File

@@ -0,0 +1,60 @@
$NetBSD: patch-main_named__acl.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- main/named_acl.c.orig 2012-12-06 17:28:35.000000000 +0000
+++ main/named_acl.c
@@ -309,11 +309,15 @@ static struct named_acl *named_acl_find_
return acl;
}
+RAII_DECL(struct named_acl_config *, cfg, ao2_cleanup);
+RAII_DECL(struct named_acl *, named_acl, ao2_cleanup);
+RAII_DECL(struct named_acl *, realtime_acl, ao2_cleanup);
+
struct ast_ha *ast_named_acl_find(const char *name, int *is_realtime, int *is_undefined) {
struct ast_ha *ha = NULL;
- RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct named_acl *, named_acl, NULL, ao2_cleanup);
+ RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct named_acl *, named_acl, NULL);
if (is_realtime) {
*is_realtime = 0;
@@ -333,7 +337,7 @@ struct ast_ha *ast_named_acl_find(const
/* If a named ACL couldn't be retrieved locally, we need to try realtime storage. */
if (!named_acl) {
- RAII_VAR(struct named_acl *, realtime_acl, NULL, ao2_cleanup);
+ RAII_VAR(struct named_acl *, realtime_acl, NULL);
/* Attempt to create from realtime */
if ((realtime_acl = named_acl_find_realtime(name))) {
@@ -441,8 +445,8 @@ static void cli_display_named_acl(int fd
int ha_index = 0;
int is_realtime = 0;
- RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct named_acl *, named_acl, NULL, ao2_cleanup);
+ RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct named_acl *, named_acl, NULL);
/* If the configuration or the configuration's named_acl_list is unavailable, abort. */
if ((!cfg) || (!cfg->named_acl_list)) {
@@ -481,7 +485,7 @@ static void cli_display_named_acl_list(i
{
struct ao2_iterator i;
void *o;
- RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals));
ast_cli(fd, "\nacl\n---\n");
@@ -503,7 +507,7 @@ static void cli_display_named_acl_list(i
/* \brief ACL command show <name> */
static char *handle_show_named_acl_cmd(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct named_acl_config *, cfg, ao2_global_obj_ref(globals));
int length;
int which;
struct ao2_iterator i;

46
comms/asterisk/patches/patch-main_udptl.c Normal file
View File

@@ -0,0 +1,46 @@
$NetBSD: patch-main_udptl.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
--- main/udptl.c.orig 2013-09-18 23:36:12.000000000 +0000
+++ main/udptl.c
@@ -952,6 +952,8 @@ unsigned int ast_udptl_get_far_max_ifp(s
return udptl->far_max_ifp;
}
+RAII_DECL(struct udptl_config *, cfg, ao2_cleanup);
+
struct ast_udptl *ast_udptl_new_with_bindaddr(struct ast_sched_context *sched, struct io_context *io, int callbackmode, struct ast_sockaddr *addr)
{
struct ast_udptl *udptl;
@@ -959,7 +961,7 @@ struct ast_udptl *ast_udptl_new_with_bin
int startplace;
int i;
long int flags;
- RAII_VAR(struct udptl_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct udptl_config *, cfg, ao2_global_obj_ref(globals));
if (!cfg || !cfg->general) {
ast_log(LOG_ERROR, "Could not access global udptl options!\n");
@@ -1352,7 +1354,7 @@ static char *handle_cli_udptl_set_debug(
static char *handle_cli_show_config(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct udptl_config *, cfg, NULL, ao2_cleanup);
+ RAII_VAR(struct udptl_config *, cfg, NULL);
switch (cmd) {
case CLI_INIT:
@@ -1417,11 +1419,13 @@ static int removed_options_handler(const
return 0;
}
+RAII_DECL(struct udptl_config *, udptl_cfg, ao2_cleanup);
+
static void __ast_udptl_reload(int reload)
{
if (aco_process_config(&cfg_info, reload) == ACO_PROCESS_ERROR) {
if (!reload) {
- RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc(), ao2_cleanup);
+ RAII_VAR(struct udptl_config *, udptl_cfg, udptl_snapshot_alloc());
if (aco_set_defaults(&general_option, "general", udptl_cfg->general)) {
ast_log(LOG_ERROR, "Failed to load udptl.conf and failed to initialize defaults.\n");

430
comms/asterisk/patches/patch-res_res__xmpp.c Normal file
View File

@@ -0,0 +1,430 @@
$NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
--- res/res_xmpp.c.orig 2013-09-07 00:59:41.000000000 +0000
+++ res/res_xmpp.c
@@ -510,11 +510,14 @@ static void *xmpp_config_find(struct ao2
return ao2_find(tmp_container, category, OBJ_KEY);
}
+RAII_DECL(struct xmpp_config *, cfg, ao2_cleanup);
+RAII_DECL(struct ast_xmpp_client_config *, clientcfg, ao2_cleanup);
+
/*! \brief Look up existing client or create a new one */
static void *xmpp_client_find_or_create(const char *category)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, category))) {
return xmpp_client_alloc(category);
@@ -602,11 +605,13 @@ error:
return NULL;
}
+RAII_DECL(struct ast_xmpp_client_config *, oldclientcfg, ao2_cleanup);
+
static int xmpp_config_prelink(void *newitem)
{
struct ast_xmpp_client_config *clientcfg = newitem;
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, oldclientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, oldclientcfg, NULL);
if (ast_strlen_zero(clientcfg->user)) {
ast_log(LOG_ERROR, "No user specified on client '%s'\n", clientcfg->name);
@@ -642,7 +647,7 @@ static int xmpp_config_prelink(void *new
static void xmpp_config_post_apply(void)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
ao2_callback(cfg->clients, OBJ_NODATA | OBJ_MULTIPLE, xmpp_client_config_post_apply, NULL);
}
@@ -728,8 +733,8 @@ static int xmpp_is_secure(struct ast_xmp
struct ast_xmpp_client *ast_xmpp_client_find(const char *name)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, name))) {
return NULL;
@@ -757,8 +762,8 @@ void ast_xmpp_client_unlock(struct ast_x
/*! \brief Internal function used to send a message to a user or chatroom */
static int xmpp_client_send_message(struct ast_xmpp_client *client, int group, const char *nick, const char *address, const char *message)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int res = 0;
char from[XMPP_MAX_JIDLEN];
iks *message_packet;
@@ -821,8 +826,8 @@ done:
static int xmpp_client_set_group_presence(struct ast_xmpp_client *client, const char *room, int level, const char *nick)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int res = 0;
iks *presence = NULL, *x = NULL;
char from[XMPP_MAX_JIDLEN], roomid[XMPP_MAX_JIDLEN];
@@ -892,8 +897,8 @@ void ast_xmpp_increment_mid(char *mid)
*/
static iks* xmpp_pubsub_iq_create(struct ast_xmpp_client *client, const char *type)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
iks *request;
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name)) ||
@@ -925,7 +930,7 @@ static iks* xmpp_pubsub_iq_create(struct
static iks* xmpp_pubsub_build_publish_skeleton(struct ast_xmpp_client *client, const char *node,
const char *event_type, unsigned int cachable)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
iks *request, *pubsub, *publish, *item;
if (!cfg || !cfg->global || !(request = xmpp_pubsub_iq_create(client, "set"))) {
@@ -1151,7 +1156,7 @@ static void xmpp_pubsub_publish_mwi(stru
static void xmpp_pubsub_publish_device_state(struct ast_xmpp_client *client, const char *device,
const char *device_state, unsigned int cachable)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
iks *request, *state;
char eid_str[20], cachable_str[2];
@@ -1263,7 +1268,7 @@ static void xmpp_pubsub_unsubscribe(stru
*/
static void xmpp_pubsub_subscribe(struct ast_xmpp_client *client, const char *node)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
iks *request = xmpp_pubsub_iq_create(client, "set");
iks *pubsub, *subscribe;
@@ -1370,7 +1375,7 @@ static int xmpp_pubsub_handle_event(void
static int xmpp_pubsub_handle_error(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
char *node_name, *error;
int error_num;
iks *orig_request, *orig_pubsub = iks_find(pak->x, "pubsub");
@@ -1443,8 +1448,8 @@ static int xmpp_pubsub_handle_error(void
*/
static void xmpp_init_event_distribution(struct ast_xmpp_client *client)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name))) {
return;
@@ -1498,8 +1503,8 @@ static int xmpp_resource_immediate(void
*/
static int xmpp_status_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_buddy *buddy;
struct ast_xmpp_resource *resource;
char *s = NULL, status[2];
@@ -1577,8 +1582,8 @@ static int xmpp_status_exec(struct ast_c
*/
static int acf_jabberstatus_read(struct ast_channel *chan, const char *name, char *data, char *buf, size_t buflen)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_buddy *buddy;
struct ast_xmpp_resource *resource;
int stat = 7;
@@ -1650,8 +1655,8 @@ static struct ast_custom_function jabber
*/
static int xmpp_join_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1709,8 +1714,8 @@ static int xmpp_join_exec(struct ast_cha
*/
static int xmpp_leave_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1770,8 +1775,8 @@ static int xmpp_leave_exec(struct ast_ch
*/
static int xmpp_send_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1811,8 +1816,8 @@ static int xmpp_send_exec(struct ast_cha
*/
static int xmpp_sendgroup_exec(struct ast_channel *chan, const char *data)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *s, nick[XMPP_MAX_RESJIDLEN];
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1864,8 +1869,8 @@ static int xmpp_sendgroup_exec(struct as
*/
static int acf_jabberreceive_read(struct ast_channel *chan, const char *name, char *data, char *buf, size_t buflen)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *parse = NULL;
int timeout, jidlen, resourcelen, found = 0;
struct timeval start;
@@ -2023,8 +2028,8 @@ static struct ast_custom_function jabber
*/
static int delete_old_messages(struct ast_xmpp_client *client, char *from)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int deleted = 0, isold = 0;
struct ast_xmpp_message *message = NULL;
@@ -2057,8 +2062,8 @@ static int delete_old_messages(struct as
static int xmpp_send_cb(const struct ast_msg *msg, const char *to, const char *from)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
char *sender, *dest;
int res;
@@ -2182,8 +2187,8 @@ static int xmpp_client_subscribe_user(vo
/*! \brief Hook function called when roster is received from server */
static int xmpp_roster_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *item;
@@ -2240,8 +2245,8 @@ static int xmpp_roster_hook(void *data,
/*! \brief Internal function which changes the presence status of an XMPP client */
static void xmpp_client_set_presence(struct ast_xmpp_client *client, const char *to, const char *from, int level, const char *desc)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
iks *presence = NULL, *cnode = NULL, *priority = NULL;
char priorityS[10];
@@ -2368,8 +2373,8 @@ static int xmpp_client_service_discovery
/*! \brief Hook function called when client finishes authenticating with the server */
static int xmpp_connect_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *roster;
@@ -2406,8 +2411,8 @@ static int xmpp_connect_hook(void *data,
/*! \brief Logging hook function */
static void xmpp_log_hook(void *data, const char *xmpp, size_t size, int incoming)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
if (!ast_strlen_zero(xmpp)) {
@@ -2745,8 +2750,8 @@ static int xmpp_component_authenticate(s
/*! \brief Hook function called when component receives a service discovery get message */
static int xmpp_component_service_discovery_get_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *identity = NULL, *disco = NULL, *reg = NULL, *commands = NULL, *gateway = NULL;
iks *version = NULL, *vcard = NULL, *search = NULL, *item = NULL;
@@ -2832,8 +2837,8 @@ done:
/*! \brief Hook function called when the component is queried about registration */
static int xmpp_component_register_get_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *error = NULL, *notacceptable = NULL, *instructions = NULL;
struct ast_xmpp_buddy *buddy;
@@ -2940,8 +2945,8 @@ done:
/*! \brief Hook function called when we receive a service discovery items request */
static int xmpp_component_service_discovery_items_hook(void *data, ikspak *pak)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
iks *iq = NULL, *query = NULL, *item = NULL, *feature = NULL;
char *node;
@@ -3324,8 +3329,8 @@ static int xmpp_pak_s10n(struct ast_xmpp
/*! \brief Action hook for when things occur */
static int xmpp_action_hook(void *data, int type, iks *node)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
struct ast_xmpp_client *client = data;
ikspak *pak;
int i;
@@ -3435,8 +3440,8 @@ int ast_xmpp_client_disconnect(struct as
static int xmpp_client_reconnect(struct ast_xmpp_client *client)
{
struct timeval tv = { .tv_sec = 5, .tv_usec = 0 };
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
int res = IKS_NET_NOCONN;
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name))) {
@@ -3611,8 +3616,8 @@ static void *xmpp_client_thread(void *da
} else if (res == IKS_NET_TLSFAIL) {
ast_log(LOG_ERROR, "JABBER: Failure in TLS.\n");
} else if (!client->timeout && client->state == XMPP_STATE_CONNECTED) {
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
if (cfg && cfg->clients) {
clientcfg = xmpp_config_find(cfg->clients, client->name);
@@ -3725,8 +3730,8 @@ static int xmpp_client_config_post_apply
*/
static int manager_jabber_send(struct mansession *s, const struct message *m)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *id = astman_get_header(m, "ActionID");
const char *jabber = astman_get_header(m, "Jabber");
const char *screenname = astman_get_header(m, "ScreenName");
@@ -3852,8 +3857,8 @@ static void xmpp_pubsub_request_nodes(st
static char *xmpp_cli_list_pubsub_nodes(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name = NULL, *collection = NULL;
switch (cmd) {
@@ -3938,8 +3943,8 @@ static void xmpp_pubsub_purge_nodes(stru
static char *xmpp_cli_purge_pubsub_nodes(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name;
switch (cmd) {
@@ -3983,8 +3988,8 @@ static char *xmpp_cli_purge_pubsub_nodes
static char *xmpp_cli_delete_pubsub_node(struct ast_cli_entry *e, int cmd, struct
ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name;
switch (cmd) {
@@ -4020,8 +4025,8 @@ static char *xmpp_cli_delete_pubsub_node
*/
static char *xmpp_cli_create_collection(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name, *collection_name;
switch (cmd) {
@@ -4060,8 +4065,8 @@ static char *xmpp_cli_create_collection(
*/
static char *xmpp_cli_create_leafnode(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
+ RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL);
const char *name, *collection_name, *leaf_name;
switch (cmd) {
@@ -4136,7 +4141,7 @@ static char *xmpp_do_set_debug(struct as
*/
static char *xmpp_show_clients(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
struct ao2_iterator i;
struct ast_xmpp_client_config *clientcfg;
@@ -4212,7 +4217,7 @@ static char *xmpp_show_clients(struct as
*/
static char *xmpp_show_buddies(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals));
struct ao2_iterator i;
struct ast_xmpp_client_config *clientcfg;

80
comms/asterisk/patches/patch-tests_test__abstract__jb.c Normal file
View File

@@ -0,0 +1,80 @@
$NetBSD: patch-tests_test__abstract__jb.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- tests/test_abstract_jb.c.orig 2012-07-23 21:15:26.000000000 +0000
+++ tests/test_abstract_jb.c
@@ -177,8 +177,11 @@ static struct ast_jb default_jb = {
* \param type_name The enum type of the jitter buffer to create
* \param literal_type_name The literal name of the type - "fixed" or "adaptive"
*/
+
+RAII_DECL(struct ast_jb *, jb, dispose_jitterbuffer);
+
#define test_create_nominal(type_name, literal_type_name) AST_TEST_DEFINE(TEST_NAME(type_name, create)) {\
- RAII_VAR(struct ast_jb *, jb, &default_jb, dispose_jitterbuffer); \
+ RAII_VAR(struct ast_jb *, jb, &default_jb); \
const struct ast_jb_impl *impl; \
struct ast_jb_conf conf; \
\
@@ -213,12 +216,16 @@ static struct ast_jb default_jb = {
* \param type_name The enum type of the jitter buffer to create
* \param literal_type_name The literal name of the type - "fixed" or "adaptive"
*/
+
+RAII_DECL(struct ast_frame *, expected_frame, dispose_frame);
+RAII_DECL(struct ast_frame *, actual_frame, dispose_frame);
+
#define test_put_first(type_name, literal_type_name) AST_TEST_DEFINE(TEST_NAME(type_name, put_first)) {\
- RAII_VAR(struct ast_jb *, jb, &default_jb, dispose_jitterbuffer); \
+ RAII_VAR(struct ast_jb *, jb, &default_jb); \
const struct ast_jb_impl *impl; \
struct ast_jb_conf conf; \
- RAII_VAR(struct ast_frame *, expected_frame, NULL, dispose_frame); \
- RAII_VAR(struct ast_frame *, actual_frame, NULL, dispose_frame); \
+ RAII_VAR(struct ast_frame *, expected_frame, NULL); \
+ RAII_VAR(struct ast_frame *, actual_frame, NULL); \
int res; \
\
switch (cmd) { \
@@ -270,11 +277,11 @@ static struct ast_jb default_jb = {
* \param literal_type_name The literal name of the type - "fixed" or "adaptive"
*/
#define test_put(type_name, literal_type_name) AST_TEST_DEFINE(TEST_NAME(type_name, put)) {\
- RAII_VAR(struct ast_jb *, jb, &default_jb, dispose_jitterbuffer); \
+ RAII_VAR(struct ast_jb *, jb, &default_jb); \
const struct ast_jb_impl *impl; \
struct ast_jb_conf conf; \
- RAII_VAR(struct ast_frame *, expected_frame, NULL, dispose_frame); \
- RAII_VAR(struct ast_frame *, actual_frame, NULL, dispose_frame); \
+ RAII_VAR(struct ast_frame *, expected_frame, NULL); \
+ RAII_VAR(struct ast_frame *, actual_frame, NULL); \
int res; \
long next; \
int i; \
@@ -333,10 +340,10 @@ static struct ast_jb default_jb = {
* \param overflow_limit The number of frames at which we expect the buffer to overflow
*/
#define test_put_overflow(type_name, literal_type_name, overflow_limit) AST_TEST_DEFINE(TEST_NAME(type_name, put_overflow)) {\
- RAII_VAR(struct ast_jb *, jb, &default_jb, dispose_jitterbuffer); \
+ RAII_VAR(struct ast_jb *, jb, &default_jb); \
const struct ast_jb_impl *impl; \
struct ast_jb_conf conf; \
- RAII_VAR(struct ast_frame *, expected_frame, NULL, dispose_frame); \
+ RAII_VAR(struct ast_frame *, expected_frame, NULL); \
int res; \
int i; \
\
@@ -398,11 +405,11 @@ static struct ast_jb default_jb = {
* \param synch_limit The synchronization limit for this particular type of jitter buffer
*/
#define test_put_out_of_order(type_name, literal_type_name, synch_limit) AST_TEST_DEFINE(TEST_NAME(type_name, put_out_of_order)) {\
- RAII_VAR(struct ast_jb *, jb, &default_jb, dispose_jitterbuffer); \
+ RAII_VAR(struct ast_jb *, jb, &default_jb); \
const struct ast_jb_impl *impl; \
struct ast_jb_conf conf; \
- RAII_VAR(struct ast_frame *, actual_frame, NULL, dispose_frame); \
- RAII_VAR(struct ast_frame *, expected_frame, NULL, dispose_frame); \
+ RAII_VAR(struct ast_frame *, actual_frame, NULL); \
+ RAII_VAR(struct ast_frame *, expected_frame, NULL); \
int res; \
long next; \
int i; \

27
comms/asterisk/patches/patch-tests_test__config.c Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-tests_test__config.c,v 1.1 2013/08/08 00:45:10 jnemeth Exp $
--- tests/test_config.c.orig 2012-07-12 21:43:09.000000000 +0000
+++ tests/test_config.c
@@ -753,15 +753,19 @@ CONFIG_INFO_STANDARD(cfg_info, global_ob
.files = ACO_FILES(&config_test_conf),
);
+RAII_DECL(struct test_config *, cfg, ao2_cleanup);
+RAII_DECL(struct test_item *, item, ao2_cleanup);
+RAII_DECL(struct test_item *, item_defaults, ao2_cleanup);
+
AST_TEST_DEFINE(config_options_test)
{
int res = AST_TEST_PASS, x, error;
struct test_item defaults = { 0, }, configs = { 0, };
struct test_item *arr[4];
struct ast_sockaddr acl_allow = {{ 0, }}, acl_fail = {{ 0, }};
- RAII_VAR(struct test_config *, cfg, NULL, ao2_cleanup);
- RAII_VAR(struct test_item *, item, NULL, ao2_cleanup);
- RAII_VAR(struct test_item *, item_defaults, NULL, ao2_cleanup);
+ RAII_VAR(struct test_config *, cfg, NULL);
+ RAII_VAR(struct test_item *, item, NULL);
+ RAII_VAR(struct test_item *, item_defaults, NULL);
switch (cmd) {
case TEST_INIT:

14
comms/asterisk10/Makefile
View File

@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.50 2013/06/16 22:10:13 jnemeth Exp $
# $NetBSD: Makefile,v 1.57 2014/02/12 23:17:37 tron Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
DISTNAME= asterisk-10.12.2
DISTNAME= asterisk-10.12.4
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
PKGREVISION= 6
PKGREVISION= 1
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -134,12 +134,18 @@ SUBST_SED.configs+= -e "s|/usr/local/man|${ASTMANDIR}|"
SUBST_SED.configs+= -e "s|/usr/local|${PREFIX}|"
SUBST_SED.configs+= -e "s|/var|${VARBASE}|"
# XXX gross hack, remove when atomics properly implemented
.if (${OPSYS} == "NetBSD")
# XXX gross hack, remove when atomics properly implemented
SUBST_CLASSES+= atomics
SUBST_STAGE.atomics= post-configure
SUBST_FILES.atomics= include/asterisk/autoconfig.h
SUBST_SED.atomics= -e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|"
# XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else
SUBST_CLASSES+= pktinfo
SUBST_STAGE.pktinfo= post-configure
SUBST_FILES.pktinfo= include/asterisk/autoconfig.h
SUBST_SED.pktinfo= -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
.endif
RCD_SCRIPTS= asterisk

3
comms/asterisk10/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.11 2013/06/14 23:53:03 jnemeth Exp $
@comment $NetBSD: PLIST,v 1.12 2014/03/11 14:04:59 jperkin Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -2815,7 +2815,6 @@ share/examples/asterisk/unistim.conf
share/examples/asterisk/users.conf
share/examples/asterisk/voicemail.conf
share/examples/asterisk/vpb.conf
share/examples/rc.d/asterisk
${PLIST.webvmail}share/httpd/htdocs/_asterisk/animlogo.gif
${PLIST.webvmail}share/httpd/htdocs/_asterisk/play.gif
@pkgdir libdata/asterisk/keys

14
comms/asterisk10/distinfo
View File

@@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.27 2013/06/14 23:53:03 jnemeth Exp $
$NetBSD: distinfo,v 1.29 2013/12/17 05:37:10 jnemeth Exp $
SHA1 (asterisk-10.12.2/asterisk-10.12.2.tar.gz) = 4c1e681223b9e86a74d5c8a57dc4da87045a1656
RMD160 (asterisk-10.12.2/asterisk-10.12.2.tar.gz) = ec365462b3f9668906b3d1bf5b7342fb39cc7e2c
Size (asterisk-10.12.2/asterisk-10.12.2.tar.gz) = 25117561 bytes
SHA1 (asterisk-10.12.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
RMD160 (asterisk-10.12.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
Size (asterisk-10.12.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
SHA1 (asterisk-10.12.4/asterisk-10.12.4.tar.gz) = 960742b18694cee94c24d258eb547398082c8bd1
RMD160 (asterisk-10.12.4/asterisk-10.12.4.tar.gz) = 548ac7f2e3aa9ce847d1e9de6920907f2b2eea0a
Size (asterisk-10.12.4/asterisk-10.12.4.tar.gz) = 25120413 bytes
SHA1 (asterisk-10.12.4/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
RMD160 (asterisk-10.12.4/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
Size (asterisk-10.12.4/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
SHA1 (patch-Makefile) = ab740f84f9883980cb5d8e8d5ca301f172c76231
SHA1 (patch-apps_app__dial.c) = e6c9f559310acdb6574d0e034dcb55df7c2ba31f
SHA1 (patch-apps_app__followme.c) = cd34774a11b96269003d9f1b6fbdfddf5d9b9d4b

16
comms/asterisk18/Makefile
View File

@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.70 2013/06/16 22:10:13 jnemeth Exp $
# $NetBSD: Makefile,v 1.80 2014/02/12 23:17:37 tron Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
DISTNAME= asterisk-1.8.22.0
DISTNAME= asterisk-1.8.25.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
PKGREVISION= 5
PKGREVISION= 1
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
@@ -130,12 +130,18 @@ SUBST_SED.configs+= -e "s|/usr/local/man|${ASTMANDIR}|"
SUBST_SED.configs+= -e "s|/usr/local|${PREFIX}|"
SUBST_SED.configs+= -e "s|/var|${VARBASE}|"
# XXX gross hack, remove when atomics properly implemented
.if (${OPSYS} == "NetBSD")
# XXX gross hack, remove when atomics properly implemented
SUBST_CLASSES+= atomics
SUBST_STAGE.atomics= post-configure
SUBST_FILES.atomics= include/asterisk/autoconfig.h
SUBST_SED.atomics= -e "s|^\#define HAVE_GCC_ATOMICS 1|\#undef HAVE_GCC_ATOMICS|"
# XXX gross hack, IP_PKTINFO in NetBSD isn't compatible with anything else
SUBST_CLASSES+= pktinfo
SUBST_STAGE.pktinfo= post-configure
SUBST_FILES.pktinfo= include/asterisk/autoconfig.h
SUBST_SED.pktinfo= -e "s|^\#define HAVE_PKTINFO 1|\#undef HAVE_PKTINFO|"
.endif
RCD_SCRIPTS= asterisk
@@ -199,7 +205,7 @@ post-patch:
post-install:
# check sounds directory for current versions when upgrading package
${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.23.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.24.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-moh-opsound-wav-2.03.tar.gz -C ${DESTDIR}${ASTDATADIR}/moh
${TAR} xzf ${DISTDIR}/${DIST_SUBDIR}/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}

11
comms/asterisk18/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.21 2013/04/18 16:55:22 jnemeth Exp $
@comment $NetBSD: PLIST,v 1.23 2014/03/11 14:04:59 jperkin Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -356,14 +356,14 @@ libdata/asterisk/phoneprov/000000000000.cfg
libdata/asterisk/phoneprov/polycom.xml
libdata/asterisk/phoneprov/polycom_line.xml
libdata/asterisk/phoneprov/snom-mac.xml
libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.23
libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.24
libdata/asterisk/sounds/en/1-for-am-2-for-pm.gsm
libdata/asterisk/sounds/en/1-yes-2-no.gsm
libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.24
libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.13
libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.24
libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.13
libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.23
libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.24
libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.13
libdata/asterisk/sounds/en/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
@@ -2906,7 +2906,6 @@ share/examples/asterisk/unistim.conf
share/examples/asterisk/users.conf
share/examples/asterisk/voicemail.conf
share/examples/asterisk/vpb.conf
share/examples/rc.d/asterisk
${PLIST.webvmail}share/httpd/htdocs/_asterisk/animlogo.gif
${PLIST.webvmail}share/httpd/htdocs/_asterisk/play.gif
@pkgdir libdata/asterisk/keys

14
comms/asterisk18/distinfo
View File

@@ -1,11 +1,11 @@
$NetBSD: distinfo,v 1.47 2013/06/15 20:51:10 jnemeth Exp $
$NetBSD: distinfo,v 1.52 2014/01/07 23:33:28 jnemeth Exp $
SHA1 (asterisk-1.8.22.0/asterisk-1.8.22.0.tar.gz) = fca7c971cb0d3621ee64069c4f83aebf10416327
RMD160 (asterisk-1.8.22.0/asterisk-1.8.22.0.tar.gz) = c232e45463f1915e204e7762a19dceacdd96fb2f
Size (asterisk-1.8.22.0/asterisk-1.8.22.0.tar.gz) = 25343979 bytes
SHA1 (asterisk-1.8.22.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
RMD160 (asterisk-1.8.22.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
Size (asterisk-1.8.22.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
SHA1 (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = c8783a72d4e5ede1c67faea8d744924a97f686a9
RMD160 (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = 0be84b6618a7d996bd4b0b38f8dc3016cad08677
Size (asterisk-1.8.25.0/asterisk-1.8.25.0.tar.gz) = 29473304 bytes
SHA1 (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 3aac6cf4a07cb2644b7b5369c618b07561619f9f
RMD160 (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 5dc9696c54d2233cf74835fe7ccd2c1791f20041
Size (asterisk-1.8.25.0/asterisk-extra-sounds-en-gsm-1.4.13.tar.gz) = 4407925 bytes
SHA1 (patch-aa) = 832f1c043b15198e0a286094dd0cc1a251bcfed0
SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39

3
comms/birda/Makefile
View File

@@ -1,7 +1,8 @@
# $NetBSD: Makefile,v 1.23 2012/10/03 11:24:39 asau Exp $
# $NetBSD: Makefile,v 1.24 2013/10/10 00:02:17 joerg Exp $
#
DISTNAME= birda-1.3
PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= ftp://ftp.augustsson.net/pub/netbsd/

6
comms/birda/distinfo
View File

@@ -1,8 +1,10 @@
$NetBSD: distinfo,v 1.19 2012/02/16 16:40:34 hans Exp $
$NetBSD: distinfo,v 1.20 2013/10/10 00:02:17 joerg Exp $
SHA1 (birda-1.3.tar.gz) = c72a2e05153f82e9e27e5cf36970a49ae122dbfe
RMD160 (birda-1.3.tar.gz) = b53823b22db733a65cea515eadca59aa1024c96a
Size (birda-1.3.tar.gz) = 57848 bytes
SHA1 (patch-aa) = 5dc29878d541f354d5ed4b0cc910ca6d57d498fe
SHA1 (patch-src-iassrv.c) = 538b6af337d278e1d435109b1651a97223979dc6
SHA1 (patch-src_sendobex.c) = d04e130a295dfb18a01aec8679df3fd70c0a09eb
SHA1 (patch-src_mkobexcard.c) = f13fa7cc68f3e92bd42dc28d55a871d25d5bac06
SHA1 (patch-src_options.c) = ce216c493384917a25fbcf359849c5fa078f4d2a
SHA1 (patch-src_sendobex.c) = 14c628ce7b04bc1a9490d77582d3ac231016adf3

13
comms/birda/patches/patch-src_mkobexcard.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_mkobexcard.c,v 1.1 2013/10/10 00:02:17 joerg Exp $
--- src/mkobexcard.c.orig 2013-10-09 23:07:15.000000000 +0000
+++ src/mkobexcard.c
@@ -142,7 +142,7 @@ int main(int argc, char** argv)
addStr(company);
addChar('\n');
if (name[0] == '\0')
- snprintf(name, MAXNAME+1, company);
+ snprintf(name, MAXNAME+1, "%s", company);
}
if (title) {
addStr("TITLE:");

13
comms/birda/patches/patch-src_options.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-src_options.c,v 1.1 2013/10/10 00:02:17 joerg Exp $
--- src/options.c.orig 2013-10-09 23:05:27.000000000 +0000
+++ src/options.c
@@ -223,7 +223,7 @@ static void showDiscovered(int addr, int
if(charset==CHARSET_UNICODE) {
/* Strip the high byte */
- for(i=0;2*i<len;i+=2) namebuf[i++]=name[2*i];
+ for(i=0;2*i<len;++i) namebuf[i]=name[2*i];
namebuf[i]=0;
} else {
memcpy(namebuf,name,len);

15
comms/birda/patches/patch-src_sendobex.c
View File

@@ -1,7 +1,16 @@
$NetBSD: patch-src_sendobex.c,v 1.1 2012/02/16 16:40:34 hans Exp $
$NetBSD: patch-src_sendobex.c,v 1.2 2013/10/10 00:02:17 joerg Exp $
--- src/sendobex.c.orig 2005-11-14 08:57:16.000000000 +0100
+++ src/sendobex.c 2012-01-25 16:30:35.349985033 +0100
--- src/sendobex.c.orig 2005-11-14 07:57:16.000000000 +0000
+++ src/sendobex.c
@@ -302,7 +302,7 @@ static int in_bind_ne(short port, int ty
if (sd < 0)
switch (sd) {
case SYSCALL_ERROR:
- fprintf(stderr, "in_bind_ne: bind", "port = %d, type = %s\n",
+ fprintf(stderr, "in_bind_ne: bind port = %d, type = %s\n",
port, socket_type_name(type));
/* NOTREACHED */
case RESOLVER_ERROR:
@@ -327,7 +327,11 @@ void createOBEXSender(int port)
//struct sockaddr addr;
//socklen_t len;

3
comms/bthfp/Makefile
View File

@@ -1,6 +1,7 @@
# $NetBSD: Makefile,v 1.8 2012/10/03 11:24:39 asau Exp $
# $NetBSD: Makefile,v 1.9 2013/09/10 14:13:40 joerg Exp $
DISTNAME= bthfp-0.1
PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= http://homepages.rya-online.net/plunky/
DISTFILES= bthfp-0.1.tar.gz

4
comms/bthfp/distinfo
View File

@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.3 2009/05/12 14:36:28 plunky Exp $
$NetBSD: distinfo,v 1.4 2013/09/10 14:13:40 joerg Exp $
SHA1 (bthfp-0.1.tar.gz) = f0cefa424596545dec3c7d61eb9e608e8178871b
RMD160 (bthfp-0.1.tar.gz) = 5185c59ee67a7482ec8c424172fdeebed5bb3238
Size (bthfp-0.1.tar.gz) = 8522 bytes
SHA1 (patch-aa) = 66e1d2be8a9de92b7a47bea8bba0adb68510d740
SHA1 (patch-aa) = d1f5f88f27f307b8392b260da27cd7e01775d86a
SHA1 (patch-ab) = 83a4185d99f658ca7a1779c5854dc71855277baf

22
comms/bthfp/patches/patch-aa
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.1 2008/06/21 20:47:28 joerg Exp $
$NetBSD: patch-aa,v 1.2 2013/09/10 14:13:40 joerg Exp $
--- bthfp.c.orig 2008-06-21 14:42:12.000000000 +0000
--- bthfp.c.orig 2006-09-13 08:16:29.000000000 +0000
+++ bthfp.c
@@ -480,8 +480,8 @@ accept_sco(int fd, short ev, void *arg)
@@ -13,3 +13,21 @@ $NetBSD: patch-aa,v 1.1 2008/06/21 20:47:28 joerg Exp $
close(sc);
sc = -1;
return;
@@ -854,7 +854,7 @@ recv_rfcomm(int fd, short ev, void *arg)
{
struct result_code *rc;
char buf[256], *code, *next;
- size_t len;
+ ssize_t len;
/* XXX what if buf is not large enough? */
@@ -895,7 +895,7 @@ recv_rfcomm(int fd, short ev, void *arg)
len -= 2;
if (verbose)
- printf("> %.*s\n", next - code, code);
+ printf("> %.*s\n", (int)(next - code), code);
for (rc = result_codes ; rc->code != NULL ; rc++) {
if (strncmp(code, rc->code, rc->strlen) == 0) {

4
comms/conserver/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2012/10/03 11:24:39 asau Exp $
# $NetBSD: Makefile,v 1.26 2014/01/02 02:40:18 dholland Exp $
#
DISTNAME= conserver-7.2.7
@@ -22,6 +22,8 @@ CONFIGURE_ARGS+= --with-regex
CONFIGURE_ARGS+= --with-libwrap
CONFIGURE_ARGS+= --with-logfile=${VARBASE}/log/conserver
.include "../../mk/bsd.prefs.mk"
.if ${MACHINE_ARCH} == alpha || ${MACHINE_ARCH} == sparc64 || \
${MACHINE_ARCH} == x86_64
CONFIGURE_ARGS+= --with-64bit

3
comms/conserver/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.7 2009/06/14 17:38:38 joerg Exp $
@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:04:59 jperkin Exp $
bin/console
man/man1/console.1
man/man5/conserver.cf.5
@@ -7,4 +7,3 @@ man/man8/conserver.8
sbin/conserver
share/examples/conserver/conserver.cf.example
share/examples/conserver/conserver.passwd.example
share/examples/rc.d/conserver

4
comms/conserver8/Makefile
View File

@@ -1,11 +1,11 @@
# $NetBSD: Makefile,v 1.12 2013/02/06 23:21:50 jperkin Exp $
# $NetBSD: Makefile,v 1.13 2014/02/12 23:17:37 tron Exp $
#
PKGVER= 8.1.18
DISTNAME= conserver-${PKGVER}
PKGNAME= conserver8-${PKGVER}
#PKGREVISION= 1
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= comms
MASTER_SITES= http://www.conserver.com/

3
comms/conserver8/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:38:39 joerg Exp $
@comment $NetBSD: PLIST,v 1.5 2014/03/11 14:05:00 jperkin Exp $
bin/console
lib/conserver/convert
man/man1/console.1
@@ -12,4 +12,3 @@ share/doc/conserver/README
share/examples/conserver/conserver.cf
share/examples/conserver/conserver.passwd
share/examples/conserver/conserver.rc
share/examples/rc.d/conserver8

4
comms/deforaos-phone/Makefile
View File

@@ -1,8 +1,9 @@
# $NetBSD: Makefile,v 1.8 2013/06/15 12:56:27 khorben Exp $
# $NetBSD: Makefile,v 1.13 2014/02/12 23:17:38 tron Exp $
#
DISTNAME= Phone-0.3.12
PKGNAME= deforaos-phone-0.3.12
PKGREVISION= 5
CATEGORIES= comms net
MASTER_SITES= http://www.defora.org/os/download/download/4296/
@@ -38,5 +39,6 @@ post-install:
.include "../../audio/pulseaudio/buildlink3.mk"
.include "../../chat/libpurple/buildlink3.mk"
.include "../../devel/sofia-sip/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/deforaos-locker/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

4
comms/efax-gtk/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.66 2013/06/06 12:54:10 wiz Exp $
# $NetBSD: Makefile,v 1.68 2013/10/10 14:42:03 ryoon Exp $
DISTNAME= efax-gtk-3.2.3.src
PKGNAME= efax-gtk-3.2.3
PKGREVISION= 17
PKGREVISION= 19
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=efax-gtk/}
EXTRACT_SUFX= .tgz

12
comms/fidogate/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.66 2013/05/31 12:39:42 wiz Exp $
# $NetBSD: Makefile,v 1.68 2013/11/24 04:01:07 dholland Exp $
#
DISTNAME= fidogate-4.4.10
PKGREVISION= 5
PKGREVISION= 7
CATEGORIES= comms
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fidogate/}
@@ -22,7 +22,6 @@ RCD_SCRIPTS= fidogate
RCD_SCRIPT_SRC.fidogate= ${WRKSRC}/scripts/maintenance/rc.fidogate
INFO_FILES= yes # PLIST
USERGROUP_PHASE= pre-install
PKG_GROUPS= news
PKG_USERS= news:news
PKG_GECOS.news= Network News
@@ -41,8 +40,6 @@ SUBST_STAGE.paths= pre-build
# Too many schar/uchar issues.
BUILDLINK_TRANSFORM+= rm:-Werror
PKG_DESTDIR_SUPPORT= destdir
OWN_DIRS= ${PKG_SYSCONFDIR}/fidogate
INSTALLATION_DIRS+= ${EGDIR} lib/fidogate \
lib/fidogate/bin share/doc/fidogate \
@@ -50,6 +47,11 @@ INSTALLATION_DIRS+= ${EGDIR} lib/fidogate \
${PKGINFODIR} \
share/fidogate/sendmail/mailer share/examples/rc.d
FIDOGATE_SUID_PERMS= news news 4111
SPECIAL_PERMS+= ${PREFIX}/lib/fidogate/ffx ${FIDOGATE_SUID_PERMS} \
${PREFIX}/lib/fidogate/ftnmail ${FIDOGATE_SUID_PERMS} \
${PREFIX}/lib/fidogate/ftnafmail ${FIDOGATE_SUID_PERMS}
post-extract:
${CP} ${WRKSRC}/examples/orodruin/fidogate.conf \
${WRKSRC}/fidogate.conf.dist

3
comms/fidogate/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:38:39 joerg Exp $
@comment $NetBSD: PLIST,v 1.12 2014/03/11 14:05:00 jperkin Exp $
info/fidogate.info
lib/fidogate/areafix.help
lib/fidogate/bin/areasbbssync
@@ -121,6 +121,5 @@ share/examples/fidogate/point/fidogate.conf
share/examples/fidogate/point/newsfeeds
share/examples/fidogate/point/packing
share/examples/fidogate/point/routing
share/examples/rc.d/fidogate
share/fidogate/sendmail/mailer/ffx.m4
share/fidogate/sendmail/mailer/ftn.m4

4
comms/fidogate/distinfo
View File

@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.17 2012/02/28 11:21:50 hans Exp $
$NetBSD: distinfo,v 1.18 2013/11/24 04:01:07 dholland Exp $
SHA1 (fidogate-4.4.10.tar.gz) = 531305ac82963d5bd6398d2e8e350676bbc9c5eb
RMD160 (fidogate-4.4.10.tar.gz) = 09b8dfa7304089ff27c7c39c1b6004aef00edadf
Size (fidogate-4.4.10.tar.gz) = 1191524 bytes
SHA1 (patch-aa) = 39b7d08fbebbc08b97f02591ee752939b1b7ce7d
SHA1 (patch-aa) = d476125a072e1691258321dfd1fed50843f0cedc
SHA1 (patch-ab) = 4ae99842832c406d94b9c40736f22e9abdb28426
SHA1 (patch-ac) = 220f4d95a4ef28fba3ac603957a2f084df5a95e4
SHA1 (patch-ad) = f2b9504700d7817ccfbe0181249737c037da2a9b

17
comms/fidogate/patches/patch-aa
View File

@@ -1,6 +1,17 @@
$NetBSD: patch-aa,v 1.8 2012/02/28 11:21:50 hans Exp $
$NetBSD: patch-aa,v 1.9 2013/11/24 04:01:07 dholland Exp $
--- config.make.orig 2003-04-15 14:45:20.000000000 -0400
- honor PREFIX, PKG_SYSCONFDIR, PKGINFODIR
- XXX: should but does not honor VARBASE
- use /var/spool/fido rather than /var/spool/fidogate (why?)
- use /var/news rather than /var/lib/news and/or /var/spool/news
- use pkgsrc perl
- set SENDMAIL_CF_DIR (XXX: it is no longer correct)
- use pkgsrc compiler and yacc
- don't build with -g by default
- use pkgsrc install tools
- handle setuid perms with SPECIAL_PERMS rather than requiring root to build
--- config.make.orig 2003-04-15 18:45:20.000000000 +0000
+++ config.make
@@ -56,13 +56,13 @@
#
@@ -106,7 +117,7 @@ $NetBSD: patch-aa,v 1.8 2012/02/28 11:21:50 hans Exp $
-INSTALL_DIR = $(INSTALL) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
+INSTALL_PROG = $(BSD_INSTALL_SCRIPT)
+INSTALL_DATA = $(BSD_INSTALL_DATA)
+INSTALL_SETUID = $(BSD_INSTALL_PROGRAM) -g $(GROUP) -o $(OWNER) -m $(PERM_SETUID)
+INSTALL_SETUID = $(BSD_INSTALL_PROGRAM)
+INSTALL_DIR = $(BSD_INSTALL_DATA_DIR) -g $(GROUP) -o $(OWNER) -m $(PERM_DIR) -d
# extra prefix for installation
PREFIX =

4
comms/gammu/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.10 2013/02/06 23:21:51 jperkin Exp $
# $NetBSD: Makefile,v 1.11 2014/02/12 23:17:38 tron Exp $
#
.include "Makefile.common"
PKGREVISION= 4
PKGREVISION= 5
COMMENT= Command line utility and library to work with mobile phones

4
comms/gnome-pilot/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.84 2013/06/06 12:53:46 wiz Exp $
# $NetBSD: Makefile,v 1.90 2014/02/12 23:17:38 tron Exp $
#
DISTNAME= gnome-pilot-2.0.17
PKGREVISION= 35
PKGREVISION= 41
CATEGORIES= comms gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-pilot/2.0/}

4
comms/gnome-pilot/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.54 2013/06/06 12:53:46 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.60 2014/02/12 23:17:38 tron Exp $
BUILDLINK_TREE+= gnome-pilot
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= gnome-pilot
GNOME_PILOT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gnome-pilot+= gnome-pilot>=2.0.12nb2
BUILDLINK_ABI_DEPENDS.gnome-pilot+= gnome-pilot>=2.0.17nb35
BUILDLINK_ABI_DEPENDS.gnome-pilot+= gnome-pilot>=2.0.17nb41
BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot
.include "../../devel/gettext-lib/buildlink3.mk"

4
comms/hylafax/MESSAGE
View File

@@ -1,7 +1,7 @@
===========================================================================
$NetBSD: MESSAGE,v 1.3 2003/05/06 17:40:40 jmmv Exp $
$NetBSD: MESSAGE,v 1.4 2014/03/14 15:59:29 adam Exp $
Hylafax was installed. You'll need manual configurations to actually
Hylafax has been installed. You'll need manual configurations to actually
activate it.
Setting up: (for impatients)

44
comms/hylafax/Makefile
View File

@@ -1,60 +1,48 @@
# $NetBSD: Makefile,v 1.68 2013/04/24 10:06:47 sbd Exp $
# $NetBSD: Makefile,v 1.70 2014/03/14 15:59:29 adam Exp $
VERS= 4.2.5
DISTNAME= hylafax-${VERS}
PKGREVISION= 9
DISTNAME= hylafax-6.0.6
CATEGORIES= comms
MASTER_SITES_BETA= ftp://ftp.hylafax.org/source/BETA/
MASTER_SITES_RELEASE= ftp://ftp.hylafax.org/source/
MASTER_SITES= ${MASTER_SITES_RELEASE}
MASTER_SITES= ftp://ftp.hylafax.org/source/
MAINTAINER= hallmann@ahatec.de
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.hylafax.org/
COMMENT= Telecommunication and fax server system
DEPENDS+= mawk>=1.2.2:../../lang/mawk
LICENSE= sgi-free-software-b-v2.0
CONFLICTS= hylafax-devel-[0-9]* mgetty-[0-9]*
DEPENDS+= mawk>=1.2.2:../../lang/mawk
BUILD_DEFS+= FAXUSER FAXGROUP VARBASE
USE_LANGUAGES= c c++
USE_TOOLS+= gs:run
USE_TOOLS+= gs:run pkg-config
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --with-MAKE=${MAKE_PROGRAM:Q}
CONFIGURE_ARGS+= --with-INSTALL="" --nointeractive
CONFIGURE_ARGS+= --with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
CONFIGURE_ARGS+= --with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
CONFIGURE_ARGS+= --with-SYSVINIT=no
CONFIGURE_ENV+= PREFIX=${PREFIX:Q} OPTIMIZER=${CFLAGS:Q}
CONFIGURE_ENV+= FAXUID=${FAXUSER:Q} FAXGID=${FAXGROUP:Q}
CONFIGURE_ENV+= VARBASE=${VARBASE:Q}
CONFIGURE_ENV+= FAXUID=${FAXUSER:Q}
CONFIGURE_ENV+= FAXGID=${FAXGROUP:Q}
CONFIGURE_ENV+= OPTIMIZER=${CFLAGS:Q}
CONFIGURE_ENV+= VARBASE=${VARBASE}
CHECK_PORTABILITY_SKIP= rpm/jobcontrol.sh
MANCOMPRESSED= yes
FAXUSER?= uucp
FAXGROUP?= dialer
RCD_SCRIPTS= hylafax
MAKE_JOBS_SAFE= NO
EGDIR= share/examples/hylafax
INSTALLATION_DIRS= libdata/hylafax
INSTALLATION_DIRS= libdata/hylafax ${EGDIR} ${EGDIR}/templates
SPECIAL_PERMS+= bin/faxalter ${SETUID_ROOT_PERMS} \
bin/faxrm ${SETUID_ROOT_PERMS} \
libexec/faxgetty ${SETUID_ROOT_PERMS} \
sbin/faxq ${SETUID_ROOT_PERMS}
PKG_OPTIONS_VAR= PKG_OPTIONS.hylafax
PKG_SUPPORTED_OPTIONS= pam
#pam doesn't work right now, so disabled by default
#PKG_SUGGESTED_OPTIONS= pam
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpam)
.include "../../mk/pam.buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-pam
.endif
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
@@ -66,7 +54,7 @@ CONFIGURE_ENV+= MACHDEPLIBS=-lrt
BUILDLINK_API_DEPENDS.libtiff+= tiff>=4.0.0
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jbigkit/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

249
comms/hylafax/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.12 2009/06/14 17:38:40 joerg Exp $
@comment $NetBSD: PLIST,v 1.14 2014/03/14 15:59:29 adam Exp $
bin/faxalter
bin/faxcover
bin/faxmail
@@ -16,10 +16,14 @@ libexec/faxgetty
libexec/faxsend
libexec/hfaxd
libexec/hylafax/archive
libexec/hylafax/b64-encode.awk
libexec/hylafax/common-functions
libexec/hylafax/dictionary
libexec/hylafax/faxrcvd
libexec/hylafax/mkcover
libexec/hylafax/notify
libexec/hylafax/notify-4.1
libexec/hylafax/notify-4.2
libexec/hylafax/notify.awk
libexec/hylafax/pcl2fax
libexec/hylafax/pdf2fax.gs
@@ -27,6 +31,7 @@ libexec/hylafax/pollrcvd
libexec/hylafax/ps2fax.dps
libexec/hylafax/ps2fax.gs
libexec/hylafax/ps2fax.imp
libexec/hylafax/qp-encode.awk
libexec/hylafax/tiff2fax
libexec/hylafax/tiff2pdf
libexec/hylafax/wedged
@@ -34,6 +39,7 @@ libexec/lockname
libexec/ondelay
libexec/pagesend
libexec/textfmt
libexec/typetest
man/man1/edit-faxcover.1
man/man1/faxalter.1
man/man1/faxcover.1
@@ -45,8 +51,6 @@ man/man1/sendfax.1
man/man1/sendpage.1
man/man1/sgi2fax.1
man/man1/textfmt.1
man/man5/callid.5
man/man5/destctrls.5
man/man5/dialrules.5
man/man5/doneq.5
man/man5/hosts.hfaxd.5
@@ -86,6 +90,7 @@ man/man8/faxsetup.8
man/man8/faxstate.8
man/man8/faxwatch.8
man/man8/hfaxd.8
man/man8/jobcontrol.8
man/man8/mkcover.8
man/man8/notify.8
man/man8/pagesend.8
@@ -132,9 +137,228 @@ sbin/tsitest
sbin/typetest
sbin/xferfaxstats
share/doc/hylafax/COPYRIGHT
share/examples/rc.d/hylafax
share/hylafax/config_template/agere-mp-2
share/hylafax/config_template/agere-mp-21
share/examples/hylafax/dialrules
share/examples/hylafax/dialrules.europe
share/examples/hylafax/dialrules.sf-ba
share/examples/hylafax/hosts.hfaxd
share/examples/hylafax/lutRS18.pcf
share/examples/hylafax/templates/README
share/examples/hylafax/templates/de/faxrcvd-error.txt
share/examples/hylafax/templates/de/faxrcvd-failure.txt
share/examples/hylafax/templates/de/faxrcvd-notify-error.txt
share/examples/hylafax/templates/de/faxrcvd-notify-success.txt
share/examples/hylafax/templates/de/faxrcvd-success.txt
share/examples/hylafax/templates/de/notify-blocked.txt
share/examples/hylafax/templates/de/notify-done-page.txt
share/examples/hylafax/templates/de/notify-done.txt
share/examples/hylafax/templates/de/notify-failed-page.txt
share/examples/hylafax/templates/de/notify-failed.txt
share/examples/hylafax/templates/de/notify-faxmaster.txt
share/examples/hylafax/templates/de/notify-format_failed.txt
share/examples/hylafax/templates/de/notify-killed.txt
share/examples/hylafax/templates/de/notify-no_formatter.txt
share/examples/hylafax/templates/de/notify-poll_failed.txt
share/examples/hylafax/templates/de/notify-poll_no_document.txt
share/examples/hylafax/templates/de/notify-poll_rejected.txt
share/examples/hylafax/templates/de/notify-rejected.txt
share/examples/hylafax/templates/de/notify-removed.txt
share/examples/hylafax/templates/de/notify-requeued.txt
share/examples/hylafax/templates/de/notify-timedout.txt
share/examples/hylafax/templates/en/faxrcvd-error.txt
share/examples/hylafax/templates/en/faxrcvd-failure.txt
share/examples/hylafax/templates/en/faxrcvd-notify-error.txt
share/examples/hylafax/templates/en/faxrcvd-notify-success.txt
share/examples/hylafax/templates/en/faxrcvd-success.txt
share/examples/hylafax/templates/en/notify-blocked.txt
share/examples/hylafax/templates/en/notify-done-page.txt
share/examples/hylafax/templates/en/notify-done.txt
share/examples/hylafax/templates/en/notify-failed-page.txt
share/examples/hylafax/templates/en/notify-failed.txt
share/examples/hylafax/templates/en/notify-faxmaster.txt
share/examples/hylafax/templates/en/notify-format_failed.txt
share/examples/hylafax/templates/en/notify-killed.txt
share/examples/hylafax/templates/en/notify-no_formatter.txt
share/examples/hylafax/templates/en/notify-poll_failed.txt
share/examples/hylafax/templates/en/notify-poll_no_document.txt
share/examples/hylafax/templates/en/notify-poll_rejected.txt
share/examples/hylafax/templates/en/notify-rejected.txt
share/examples/hylafax/templates/en/notify-removed.txt
share/examples/hylafax/templates/en/notify-requeued.txt
share/examples/hylafax/templates/en/notify-timedout.txt
share/examples/hylafax/templates/es/faxrcvd-error.txt
share/examples/hylafax/templates/es/faxrcvd-failure.txt
share/examples/hylafax/templates/es/faxrcvd-notify-error.txt
share/examples/hylafax/templates/es/faxrcvd-notify-success.txt
share/examples/hylafax/templates/es/faxrcvd-success.txt
share/examples/hylafax/templates/es/notify-blocked.txt
share/examples/hylafax/templates/es/notify-done-page.txt
share/examples/hylafax/templates/es/notify-done.txt
share/examples/hylafax/templates/es/notify-failed-page.txt
share/examples/hylafax/templates/es/notify-failed.txt
share/examples/hylafax/templates/es/notify-faxmaster.txt
share/examples/hylafax/templates/es/notify-format_failed.txt
share/examples/hylafax/templates/es/notify-killed.txt
share/examples/hylafax/templates/es/notify-no_formatter.txt
share/examples/hylafax/templates/es/notify-poll_failed.txt
share/examples/hylafax/templates/es/notify-poll_no_document.txt
share/examples/hylafax/templates/es/notify-poll_rejected.txt
share/examples/hylafax/templates/es/notify-rejected.txt
share/examples/hylafax/templates/es/notify-removed.txt
share/examples/hylafax/templates/es/notify-requeued.txt
share/examples/hylafax/templates/es/notify-timedout.txt
share/examples/hylafax/templates/fr/faxrcvd-error.txt
share/examples/hylafax/templates/fr/faxrcvd-failure.txt
share/examples/hylafax/templates/fr/faxrcvd-notify-error.txt
share/examples/hylafax/templates/fr/faxrcvd-notify-success.txt
share/examples/hylafax/templates/fr/faxrcvd-success.txt
share/examples/hylafax/templates/fr/notify-blocked.txt
share/examples/hylafax/templates/fr/notify-done-page.txt
share/examples/hylafax/templates/fr/notify-done.txt
share/examples/hylafax/templates/fr/notify-failed-page.txt
share/examples/hylafax/templates/fr/notify-failed.txt
share/examples/hylafax/templates/fr/notify-faxmaster.txt
share/examples/hylafax/templates/fr/notify-format_failed.txt
share/examples/hylafax/templates/fr/notify-killed.txt
share/examples/hylafax/templates/fr/notify-no_formatter.txt
share/examples/hylafax/templates/fr/notify-poll_failed.txt
share/examples/hylafax/templates/fr/notify-poll_no_document.txt
share/examples/hylafax/templates/fr/notify-poll_rejected.txt
share/examples/hylafax/templates/fr/notify-rejected.txt
share/examples/hylafax/templates/fr/notify-removed.txt
share/examples/hylafax/templates/fr/notify-requeued.txt
share/examples/hylafax/templates/fr/notify-timedout.txt
share/examples/hylafax/templates/html-sample1/css.inc
share/examples/hylafax/templates/html-sample1/divider.inc
share/examples/hylafax/templates/html-sample1/fax-attach.inc
share/examples/hylafax/templates/html-sample1/fax-data.inc
share/examples/hylafax/templates/html-sample1/fax-dispatched.inc
share/examples/hylafax/templates/html-sample1/faxrcvd-error.txt
share/examples/hylafax/templates/html-sample1/faxrcvd-failure.txt
share/examples/hylafax/templates/html-sample1/faxrcvd-notify-error.txt
share/examples/hylafax/templates/html-sample1/faxrcvd-notify-success.txt
share/examples/hylafax/templates/html-sample1/faxrcvd-success.txt
share/examples/hylafax/templates/html-sample1/footer.inc
share/examples/hylafax/templates/html-sample1/header.inc
share/examples/hylafax/templates/html-sample1/hook.sh
share/examples/hylafax/templates/html-sample1/job-data.inc
share/examples/hylafax/templates/html-sample1/notify-blocked.txt
share/examples/hylafax/templates/html-sample1/notify-done.txt
share/examples/hylafax/templates/html-sample1/notify-failed.txt
share/examples/hylafax/templates/html-sample1/notify-faxmaster.txt
share/examples/hylafax/templates/html-sample1/notify-format_failed.txt
share/examples/hylafax/templates/html-sample1/notify-killed.txt
share/examples/hylafax/templates/html-sample1/notify-no_formatter.txt
share/examples/hylafax/templates/html-sample1/notify-rejected.txt
share/examples/hylafax/templates/html-sample1/notify-removed.txt
share/examples/hylafax/templates/html-sample1/notify-requeued.txt
share/examples/hylafax/templates/html-sample1/notify-timedout.txt
share/examples/hylafax/templates/html-sample1/session_log.inc
share/examples/hylafax/templates/it/faxrcvd-error.txt
share/examples/hylafax/templates/it/faxrcvd-failure.txt
share/examples/hylafax/templates/it/faxrcvd-notify-error.txt
share/examples/hylafax/templates/it/faxrcvd-notify-success.txt
share/examples/hylafax/templates/it/faxrcvd-success.txt
share/examples/hylafax/templates/it/notify-blocked.txt
share/examples/hylafax/templates/it/notify-done-page.txt
share/examples/hylafax/templates/it/notify-done.txt
share/examples/hylafax/templates/it/notify-failed-page.txt
share/examples/hylafax/templates/it/notify-failed.txt
share/examples/hylafax/templates/it/notify-faxmaster.txt
share/examples/hylafax/templates/it/notify-format_failed.txt
share/examples/hylafax/templates/it/notify-killed.txt
share/examples/hylafax/templates/it/notify-no_formatter.txt
share/examples/hylafax/templates/it/notify-poll_failed.txt
share/examples/hylafax/templates/it/notify-poll_no_document.txt
share/examples/hylafax/templates/it/notify-poll_rejected.txt
share/examples/hylafax/templates/it/notify-rejected.txt
share/examples/hylafax/templates/it/notify-removed.txt
share/examples/hylafax/templates/it/notify-requeued.txt
share/examples/hylafax/templates/it/notify-timedout.txt
share/examples/hylafax/templates/pl/faxrcvd-error.txt
share/examples/hylafax/templates/pl/faxrcvd-failure.txt
share/examples/hylafax/templates/pl/faxrcvd-notify-error.txt
share/examples/hylafax/templates/pl/faxrcvd-notify-success.txt
share/examples/hylafax/templates/pl/faxrcvd-success.txt
share/examples/hylafax/templates/pl/notify-blocked.txt
share/examples/hylafax/templates/pl/notify-done-page.txt
share/examples/hylafax/templates/pl/notify-done.txt
share/examples/hylafax/templates/pl/notify-failed-page.txt
share/examples/hylafax/templates/pl/notify-failed.txt
share/examples/hylafax/templates/pl/notify-faxmaster.txt
share/examples/hylafax/templates/pl/notify-format_failed.txt
share/examples/hylafax/templates/pl/notify-killed.txt
share/examples/hylafax/templates/pl/notify-no_formatter.txt
share/examples/hylafax/templates/pl/notify-poll_failed.txt
share/examples/hylafax/templates/pl/notify-poll_no_document.txt
share/examples/hylafax/templates/pl/notify-poll_rejected.txt
share/examples/hylafax/templates/pl/notify-rejected.txt
share/examples/hylafax/templates/pl/notify-removed.txt
share/examples/hylafax/templates/pl/notify-requeued.txt
share/examples/hylafax/templates/pl/notify-timedout.txt
share/examples/hylafax/templates/pt/faxrcvd-error.txt
share/examples/hylafax/templates/pt/faxrcvd-failure.txt
share/examples/hylafax/templates/pt/faxrcvd-notify-error.txt
share/examples/hylafax/templates/pt/faxrcvd-notify-success.txt
share/examples/hylafax/templates/pt/faxrcvd-success.txt
share/examples/hylafax/templates/pt/notify-blocked.txt
share/examples/hylafax/templates/pt/notify-done-page.txt
share/examples/hylafax/templates/pt/notify-done.txt
share/examples/hylafax/templates/pt/notify-failed-page.txt
share/examples/hylafax/templates/pt/notify-failed.txt
share/examples/hylafax/templates/pt/notify-faxmaster.txt
share/examples/hylafax/templates/pt/notify-format_failed.txt
share/examples/hylafax/templates/pt/notify-killed.txt
share/examples/hylafax/templates/pt/notify-no_formatter.txt
share/examples/hylafax/templates/pt/notify-poll_failed.txt
share/examples/hylafax/templates/pt/notify-poll_no_document.txt
share/examples/hylafax/templates/pt/notify-poll_rejected.txt
share/examples/hylafax/templates/pt/notify-rejected.txt
share/examples/hylafax/templates/pt/notify-removed.txt
share/examples/hylafax/templates/pt/notify-requeued.txt
share/examples/hylafax/templates/pt/notify-timedout.txt
share/examples/hylafax/templates/pt_BR/faxrcvd-error.txt
share/examples/hylafax/templates/pt_BR/faxrcvd-failure.txt
share/examples/hylafax/templates/pt_BR/faxrcvd-notify-error.txt
share/examples/hylafax/templates/pt_BR/faxrcvd-notify-success.txt
share/examples/hylafax/templates/pt_BR/faxrcvd-success.txt
share/examples/hylafax/templates/pt_BR/notify-blocked.txt
share/examples/hylafax/templates/pt_BR/notify-done-page.txt
share/examples/hylafax/templates/pt_BR/notify-done.txt
share/examples/hylafax/templates/pt_BR/notify-failed-page.txt
share/examples/hylafax/templates/pt_BR/notify-failed.txt
share/examples/hylafax/templates/pt_BR/notify-faxmaster.txt
share/examples/hylafax/templates/pt_BR/notify-format_failed.txt
share/examples/hylafax/templates/pt_BR/notify-killed.txt
share/examples/hylafax/templates/pt_BR/notify-no_formatter.txt
share/examples/hylafax/templates/pt_BR/notify-poll_failed.txt
share/examples/hylafax/templates/pt_BR/notify-poll_no_document.txt
share/examples/hylafax/templates/pt_BR/notify-poll_rejected.txt
share/examples/hylafax/templates/pt_BR/notify-rejected.txt
share/examples/hylafax/templates/pt_BR/notify-removed.txt
share/examples/hylafax/templates/pt_BR/notify-requeued.txt
share/examples/hylafax/templates/pt_BR/notify-timedout.txt
share/examples/hylafax/templates/ro/faxrcvd-error.txt
share/examples/hylafax/templates/ro/faxrcvd-failure.txt
share/examples/hylafax/templates/ro/faxrcvd-notify-error.txt
share/examples/hylafax/templates/ro/faxrcvd-notify-success.txt
share/examples/hylafax/templates/ro/faxrcvd-success.txt
share/examples/hylafax/templates/ro/notify-blocked.txt
share/examples/hylafax/templates/ro/notify-done-page.txt
share/examples/hylafax/templates/ro/notify-done.txt
share/examples/hylafax/templates/ro/notify-failed-page.txt
share/examples/hylafax/templates/ro/notify-failed.txt
share/examples/hylafax/templates/ro/notify-faxmaster.txt
share/examples/hylafax/templates/ro/notify-format_failed.txt
share/examples/hylafax/templates/ro/notify-killed.txt
share/examples/hylafax/templates/ro/notify-no_formatter.txt
share/examples/hylafax/templates/ro/notify-poll_failed.txt
share/examples/hylafax/templates/ro/notify-poll_no_document.txt
share/examples/hylafax/templates/ro/notify-poll_rejected.txt
share/examples/hylafax/templates/ro/notify-rejected.txt
share/examples/hylafax/templates/ro/notify-removed.txt
share/examples/hylafax/templates/ro/notify-requeued.txt
share/examples/hylafax/templates/ro/notify-timedout.txt
share/examples/hylafax/xferfaxlog
share/hylafax/config_template/att-dataport
share/hylafax/config_template/att-dataport-2
share/hylafax/config_template/att-dataport-2.0
@@ -160,13 +384,20 @@ share/hylafax/config_template/exar
share/hylafax/config_template/gvc-288
share/hylafax/config_template/gvc-288-2
share/hylafax/config_template/hayes
share/hylafax/config_template/iaxmodem
share/hylafax/config_template/intel-400e
share/hylafax/config_template/ip568x
share/hylafax/config_template/linux-isdn-2
share/hylafax/config_template/lucent
share/hylafax/config_template/lucent-isa
share/hylafax/config_template/lucent-mt-10
share/hylafax/config_template/lucent-mt-2
share/hylafax/config_template/lucent-mt-20
share/hylafax/config_template/lucent-mt-21
share/hylafax/config_template/mainpine-10
share/hylafax/config_template/mainpine-2
share/hylafax/config_template/mainpine-20
share/hylafax/config_template/mainpine-21
share/hylafax/config_template/moto-288
share/hylafax/config_template/mt-1432
share/hylafax/config_template/nuvo-voyager
@@ -200,10 +431,4 @@ share/hylafax/config_template/zyxel-1496e-1
share/hylafax/config_template/zyxel-1496e-2.0
share/hylafax/config_template/zyxel-2864
share/hylafax/etc_template/cover.templ
share/hylafax/etc_template/dialrules
share/hylafax/etc_template/dialrules.europe
share/hylafax/etc_template/dialrules.sf-ba
share/hylafax/etc_template/dpsprinter.ps
share/hylafax/etc_template/hosts.hfaxd
share/hylafax/etc_template/lutRS18.pcf
share/hylafax/etc_template/xferfaxlog

33
comms/hylafax/distinfo
View File

@@ -1,21 +1,20 @@
$NetBSD: distinfo,v 1.24 2013/05/21 18:36:52 joerg Exp $
$NetBSD: distinfo,v 1.26 2014/03/14 15:59:29 adam Exp $
SHA1 (hylafax-4.2.5.tar.gz) = b3bfd492dcb85e8aa1ddff9e6dcec3c31e00fccc
RMD160 (hylafax-4.2.5.tar.gz) = aef5e7a8ff32bafa43b5efc431b9fd8c334ddb3a
Size (hylafax-4.2.5.tar.gz) = 1450958 bytes
SHA1 (patch-aa) = 94de7c7fb55c9c95c6a774fb732e2d47ec818152
SHA1 (hylafax-6.0.6.tar.gz) = 8d8cc9a5f242ef83d7bc6f5cd200fec1351b280e
RMD160 (hylafax-6.0.6.tar.gz) = 1f6e3022fe9886f2cde9fb406277d5496ee24f1c
Size (hylafax-6.0.6.tar.gz) = 1297412 bytes
SHA1 (patch-aa) = 54f34633757a4925084d9e7e4c1e743bca48e4ba
SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
SHA1 (patch-ac) = 6f89cc0c9e7a0e789c23b0dfc604376e457091b7
SHA1 (patch-ac) = b2051ac2e43d0635797043605d96f128e535c976
SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
SHA1 (patch-ae) = 75b243c618a197bacd97e4292b123e97ffe178cd
SHA1 (patch-af) = cb76c429c01e05ceeee7664a09344dc9d27f972d
SHA1 (patch-ag) = e1a38918cadf1d1cca7765ee2c050e99dfed0b7f
SHA1 (patch-ah) = 084a99cfe21d7090fca33d9e068036e19707f441
SHA1 (patch-ai) = d45bb9e224b18999489314aa1c1c74fc62a77328
SHA1 (patch-al) = edac7c7af07556f7321ba7ede1eeca55e618b8cc
SHA1 (patch-ae) = 031813b7a130cb7ee99596be88aa933e6ec8786e
SHA1 (patch-af) = f1dd817fcd086bfdd354351dc0b92027250edcba
SHA1 (patch-ag) = 52024e0184e2607c6cfb2c6c19c9f31b3c37ec95
SHA1 (patch-ah) = 8558a0f9d970ce1cddbeb76fc87a1c450bd0941d
SHA1 (patch-ai) = 85ae0baa95f012593b908b3394280e49ba3b7f24
SHA1 (patch-al) = a0f006412918c047176945d911042264aa050fc0
SHA1 (patch-am) = b004485310a2257630561a42b3f08896604ce986
SHA1 (patch-an) = 535f9454e473d7bb26a256aec3158cffdb3d0399
SHA1 (patch-ao) = 73da088c0dbc13a0dcb8d6abaa36804f34638c51
SHA1 (patch-ap) = f9d6a2796535e7200419d6e24203b9995e5cfb39
SHA1 (patch-hfaxd_FileSystem_c__) = d39e8abb1163f5f02b2cb1fa5814c4588a8fa73e
SHA1 (patch-hfaxd_FileTransfer_c__) = 683b4a0bdd1927d0a0636e8df75d5b8bae27e0ff
SHA1 (patch-an) = de131bcdeb22a2f7daadbaf86d0aa00b841512af
SHA1 (patch-ao) = d46c0c4d3e3e6309a807fa5c335888a3c28886d8
SHA1 (patch-ap) = 419036385f1d0582ab6e5dd0710f5bbf41744e0f
SHA1 (patch-rules.in) = 4c9604ce9fc5848764adfdbd2e39cc7576674ebc

14
comms/hylafax/options.mk Normal file
View File

@@ -0,0 +1,14 @@
# $NetBSD: options.mk,v 1.1 2014/03/14 15:59:29 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.hylafax
PKG_SUPPORTED_OPTIONS= pam
#pam doesn't work right now, so disabled by default
#PKG_SUGGESTED_OPTIONS= pam
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mpam)
.include "../../mk/pam.buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-pam
.endif

4
comms/hylafax/patches/patch-aa
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.8 2003/09/23 21:39:47 abs Exp $
$NetBSD: patch-aa,v 1.9 2014/03/14 15:59:29 adam Exp $
--- Makefile.in.orig Mon Apr 14 03:44:42 2003
+++ Makefile.in
@@ -237,22 +237,13 @@ makeClientDirs::
@@ -227,22 +227,13 @@ makeClientDirs::
makeServerDirs::
-${INSTALL} -u ${SYSUSER} -g ${SYSGROUP} -m ${DIRMODE} \
-idb hylafax.sw.server -dir ${SBIN};

4
comms/hylafax/patches/patch-ac
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-ac,v 1.7 2005/01/27 16:22:37 adam Exp $
$NetBSD: patch-ac,v 1.8 2014/03/14 15:59:29 adam Exp $
--- config/Makefile.in.orig 2004-05-22 02:12:35.000000000 +0000
+++ config/Makefile.in
@@ -120,6 +120,7 @@ targets: ${TARGETS}
@@ -124,6 +124,7 @@ targets: ${TARGETS}
PUTSERVER=${INSTALL} -idb ${PRODUCT}.sw.server
install: default ${CONFIGFILES}

145
comms/hylafax/patches/patch-ae
View File

@@ -1,10 +1,9 @@
$NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
$NetBSD: patch-ae,v 1.18 2014/03/14 15:59:29 adam Exp $
- Configure for pkgsrc.
- Recognize libtiff 4.x.
- ...
* Customize paths.
* Configure for pkgsrc.
--- configure.orig 2005-12-16 22:40:30.000000000 +0000
--- configure.orig 2012-06-06 00:58:38.000000000 +0000
+++ configure
@@ -37,23 +37,23 @@
#
@@ -16,7 +15,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
-DIR_LIB=/usr/local/lib
-DIR_LIBEXEC=$DIR_SBIN
-DIR_SPOOL=/var/spool/hylafax
-DIR_HTML=/var/httpd/htdocs/hylafax
-DIR_LOCALE=/usr/local/share/locale
-DIR_CGI=/var/httpd/cgi-bin
+DIR_BIN=${PREFIX}/bin
+DIR_SBIN=${PREFIX}/sbin
@@ -24,13 +23,13 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
+DIR_LIB=${PREFIX}/lib
+DIR_LIBEXEC=${PREFIX}/libexec
+DIR_SPOOL=${VARBASE}/spool/hylafax
+DIR_HTML=${PREFIX}/http/htdocs/hylafax
+DIR_LOCALE=${PREFIX}/share/locale
+DIR_CGI=${PREFIX}/http/cgi-bin
PATH_DPSRIP=$DIR_LIBEXEC/ps2fax.exe
-PATH_IMPRIP=/usr/lib/print/psrip
+PATH_IMPRIP=${PREFIX}/lib/print/psrip
HTMLPATH=/hylafax
CGIPATH=/cgi-bin
LOCALE_DOMAIN=hylafax
DEFVRES=98
PAGESIZE="North American Letter"
FAXUID=uucp
@@ -40,38 +39,29 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
SYSGID=
DSO=auto
GETTY=auto
@@ -72,9 +72,8 @@ DPS=no
GS=no
@@ -70,11 +70,10 @@ GS=no
IMP=no
UTMP=auto
NLS=auto
-OPTIMIZER="-O"
-LIBTIFF="-L/usr/local/lib -ltiff"
-TIFFINC=/usr/local/include
+LIBTIFF="-Wl,-R${PREFIX}/lib -L${PREFIX}/lib -ltiff -ljpeg -lz -lm"
+TIFFINC=${PREFIX}/include
LIBCRYPT=
LIBPAM=
-LIBTIFF="-ltiff"
-TIFFINC=
+LIBTIFF=`pkg-config --libs libtiff-4`
+TIFFINC=`pkg-config --cflags libtiff-4`
TIFFBIN=
LIBZ=
ZLIBINC=
@@ -82,8 +81,8 @@ REGEX=yes
LIBREGEX='-L${DEPTH}/regex -lregex'
REGEXINC='${DEPTH}/${TOPSRCDIR}/regex'
DBLIB=no
-LIBDB="-L/usr/local/lib -ldb"
-DBLIBINC=/usr/local/include
+LIBDB="-L${PREFIX}/lib -ldb"
+DBLIBINC=${PREFIX}/include
FAXD=
LIBFAXSERVER='libfaxserver.${DSO}'
LIBUTIL='${UTIL}/libfaxutil.${DSO}'
@@ -224,6 +223,7 @@ PKG_EMAIL
LIBUTIL=
LIBZ=-lz
@@ -229,6 +228,7 @@ PKG_ARCH
PKG_EMAIL
PKG_VENDOR
PORT
PORTFUNCS
+PREFIX
PROTOTYPES
PSPACKAGE PS
PWDCMD
@@ -290,7 +290,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
@@ -300,7 +300,7 @@ test -d /usr/bsd && PATH=$PATH:/usr/bsd
test -d /usr/ucb && PATH=$PATH:/usr/ucb # Sun and others
test -d /usr/contrib/bin && PATH=$PATH:/usr/contrib/bin # BSDi
test -d /usr/5bin && PATH=/usr/5bin:$PATH:/usr/etc # Sun and others
@@ -80,7 +70,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
PATH=$PATH:$OPATH
POSIXLY_CORRECT=1; export POSIXLY_CORRECT # disable GNU extensions
@@ -809,7 +809,7 @@ checkGCCVersion()
@@ -831,7 +831,7 @@ checkGCCVersion()
# NB: use ANSI C prototype to weed out non-ANSI compilers.
#
cat>dummy.c<<EOF
@@ -89,7 +79,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
EOF
checkCompiler()
@@ -958,7 +958,7 @@ fi
@@ -982,7 +982,7 @@ fi
# Make dependency information.
#
cat>dummy.c<<EOF
@@ -98,32 +88,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
EOF
capture cat dummy.c
if capture "$CCOMPILER -c -M $MKDEPCOPTS dummy.c | grep '^dummy.o[ ]*:[ ]*dummy.c'"; then
@@ -1418,12 +1418,22 @@ runMake()
CheckForCXXRuntime()
{
cat>t.c++<<EOF
+#include <iostream>
+int main(){ std::cout << "Hello World!" << std::endl; return 0;}
+EOF
+ runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}" || return $?
+ Note "Looks like the system has a CXX runtime"
+}
+CheckForDeprecatedCXXRuntime()
+{
+cat>t.c++<<EOF
#include "iostream.h"
int main(){ cout << "Hello World!" << endl; return 0;}
EOF
- runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}"
+ runMake t "t:; \${C++F} \${C++FILE} t.c++${MAKECXXOVERRIDE}" || return $?
+ Note "Looks like the system has a CXX runtime with deprecated headers"
}
-CheckForCXXRuntime || {
+CheckForCXXRuntime || CheckForDeprecatedCXXRuntime || {
cat 1>&2 <<EOF
Missing C++ runtime support for $CXX ($CXXCOMPILER).
@@ -1591,7 +1601,7 @@ pamconv(int num_msg, const struct pam_me
@@ -1629,7 +1629,7 @@ pamconv(int num_msg, const struct pam_me
{
return(0);
}
@@ -132,16 +97,16 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
{
struct pam_conv conv = { pamconv };
}
@@ -2062,7 +2072,7 @@ EmitConfigurationDefinitions()
@@ -2176,7 +2176,7 @@ EmitConfigurationDefinitions()
#
CheckForFunc()
{
- echo "extern int $1(); main(){$1();exit(0);}" >t.c
+ echo "extern int $1(); int main(){$1();exit(0);}" >t.c
- echo "extern int $1(); main(){$1($2);exit(0);}" >t.c
+ echo "extern int $1(); int main(){$1($2);exit(0);}" >t.c
capture cat t.c
runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
}
@@ -2315,7 +2325,7 @@ CheckForStructExitStatus()
@@ -2448,7 +2448,7 @@ CheckForStructExitStatus()
echo "$i"
done
cat<<EOF
@@ -150,7 +115,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
{
struct $decl x;
x.ut_exit.e_exit = 0;
@@ -2332,7 +2342,7 @@ CheckForTimeZoneHandling()
@@ -2465,7 +2465,7 @@ CheckForTimeZoneHandling()
{
(echo '#include <time.h>'
cat<<EOF
@@ -159,7 +124,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
{
struct tm x;
char* cp;
@@ -2351,7 +2361,7 @@ CheckForTXCD()
@@ -2484,7 +2484,7 @@ CheckForTXCD()
{
cat>t.c<<EOF
#include <sys/ioctl.h>
@@ -168,7 +133,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
{
ioctl(0, TXADDCD, "rts");
ioctl(0, TXDELCD, "rts");
@@ -2400,7 +2410,7 @@ CheckLibtiff()
@@ -2538,7 +2538,7 @@ CheckLibtiff()
cat>t.c<<EOF
#include <stdio.h>
#include "tiffio.h"
@@ -177,16 +142,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
{
printf( "header_ver=%d lib_ver=%s", TIFFLIB_VERSION, TIFFGetVersion() );
exit(0);
@@ -2418,7 +2428,7 @@ EOF
if [ ${header_ver} -ge 19960307 ]; then
case ${lib_ver} in
3.4) tiff_runlen_t="uint16" ;;
- 3.[567]) tiff_runlen_t="uint32" ;;
+ 3.[56789]|4*) tiff_runlen_t="uint32" ;;
esac
fi
else
@@ -3102,7 +3112,7 @@ CheckForSyslog()
@@ -3281,7 +3281,7 @@ CheckForSyslog()
{
(echo '#include <syslog.h>';
echo '#include "port.h"';
@@ -195,7 +151,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
capture cat t.c
runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
}
@@ -3111,7 +3121,7 @@ CheckForVSyslog()
@@ -3290,7 +3290,7 @@ CheckForVSyslog()
(echo '#include <syslog.h>';
echo '#include <stdarg.h>';
echo '#include "port.h"';
@@ -204,7 +160,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
capture cat t.c
runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
}
@@ -3139,19 +3149,13 @@ Note "Checking ZLIB support."
@@ -3314,19 +3314,13 @@ Note "Checking ZLIB support."
#
cat>t.c<<EOF
#include "zlib.h"
@@ -225,7 +181,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
}
EOF
capture cat t.c
@@ -3213,7 +3217,7 @@ Note "Checking TIFF support."
@@ -3385,7 +3379,7 @@ Note "Checking TIFF support."
# Location of TIFF binaries
#
if [ -z "$TIFFBIN" ]; then
@@ -234,16 +190,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
for i in $DIRS; do
test -x $i/tiff2ps && { TIFFBIN=$i; break; }
done
@@ -3245,7 +3249,7 @@ if [ -f $SRCDIR/MLA/VERSION -a $DBLIB =
#include <stdio.h>
#include <string.h>
#include "db.h"
-main()
+int main()
{
DBT key, data;
const char d[] = "some random string";
@@ -3722,6 +3726,7 @@ if [ -z "$FAXGID" ]; then
@@ -3806,6 +3800,7 @@ if [ -z "$FAXGID" ]; then
*-bsdi*) FAXGID=uucp;;
*freebsd2.1*) FAXGID=uucp; break;; # Not sure when this changed..
*bsd*) FAXGID=dialer;;
@@ -251,7 +198,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
*-hpux*) FAXGID=sys;;
*-irix*) FAXGID=nuucp;;
*-isc*) FAXGID=uucp;;
@@ -3750,6 +3755,7 @@ if [ -z "$SYSGID" ]; then
@@ -3834,6 +3829,7 @@ if [ -z "$SYSGID" ]; then
*-aix*) SYSGID=sys;;
*netbsd*) SYSGID=wheel;;
*bsd*) SYSGID=bin;;
@@ -259,7 +206,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
*-hpux*) SYSGID=bin;;
*-irix*) SYSGID=sys;;
*-isc*) SYSGID=sys;;
@@ -3794,6 +3800,7 @@ fi
@@ -3878,6 +3874,7 @@ fi
if [ "$GETTY" = auto ]; then
case $TARGET in
*bsd*) GETTY=BSD;;
@@ -267,7 +214,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
*-sunos*) GETTY=BSD;;
*-ultrix*) GETTY=BSD;;
*darwin*) GETTY=BSD;;
@@ -3836,7 +3843,7 @@ fi
@@ -3920,7 +3917,7 @@ fi
if [ -z "$PATH_VGETTY" ]; then
PATH_VGETTY=`findApp vgetty /usr/libexec:/sbin:$PATH`
if [ -z "$PATH_VGETTY" ]; then
@@ -276,7 +223,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
Note "WARNING, no vgetty program found to handle a voice call, using $PATH_VGETTY."
else
Note "Looks like $PATH_VGETTY is the program to exec for a voice call."
@@ -3849,7 +3856,7 @@ fi
@@ -3933,7 +3930,7 @@ fi
if [ -z "$PATH_EGETTY" ]; then
PATH_EGETTY=`findApp egetty /usr/libexec:/sbin:$PATH`
if [ -z "$PATH_EGETTY" ]; then
@@ -285,7 +232,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
Note "WARNING, no egetty program found, using $PATH_EGETTY."
else
Note "Looks like $PATH_EGETTY is the program to exec for an extern call."
@@ -3871,6 +3878,7 @@ if [ "$LOCKS" = auto ]; then
@@ -3956,6 +3953,7 @@ if [ "$LOCKS" = auto ]; then
*-sysv5*) LOCKS="+ascii";;
*-solaris*) LOCKS="+ascii";;
*-freebsd*) LOCKS=ascii;;
@@ -293,7 +240,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
*-netbsd*) LOCKS=ascii;;
*bsd*) LOCKS=binary;;
*) LOCKS=ascii;;
@@ -3920,6 +3928,7 @@ PickRIP()
@@ -4005,6 +4003,7 @@ PickRIP()
{
if [ -z "$PATH_GSRIP" ]; then
GSLOCS="
@@ -301,7 +248,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
/usr/local/bin/gs
/usr/contrib/bin/gs
/usr/gnu/bin/gs
@@ -3967,7 +3976,7 @@ fax software to operate correctly. See
@@ -4052,7 +4051,7 @@ fax software to operate correctly. See
on building Ghostscript with the necessary TIFF driver.
EOF
@@ -310,7 +257,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
PATH_GSRIP=$PATH_PSRIP
fi
}
@@ -4034,9 +4043,9 @@ if [ -z "$PATH_AFM" ]; then
@@ -4119,9 +4118,9 @@ if [ -z "$PATH_AFM" ]; then
else
DIR_AFMS="
/usr/lib/afm
@@ -323,7 +270,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
/usr/share/ghostscript/fonts
/usr/gnu/lib/ghostscript/fonts
/opt/gnu/lib/ghostscript/fonts
@@ -4056,7 +4065,7 @@ if [ -z "$PATH_AFM" ]; then
@@ -4141,7 +4140,7 @@ if [ -z "$PATH_AFM" ]; then
fi
if [ -z "$PATH_AFM" ]; then
# put it where ghostscript normally puts things
@@ -332,7 +279,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
Note "WARNING, could not locate a directory with font metric information,"
Note "guessing that font metric information goes in $PATH_AFM."
else
@@ -4075,7 +4084,7 @@ fi
@@ -4160,7 +4159,7 @@ fi
#
if [ -z "$DIR_MAN" ]; then
MANPATH="
@@ -341,7 +288,7 @@ $NetBSD: patch-ae,v 1.17 2013/05/21 18:36:52 joerg Exp $
/usr/local/man
/usr/contrib/man
/usr/catman/local
@@ -4084,43 +4093,11 @@ if [ -z "$DIR_MAN" ]; then
@@ -4169,43 +4168,11 @@ if [ -z "$DIR_MAN" ]; then
for i in $MANPATH; do
test -d $i && { DIR_MAN=$i; break; }
done

19
comms/hylafax/patches/patch-af
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
$NetBSD: patch-af,v 1.9 2014/03/14 15:59:29 adam Exp $
--- defs.in.orig 2005-09-27 18:38:24.000000000 +0000
--- defs.in.orig 2012-06-06 00:58:38.000000000 +0000
+++ defs.in
@@ -44,13 +44,14 @@ SHELL = @SCRIPT_SH@
@@ -48,12 +48,13 @@ ABI_PATCH = @ABI_PATCH@
# to insufficient; you are better off rerunning the
# configure script so that all uses are set correctly.
#
@@ -12,7 +12,6 @@ $NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
-LIBDATA = @LIBDATA@
-LIBDIR = @LIBDIR@
-LIBEXEC = @LIBEXEC@
-HTMLDIR = @HTMLDIR@
+PREFIX = ${DESTDIR}@PREFIX@
+SPOOL = ${DESTDIR}@SPOOL@
+SBIN = ${DESTDIR}@SBIN@
@@ -20,20 +19,10 @@ $NetBSD: patch-af,v 1.8 2010/01/29 16:44:13 joerg Exp $
+LIBDATA = ${DESTDIR}@LIBDATA@
+LIBDIR = ${DESTDIR}@LIBDIR@
+LIBEXEC = ${DESTDIR}@LIBEXEC@
+HTMLDIR = ${DESTDIR}@HTMLDIR@
FONTMAP = @FONTMAP@
FONTPATH = @FONTPATH@
SENDMAIL = @SENDMAIL@
@@ -261,7 +262,7 @@ LDFLAGS = ${LDOPTS} ${LDLIBS}
LDOPTS = ${VLDOPTS} ${LLDOPTS} ${GLDOPTS}
LDLIBS = ${VLDLIBS} ${LLDLIBS} ${GLDLIBS}
-GLDOPTS = -L/usr/local/lib
+GLDOPTS = -L${PREFIX}/lib
GLDLIBS = ${SHDLIBC}
#
@@ -322,7 +323,7 @@ INCLDIR = /usr/include
@@ -328,7 +329,7 @@ INCLDIR = /usr/include
# MANSYS subdirectory for server & server-related apps
# MANFILES subdirectory for file format info
#

35
comms/hylafax/patches/patch-ag
View File

@@ -1,25 +1,38 @@
$NetBSD: patch-ag,v 1.5 2003/09/23 21:39:48 abs Exp $
$NetBSD: patch-ag,v 1.6 2014/03/14 15:59:29 adam Exp $
--- etc/Makefile.in.orig Tue Feb 6 04:54:06 2001
--- etc/Makefile.in.orig 2012-06-06 00:58:38.000000000 +0000
+++ etc/Makefile.in
@@ -85,14 +85,16 @@ install: default
@@ -86,25 +86,25 @@ install: default
-src ${SRCDIR}/faxsetup.$$i -O faxsetup.$$i; \
done
${PUTSERVER} -F ${SBIN} -m 755 -src probemodem.sh -O probemodem
- ${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -o xferfaxlog
- ${PUTSAMPLE} -F ${SPOOL}/etc -m 600 -o hosts.hfaxd
+ -${MKDIR} -m 755 ${PREFIX}/share/hylafax
+ -${MKDIR} -m 755 ${PREFIX}/share/hylafax/etc_template
+ ${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 644 -o xferfaxlog
+ ${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 600 -o hosts.hfaxd
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax -m 644 -o xferfaxlog
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax -m 600 -o hosts.hfaxd
for i in ${DIALRULES}; do \
- ${PUTSERVER} -F ${SPOOL}/etc -m 444 -src ${SRCDIR}/$$i \
+ ${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -m 444 -src ${SRCDIR}/$$i \
+ ${PUTSERVER} -F ${PREFIX}/share/examples/hylafax -m 444 -src ${SRCDIR}/$$i \
-idb "config(update)" -O $$i; \
done
${PUTSERVER} -F ${LIBEXEC} -m 755 -O lockname ondelay
- ${PUTSAMPLE} -F ${SPOOL}/etc -m 644 -idb nostrip \
+ ${PUTSAMPLE} -F ${PREFIX}/share/hylafax/etc_template -m 644 -idb nostrip \
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax -m 644 -idb nostrip \
-src ${SRCDIR}/lutRS18.pcf -O lutRS18.pcf
#
${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
- -idb hylafax.sw.server -dir -F ${SPOOL}/etc templates
- ${PUTSAMPLE} -F ${SPOOL}/etc/templates -m 644 \
+ -idb hylafax.sw.server -dir -F ${PREFIX}/share/examples/hylafax templates
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax/templates -m 644 \
-src ${SRCDIR}/templates/README -O README
@for d in ${TEMPLATES}; do \
${ECHO} "Installing templates/$$d"; \
${INSTALL} -u ${FAXUSER} -g ${FAXGROUP} -m ${DIRMODE} \
- -idb hylafax.sw.server -dir -F ${SPOOL}/etc/templates $$d; \
+ -idb hylafax.sw.server -dir -F ${PREFIX}/share/examples/hylafax/templates $$d; \
for f in ${SRCDIR}/templates/$$d/*; do \
- ${PUTSAMPLE} -F ${SPOOL}/etc/templates/$$d -m 644 -src $$f `basename $$f`; \
+ ${PUTSAMPLE} -F ${PREFIX}/share/examples/hylafax/templates/$$d -m 644 -src $$f `basename $$f`; \
done; \
done;

18
comms/hylafax/patches/patch-ah
View File

@@ -1,16 +1,16 @@
$NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
$NetBSD: patch-ah,v 1.7 2014/03/14 15:59:29 adam Exp $
--- etc/faxaddmodem.sh.in.orig 2004-12-22 13:44:05.000000000 +0000
--- etc/faxaddmodem.sh.in.orig 2012-06-06 00:58:38.000000000 +0000
+++ etc/faxaddmodem.sh.in
@@ -46,6 +46,7 @@
SPOOL=@SPOOL@
@@ -51,6 +51,7 @@ die()
}
SPEED=
+TTY=
DOFUSER=no
while [ x"$1" != x"" ] ; do
case $1 in
-s) SPEED=$2; shift;;
@@ -115,7 +116,7 @@ CAT="$CAT -u" # something to do unbuff
@@ -124,7 +125,7 @@ CAT="$CAT -u" # something to do unbuff
FAX=@FAXUID@ # identity of the fax user
GROUP=/etc/group # where to go for group entries
PROTOGID=@FAXGID@ # group who's gid we use for FAX user
@@ -19,7 +19,7 @@ $NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
MODEMCONFIG=$SPOOL/config # location of prototype modem config files
RMCMD="$RM -f" # forced removal
@@ -809,7 +810,7 @@ SendToModem()
@@ -833,7 +834,7 @@ SendToModem()
COMMAND=$*
sleep 1 # wait for previous kill
case $TARGET in
@@ -28,7 +28,7 @@ $NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
*) onDev $STTY 0; sleep 1 ;; # reset the modem (hopefully)
esac
# start listening for output
@@ -1152,7 +1153,7 @@ EOF
@@ -1178,7 +1179,7 @@ EOF
done;
MODEMCLASSES=`echo $MODEMCLASSES | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g' -e 's/ $//g'`
SUPPORT=`echo $SUPPORT | $SED -e 's/3/2.0/g' -e 's/4/1.0/g' -e 's/5/2.1/g'`.
@@ -37,7 +37,7 @@ $NetBSD: patch-ah,v 1.6 2005/01/27 16:22:37 adam Exp $
case "$MODEMCLASSES" in
"") giveup;;
"1") ModemType=Class1; configureClass1Modem;;
@@ -1163,7 +1164,7 @@ EOF
@@ -1189,7 +1190,7 @@ EOF
*)
DEFAULTCLASS=`echo $MODEMCLASSES | $SED 's/\([^ ]*\).*/\1/g'`
x=""

12
comms/hylafax/patches/patch-ai
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
$NetBSD: patch-ai,v 1.10 2014/03/14 15:59:29 adam Exp $
--- etc/faxsetup.sh.in.orig 2004-12-28 04:45:04.000000000 +0000
--- etc/faxsetup.sh.in.orig 2012-06-06 00:58:38.000000000 +0000
+++ etc/faxsetup.sh.in
@@ -41,7 +41,9 @@
# This script interactively prepares and verifies
@@ -18,10 +18,10 @@ $NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
LN=@LN@ # ln command for use below
LN_S=@LN_S@ # ln option for creating a symbolic link
+MKDIR=@MKDIR@ # directory creation program for use below
MIMENCODE=@MIMENCODE@ # mimencode command to dump in setup.cache
MKFIFO=@MKFIFO@ # FIFO creation program for use below
MV=@MV@ # move file for use below
@@ -149,6 +152,7 @@ LIBEXEC DIR_LIBEXEC
PCL6CMD=@PCL6CMD@ # pcl6 (GhostPCL) program
@@ -154,6 +157,7 @@ LIBEXEC DIR_LIBEXEC
LN
MANDIR DIR_MAN
MIMENCODE
@@ -29,7 +29,7 @@ $NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
MKFIFO
MV
PATH
@@ -816,6 +820,61 @@ if [ "$euid" != "root" ]; then
@@ -870,6 +874,61 @@ if [ "$euid" != "root" ]; then
boom
fi
@@ -91,7 +91,7 @@ $NetBSD: patch-ai,v 1.9 2005/01/27 16:22:37 adam Exp $
onClient && Note "Checking system for proper client configuration."
onServer && Note "Checking system for proper server configuration."
@@ -2214,12 +2273,7 @@ if onServer; then
@@ -2426,12 +2485,7 @@ if onServer; then
findproc()
{

4
comms/hylafax/patches/patch-al
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-al,v 1.6 2005/01/27 16:22:37 adam Exp $
$NetBSD: patch-al,v 1.7 2014/03/14 15:59:29 adam Exp $
--- faxd/Getty.c++.orig 2005-01-01 21:27:15.000000000 +0000
+++ faxd/Getty.c++
@@ -234,7 +234,7 @@ Getty::hangup()
@@ -230,7 +230,7 @@ Getty::hangup()
// NB: this is executed in the parent
fxStr device = fxStr::format("%s" | line, _PATH_DEV);
Sys::chown(device, UUCPLock::getUUCPUid(), UUCPLock::getUUCPGid());

4
comms/hylafax/patches/patch-an
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-an,v 1.7 2005/01/27 16:22:37 adam Exp $
$NetBSD: patch-an,v 1.8 2014/03/14 15:59:29 adam Exp $
--- faxd/faxGettyApp.c++.orig 2005-01-01 21:27:16.000000000 +0000
+++ faxd/faxGettyApp.c++
@@ -789,7 +789,7 @@ faxGettyApp::notifyDocumentRecvd(const F
@@ -815,7 +815,7 @@ faxGettyApp::notifyDocumentRecvd(const F
FaxServer::notifyDocumentRecvd(ri);
FaxAcctInfo ai;

14
comms/hylafax/patches/patch-ao
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $
$NetBSD: patch-ao,v 1.8 2014/03/14 15:59:29 adam Exp $
--- hfaxd/User.c++.orig 2005-01-10 04:52:09.000000000 +0000
--- hfaxd/User.c++.orig 2012-06-06 00:58:38.000000000 +0000
+++ hfaxd/User.c++
@@ -244,7 +244,7 @@ HylaFAXServer::userName(u_int id)
@@ -260,7 +260,7 @@ HylaFAXServer::userName(u_int id)
if (id == uid) // user currently logged in
return (const char*) the_user;
if (id == FAXUID_ANON) // anonymous user
@@ -11,7 +11,7 @@ $NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $
if (idcache == NULL) // load cache from file
fillIDCache();
const fxStr* hit = idcache->find(id); // check cache
@@ -263,7 +263,7 @@ HylaFAXServer::userID(const char* name,
@@ -279,7 +279,7 @@ HylaFAXServer::userID(const char* name,
{
if (name == the_user)
id = uid;
@@ -20,12 +20,12 @@ $NetBSD: patch-ao,v 1.7 2005/01/27 16:22:37 adam Exp $
id = FAXUID_ANON;
else {
if (idcache == NULL)
@@ -350,7 +350,7 @@ HylaFAXServer::findUser(FILE* db, const
@@ -366,7 +366,7 @@ HylaFAXServer::findUser(FILE* db, const
if (faxuid < FAXUID_MAX)
SetBit(FAXUID_RESV); // reserved uid
SetBit(faxuid); // reserved uid
else
- logError("Internal error, \"fax\" UID (%u) too large.", faxuid);
+ logError("Internal error, \"" FAX_USER "\" UID (%u) too large.", faxuid);
SetBit(0); // 0 uid is reserved
SetBit(FAXUID_ANON); // anonymous uid is reserved
while (nextRecord(db, line, sizeof (line))) {
if (line[0] == '!')

12
comms/hylafax/patches/patch-ap
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
$NetBSD: patch-ap,v 1.9 2014/03/14 15:59:29 adam Exp $
--- util/Makefile.in.orig 2004-08-16 12:58:22.000000000 +0000
--- util/Makefile.in.orig 2012-06-06 00:58:38.000000000 +0000
+++ util/Makefile.in
@@ -156,7 +156,7 @@ checkat: checkat.o ${LIBS}
@@ -117,7 +117,7 @@ checkat: checkat.o ${LIBS}
PUTCLIENT = ${INSTALL} -idb ${PRODUCT}.sw.client
PUTSERVER = ${INSTALL} -idb ${PRODUCT}.sw.server
PUTSERV = ${PUTSERVER} -m 755
@@ -11,7 +11,7 @@ $NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
PUTSBIN = ${PUTSERVER} -F ${SBIN}
installClient: default
@@ -173,6 +173,7 @@ install: installClient
@@ -133,6 +133,7 @@ install: installClient
${PUTSBIN} -m 755 -src xferfaxstats.sh -O xferfaxstats
${PUTSBIN} -m 755 -src recvstats.sh -O recvstats
${PUTSBIN} -m 755 -idb "config(update)" -src faxcron.sh -O faxcron
@@ -19,7 +19,7 @@ $NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
${PUTSUPD} -m 755 -src ps2fax.gs.sh -O ps2fax.gs
${PUTSUPD} -m 755 -src ps2fax.dps.sh -O ps2fax.dps
${PUTSUPD} -m 755 -src ps2fax.imp.sh -O ps2fax.imp
@@ -187,9 +188,11 @@ install: installClient
@@ -153,9 +154,11 @@ install: installClient
${PUTSUPD} -m 755 -src pollrcvd.sh -O pollrcvd
${PUTSUPD} -m 755 -src mkcover.sh -O mkcover
${PUTSUPD} -m 755 -src wedged.sh -O wedged
@@ -32,4 +32,4 @@ $NetBSD: patch-ap,v 1.8 2005/01/27 16:22:37 adam Exp $
+ ${PUTSERVER} -F ${PREFIX}/share/hylafax/etc_template -idb "config(suggest)" \
-m 444 -src ${SRCDIR}/cover.templ -O cover.templ
@MAKEDSOINCLUDE@ @MAKELQUOTE@${SRCDIR}/Makefile.@DSO@dso@MAKERQUOTE@
#

33
comms/hylafax/patches/patch-hfaxd_FileSystem_c__
View File

@@ -1,33 +0,0 @@
$NetBSD: patch-hfaxd_FileSystem_c__,v 1.1 2012/04/08 03:25:03 dholland Exp $
Support libtiff 4.x.
--- hfaxd/FileSystem.c++~ 2003-02-08 22:49:52.000000000 +0000
+++ hfaxd/FileSystem.c++
@@ -728,7 +728,7 @@ HylaFAXServer::nlstUnixFile(FILE* fd, co
}
static bool
-isTIFF(const TIFFHeader& h)
+isTIFF(const TIFFHeaderClassic& h)
{
if (h.tiff_magic != TIFF_BIGENDIAN && h.tiff_magic != TIFF_LITTLEENDIAN)
return (false);
@@ -741,7 +741,7 @@ isTIFF(const TIFFHeader& h)
// byte swap version stamp if opposite byte order
if ((u.c[0] == 0) ^ (h.tiff_magic == TIFF_BIGENDIAN))
TIFFSwabShort(&version);
- return (version == TIFF_VERSION);
+ return (version == TIFF_VERSION_CLASSIC);
}
bool
@@ -754,7 +754,7 @@ HylaFAXServer::docType(const char* docna
if (FileCache::lookup(docname, sb) && S_ISREG(sb.st_mode)) {
union {
char buf[512];
- TIFFHeader h;
+ TIFFHeaderClassic h;
} b;
ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
if (cc > 2 && b.buf[0] == '%' && b.buf[1] == '!')

70
comms/hylafax/patches/patch-hfaxd_FileTransfer_c__
View File

@@ -1,70 +0,0 @@
$NetBSD: patch-hfaxd_FileTransfer_c__,v 1.1 2012/04/08 03:25:03 dholland Exp $
Support libtiff 4.x. Hopefully.
--- hfaxd/FileTransfer.c++.orig 2005-08-05 19:08:15.000000000 +0000
+++ hfaxd/FileTransfer.c++
@@ -50,6 +50,14 @@
#define HAVE_PSLEVEL2 false
#define HAVE_PCL5 false
+/* XXX */
+struct TIFFDirEntry {
+ uint16_t tdir_tag;
+ uint16_t tdir_type;
+ uint16_t tdir_count;
+ uint16_t tdir_offset;
+};
+
static struct {
const char* name; // protocol token name
bool supported; // true if format is supported
@@ -210,7 +218,7 @@ HylaFAXServer::retrievePageCmd(const cha
uint32* sb;
TIFFGetField(tif, TIFFTAG_STRIPBYTECOUNTS, &sb);
file_size = sizeof (DirTemplate) +
- sizeof (TIFFHeader) + sizeof (uint16);
+ sizeof (TIFFHeaderClassic) + sizeof (uint16);
for (tstrip_t s = 0, ns = TIFFNumberOfStrips(tif); s < ns; s++)
file_size += sb[s];
reply(code, "%s for %s (%lu bytes).",
@@ -242,10 +250,10 @@ HylaFAXServer::openTIFF(const char* name
if (fd >= 0) {
union {
char buf[512];
- TIFFHeader h;
+ TIFFHeaderClassic h;
} b;
ssize_t cc = Sys::read(fd, (char*) &b, sizeof (b));
- if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION &&
+ if (cc > (ssize_t)sizeof (b.h) && b.h.tiff_version == TIFF_VERSION_CLASSIC &&
(b.h.tiff_magic == TIFF_BIGENDIAN ||
b.h.tiff_magic == TIFF_LITTLEENDIAN)) {
(void) lseek(fd, 0L, SEEK_SET); // rewind
@@ -324,7 +332,7 @@ HylaFAXServer::sendTIFFHeader(TIFF* tif,
{
static DirTemplate templ = {
#define TIFFdiroff(v) \
- (uint32) (sizeof (TIFFHeader) + sizeof (uint16) + \
+ (uint32) (sizeof (TIFFHeaderClassic) + sizeof (uint16) + \
(intptr_t) &(((DirTemplate*) 0)->v))
{ TIFFTAG_SUBFILETYPE, TIFF_LONG, 1 },
{ TIFFTAG_IMAGEWIDTH, TIFF_LONG, 1 },
@@ -358,14 +366,14 @@ HylaFAXServer::sendTIFFHeader(TIFF* tif,
* of things about the contents of the TIFF file.
*/
struct {
- TIFFHeader h;
+ TIFFHeaderClassic h;
uint16 dircount;
u_char dirstuff[sizeof (templ)];
} buf;
union { int32 i; char c[4]; } u; u.i = 1;
buf.h.tiff_magic = (u.c[0] == 0 ? TIFF_BIGENDIAN : TIFF_LITTLEENDIAN);
- buf.h.tiff_version = TIFF_VERSION;
- buf.h.tiff_diroff = sizeof (TIFFHeader);
+ buf.h.tiff_version = TIFF_VERSION_CLASSIC;
+ buf.h.tiff_diroff = sizeof (TIFFHeaderClassic);
buf.dircount = (uint16) NTAGS;
getLong(tif, templ.SubFileType);
getLong(tif, templ.ImageWidth);

10
comms/hylafax/patches/patch-rules.in Normal file
View File

@@ -0,0 +1,10 @@
$NetBSD: patch-rules.in,v 1.2 2014/03/14 15:59:29 adam Exp $
--- rules.in.orig 2013-08-30 14:42:52.000000000 +0000
+++ rules.in
@@ -198,3 +198,5 @@ RAWDEPFILTER= sed -e 's:^:${VPATH}/:'
# Include the make dependency file if it exists.
#
@MAKEDEPINCLUDE@ @MAKELQUOTE@${MKDEPFILE}@MAKERQUOTE@
+
+-ljbig:

4
comms/jpilot-syncmal/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.60 2013/06/06 12:54:10 wiz Exp $
# $NetBSD: Makefile,v 1.62 2013/10/10 14:42:03 ryoon Exp $
DISTNAME= jpilot-syncmal-0.80
PKGREVISION= 18
PKGREVISION= 20
CATEGORIES= comms
MASTER_SITES= http://www.jlogday.com/code/syncmal/archive/

6
comms/jpilot/Makefile
View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.91 2013/06/06 12:53:53 wiz Exp $
# $NetBSD: Makefile,v 1.97 2014/02/12 23:17:38 tron Exp $
#
DISTNAME= jpilot-1.8.0
#KGREVISION= 19
DISTNAME= jpilot-1.8.1
PKGREVISION= 3
CATEGORIES= comms
MASTER_SITES= http://www.jpilot.org/
@@ -37,6 +36,7 @@ PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
post-extract:

3
comms/jpilot/PLIST
View File

@@ -1,6 +1,7 @@
@comment $NetBSD: PLIST,v 1.13 2013/05/25 16:28:05 shattered Exp $
@comment $NetBSD: PLIST,v 1.14 2013/10/10 10:58:38 bad Exp $
bin/jpilot
bin/jpilot-dump
bin/jpilot-merge
bin/jpilot-sync
include/jpilot/libplugin.h
include/jpilot/prefs.h

4
comms/jpilot/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.31 2013/06/06 12:53:53 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.33 2013/10/10 14:41:51 ryoon Exp $
BUILDLINK_TREE+= jpilot
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= jpilot
JPILOT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.jpilot+= jpilot>=1.6.0
BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.8.0nb3
BUILDLINK_ABI_DEPENDS.jpilot+= jpilot>=1.8.1nb1
BUILDLINK_PKGSRCDIR.jpilot?= ../../comms/jpilot
.include "../../comms/pilot-link-libs/buildlink3.mk"

10
comms/jpilot/distinfo
View File

@@ -1,5 +1,7 @@
$NetBSD: distinfo,v 1.22 2013/05/25 16:28:05 shattered Exp $
$NetBSD: distinfo,v 1.24 2013/10/14 14:33:31 joerg Exp $
SHA1 (jpilot-1.8.0.tar.gz) = abc6a82823533bfab8c50fce7fff20cfaa898193
RMD160 (jpilot-1.8.0.tar.gz) = 27a2430e7f60d8468c97fdc3589e7344681c2ecc
Size (jpilot-1.8.0.tar.gz) = 1604468 bytes
SHA1 (jpilot-1.8.1.tar.gz) = 98a70bbb30bcccb8ba74aecb6a41b819dc8a4a3b
RMD160 (jpilot-1.8.1.tar.gz) = 4b40d625d4582994eeb5acfa296ed0925a59b7bd
Size (jpilot-1.8.1.tar.gz) = 1582869 bytes
SHA1 (patch-utils.c) = 3e7551d0859820cc103a6c5cbfbac8d4ff21eee9
SHA1 (patch-utils.h) = 950d4de9824620847ca8b7f197d788c666a69d81

13
comms/jpilot/patches/patch-utils.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-utils.c,v 1.1 2013/10/14 14:33:31 joerg Exp $
--- utils.c.orig 2013-10-14 13:14:27.000000000 +0000
+++ utils.c
@@ -899,7 +899,7 @@ void clist_clear(GtkCList *clist)
/* Encapsulate GTK tooltip function which no longer supports disabling as
* of GTK 2.12 */
-inline void set_tooltip(int show_tooltip,
+void set_tooltip(int show_tooltip,
GtkTooltips *tooltips,
GtkWidget *widget,
const gchar *tip_text,

13
comms/jpilot/patches/patch-utils.h Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-utils.h,v 1.1 2013/10/14 14:33:31 joerg Exp $
--- utils.h.orig 2013-10-14 13:14:44.000000000 +0000
+++ utils.h
@@ -349,7 +349,7 @@ void entry_set_multiline_truncate(GtkEnt
void clist_clear(GtkCList *clist);
-inline void set_tooltip(int show_tooltip,
+void set_tooltip(int show_tooltip,
GtkTooltips *tooltips,
GtkWidget *widget,
const gchar *tip_text,

16
comms/kermit/Makefile
View File

@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.82 2013/02/06 23:21:51 jperkin Exp $
# $NetBSD: Makefile,v 1.84 2014/02/12 23:17:38 tron Exp $
DISTNAME= cku302
PKGNAME= kermit-9.0.302
PKGREVISION= 3
PKGREVISION= 5
CATEGORIES= comms
MASTER_SITES= ftp://kermit.columbia.edu/kermit/archives/
MASTER_SITES= ftp://ftp.kermitproject.org/kermit/archives/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.columbia.edu/kermit/
HOMEPAGE= http://www.kermitproject.org
COMMENT= Network and serial communication, file transfer, and scripting utility
LICENSE= kermit-license
@@ -19,6 +19,8 @@ BUILD_DEFS+= KFLAGS LIBS MANINSTALL
MAKE_ENV+= KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
MAKE_FILE= makefile
LIBS+= ${BUILDLINK_LDADD.termcap}
#KFLAGS+= -DNODEBUG -DNOOLDMODEMS
KFLAGS+= ${BUILDLINK_CPPFLAGS}
LIBS+= ${BUILDLINK_LDFLAGS}
@@ -33,13 +35,9 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/ckuker.nr \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/kermit.1; \
.for p in NetBSD-1.3*
. if ${MACHINE_PLATFORM:M${p}} != ""
LIBS+= -ltermcap
. endif
.endfor
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk"
.if ${OPSYS} == "Darwin"
. if !empty(OS_VERSION:M??.*)

5
comms/kyopon/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2013/04/06 03:45:07 rodent Exp $
# $NetBSD: Makefile,v 1.13 2013/09/10 14:14:02 joerg Exp $
DISTNAME= kyopon-0.5
CATEGORIES= comms
@@ -12,6 +12,9 @@ ONLY_FOR_PLATFORM= NetBSD-*-* DragonFly-*-*
USE_BSD_MAKEFILE= yes
CWARNFLAGS.clang= -Wno-error=pointer-sign
MAKE_ENV+= CWARNFLAGS.clang=${CWARNFLAGS.clang:Q}
INSTALLATION_DIRS= bin ${PKGMANDIR}/cat1 ${PKGMANDIR}/man1
.include "../../mk/bsd.pkg.mk"

4
comms/libopensync-plugin-evolution2/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.20 2013/05/24 18:23:35 wiz Exp $
# $NetBSD: Makefile,v 1.22 2014/01/01 11:52:11 wiz Exp $
#
DISTNAME= libopensync-plugin-evolution2-0.22
PKGREVISION= 15
PKGREVISION= 17
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2

4
comms/libopensync-plugin-file/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.13 2013/05/09 07:39:30 adam Exp $
# $NetBSD: Makefile,v 1.14 2013/10/19 09:07:01 adam Exp $
#
DISTNAME= libopensync-plugin-file-0.22
PKGREVISION= 9
PKGREVISION= 10
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2

4
comms/libopensync-plugin-kdepim/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.30 2013/06/06 12:54:10 wiz Exp $
# $NetBSD: Makefile,v 1.34 2014/02/12 23:17:38 tron Exp $
#
DISTNAME= libopensync-plugin-kdepim-0.22
PKGREVISION= 26
PKGREVISION= 30
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2

4
comms/libopensync-plugin-syncml/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.14 2013/05/09 07:39:30 adam Exp $
# $NetBSD: Makefile,v 1.15 2013/10/19 09:07:01 adam Exp $
#
DISTNAME= libopensync-plugin-syncml-0.22
PKGREVISION= 10
PKGREVISION= 11
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2

4
comms/libopensync/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.17 2013/05/09 07:39:05 adam Exp $
# $NetBSD: Makefile,v 1.18 2013/10/19 09:06:56 adam Exp $
#
DISTNAME= libopensync-0.22
PKGREVISION= 10
PKGREVISION= 11
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2

4
comms/libopensync/buildlink3.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.13 2013/05/09 07:39:05 adam Exp $
# $NetBSD: buildlink3.mk,v 1.14 2013/10/19 09:06:56 adam Exp $
BUILDLINK_TREE+= libopensync
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= libopensync
LIBOPENSYNC_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.libopensync+= libopensync>=0.22
BUILDLINK_ABI_DEPENDS.libopensync+= libopensync>=0.22nb10
BUILDLINK_ABI_DEPENDS.libopensync+= libopensync>=0.22nb11
BUILDLINK_PKGSRCDIR.libopensync?= ../../comms/libopensync
.include "../../databases/sqlite3/buildlink3.mk"

4
comms/libticables2/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/05/26 22:57:53 rodent Exp $
# $NetBSD: Makefile,v 1.2 2013/12/31 15:41:17 rodent Exp $
#
DISTNAME= libticables2-1.3.3
@@ -20,6 +20,8 @@ PKGCONFIG_OVERRIDE+= ticables2.pc.in
.include "options.mk"
LDFLAGS.SunOS+= -lsocket -lnsl
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"

3
comms/lirc/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2012/12/02 01:21:50 cheusov Exp $
@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:00 jperkin Exp $
bin/ircat
bin/irexec
bin/irpty
@@ -29,4 +29,3 @@ sbin/lircd
sbin/lircmd
share/examples/lirc/lircd.conf
share/examples/lirc/lircmd.conf
share/examples/rc.d/lircd

3
comms/lrzsz/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.4 2009/08/29 11:33:14 wiz Exp $
$NetBSD: distinfo,v 1.5 2014/03/02 13:48:03 apb Exp $
SHA1 (lrzsz-0.12.20.tar.gz) = 451e6a1813dfb71a412c973acd1b88b9ee3f28c4
RMD160 (lrzsz-0.12.20.tar.gz) = 1b1776143afaff8bc7447ce998f9d3a958d51f25
@@ -6,3 +6,4 @@ Size (lrzsz-0.12.20.tar.gz) = 280938 bytes
SHA1 (patch-aa) = aaf33281da19658906eee6a922397968a200f186
SHA1 (patch-ab) = 273f343a3e4ca8190ae4ab52483600f7bcf8e404
SHA1 (patch-ac) = a224a77a6d9581c601a50ebe9153e6ad25c8601b
SHA1 (patch-src_Makefile.in) = 8f95cfdf1525f27b1e860f2691559277dce62b32

21
comms/lrzsz/patches/patch-src_Makefile.in Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: patch-src_Makefile.in,v 1.1 2014/03/02 13:48:03 apb Exp $
--- src/Makefile.in.orig 1998-12-30 16:31:46.000000000 +0000
+++ src/Makefile.in
@@ -372,13 +372,13 @@ install-exec-local:
rm -f $(DESTDIR)/$(bindir)/`echo lsb | sed -e '$(transform)'`
ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
$(DESTDIR)/$(bindir)/`echo lsb |sed -e '$(transform)'`
- rm -f $(bindir)/`echo lsx | sed -e '$(transform)'`
+ rm -f $(DESTDIR)$(bindir)/`echo lsx | sed -e '$(transform)'`
ln $(DESTDIR)/$(bindir)/`echo lsz |sed -e '$(transform)'` \
$(DESTDIR)/$(bindir)/`echo lsx |sed -e '$(transform)'`
- rm -f $(bindir)/`echo lrb | sed -e '$(transform)'`
+ rm -f $(DESTDIR)$(bindir)/`echo lrb | sed -e '$(transform)'`
ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
$(DESTDIR)/$(bindir)/`echo lrb |sed -e '$(transform)'`
- rm -f $(bindir)/`echo lrx | sed -e '$(transform)'`
+ rm -f $(DESTDIR)$(bindir)/`echo lrx | sed -e '$(transform)'`
ln $(DESTDIR)/$(bindir)/`echo lrz |sed -e '$(transform)'` \
$(DESTDIR)/$(bindir)/`echo lrx |sed -e '$(transform)'`
# rm -f $(bindir)/`echo lrzszbug | sed -e '$(transform)'`

5
comms/malsync/Makefile
View File

@@ -1,5 +1,4 @@
# $NetBSD: Makefile,v 1.24 2012/10/03 11:24:41 asau Exp $
#
# $NetBSD: Makefile,v 1.25 2013/12/23 11:57:02 wiz Exp $
DISTNAME= ${PKGNAME_NOREV:S/-/_/}.src
PKGNAME= malsync-2.2.0
@@ -7,7 +6,7 @@ PKGREVISION= 1
CATEGORIES= comms
MASTER_SITES= http://www.tomw.org/malsync/
MAINTAINER= rh@NetBSD.org
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.tomw.org/malsync/
COMMENT= Utility to synchronize Palm Pilots to the AvantGo.com service

4
comms/mgetty+sendfax/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.87 2013/05/31 12:39:42 wiz Exp $
# $NetBSD: Makefile,v 1.88 2013/07/12 10:44:53 jperkin Exp $
DISTNAME= mgetty1.1.37-Jun05
PKGNAME= mgetty-1.1.37
PKGREVISION= 8
PKGREVISION= 9
CATEGORIES= comms
MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/

6
comms/minicom/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.62 2012/12/12 12:35:21 wiz Exp $
# $NetBSD: Makefile,v 1.64 2013/10/09 10:53:24 adam Exp $
DISTNAME= minicom-2.6.1
DISTNAME= minicom-2.6.2
CATEGORIES= comms
MASTER_SITES= http://alioth.debian.org/frs/download.php/3700/
MASTER_SITES= http://alioth.debian.org/frs/download.php/3869/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://alioth.debian.org/projects/minicom/

8
comms/minicom/distinfo
View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.13 2012/12/12 12:35:21 wiz Exp $
$NetBSD: distinfo,v 1.14 2013/10/09 10:53:24 adam Exp $
SHA1 (minicom-2.6.1.tar.gz) = ce6b5f3dab6b4179736152e38a806029f8ad222a
RMD160 (minicom-2.6.1.tar.gz) = d9c7bf6d661427ff1a4007a917574e4ecd872c50
Size (minicom-2.6.1.tar.gz) = 830485 bytes
SHA1 (minicom-2.6.2.tar.gz) = e4267f89e4046c4e3d28cad5aa643edb1de4169a
RMD160 (minicom-2.6.2.tar.gz) = c6c2936bc0e4ae662bdf09ead6e76b68d7278e56
Size (minicom-2.6.2.tar.gz) = 855340 bytes
SHA1 (patch-ab) = e87dbe616958b2b1a01a9a7dfa8cb8f8c1a6978f
SHA1 (patch-ac) = b2ffa106989ea562b8ea85bfd15e516713a37f3f
SHA1 (patch-ad) = a3e50ae6dcacb6ae6a177e5b6e4d3d959d960eca

6
comms/modemd/Makefile
View File

@@ -1,15 +1,15 @@
# $NetBSD: Makefile,v 1.22 2012/10/03 11:24:42 asau Exp $
# $NetBSD: Makefile,v 1.24 2014/02/24 12:44:23 wiedi Exp $
DISTNAME= modemd-970221
PKGNAME= modemd-19970221
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= comms
MASTER_SITES= ftp://ftp.vix.com/pub/modemd/
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Replacement getty for dialup ttys and a modem server
USE_TOOLS+= nroff
USE_TOOLS+= nroff groff
MAKE_JOBS_SAFE= no

15
comms/modemd/distinfo
View File

@@ -1,10 +1,10 @@
$NetBSD: distinfo,v 1.12 2012/02/16 17:32:45 hans Exp $
$NetBSD: distinfo,v 1.13 2013/09/10 14:15:11 joerg Exp $
SHA1 (modemd-970221.tar.gz) = 104f8e596f711e349203b2da8c4f2ecf40d490c3
RMD160 (modemd-970221.tar.gz) = ade5d735e5fd07b91006cf1334a41a43dca7e3d9
Size (modemd-970221.tar.gz) = 56093 bytes
SHA1 (patch-aa) = 093d70c98c5fa21f3c5fff8dc5092ca0afa365ef
SHA1 (patch-ab) = 711b600d5dfa11e859f6af1124aaa18224b37ad3
SHA1 (patch-ab) = 9e797451de1de1e3515562281d9ae8e16f2c0de6
SHA1 (patch-ac) = fe3898ea85204631e31c49a8872855c0e7c09e9d
SHA1 (patch-ad) = f18d3ffe0658ef2709eb28d342b31361b86b1b0b
SHA1 (patch-ae) = 44e38979c686f66a22e3fd3b027cb9129b6266ba
@@ -14,16 +14,17 @@ SHA1 (patch-ah) = 9294419cd64c3b5cc9ebadc3a4c135a0a969262d
SHA1 (patch-ai) = 8e81c1e522979f616f2f4aafd5dd65400a6330fa
SHA1 (patch-aj) = 2837ce9ac377aa6b4f7a8c96f63ff80fcdee9b17
SHA1 (patch-ak) = 0d60a615020abad77dae56d783667e49112593e5
SHA1 (patch-al) = 0c24d9ea8ef1d5bc0dc56de7f2d07a7e39062693
SHA1 (patch-al) = 13259e7c330aecd800cf108eec292d23c6d369b7
SHA1 (patch-am) = d740f41abf89f760431f32ca7ffa25bf1b3bd4e1
SHA1 (patch-an) = 3369e7dc8db3f837bc4f71ec72e6f7882462c2a7
SHA1 (patch-ao) = 64271c0955600d1ad9bc7f4c74273a537d33f71c
SHA1 (patch-ap) = ed747dc8ef3419bc4431d934aaf4692cadd0ade4
SHA1 (patch-aq) = f77b4b16b12ca74e897372f328e850a3d9b52229
SHA1 (patch-ar) = 0fc63025d29a0bd626ec8a51f8c6a461bdbb84a4
SHA1 (patch-ap) = d5a8dfe6fe162879a1a3185aaa55596df579c47f
SHA1 (patch-aq) = 5653ce5b0251b6d3fb35972869c8fb6eabae77cb
SHA1 (patch-ar) = ae25a728c094f94a992b625fd405daedd096c5fd
SHA1 (patch-as) = 5ac081a2200b72321973004803d15dd3b9d387b3
SHA1 (patch-cf_sunos4.h) = efe0b9c58ad20247cbc313c1569f9d0be8901d14
SHA1 (patch-common_dialog.c) = 2dd6fadd2a83eede976d63e15364650955cf9cca
SHA1 (patch-incoming_login.c) = 62784076e0ac1e23e2e7a6f8c248f3e1fa6b6293
SHA1 (patch-outgoing_tn.c) = 133c714eb6d33912f6edfcd12034b3155707d701
SHA1 (patch-outgoing_tnstate.c) = da65871a0397c13e1cd345c1832e3cfbe188f629
SHA1 (patch-outgoing_tnstate.c) = 7ecc5645e2b4d854a784a7a52487fbef024fa51a
SHA1 (patch-outgoing_tnutil.c) = ef8b3f32a6e491d6fa56ba3a8f8c4ee64a368cc9

22
comms/modemd/patches/patch-ab
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
$NetBSD: patch-ab,v 1.6 2013/09/10 14:15:11 joerg Exp $
--- common/ttio.c.orig 1997-02-21 23:06:09.000000000 +0000
+++ common/ttio.c
@@ -45,12 +45,19 @@ static char copyright[] =
@@ -45,12 +45,20 @@ static char copyright[] =
#include "osdep.h"
#include "cdefs.h"
#include "global.h"
@@ -14,6 +14,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
#include "ttio.h"
#include <pwd.h>
+#include <stdlib.h>
+#include <sys/ioctl.h>
+#ifndef __sun
+#include <util.h>
+#else
@@ -22,7 +23,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
static void dectl PROTO ((char *, int, char *, int, char *));
@@ -73,6 +76,16 @@ int ttsetup (name)
@@ -73,6 +81,16 @@ int ttsetup (name)
{
if (chown (nbuf, pw -> pw_uid, pw -> pw_gid) < 0)
warn ("Can't set owner on %s: %m", nbuf);
@@ -39,7 +40,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
}
/* Open the terminal device. */
@@ -131,20 +144,19 @@ int ttsetup (name)
@@ -131,20 +149,19 @@ int ttsetup (name)
return fd;
}
@@ -63,7 +64,7 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
{
int i;
@@ -203,10 +215,8 @@ static int tteof = 0;
@@ -203,10 +220,8 @@ static int tteof = 0;
/* Match the specified string with input from the specified tty.
Return nonzero if input matches, zero if not. */
@@ -76,7 +77,16 @@ $NetBSD: patch-ab,v 1.5 2012/02/16 17:32:45 hans Exp $
{
TIME entry, now, to;
int cur, curmatch, next;
@@ -316,9 +326,7 @@ ttmatch (ANSI_DECL (int) tty, ANSI_DECL
@@ -230,7 +245,7 @@ ttmatch (ANSI_DECL (int) tty, ANSI_DECL
match, try reading some more data from the tty... */
matchID = 1;
VA_start (list, timeout);
- while (string = va_arg (list, char *))
+ while ((string = va_arg (list, char *)))
{
syslog (LOG_DEBUG, "Matching against %s", string);
for (cur = ttstart; cur != ttend; cur = NEXT (cur))
@@ -316,9 +331,7 @@ ttmatch (ANSI_DECL (int) tty, ANSI_DECL
}
/* Read a connect speed from standard in... */

11
comms/modemd/patches/patch-al
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-al,v 1.5 2010/12/30 09:02:52 obache Exp $
$NetBSD: patch-al,v 1.6 2013/09/10 14:15:11 joerg Exp $
--- incoming/modemd.c.orig 1996-09-10 00:34:58.000000000 +0000
+++ incoming/modemd.c
@@ -10,3 +10,12 @@ $NetBSD: patch-al,v 1.5 2010/12/30 09:02:52 obache Exp $
static char *ttyName;
static char progName [1024];
@@ -86,7 +87,7 @@ int main (argc, argv, envp)
}
sprintf (progName, "modemd %s", ttyNameP);
openlog (progName, LOG_NDELAY, LOG_LOCAL3);
- /* setlogmask(LOG_UPTO (LOG_INFO)); /* */
+ /* setlogmask(LOG_UPTO (LOG_INFO)); */
syslog (LOG_DEBUG, "Log Mask is %x", LOG_UPTO (LOG_INFO));
/* If the arguments were bogus... */

11
comms/modemd/patches/patch-ap
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-ap,v 1.3 2011/11/25 21:34:34 joerg Exp $
$NetBSD: patch-ap,v 1.4 2013/09/10 14:15:11 joerg Exp $
--- outgoing/listen.c.orig 1996-04-30 07:02:48.000000000 +0000
+++ outgoing/listen.c
@@ -21,3 +21,12 @@ $NetBSD: patch-ap,v 1.3 2011/11/25 21:34:34 joerg Exp $
void listener (port, addr, forkp)
int port;
@@ -116,7 +119,7 @@ void listener (port, addr, forkp)
do {
int pid;
struct sockaddr_in name;
- int namelen = sizeof name;
+ socklen_t namelen = sizeof name;
if ((clientSock =
accept (mpoolSock, (struct sockaddr *)&name, &namelen)) < 0)
{

11
comms/modemd/patches/patch-aq
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-aq,v 1.3 2011/11/25 21:34:34 joerg Exp $
$NetBSD: patch-aq,v 1.4 2013/09/10 14:15:11 joerg Exp $
--- incoming/connect.c.orig 1996-04-30 07:02:43.000000000 +0000
+++ incoming/connect.c
@@ -20,3 +20,12 @@ $NetBSD: patch-aq,v 1.3 2011/11/25 21:34:34 joerg Exp $
static void pump PROTO ((int, int));
@@ -85,7 +87,7 @@ int tcp_connect (tty)
name.sin_family = AF_INET;
/* Allow numeric or symbolic port names... */
- if (se = getservbyname (modemcap.connect_port, "tcp"))
+ if ((se = getservbyname (modemcap.connect_port, "tcp")))
name.sin_port = se -> s_port;
else
name.sin_port = htons (atoi (modemcap.connect_port));

40
comms/modemd/patches/patch-ar
View File

@@ -1,7 +1,7 @@
$NetBSD: patch-ar,v 1.2 2011/09/25 19:41:11 joerg Exp $
$NetBSD: patch-ar,v 1.3 2013/09/10 14:15:11 joerg Exp $
--- common/errwarn.c.orig 1996-09-10 00:12:34.000000000 +0000
+++ common/errwarn.c 2007-10-10 16:48:18.000000000 +0000
+++ common/errwarn.c
@@ -46,6 +46,8 @@ static char copyright[] =
#include "global.h"
#include <syslog.h>
@@ -11,3 +11,39 @@ $NetBSD: patch-ar,v 1.2 2011/09/25 19:41:11 joerg Exp $
static void do_percentm PROTO ((char *obuf, char *ibuf));
@@ -65,7 +67,7 @@ int error (ANSI_DECL(char *) fmt, VA_DOT
VA_start (list, fmt);
vsnprintf (mbuf, sizeof mbuf, fbuf, list);
va_end (list);
- syslog (LOG_ERR, mbuf);
+ syslog (LOG_ERR, "%s", mbuf);
cleanup ();
exit (1);
@@ -86,7 +88,7 @@ int warn (ANSI_DECL (char *) fmt, VA_DOT
VA_start (list, fmt);
vsnprintf (mbuf, sizeof mbuf, fbuf, list);
va_end (list);
- syslog (LOG_ERR, mbuf);
+ syslog (LOG_ERR, "%s", mbuf);
return 0;
}
@@ -105,7 +107,7 @@ int info (ANSI_DECL (char *) fmt, VA_DOT
VA_start (list, fmt);
vsnprintf (mbuf, sizeof mbuf, fbuf, list);
va_end (list);
- syslog (LOG_INFO, mbuf);
+ syslog (LOG_INFO, "%s", mbuf);
return 0;
}
@@ -124,7 +126,7 @@ int debug (ANSI_DECL (char *) fmt, VA_DO
VA_start (list, fmt);
vsnprintf (mbuf, sizeof mbuf, fbuf, list);
va_end (list);
- syslog (LOG_DEBUG, mbuf);
+ syslog (LOG_DEBUG, "%s", mbuf);
return 0;
}

12
comms/modemd/patches/patch-common_dialog.c Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-common_dialog.c,v 1.1 2013/09/10 18:24:10 joerg Exp $
--- common/dialog.c.orig 2013-09-10 11:53:40.000000000 +0000
+++ common/dialog.c
@@ -47,6 +47,7 @@ static char copyright[] =
#include <stdio.h>
#include <fcntl.h>
#include <syslog.h>
+#include <sys/ioctl.h>
#include "mcap.h"
#include "ttio.h"

11
comms/modemd/patches/patch-outgoing_tnstate.c
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-outgoing_tnstate.c,v 1.1 2011/12/19 13:25:22 wiz Exp $
$NetBSD: patch-outgoing_tnstate.c,v 1.2 2013/09/10 14:15:11 joerg Exp $
Add missing header files (for cleanup()).
@@ -13,3 +13,12 @@ Add missing header files (for cleanup()).
unsigned char doopt[] = { IAC, DO, '%', 'c', 0 };
unsigned char dont[] = { IAC, DONT, '%', 'c', 0 };
@@ -105,7 +107,7 @@ telrcv()
state = TS_DATA;
/* Strip off \n or \0 after a \r */
if (his_state_is_wont(TELOPT_BINARY)
- && (c == 0) || (c == '\n')) {
+ && ((c == 0) || (c == '\n'))) {
break;
}
/* FALL THROUGH */

4
comms/msynctool/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.13 2013/05/09 07:39:30 adam Exp $
# $NetBSD: Makefile,v 1.14 2013/10/19 09:07:01 adam Exp $
#
DISTNAME= msynctool-0.22
PKGREVISION= 9
PKGREVISION= 10
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/download/releases/0.22/
EXTRACT_SUFX= .tar.bz2

6
comms/multisync-gui/Makefile
View File

@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.30 2013/06/06 12:54:10 wiz Exp $
#
# $NetBSD: Makefile,v 1.34 2014/01/25 10:29:58 wiz Exp $
DISTNAME= multisync-gui-0.91.0
PKGREVISION= 24
PKGREVISION= 27
CATEGORIES= comms
MASTER_SITES= http://www.opensync.org/raw-attachment/wiki/releases/0.2x/download/
@@ -14,6 +13,7 @@ USE_TOOLS+= pkg-config
HAS_CONFIGURE= yes
REPLACE_PYTHON= waf
PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 0.91.0
LDFLAGS.DragonFly= -lgthread-2.0

4
comms/obexapp/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.31 2013/03/15 08:23:05 plunky Exp $
# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:18 ryoon Exp $
#
DISTNAME= obexapp-1.4.15
@@ -48,6 +48,6 @@ post-extract:
.include "../../comms/openobex/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

Some files were not shown because too many files have changed in this diff Show More