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

Import of pkgsrc-2015Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2015-10-03 03:37:01 -07:00
committed by Lionel Sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228314 additions and 80018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
comms/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.98 2015/04/03 22:31:32 rodent Exp $
# $NetBSD: Makefile,v 1.101 2015/09/14 09:06:39 jnemeth Exp $
#
COMMENT= Communication utilities
@@ -6,7 +6,6 @@ COMMENT= Communication utilities
SUBDIR+= asterisk
SUBDIR+= asterisk-sounds-de-x9media
SUBDIR+= asterisk-sounds-native
SUBDIR+= asterisk10
SUBDIR+= asterisk18
SUBDIR+= binkd
SUBDIR+= birda
@@ -74,6 +73,7 @@ SUBDIR+= ruby-termios
SUBDIR+= scmxx
SUBDIR+= snooper
SUBDIR+= spandsp
SUBDIR+= srtp
SUBDIR+= synce-librapi2
SUBDIR+= synce-libsynce
SUBDIR+= synce-rra
@@ -81,6 +81,7 @@ SUBDIR+= synce-serial
SUBDIR+= tilp2
SUBDIR+= tkhylafax
SUBDIR+= tn3270
SUBDIR+= xfce4-modemlights-plugin
SUBDIR+= xisp
SUBDIR+= xtel

6
comms/asterisk/Makefile
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.124 2015/06/12 10:48:29 wiz Exp $
# $NetBSD: Makefile,v 1.127 2015/08/18 07:31:03 wiz Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
DISTNAME= asterisk-11.17.1
DISTNAME= asterisk-11.19.0
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
@@ -215,7 +215,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.26.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.27.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.15.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}

16
comms/asterisk/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.9 2014/10/14 03:36:40 jnemeth Exp $
@comment $NetBSD: PLIST,v 1.10 2015/08/09 04:07:13 jnemeth Exp $
include/asterisk.h
include/asterisk/_private.h
include/asterisk/abstract_jb.h
@@ -145,6 +145,7 @@ include/asterisk/udptl.h
include/asterisk/ulaw.h
include/asterisk/unaligned.h
include/asterisk/utils.h
include/asterisk/vector.h
include/asterisk/version.h
include/asterisk/xml.h
include/asterisk/xmldoc.h
@@ -222,11 +223,13 @@ lib/asterisk/modules/cdr_csv.so
lib/asterisk/modules/cdr_custom.so
lib/asterisk/modules/cdr_manager.so
${PLIST.unixodbc}lib/asterisk/modules/cdr_odbc.so
${PLIST.pgsql}lib/asterisk/modules/cdr_pgsql.so
lib/asterisk/modules/cdr_sqlite3_custom.so
lib/asterisk/modules/cdr_syslog.so
lib/asterisk/modules/cel_custom.so
lib/asterisk/modules/cel_manager.so
${PLIST.unixodbc}lib/asterisk/modules/cel_odbc.so
${PLIST.pgsql}lib/asterisk/modules/cel_pgsql.so
lib/asterisk/modules/cel_sqlite3_custom.so
lib/asterisk/modules/chan_agent.so
lib/asterisk/modules/chan_bridge.so
@@ -327,6 +330,7 @@ lib/asterisk/modules/res_clioriginate.so
lib/asterisk/modules/res_config_curl.so
${PLIST.ldap}lib/asterisk/modules/res_config_ldap.so
${PLIST.unixodbc}lib/asterisk/modules/res_config_odbc.so
${PLIST.pgsql}lib/asterisk/modules/res_config_pgsql.so
lib/asterisk/modules/res_config_sqlite3.so
lib/asterisk/modules/res_convert.so
lib/asterisk/modules/res_crypto.so
@@ -350,6 +354,7 @@ lib/asterisk/modules/res_rtp_asterisk.so
lib/asterisk/modules/res_rtp_multicast.so
lib/asterisk/modules/res_security_log.so
lib/asterisk/modules/res_smdi.so
${PLIST.snmp}lib/asterisk/modules/res_snmp.so
lib/asterisk/modules/res_speech.so
lib/asterisk/modules/res_stun_monitor.so
${PLIST.kqueue}lib/asterisk/modules/res_timing_kqueue.so
@@ -377,14 +382,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.26
libdata/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.27
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.26
libdata/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.27
libdata/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
libdata/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.27
libdata/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
libdata/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.27
libdata/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
libdata/asterisk/sounds/en/OfficeSpace.gsm
libdata/asterisk/sounds/en/Randulo-allison.gsm
@@ -497,6 +502,7 @@ libdata/asterisk/sounds/en/bar.gsm
libdata/asterisk/sounds/en/barn.gsm
libdata/asterisk/sounds/en/barns.gsm
libdata/asterisk/sounds/en/barometric.gsm
libdata/asterisk/sounds/en/basic-pbx-ivr-main.gsm
libdata/asterisk/sounds/en/bearing.gsm
libdata/asterisk/sounds/en/beaufort.gsm
libdata/asterisk/sounds/en/because-paranoid.gsm

21
comms/asterisk/distinfo
View File

@@ -1,12 +1,12 @@
$NetBSD: distinfo,v 1.73 2015/05/19 07:52:14 jnemeth Exp $
$NetBSD: distinfo,v 1.74 2015/08/09 04:07:13 jnemeth Exp $
SHA1 (asterisk-11.17.1/asterisk-11.17.1.tar.gz) = 90a83350623cd0d3638e526504107aafe6df4cc5
RMD160 (asterisk-11.17.1/asterisk-11.17.1.tar.gz) = 1aefeecafb9efb98b9aa259827bf6b72f99a6c5b
Size (asterisk-11.17.1/asterisk-11.17.1.tar.gz) = 35002041 bytes
SHA1 (asterisk-11.17.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
RMD160 (asterisk-11.17.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
Size (asterisk-11.17.1/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
SHA1 (patch-Makefile) = ed581d46026e8e89ed8be374c7085efca19911d2
SHA1 (asterisk-11.19.0/asterisk-11.19.0.tar.gz) = e35b9d910cb549b0bea20dbad60760f230bd3881
RMD160 (asterisk-11.19.0/asterisk-11.19.0.tar.gz) = 1dca1ddf50233b57f8f1edcaace76ccd56ca2e7e
Size (asterisk-11.19.0/asterisk-11.19.0.tar.gz) = 34852510 bytes
SHA1 (asterisk-11.19.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
RMD160 (asterisk-11.19.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
Size (asterisk-11.19.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
SHA1 (patch-Makefile) = 5fd774779d3c8d85936beca8a3407dd3011af2dc
SHA1 (patch-addons_chan__ooh323.c) = 57f61a2edf0f9f022e03837230ee572ec9cf47b4
SHA1 (patch-apps_app__confbridge.c) = c815905994355a19c32e8e3e2eb5dc9f1679eb29
SHA1 (patch-apps_app__dial.c) = 0f78d2571af88384a2d472ece08bf4b06f9ad211
@@ -33,7 +33,7 @@ SHA1 (patch-include_asterisk_autoconfig.h.in) = 09a8f8d5398612fdadba25f221b16c19
SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
SHA1 (patch-include_asterisk_lock.h) = cb1404e56de4708836091c224df439158119764c
SHA1 (patch-include_asterisk_strings.h) = fc5987a98429ca470f7e9bdcf170d49b0c1f3407
SHA1 (patch-include_asterisk_utils.h) = ea06ed86369b1eaedf5d7d245190f54f1eb1edd0
SHA1 (patch-include_asterisk_utils.h) = 07e70fe0adf39cd9a7f94c735b9a3fa72ae3df89
SHA1 (patch-main_Makefile) = 5f9238a528d2b96777e17a4ac6d3e7876dfffb98
SHA1 (patch-main_acl.c) = 1eac532a15127c25981d2db9462a8ccce2c58620
SHA1 (patch-main_asterisk.c) = bfdbd5299b7279ef080a015a9a10627aa929dd49
@@ -55,6 +55,7 @@ SHA1 (patch-main_test.c) = 3f239ed7611facbd937057f056ebc7495403dbaf
SHA1 (patch-main_udptl.c) = 260586e4203b4bf51737ba171cbfe57621de8728
SHA1 (patch-main_utils.c) = df8bfd592f82b9b5c2c95a6860d2dca7003f66ca
SHA1 (patch-pbx_pbx__dundi.c) = 4dbcbbae3cbace91c8ed87e3e10cad0a1eb45e75
SHA1 (patch-res_Makefile) = 2b3fa69b155a88e9026005fa6d89f651541bde8a
SHA1 (patch-res_pjproject_aconfigure) = 0095894c5daac2dec6a9ec745c0ecb8d46c0b73a
SHA1 (patch-res_pjproject_aconfigure.ac) = cbabe4a5f1888e180c93404324ddb96728dc20b9
SHA1 (patch-res_pjproject_build.symbian_makedef.sh) = 37781fe307564ad827e9be67f507f84230ebf299
@@ -62,7 +63,7 @@ SHA1 (patch-res_res__calendar.c) = a4c491d8c77f88d0834d0eb52622f7c6e4f3428b
SHA1 (patch-res_res__calendar__caldav.c) = 673e8a256fc748338f35c7deddbf283809d19904
SHA1 (patch-res_res__calendar__icalendar.c) = 3258522abbdc5c0cfe76868f73f16931118983e5
SHA1 (patch-res_res__config__pgsql.c) = 719fa8939ca0e6cae256dd1b19a11405f475a620
SHA1 (patch-res_res__xmpp.c) = 5296a4f7454e432592a058939c7b0f2e328d53e2
SHA1 (patch-res_res__xmpp.c) = 25ce66a0536a290598b4c11f14c7ab94f6577af5
SHA1 (patch-sounds_Makefile) = 792c2e25e1c8334fe8c9038b8b630376a5894c31
SHA1 (patch-tests_test__abstract__jb.c) = 42cfa303fc2e399aa9fe3bebf51464d0776e171c
SHA1 (patch-tests_test__config.c) = fa049dc1fedb8a0c898afa6848406d191acb54d3

22
comms/asterisk/options.mk
View File

@@ -1,15 +1,15 @@
# $NetBSD: options.mk,v 1.6 2015/01/29 21:54:33 jnemeth Exp $
# $NetBSD: options.mk,v 1.7 2015/08/09 04:07:13 jnemeth Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp
PKG_SUPPORTED_OPTIONS+= jabber speex
PKG_SUPPORTED_OPTIONS+= jabber speex snmp pgsql
PKG_OPTIONS_LEGACY_OPTS+= gtk:x11
PKG_SUGGESTED_OPTIONS= ldap jabber speex
.include "../../mk/bsd.options.mk"
PLIST_VARS+= zaptel x11 unixodbc webvmail ldap spandsp jabber
PLIST_VARS+= speex
PLIST_VARS+= speex snmp pgsql
# Asterisk now uses DAHDI, not zaptel; not implemented yet...
#.if !empty(PKG_OPTIONS:Mzaptel)
@@ -105,3 +105,19 @@ PLIST.speex= yes
CONFIGURE_ARGS+= --without-speex
CONFIGURE_ARGS+= --without-speexdsp
.endif
.if !empty(PKG_OPTIONS:Msnmp)
.include "../../net/net-snmp/buildlink3.mk"
CONFIGURE_ARGS+= --with-netsnmp
PLIST.snmp= yes
.else
CONFIGURE_ARGS+= --without-netsnmp
.endif
.if !empty(PKG_OPTIONS:Mpgsql)
.include "../../mk/pgsql.buildlink3.mk"
CONFIGURE_ARGS+= --with-postgres
PLIST.pgsql= yes
.else
CONFIGURE_ARGS+= --without-postgres
.endif

43
comms/asterisk/patches/patch-Makefile
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
$NetBSD: patch-Makefile,v 1.3 2015/08/09 04:07:13 jnemeth Exp $
--- Makefile.orig 2013-02-04 19:50:52.000000000 +0000
--- Makefile.orig 2015-06-04 00:44:42.000000000 +0000
+++ Makefile
@@ -130,7 +130,7 @@ DEBUG=-g3
@@ -11,7 +11,17 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
AGI_DIR=$(ASTDATADIR)/agi-bin
# If you use Apache, you may determine by a grep 'DocumentRoot' of your httpd.conf file
@@ -197,10 +197,6 @@ ifeq ($(AST_DEVMODE),yes)
@@ -164,6 +164,9 @@ LINKER_SYMBOL_PREFIX=
# supported run:
# menuselect/menuselect --help
+GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
+USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
+
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
@@ -203,10 +206,6 @@ ifeq ($(AST_DEVMODE),yes)
ADDL_TARGETS+=validate-docs
endif
@@ -22,7 +32,20 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
@@ -427,7 +423,6 @@ dist-clean: distclean
@@ -340,10 +339,10 @@ makeopts: configure
@echo "****"
@exit 1
-menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps
+menuselect.makeopts: menuselect/menuselect menuselect-tree makeopts build_tools/menuselect-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
ifeq ($(filter %menuselect,$(MAKECMDGOALS)),)
menuselect/menuselect --check-deps $@
- menuselect/menuselect --check-deps $@
+ menuselect/menuselect --check-deps $@ $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS)
endif
$(MOD_SUBDIRS_EMBED_LDSCRIPT):
@@ -439,7 +438,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
@@ -30,7 +53,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status config.cache
@@ -525,7 +520,7 @@ update:
@@ -538,7 +536,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
@@ -39,7 +62,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
"$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
@@ -636,21 +631,21 @@ upgrade: bininstall
@@ -650,21 +648,21 @@ upgrade: bininstall
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
@@ -65,7 +88,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s "$${dst}" "$$x" ; then \
@@ -679,9 +674,9 @@ samples: adsi
@@ -693,9 +691,9 @@ samples: adsi
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
@@ -78,7 +101,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
fi ; \
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
@@ -707,7 +702,7 @@ samples: adsi
@@ -721,7 +719,7 @@ samples: adsi
webvmail:
@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
@@ -87,7 +110,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
@@ -863,7 +858,7 @@ uninstall-all: _uninstall
@@ -899,7 +897,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -96,7 +119,7 @@ $NetBSD: patch-Makefile,v 1.2 2013/05/18 03:40:17 jnemeth Exp $
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
@@ -934,6 +929,7 @@ menuselect-tree: $(foreach dir,$(filter-
@@ -970,6 +968,7 @@ menuselect-tree: $(foreach dir,$(filter-
@echo "</menu>" >> $@
.PHONY: menuselect

16
comms/asterisk/patches/patch-include_asterisk_utils.h
View File

@@ -1,25 +1,19 @@
$NetBSD: patch-include_asterisk_utils.h,v 1.2 2015/05/19 07:52:14 jnemeth Exp $
$NetBSD: patch-include_asterisk_utils.h,v 1.3 2015/08/09 04:07:13 jnemeth Exp $
--- include/asterisk/utils.h.orig 2015-03-12 12:26:57.000000000 +0000
--- include/asterisk/utils.h.orig 2015-06-04 00:44:42.000000000 +0000
+++ include/asterisk/utils.h
@@ -943,30 +943,9 @@ char *ast_utils_which(const char *binary
@@ -949,24 +949,9 @@ char *ast_utils_which(const char *binary
* \encode
*/
-#if defined(__clang__)
-
-#if defined(__has_feature) && __has_feature(blocks)
-typedef void (^_raii_cleanup_block_t)(void);
-static inline void _raii_cleanup_block(_raii_cleanup_block_t *b) { (*b)(); }
-
-#define RAII_VAR(vartype, varname, initval, dtor) \
- _raii_cleanup_block_t _raii_cleanup_ ## varname __attribute__((cleanup(_raii_cleanup_block),unused)) = NULL; \
- vartype varname = initval; \
- _raii_cleanup_ ## varname = ^{ dtor(varname); }
-
-#else
- #error "CLANG must support the 'blocks' feature to compile Asterisk."
-#endif /* #if defined(__has_feature) && __has_feature(blocks) */
- __block vartype varname = initval; \
- _raii_cleanup_ ## varname = ^{ {(void)dtor(varname);} }
-
-#elif defined(__GNUC__)
-

24
comms/asterisk/patches/patch-res_Makefile Normal file
View File

@@ -0,0 +1,24 @@
$NetBSD: patch-res_Makefile,v 1.1 2015/08/09 04:07:13 jnemeth Exp $
--- res/Makefile.orig 2015-06-04 00:44:42.000000000 +0000
+++ res/Makefile
@@ -90,11 +90,12 @@ FORCE:
$(PJ_LIB_FILES): FORCE
$(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
-ifeq ($(subst 1:0,1,$(UUID)), 1)
-res_rtp_asterisk.o: $(PJ_LIB_FILES)
-res_rtp_asterisk.o: _ASTCFLAGS+=-DUSE_PJPROJECT
-res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
-res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
-res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
-endif
+#XXX PJSIP is known not work properly on NetBSD, comment it out for now
+#ifeq ($(subst 1:0,1,$(UUID)), 1)
+#res_rtp_asterisk.o: $(PJ_LIB_FILES)
+#res_rtp_asterisk.o: _ASTCFLAGS+=-DUSE_PJPROJECT
+#res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
+#res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
+#res_rtp_asterisk.so: LIBS+=$(PJ_LDLIBS)
+#endif

96
comms/asterisk/patches/patch-res_res__xmpp.c
View File

@@ -1,8 +1,8 @@
$NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
$NetBSD: patch-res_res__xmpp.c,v 1.3 2015/08/09 04:07:13 jnemeth Exp $
--- res/res_xmpp.c.orig 2013-09-07 00:59:41.000000000 +0000
--- res/res_xmpp.c.orig 2015-06-04 00:44:42.000000000 +0000
+++ res/res_xmpp.c
@@ -510,11 +510,14 @@ static void *xmpp_config_find(struct ao2
@@ -511,11 +511,14 @@ static void *xmpp_config_find(struct ao2
return ao2_find(tmp_container, category, OBJ_KEY);
}
@@ -19,7 +19,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, category))) {
return xmpp_client_alloc(category);
@@ -602,11 +605,13 @@ error:
@@ -601,11 +604,13 @@ error:
return NULL;
}
@@ -35,7 +35,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -641,7 +646,7 @@ static int xmpp_config_prelink(void *new
static void xmpp_config_post_apply(void)
{
@@ -44,7 +44,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -727,8 +732,8 @@ static int xmpp_is_secure(struct ast_xmp
struct ast_xmpp_client *ast_xmpp_client_find(const char *name)
{
@@ -55,7 +55,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -756,8 +761,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)
{
@@ -66,7 +66,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
int res = 0;
char from[XMPP_MAX_JIDLEN];
iks *message_packet;
@@ -821,8 +826,8 @@ done:
@@ -820,8 +825,8 @@ done:
static int xmpp_client_set_group_presence(struct ast_xmpp_client *client, const char *room, int level, const char *nick)
{
@@ -77,7 +77,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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)
@@ -891,8 +896,8 @@ void ast_xmpp_increment_mid(char *mid)
*/
static iks* xmpp_pubsub_iq_create(struct ast_xmpp_client *client, const char *type)
{
@@ -88,7 +88,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -924,7 +929,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)
{
@@ -97,7 +97,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -1150,7 +1155,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)
{
@@ -106,7 +106,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *request, *state;
char eid_str[20], cachable_str[2];
@@ -1263,7 +1268,7 @@ static void xmpp_pubsub_unsubscribe(stru
@@ -1262,7 +1267,7 @@ static void xmpp_pubsub_unsubscribe(stru
*/
static void xmpp_pubsub_subscribe(struct ast_xmpp_client *client, const char *node)
{
@@ -115,7 +115,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *request = xmpp_pubsub_iq_create(client, "set");
iks *pubsub, *subscribe;
@@ -1370,7 +1375,7 @@ static int xmpp_pubsub_handle_event(void
@@ -1369,7 +1374,7 @@ static int xmpp_pubsub_handle_event(void
static int xmpp_pubsub_handle_error(void *data, ikspak *pak)
{
@@ -124,7 +124,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -1442,8 +1447,8 @@ static int xmpp_pubsub_handle_error(void
*/
static void xmpp_init_event_distribution(struct ast_xmpp_client *client)
{
@@ -135,7 +135,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, client->name))) {
return;
@@ -1498,8 +1503,8 @@ static int xmpp_resource_immediate(void
@@ -1497,8 +1502,8 @@ static int xmpp_resource_immediate(void
*/
static int xmpp_status_exec(struct ast_channel *chan, const char *data)
{
@@ -146,7 +146,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -1576,8 +1581,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)
{
@@ -157,7 +157,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_buddy *buddy;
struct ast_xmpp_resource *resource;
int stat = 7;
@@ -1650,8 +1655,8 @@ static struct ast_custom_function jabber
@@ -1649,8 +1654,8 @@ static struct ast_custom_function jabber
*/
static int xmpp_join_exec(struct ast_channel *chan, const char *data)
{
@@ -168,7 +168,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -1708,8 +1713,8 @@ static int xmpp_join_exec(struct ast_cha
*/
static int xmpp_leave_exec(struct ast_channel *chan, const char *data)
{
@@ -179,7 +179,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -1769,8 +1774,8 @@ static int xmpp_leave_exec(struct ast_ch
*/
static int xmpp_send_exec(struct ast_channel *chan, const char *data)
{
@@ -190,7 +190,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *s;
AST_DECLARE_APP_ARGS(args,
AST_APP_ARG(sender);
@@ -1811,8 +1816,8 @@ static int xmpp_send_exec(struct ast_cha
@@ -1810,8 +1815,8 @@ static int xmpp_send_exec(struct ast_cha
*/
static int xmpp_sendgroup_exec(struct ast_channel *chan, const char *data)
{
@@ -201,7 +201,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -1863,8 +1868,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)
{
@@ -212,7 +212,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *parse = NULL;
int timeout, jidlen, resourcelen, found = 0;
struct timeval start;
@@ -2023,8 +2028,8 @@ static struct ast_custom_function jabber
@@ -2022,8 +2027,8 @@ static struct ast_custom_function jabber
*/
static int delete_old_messages(struct ast_xmpp_client *client, char *from)
{
@@ -223,7 +223,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
int deleted = 0, isold = 0;
struct ast_xmpp_message *message = NULL;
@@ -2057,8 +2062,8 @@ static int delete_old_messages(struct as
@@ -2056,8 +2061,8 @@ static int delete_old_messages(struct as
static int xmpp_send_cb(const struct ast_msg *msg, const char *to, const char *from)
{
@@ -234,7 +234,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
char *sender, *dest;
int res;
@@ -2182,8 +2187,8 @@ static int xmpp_client_subscribe_user(vo
@@ -2181,8 +2186,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)
{
@@ -245,7 +245,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
iks *item;
@@ -2240,8 +2245,8 @@ static int xmpp_roster_hook(void *data,
@@ -2239,8 +2244,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)
{
@@ -256,7 +256,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
iks *presence = NULL, *cnode = NULL, *priority = NULL;
char priorityS[10];
@@ -2368,8 +2373,8 @@ static int xmpp_client_service_discovery
@@ -2367,8 +2372,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)
{
@@ -267,7 +267,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
iks *roster;
@@ -2406,8 +2411,8 @@ static int xmpp_connect_hook(void *data,
@@ -2405,8 +2410,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)
{
@@ -278,7 +278,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
if (!ast_strlen_zero(xmpp)) {
@@ -2745,8 +2750,8 @@ static int xmpp_component_authenticate(s
@@ -2748,8 +2753,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)
{
@@ -289,7 +289,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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:
@@ -2835,8 +2840,8 @@ done:
/*! \brief Hook function called when the component is queried about registration */
static int xmpp_component_register_get_hook(void *data, ikspak *pak)
{
@@ -300,7 +300,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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:
@@ -2943,8 +2948,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)
{
@@ -311,7 +311,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -3327,8 +3332,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)
{
@@ -322,7 +322,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ast_xmpp_client *client = data;
ikspak *pak;
int i;
@@ -3435,8 +3440,8 @@ int ast_xmpp_client_disconnect(struct as
@@ -3438,8 +3443,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 };
@@ -333,7 +333,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -3614,8 +3619,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) {
@@ -344,7 +344,21 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
if (cfg && cfg->clients) {
clientcfg = xmpp_config_find(cfg->clients, client->name);
@@ -3725,8 +3730,8 @@ static int xmpp_client_config_post_apply
@@ -3669,10 +3674,12 @@ static int xmpp_client_config_merge_budd
return 1;
}
+RAII_DECL(struct xmpp_config *, gcfg, ao2_cleanup);
+
static int xmpp_client_config_post_apply(void *obj, void *arg, int flags)
{
struct ast_xmpp_client_config *cfg = obj;
- RAII_VAR(struct xmpp_config *, gcfg, ao2_global_obj_ref(globals), ao2_cleanup);
+ RAII_VAR(struct xmpp_config *, gcfg, ao2_global_obj_ref(globals));
/* Merge global options that have not been modified */
ast_copy_flags(&cfg->flags, &gcfg->global->general, ~(cfg->mod_flags.flags) & (XMPP_AUTOPRUNE | XMPP_AUTOREGISTER | XMPP_AUTOACCEPT));
@@ -3732,8 +3739,8 @@ static int xmpp_client_config_post_apply
*/
static int manager_jabber_send(struct mansession *s, const struct message *m)
{
@@ -355,7 +369,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
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
@@ -3859,8 +3866,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)
{
@@ -366,7 +380,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name = NULL, *collection = NULL;
switch (cmd) {
@@ -3938,8 +3943,8 @@ static void xmpp_pubsub_purge_nodes(stru
@@ -3945,8 +3952,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)
{
@@ -377,7 +391,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name;
switch (cmd) {
@@ -3983,8 +3988,8 @@ static char *xmpp_cli_purge_pubsub_nodes
@@ -3990,8 +3997,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)
{
@@ -388,7 +402,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name;
switch (cmd) {
@@ -4020,8 +4025,8 @@ static char *xmpp_cli_delete_pubsub_node
@@ -4027,8 +4034,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)
{
@@ -399,7 +413,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name, *collection_name;
switch (cmd) {
@@ -4060,8 +4065,8 @@ static char *xmpp_cli_create_collection(
@@ -4067,8 +4074,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)
{
@@ -410,7 +424,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
const char *name, *collection_name, *leaf_name;
switch (cmd) {
@@ -4136,7 +4141,7 @@ static char *xmpp_do_set_debug(struct as
@@ -4143,7 +4150,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)
{
@@ -419,7 +433,7 @@ $NetBSD: patch-res_res__xmpp.c,v 1.2 2013/12/23 01:34:03 jnemeth Exp $
struct ao2_iterator i;
struct ast_xmpp_client_config *clientcfg;
@@ -4212,7 +4217,7 @@ static char *xmpp_show_clients(struct as
@@ -4219,7 +4226,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)
{

14
comms/asterisk10/DESCR
View File

@@ -1,14 +0,0 @@
Asterisk is a complete PBX in software. It provides all of the
features you would expect from a PBX and more. Asterisk does voice
over IP in three protocols, and can interoperate with almost all
standards-based telephony equipment using relatively inexpensive
hardware.
Asterisk provides Voicemail services with Directory, Call Conferencing,
Interactive Voice Response, Call Queuing. It has support for
three-way calling, caller ID services, ADSI, SIP and H.323 (as both
client and gateway).
NOTE: This version does not work with the zaptel drivers. It
requires the newer DAHDI drivers which are still being ported.
So, there is no hardware support available at this moment.

12
comms/asterisk10/MESSAGE
View File

@@ -1,12 +0,0 @@
===========================================================================
$NetBSD: MESSAGE,v 1.3 2013/04/07 18:22:10 jnemeth Exp $
${PKGBASE} now runs as ${ASTERISK_USER}:${ASTERISK_GROUP} instead of ${ROOT_USER}:${ROOT_GROUP} by default.
If you are upgrading from an older version, you should execute the
following commands to correct permissions on existing files:
chown -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${PKG_SYSCONFDIR} ${ASTDBDIR}
chown -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${ASTSPOOLDIR} ${ASTLOGDIR}
===========================================================================

245
comms/asterisk10/Makefile
View File

@@ -1,245 +0,0 @@
# $NetBSD: Makefile,v 1.67 2015/06/12 10:48:29 wiz Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
DISTNAME= asterisk-10.12.4
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
PKGREVISION= 10
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
http://downloads.asterisk.org/pub/telephony/sounds/releases/
OWNER= jnemeth@NetBSD.org
HOMEPAGE= http://www.asterisk.org/
COMMENT= The Asterisk Software PBX
LICENSE= gnu-gpl-v2
# known to have issues on i386, block the package until the bug is fixed
BROKEN_ON_PLATFORM= NetBSD-*-i386
CONFLICTS+= asterisk-sounds-extra-[0-9]*
.include "../../mk/bsd.prefs.mk"
USE_TOOLS+= bison gmake perl:run pkg-config tar
USE_LANGUAGES= c c++
REPLACE_PERL+= agi/DialAnMp3.agi agi/agi-test.agi
REPLACE_PERL+= agi/fastagi-test agi/jukebox.agi agi/numeralize
REPLACE_PERL+= contrib/scripts/vmail.cgi
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --datarootdir=${PREFIX}/libdata
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --without-gtk2
# XXX remove when lang/lua gets builtin.mk
CONFIGURE_ARGS+= --without-lua
INSTALL_TARGET= install samples
INSTALLATION_DIRS+= lib/pkgconfig share/doc/${PKGBASE}
INSTALLATION_DIRS+= share/examples/asterisk share/examples/rc.d
INSTALLATION_DIRS+= ${ASTDATADIR}/sounds/en ${ASTDATADIR}/moh
BUILD_DEFS+= VARBASE
ASTERISK_USER?= asterisk
ASTERISK_GROUP?= asterisk
PKG_GROUPS= ${ASTERISK_GROUP}
PKG_USERS= ${ASTERISK_USER}:${ASTERISK_GROUP}
PKG_GECOS.${ASTERISK_USER}= Asterisk PBX
PKG_GROUPS_VARS= ASTERISK_GROUP
PKG_USERS_VARS= ASTERISK_USER
FILES_SUBST+= ASTERISK_USER=${ASTERISK_USER}
FILES_SUBST+= ASTERISK_GROUP=${ASTERISK_GROUP}
MESSAGE_SUBST+= ASTERISK_USER=${ASTERISK_USER}
MESSAGE_SUBST+= ASTERISK_GROUP=${ASTERISK_GROUP}
# Various path settings for Asterisk
PKG_SYSCONFSUBDIR= asterisk
PKG_SYSCONFDIR_PERMS= ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
ASTETCDIR= ${PKG_SYSCONFDIR}
ASTEXAMPLEDIR= ${PREFIX}/share/examples/asterisk
ASTDBDIR= ${VARBASE}/db/asterisk
ASTSPOOLDIR= ${VARBASE}/spool/asterisk
ASTLOGDIR= ${VARBASE}/log/asterisk
MESSAGE_SUBST+= ASTDBDIR=${ASTDBDIR}
MESSAGE_SUBST+= ASTSPOOLDIR=${ASTSPOOLDIR}
MESSAGE_SUBST+= ASTLOGDIR=${ASTLOGDIR}
ASTVARRUNDIR= ${VARBASE}/run/asterisk
FILES_SUBST+= ASTVARRUNDIR=${ASTVARRUNDIR}
ASTDATADIR= ${PREFIX}/libdata/asterisk
MAKE_FLAGS+= ASTLIBDIR=${PREFIX}/lib/asterisk
MAKE_FLAGS+= ASTVARLIBDIR=${ASTDATADIR}
MAKE_FLAGS+= ASTKEYDIR=${ASTDATADIR}
MAKE_FLAGS+= ASTDATADIR=${ASTDATADIR}
MAKE_FLAGS+= ASTSPOOLDIR=${ASTSPOOLDIR}
MAKE_FLAGS+= ASTLOGDIR=${ASTLOGDIR}
MAKE_FLAGS+= ASTHEADERDIR=${PREFIX}/include/asterisk
MAKE_FLAGS+= ASTCONFPATH=${ASTETCDIR}/asterisk.conf
MAKE_FLAGS+= ASTBINDIR=${PREFIX}/bin
MAKE_FLAGS+= ASTSBINDIR=${PREFIX}/sbin
MAKE_FLAGS+= ASTVARRUNDIR=${ASTVARRUNDIR}
MAKE_FLAGS+= ASTMANDIR=${PREFIX}/${PKGMANDIR}
MAKE_FLAGS+= ASTETCDIR=${ASTETCDIR}
MAKE_FLAGS+= ASTDBDIR=${ASTDBDIR}
MAKE_FLAGS+= AGI_DIR=${PREFIX}/libexec/agi-bin
MAKE_FLAGS+= ASTEXAMPLEDIR=${ASTEXAMPLEDIR}
MAKE_FLAGS+= WRKSRC=${WRKSRC}
MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q}
MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs
MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin
MAKE_FLAGS+= OPTIMIZE=-O3
.if !empty(MACHINE_PLATFORM:MSunOS-*-i386)
BUILDLINK_TRANSFORM+= rm:-march=i386
.endif
PLIST_VARS+= kqueue
.if exists(/usr/include/sys/event.h)
PLIST.kqueue= yes
.endif
PLIST_VARS+= mgcp
# NOSIGPIPE is a temp variable, since PLIST.mgcp MUST remain undefined
# if the grep fails
NOSIGPIPE!= ${GREP} SO_NOSIGPIPE /usr/include/sys/socket.h || echo ""
.if ${NOSIGPIPE} != ""
PLIST.mgcp= yes
.endif
.include "options.mk"
# check sounds/Makefile for current version when upgrading package
DISTFILES+= asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
# Override default paths in config files
SUBST_CLASSES+= configs
SUBST_STAGE.configs= pre-configure
SUBST_FILES.configs= configs/cli_aliases.conf.sample
SUBST_FILES.configs+= configs/festival.conf.sample
SUBST_FILES.configs+= configs/http.conf.sample
SUBST_FILES.configs+= configs/iax.conf.sample
SUBST_FILES.configs+= configs/musiconhold.conf.sample
SUBST_FILES.configs+= configs/osp.conf.sample
SUBST_FILES.configs+= configs/phoneprov.conf.sample
SUBST_FILES.configs+= configs/res_config_sqlite.conf.sample
SUBST_FILES.configs+= configs/sla.conf.sample
SUBST_SED.configs+= -e 's|doc/|${PREFIX}/share/doc/${PKGBASE}/|'
SUBST_SED.configs+= -e 's|/etc/asterisk|${ASTETCDIR}|'
SUBST_SED.configs+= -e 's|/var/lib/asterisk|${ASTVARLIBDIR}|'
SUBST_SED.configs+= -e "s|/usr/local/man|${ASTMANDIR}|"
SUBST_SED.configs+= -e "s|/usr/local|${PREFIX}|"
SUBST_SED.configs+= -e "s|/var|${VARBASE}|"
.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
OWN_DIRS_PERMS+= ${ASTDBDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/dictate ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/meetme ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/monitor ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/outgoing ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/system ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/tmp ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/voicemail ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/voicemail/default ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/voicemail/default/1234 ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/voicemail/default/1234/INBOX ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/voicemail/default/1234/en ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
SPECIAL_PERMS+= ${ASTSPOOLDIR}/voicemail/default/1234/en/busy.gsm ${ASTERISK_USER} ${ASTERISK_GROUP} 0644
SPECIAL_PERMS+= ${ASTSPOOLDIR}/voicemail/default/1234/en/unavail.gsm ${ASTERISK_USER} ${ASTERISK_GROUP} 0644
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/voicemail/default/INBOX ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTSPOOLDIR}/voicemail/default/en ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTLOGDIR} ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTLOGDIR}/cdr-csv ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
OWN_DIRS_PERMS+= ${ASTLOGDIR}/cdr-custom ${ASTERISK_USER} ${ASTERISK_GROUP} 0755
CONF_FILES_PERMS= # empty
.for f in asterisk.conf extensions.conf
CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_USER} ${ASTERISK_GROUP} 0644
.endfor
# if we put all the files in $CONF_FILES, the message is _way_ too long.
.for f in adsi.conf agents.conf ais.conf alarmreceiver.conf alsa.conf \
amd.conf app_mysql.conf asterisk.adsi calendar.conf ccss.conf \
cdr.conf cdr_adaptive_odbc.conf cdr_custom.conf \
cdr_manager.conf cdr_mysql.conf cdr_odbc.conf cdr_pgsql.conf \
cdr_sqlite3_custom.conf cdr_syslog.conf cdr_tds.conf cel.conf \
cel_custom.conf cel_odbc.conf cel_pgsql.conf \
cel_sqlite3_custom.conf cel_tds.conf chan_dahdi.conf \
chan_mobile.conf chan_ooh323.conf cli.conf cli_aliases.conf \
cli_permissions.conf codecs.conf confbridge.conf console.conf \
dbsep.conf dnsmgr.conf dsp.conf dundi.conf enum.conf \
extconfig.conf extensions.ael extensions.conf extensions.lua \
extensions_minivm.conf features.conf festival.conf \
followme.conf func_odbc.conf gtalk.conf h323.conf http.conf \
iax.conf iaxprov.conf indications.conf jabber.conf jingle.conf \
logger.conf manager.conf meetme.conf mgcp.conf minivm.conf \
misdn.conf modules.conf musiconhold.conf muted.conf osp.conf \
oss.conf phone.conf phoneprov.conf queuerules.conf queues.conf \
res_config_mysql.conf res_config_sqlite.conf res_curl.conf \
res_fax.conf res_ldap.conf res_odbc.conf res_pgsql.conf \
res_pktccops.conf res_snmp.conf res_stun_monitor.conf rtp.conf \
say.conf sip.conf sip_notify.conf skinny.conf sla.conf \
smdi.conf telcordia-1.adsi udptl.conf unistim.conf users.conf \
voicemail.conf vpb.conf
CONF_FILES_PERMS+= ${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_USER} ${ASTERISK_GROUP} 0644
.endfor
PTHREAD_OPTS+= require native
.if (${OPSYS} == "Darwin" && exists(/usr/include/sys/poll.h))
post-patch:
${ECHO} "#include <sys/poll.h>" > ${WRKSRC}/include/asterisk/poll-compat.h
.endif
post-install:
# check sounds directory for current versions when upgrading package
${TAR} xzf ${WRKSRC}/sounds/asterisk-core-sounds-en-gsm-1.4.22.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.11.tar.gz -C ${DESTDIR}${ASTDATADIR}/sounds/en
${INSTALL_DATA} ${WRKSRC}/BUGS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/CHANGES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/CREDITS ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/LICENSE ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/README-SERIOUSLY.bestpractices.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/UPGRADE-1.2.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/UPGRADE-1.4.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/UPGRADE-1.6.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/UPGRADE-1.8.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/UPGRADE.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/Zaptel-to-DAHDI.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/Asterisk-Admin-Guide.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/IAX2-security.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/README.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/api-1.6.2-changes.txt ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
cp -r ${WRKSRC}/doc/Asterisk-Admin-Guide ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}/Asterisk-Admin-Guide
.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

2822
comms/asterisk10/PLIST
View File

File diff suppressed because it is too large Load Diff

38
comms/asterisk10/distinfo
View File

@@ -1,38 +0,0 @@
$NetBSD: distinfo,v 1.29 2013/12/17 05:37:10 jnemeth Exp $
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
SHA1 (patch-apps_app__queue.c) = 6fc4edbf9386e2ff39a63a1c3a3d9fe2ea27d187
SHA1 (patch-apps_app__sms.c) = d89b27a9df04d4da98d562241c07d25d182baefc
SHA1 (patch-build__tools_mkpkgconfig) = 2bd3c0e24bc6d721cc234feb19b64a57106fcbe4
SHA1 (patch-channels_chan__oss.c) = fccfa6fca010294ed2d3ab87fc31f436d67f49fa
SHA1 (patch-configure) = 49b17e4661cf1ef98342774ad4f2bb377326dee5
SHA1 (patch-configure.ac) = a68fce7769679a8f40fc266711b80dcccdc15cad
SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4
SHA1 (patch-include_asterisk_autoconfig.h.in) = 90f8688b17f181775319e0c92e353a969b09c93f
SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28
SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666
SHA1 (patch-include_asterisk_lock.h) = fc7b4934e5f53a09066802daa054300895cf7bcf
SHA1 (patch-main_Makefile) = cc8ab49ca045aff935125d1905f311ea557130eb
SHA1 (patch-main_acl.c) = 1eac532a15127c25981d2db9462a8ccce2c58620
SHA1 (patch-main_asterisk.c) = df7bcdaeb2fc90f9fdc1b16388fbb5cf7eba141c
SHA1 (patch-main_features.c) = 1932f46e435f38b0f03b25ce98767fccd4f83ec7
SHA1 (patch-main_manager.c) = 05e65a5d3d06a674c55a5b2d5779fd62aff26b7d
SHA1 (patch-main_netsock.c) = 92542984c6f35fab53d1d107880a51743e3419c6
SHA1 (patch-main_sched.c) = 3a1ef5a384a7fa7329abf2babdacf3dd1d57a041
SHA1 (patch-main_stdtime_localtime.c) = f2234055c370854b43a7a3a6b06226aeeb1dbe96
SHA1 (patch-main_utils.c) = 6d0fd44963149b0561ae179771b7e9fd80fa00b9
SHA1 (patch-pbx_pbx__dundi.c) = 0645ee88c18f94b90ed051cfe100414300f2763f
SHA1 (patch-sounds_Makefile) = 579c38e483bb0631fa1c4ea67fca24462caac41e
SHA1 (patch-tests_test__locale.c) = 37ba5fbf7cd3b0c4db4bf1872eb098aef440eeb9
SHA1 (patch-utils_Makefile) = 0d8c38b1a9450f4f0e364fc0213b9a8e56afce55
SHA1 (patch-utils_db1-ast_include_db.h) = 94ec413fe6a6154d65c43bdde2b26644d8bb5dac
SHA1 (patch-utils_extconf.c) = 9df5ebd9ad1dd669d9a2db5d7da455e8caae3811
SHA1 (patch-utils_streamplayer.c) = fd83c3063f19405fdac3fb4640e42d62f55c7593

43
comms/asterisk10/files/asterisk.sh
View File

@@ -1,43 +0,0 @@
#!@RCD_SCRIPTS_SHELL@
#
# $NetBSD: asterisk.sh,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
#
# PROVIDE: asterisk
# REQUIRE: DAEMON
# KEYWORD: shutdown
#
# You will need to set some variables in /etc/rc.conf to start Asterisk:
#
# asterisk=YES
if [ -f /etc/rc.subr ]
then
. /etc/rc.subr
fi
name="asterisk"
rcvar=$name
command="@PREFIX@/sbin/asterisk"
pidfile=@ASTVARRUNDIR@/${name}.pid
required_files="@PKG_SYSCONFDIR@/asterisk.conf"
extra_commands="reload"
start_precmd=asterisk_prestart
auser="@ASTERISK_USER@"
agroup="@ASTERISK_GROUP@"
command_args="-U $auser -G $agroup -n"
asterisk_prestart() {
if test ! -d @ASTVARRUNDIR@; then
mkdir @ASTVARRUNDIR@
fi
chown $auser:$agroup @ASTVARRUNDIR@
chmod 0755 @ASTVARRUNDIR@
}
stop_cmd="$command -nr -x 'core stop gracefully' >/dev/null"
reload_cmd="$command -nr -x 'core reload' >/dev/null"
asterisk_nice="-20"
load_rc_config $name
run_rc_command "$1"

107
comms/asterisk10/options.mk
View File

@@ -1,107 +0,0 @@
# $NetBSD: options.mk,v 1.6 2015/01/29 21:52:28 jnemeth Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp
PKG_SUPPORTED_OPTIONS+= jabber speex
PKG_OPTIONS_LEGACY_OPTS+= gtk:x11
PKG_SUGGESTED_OPTIONS= ldap jabber speex
.include "../../mk/bsd.options.mk"
PLIST_VARS+= zaptel x11 unixodbc webvmail ldap spandsp jabber
PLIST_VARS+= speex
# Asterisk now uses DAHDI, not zaptel; not implemented yet...
#.if !empty(PKG_OPTIONS:Mzaptel)
## zaptel only supported under NetBSD at the moment
#. include "../../comms/zaptel-netbsd/buildlink3.mk"
#PLIST.zaptel= yes
#.else
#MAKE_FLAGS+= WITHOUT_ZAPTEL=1
#.endif
# gtkconsole depends on GTK 2.x
.if !empty(PKG_OPTIONS:Mx11)
. include "../../x11/gtk2/buildlink3.mk"
. include "../../devel/SDL/buildlink3.mk"
CONFIGURE_ARGS+= --with-sdl
CONFIGURE_ARGS+= --with-gtk2
PLIST.x11= yes
.else
CONFIGURE_ARGS+= --without-sdl
CONFIGURE_ARGS+= --without-gtk2
.endif
.if !empty(PKG_OPTIONS:Munixodbc)
. include "../../databases/unixodbc/buildlink3.mk"
. include "../../devel/libltdl/buildlink3.mk"
CONFIGURE_ARGS+= --with-ltdl
CONFIGURE_ARGS+= --with-unixodbc
PLIST.unixodbc= yes
.else
CONFIGURE_ARGS+= --without-ltdl
CONFIGURE_ARGS+= --without-unixodbc
.endif
.if !empty(PKG_OPTIONS:Mspandsp)
. include "../../comms/spandsp/buildlink3.mk"
CONFIGURE_ARGS+= --with-spandsp
PLIST.spandsp= yes
.else
CONFIGURE_ARGS+= --without-spandsp
.endif
.if !empty(PKG_OPTIONS:Mjabber)
. include "../../textproc/iksemel/buildlink3.mk"
CONFIGURE_ARGS+= --with-iksemel=${PREFIX}
PLIST.jabber= yes
.else
CONFIGURE_ARGS+= --without-iksemel
.endif
MAKE_FLAGS+= GLOBAL_MAKEOPTS=${WRKSRC}/pkgsrc.makeopts
post-configure:
.if !empty(PKG_OPTIONS:Mx11)
${ECHO} "MENUSELECT_PBX=-pbx_gtkconsole" >> ${WRKSRC}/pkgsrc.makeopts
.endif
.if !empty(PKG_OPTIONS:Munixodbc)
${ECHO} "MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE" >> ${WRKSRC}/pkgsrc.makeopts
.endif
.if defined(PLIST.mgcp)
${ECHO} "MENUSELECT_RES=-res_pktccops" >> ${WRKSRC}/pkgsrc.makeopts
${ECHO} "MENUSELECT_CHANNELS=-chan_mgcp" >> ${WRKSRC}/pkgsrc.makeopts
.endif
${ECHO} "MENUSELECT_AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi" >> ${WRKSRC}/pkgsrc.makeopts
# this is a hack to work around a bug in menuselect
cd ${WRKSRC} && make menuselect.makeopts
.if !empty(PKG_OPTIONS:Mwebvmail)
DEPENDS+= p5-DBI-[0-9]*:../../databases/p5-DBI
SUBST_CLASSES+= webvmail
SUBST_STAGE.webvmail= post-patch
SUBST_FILES.webvmail= contrib/scripts/vmail.cgi
SUBST_SED.webvmail+= -e 's|@ASTETCDIR@|${ASTETCDIR}|'
SUBST_SED.webvmail+= -e "s|@ASTSPOOLDIR@|${ASTSPOOLDIR}|"
INSTALLATION_DIRS+= ${PREFIX}/libexec/cgi-bin ${PREFIX}/share/httpd/htdocs
SPECIAL_PERMS+= ${PREFIX}/libexec/cgi-bin/vmail ${ASTERISK_USER} ${ASTERISK_GROUP} 04555
INSTALL_TARGET+= webvmail
PLIST.webvmail= yes
.endif
.if !empty(PKG_OPTIONS:Mldap)
.include "../../databases/openldap-client/buildlink3.mk"
PLIST.ldap= yes
.else
CONFIGURE_ARGS+= --without-ldap
.endif
.if !empty(PKG_OPTIONS:Mspeex)
.include "../../audio/speex/buildlink3.mk"
.include "../../audio/speexdsp/buildlink3.mk"
CONFIGURE_ARGS+= --with-speex
CONFIGURE_ARGS+= --with-speexdsp
PLIST.speex= yes
.else
CONFIGURE_ARGS+= --without-speex
CONFIGURE_ARGS+= --without-speexdsp
.endif

124
comms/asterisk10/patches/patch-Makefile
View File

@@ -1,124 +0,0 @@
$NetBSD: patch-Makefile,v 1.4 2012/10/09 01:36:32 jnemeth Exp $
--- Makefile.orig 2012-09-11 17:14:06.000000000 +0000
+++ Makefile
@@ -127,7 +127,7 @@ DEBUG=-g3
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+ASTCONFPATH=$(ASTEXAMPLEDIR)/asterisk.conf
MODULES_DIR=$(ASTLIBDIR)/modules
AGI_DIR=$(ASTDATADIR)/agi-bin
@@ -186,10 +186,6 @@ ifeq ($(AST_DEVMODE),yes)
ADDL_TARGETS+=validate-docs
endif
-ifneq ($(findstring BSD,$(OSARCH)),)
- _ASTCFLAGS+=-isystem /usr/local/include
-endif
-
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
@@ -399,7 +395,6 @@ dist-clean: distclean
distclean: $(SUBDIRS_DIST_CLEAN) _clean
@$(MAKE) -C menuselect dist-clean
- @$(MAKE) -C sounds dist-clean
rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
rm -f makeopts.embed_rules
rm -f config.log config.status config.cache
@@ -409,7 +404,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
rm -rf doc/api
rm -f build_tools/menuselect-deps
-datafiles: _all doc/core-en_US.xml
+datafiles: doc/core-en_US.xml
CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
@@ -476,7 +471,7 @@ update:
NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h))
OLDHEADERS=$(filter-out $(NEWHEADERS) $(notdir $(DESTDIR)$(ASTHEADERDIR)),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
-INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTETCDIR)" "$(ASTVARRUNDIR)" \
+INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DIR)" "$(ASTSBINDIR)" "$(ASTEXAMPLEDIR)" "$(ASTVARRUNDIR)" \
"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
"$(ASTSPOOLDIR)/voicemail" "$(ASTHEADERDIR)" "$(ASTHEADERDIR)/doxygen" \
@@ -494,7 +489,7 @@ installdirs:
fi; \
done
-bininstall: _all installdirs $(SUBDIRS_INSTALL)
+bininstall: installdirs $(SUBDIRS_INSTALL)
$(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
@@ -586,21 +581,21 @@ upgrade: bininstall
# XXX why *.adsi is installed first ?
adsi:
@echo Installing adsi config files...
- $(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)"
+ $(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)"
@for x in configs/*.adsi; do \
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \
if [ -f "$${dst}" ] ; then \
echo "Overwriting $$x" ; \
else \
echo "Installing $$x" ; \
fi ; \
- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
+ $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x`" ; \
done
samples: adsi
@echo Installing other config files...
@for x in configs/*.sample; do \
- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
+ dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x .sample`" ; \
if [ -f "$${dst}" ]; then \
if [ "$(OVERWRITE)" = "y" ]; then \
if cmp -s "$${dst}" "$$x" ; then \
@@ -629,9 +624,9 @@ samples: adsi
-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
+ "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \
+ rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
fi ; \
$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
@@ -657,7 +652,7 @@ samples: adsi
webvmail:
@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- $(INSTALL) -m 4755 contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi"
+ $(INSTALL) contrib/scripts/vmail.cgi "$(DESTDIR)$(HTTP_CGIDIR)/vmail"
$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
for x in images/*.gif; do \
$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
@@ -811,7 +806,7 @@ uninstall-all: _uninstall
rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
rm -rf "$(DESTDIR)$(ASTDATADIR)"
rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
- rm -rf "$(DESTDIR)$(ASTETCDIR)"
+ rm -rf "$(DESTDIR)$(ASTEXAMPLEDIR)"
rm -rf "$(DESTDIR)$(ASTLOGDIR)"
menuconfig: menuselect
@@ -880,6 +875,7 @@ menuselect-tree: $(foreach dir,$(filter-
@echo "</menu>" >> $@
.PHONY: menuselect
+.PHONY: menuselect.makeopts
.PHONY: main
.PHONY: sounds
.PHONY: clean

19
comms/asterisk10/patches/patch-apps_app__dial.c
View File

@@ -1,19 +0,0 @@
$NetBSD: patch-apps_app__dial.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- apps/app_dial.c.orig 2012-08-29 18:24:54.000000000 +0000
+++ apps/app_dial.c
@@ -1935,12 +1935,12 @@ static void end_bridge_callback(void *da
ast_channel_lock(chan);
if (chan->cdr->answer.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
+ snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->answer.tv_sec));
pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
}
if (chan->cdr->start.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
+ snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->start.tv_sec));
pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
}
ast_channel_unlock(chan);

19
comms/asterisk10/patches/patch-apps_app__followme.c
View File

@@ -1,19 +0,0 @@
$NetBSD: patch-apps_app__followme.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- apps/app_followme.c.orig 2012-09-06 00:56:47.000000000 +0000
+++ apps/app_followme.c
@@ -1127,12 +1127,12 @@ static void end_bridge_callback(void *da
ast_channel_lock(chan);
if (chan->cdr->answer.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->answer.tv_sec);
+ snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->answer.tv_sec));
pbx_builtin_setvar_helper(chan, "ANSWEREDTIME", buf);
}
if (chan->cdr->start.tv_sec) {
- snprintf(buf, sizeof(buf), "%ld", (long) end - chan->cdr->start.tv_sec);
+ snprintf(buf, sizeof(buf), "%jd", (intmax_t) ((long) end - chan->cdr->start.tv_sec));
pbx_builtin_setvar_helper(chan, "DIALEDTIME", buf);
}
ast_channel_unlock(chan);

165
comms/asterisk10/patches/patch-apps_app__queue.c
View File

@@ -1,165 +0,0 @@
$NetBSD: patch-apps_app__queue.c,v 1.3 2012/10/09 01:36:32 jnemeth Exp $
--- apps/app_queue.c.orig 2012-09-07 21:49:16.000000000 +0000
+++ apps/app_queue.c
@@ -3449,8 +3449,8 @@ static void record_abandoned(struct queu
"Uniqueid: %s\r\n"
"Position: %d\r\n"
"OriginalPosition: %d\r\n"
- "HoldTime: %d\r\n",
- qe->parent->name, qe->chan->uniqueid, qe->pos, qe->opos, (int)(time(NULL) - qe->start));
+ "HoldTime: %jd\r\n",
+ qe->parent->name, qe->chan->uniqueid, qe->pos, qe->opos, (intmax_t)(time(NULL) - qe->start));
qe->parent->callsabandoned++;
ao2_unlock(qe->parent);
@@ -4109,7 +4109,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;
- ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
+ ast_queue_log(qe->parent->name, qe->chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
leave_queue(qe);
break;
}
@@ -4315,12 +4315,12 @@ static void send_agent_complete(const st
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
- "HoldTime: %ld\r\n"
- "TalkTime: %ld\r\n"
+ "HoldTime: %jd\r\n"
+ "TalkTime: %jd\r\n"
"Reason: %s\r\n"
"%s",
queuename, qe->chan->uniqueid, peer->name, member->interface, member->membername,
- (long)(callstart - qe->start), (long)(time(NULL) - callstart), reason,
+ (intmax_t)(callstart - qe->start), (intmax_t)(time(NULL) - callstart), reason,
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, vars_len) : "");
}
@@ -4363,9 +4363,9 @@ static void queue_transfer_fixup(void *d
int callcompletedinsl = qtds->callcompletedinsl;
struct ast_datastore *datastore;
- ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld|%d",
- new_chan->exten, new_chan->context, (long) (callstart - qe->start),
- (long) (time(NULL) - callstart), qe->opos);
+ ast_queue_log(qe->parent->name, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%jd|%jd|%d",
+ new_chan->exten, new_chan->context, (intmax_t) (callstart - qe->start),
+ (intmax_t) (time(NULL) - callstart), qe->opos);
update_queue(qe->parent, member, callcompletedinsl, (time(NULL) - callstart));
@@ -4854,7 +4854,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", peer->name);
- ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%ld", qe->pos, qe->opos, (long) time(NULL) - qe->start);
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "ABANDON", "%d|%d|%jd", qe->pos, qe->opos, (intmax_t) time(NULL) - qe->start);
record_abandoned(qe);
ast_hangup(peer);
ao2_ref(member, -1);
@@ -4901,8 +4901,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) {
- snprintf(interfacevar, sizeof(interfacevar), "QEHOLDTIME=%ld,QEORIGINALPOS=%d",
- (long) time(NULL) - qe->start, qe->opos);
+ snprintf(interfacevar, sizeof(interfacevar), "QEHOLDTIME=%jd,QEORIGINALPOS=%d",
+ (intmax_t) time(NULL) - qe->start, qe->opos);
pbx_builtin_setvar_multiple(qe->chan, interfacevar);
pbx_builtin_setvar_multiple(peer, interfacevar);
}
@@ -5158,8 +5158,8 @@ static int try_calling(struct queue_ent
ast_log(LOG_WARNING, "Asked to execute an AGI on this channel, but could not find application (agi)!\n");
}
qe->handled++;
- ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "CONNECT", "%ld|%s|%ld", (long) time(NULL) - qe->start, peer->uniqueid,
- (long)(orig - to > 0 ? (orig - to) / 1000 : 0));
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "CONNECT", "%jd|%s|%jd", (intmax_t) time(NULL) - qe->start, peer->uniqueid,
+ (intmax_t)(orig - to > 0 ? (orig - to) / 1000 : 0));
if (qe->chan->cdr) {
struct ast_cdr *cdr;
@@ -5195,12 +5195,12 @@ static int try_calling(struct queue_ent
"Channel: %s\r\n"
"Member: %s\r\n"
"MemberName: %s\r\n"
- "Holdtime: %ld\r\n"
+ "Holdtime: %jd\r\n"
"BridgedChannel: %s\r\n"
- "Ringtime: %ld\r\n"
+ "Ringtime: %jd\r\n"
"%s",
queuename, qe->chan->uniqueid, peer->name, member->interface, member->membername,
- (long) time(NULL) - qe->start, peer->uniqueid, (long)(orig - to > 0 ? (orig - to) / 1000 : 0),
+ (intmax_t) time(NULL) - qe->start, peer->uniqueid, (intmax_t)(orig - to > 0 ? (orig - to) / 1000 : 0),
qe->parent->eventwhencalled == QUEUE_EVENT_VARIABLES ? vars2manager(qe->chan, vars, sizeof(vars)) : "");
ast_copy_string(oldcontext, qe->chan->context, sizeof(oldcontext));
ast_copy_string(oldexten, qe->chan->exten, sizeof(oldexten));
@@ -5232,17 +5232,17 @@ static int try_calling(struct queue_ent
/* detect a blind transfer */
if (!(qe->chan->_softhangup | peer->_softhangup) && (strcasecmp(oldcontext, qe->chan->context) || strcasecmp(oldexten, qe->chan->exten))) {
- ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%ld|%ld|%d",
- qe->chan->exten, qe->chan->context, (long) (callstart - qe->start),
- (long) (time(NULL) - callstart), qe->opos);
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "TRANSFER", "%s|%s|%jd|%jd|%d",
+ qe->chan->exten, qe->chan->context, (intmax_t) (callstart - qe->start),
+ (intmax_t) (time(NULL) - callstart), qe->opos);
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), TRANSFER);
} else if (ast_check_hangup(qe->chan)) {
- ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%ld|%ld|%d",
- (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETECALLER", "%jd|%jd|%d",
+ (intmax_t) (callstart - qe->start), (intmax_t) (time(NULL) - callstart), qe->opos);
send_agent_complete(qe, queuename, peer, member, callstart, vars, sizeof(vars), CALLER);
} else {
- ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%ld|%ld|%d",
- (long) (callstart - qe->start), (long) (time(NULL) - callstart), qe->opos);
+ ast_queue_log(queuename, qe->chan->uniqueid, member->membername, "COMPLETEAGENT", "%jd|%jd|%d",
+ (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))) {
@@ -6183,8 +6183,8 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
- ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld",
- qe.pos, qe.opos, (long) time(NULL) - qe.start);
+ ast_queue_log(args.queuename, chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%jd",
+ qe.pos, qe.opos, (intmax_t) time(NULL) - qe.start);
break;
}
@@ -6226,7 +6226,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;
- ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%ld", qe.pos, qe.opos, (long)(time(NULL) - qe.start));
+ ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITEMPTY", "%d|%d|%jd", qe.pos, qe.opos, (intmax_t)(time(NULL) - qe.start));
res = 0;
break;
}
@@ -6248,7 +6248,7 @@ check_turns:
record_abandoned(&qe);
reason = QUEUE_TIMEOUT;
res = 0;
- ast_queue_log(qe.parent->name, qe.chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%ld", qe.pos, qe.opos, (long) time(NULL) - qe.start);
+ ast_queue_log(qe.parent->name, qe.chan->uniqueid,"NONE", "EXITWITHTIMEOUT", "%d|%d|%jd", qe.pos, qe.opos, (intmax_t) time(NULL) - qe.start);
break;
}
@@ -6275,8 +6275,8 @@ stop:
if (!qe.handled) {
record_abandoned(&qe);
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
- "%d|%d|%ld", qe.pos, qe.opos,
- (long) time(NULL) - qe.start);
+ "%d|%d|%jd", qe.pos, qe.opos,
+ (intmax_t) time(NULL) - qe.start);
res = -1;
} else if (qcontinue) {
reason = QUEUE_CONTINUE;

13
comms/asterisk10/patches/patch-apps_app__sms.c
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-apps_app__sms.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- apps/app_sms.c.orig 2012-07-31 19:57:09.000000000 +0000
+++ apps/app_sms.c
@@ -553,7 +553,7 @@ static void packdate(unsigned char *o, t
int z;
ast_localtime(&topack, &t, NULL);
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__DragonFly__)
z = -t.tm_gmtoff / 60 / 15;
#else
z = timezone / 60 / 15;

21
comms/asterisk10/patches/patch-build__tools_mkpkgconfig
View File

@@ -1,21 +0,0 @@
$NetBSD: patch-build__tools_mkpkgconfig,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- build_tools/mkpkgconfig.orig 2011-08-25 15:29:56.000000000 +0000
+++ build_tools/mkpkgconfig
@@ -21,12 +21,15 @@ else
fi
## Clean out CFLAGS for the spec file.
+## pkgsrc -- the regex below isn't sed compatible, so always use perl
+EXTREGEX="perl -pe"
LOCAL_CFLAGS=`echo $CFLAGS | ${EXTREGEX} 's/\s*-pipe\s*//g' | ${EXTREGEX} 's/-[Wmp]\S*\s*//g' | \
${EXTREGEX} 's/-I(include|\.\.\/include) //g' | \
${EXTREGEX} 's/-DINSTALL_PREFIX=\S* //g' | \
${EXTREGEX} 's/-DASTERISK_VERSION=\S* //g' | \
- ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g'`
+ ${EXTREGEX} 's/-DAST(ETCDIR|LIBDIR|VARLIBDIR|VARRUNDIR|SPOOLDIR|LOGDIR|CONFPATH|MODDIR|AGIDIR)=\S* //g' | \
+ ${EXTREGEX} "s;${WRKSRC};${PREFIX};g"`
cat <<EOF > "$PPATH/asterisk.pc"

31
comms/asterisk10/patches/patch-channels_chan__oss.c
View File

@@ -1,31 +0,0 @@
$NetBSD: patch-channels_chan__oss.c,v 1.3 2012/10/09 01:36:32 jnemeth Exp $
--- channels/chan_oss.c.orig 2012-08-21 20:40:18.000000000 +0000
+++ channels/chan_oss.c
@@ -48,7 +48,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifdef __linux
#include <linux/soundcard.h>
-#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__GLIBC__)
+#elif defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__DragonFly__) || defined(__GLIBC__)
#include <sys/soundcard.h>
#else
#include <soundcard.h>
@@ -250,7 +250,7 @@ struct chan_oss_pvt {
char *name;
int total_blocks; /*!< total blocks in the output device */
int sounddev;
- enum { M_UNSET, M_FULL, M_READ, M_WRITE } duplex;
+ enum { M_UNSET, M_FULL, M_READ_foo, M_WRITE } duplex;
int autoanswer; /*!< Boolean: whether to answer the immediately upon calling */
int autohangup; /*!< Boolean: whether to hangup the call when the remote end hangs up */
int hookstate; /*!< Boolean: 1 if offhook; 0 if onhook */
@@ -517,7 +517,7 @@ static int setformat(struct chan_oss_pvt
break;
case O_RDONLY:
- o->duplex = M_READ;
+ o->duplex = M_READ_foo;
break;
}

192
comms/asterisk10/patches/patch-configure
View File

@@ -1,192 +0,0 @@
$NetBSD: patch-configure,v 1.7 2013/06/14 23:53:03 jnemeth Exp $
--- configure.orig 2012-10-18 19:53:08.000000000 +0000
+++ configure
@@ -19348,7 +19348,7 @@ done
-for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
+for ac_func in asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strftime_l strptime_l strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl
do
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -23647,7 +23647,7 @@ $as_echo "user CFLAGS present" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
- AST_NATIVE_ARCH=
+ AST_NATIVE_ARCH=0
fi
@@ -24536,6 +24536,148 @@ fi
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
+ { $as_echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
+$as_echo_n "checking for sys/atomic.h... " >&6; }
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
+$as_echo "$ac_cv_header_sys_atomic_h" >&6; }
+else
+ # Is the header compilable?
+{ $as_echo "$as_me:$LINENO: checking sys/atomic.h usability" >&5
+$as_echo_n "checking sys/atomic.h usability... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/atomic.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_header_compiler=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:$LINENO: checking sys/atomic.h presence" >&5
+$as_echo_n "checking sys/atomic.h presence... " >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/atomic.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
+ ac_header_preproc=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: sys/atomic.h: in the future, the compiler will take precedence" >&2;}
+ ( cat <<\_ASBOX
+## ------------------------------------------ ##
+## Report this to https://issues.asterisk.org ##
+## ------------------------------------------ ##
+_ASBOX
+ ) | sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for sys/atomic.h" >&5
+$as_echo_n "checking for sys/atomic.h... " >&6; }
+if test "${ac_cv_header_sys_atomic_h+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ ac_cv_header_sys_atomic_h=$ac_header_preproc
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_atomic_h" >&5
+$as_echo "$ac_cv_header_sys_atomic_h" >&6; }
+
+fi
+if test "x$ac_cv_header_sys_atomic_h" = x""yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ATOMIC_H 1
+_ACEOF
+
+fi
+
+
+
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -29111,6 +29253,8 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/socket.h>
#include <ifaddrs.h>
int
main ()
@@ -55871,10 +56015,10 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_SBIN_LAUNCHD 1
_ACEOF
-fi
PBX_LAUNCHD=1
fi
+fi
PBX_GTK2=0

32
comms/asterisk10/patches/patch-configure.ac
View File

@@ -1,32 +0,0 @@
$NetBSD: patch-configure.ac,v 1.4 2013/06/14 23:53:03 jnemeth Exp $
--- configure.ac.orig 2012-10-18 19:53:08.000000000 +0000
+++ configure.ac
@@ -571,7 +571,7 @@ AC_FUNC_STRNLEN
AC_FUNC_STRTOD
AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl])
+AC_CHECK_FUNCS([asprintf atexit closefrom dup2 eaccess endpwent euidaccess ffsll ftruncate getcwd gethostbyname gethostname getloadavg gettimeofday glob htonll ioperm inet_ntoa isascii memchr memmove memset mkdir mkdtemp munmap ntohll newlocale ppoll putenv re_comp regcomp select setenv socket strcasecmp strcasestr strchr strcspn strdup strerror strlcat strlcpy strncasecmp strndup strnlen strrchr strsep strspn strstr strftime_l strptime_l strtod strtol strtold strtoq unsetenv utime vasprintf getpeereid sysctl swapctl])
# NOTE: we use AC_CHECK_LIB to get -lm into the arguments for later checks,
# so that AC_CHECK_FUNCS can detect functions in that library.
@@ -1005,7 +1005,7 @@ if $(${CC} -march=native -S -o /dev/null
fi
else
AC_MSG_RESULT(no)
- AST_NATIVE_ARCH=
+ AST_NATIVE_ARCH=0
fi
AC_SUBST(AST_NATIVE_ARCH)
@@ -1085,6 +1085,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
AC_CHECK_HEADER([libkern/OSAtomic.h],
[AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
+AC_CHECK_HEADER([sys/atomic.h],
+ [AC_DEFINE_UNQUOTED([HAVE_SYS_ATOMIC_H], 1, [Define to 1 if sys/atomic.h atomic operations are supported.])])
+
AC_CHECK_SIZEOF([int])
AC_CHECK_SIZEOF([long])
AC_CHECK_SIZEOF([long long])

187
comms/asterisk10/patches/patch-contrib_scripts_vmail.cgi
View File

@@ -1,187 +0,0 @@
$NetBSD: patch-contrib_scripts_vmail.cgi,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- contrib/scripts/vmail.cgi.orig 2008-09-20 00:52:20.000000000 +0000
+++ contrib/scripts/vmail.cgi
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/pkg/bin/perl
#
# Web based Voicemail for Asterisk
#
@@ -145,7 +145,7 @@ sub check_login($$)
$context = "default";
}
if (!$filename) {
- $filename = "/etc/asterisk/voicemail.conf";
+ $filename = "@ASTETCDIR@/voicemail.conf";
}
# print header;
# print "Including <h2>$filename</h2> while in <h2>$category</h2>...\n";
@@ -153,7 +153,7 @@ sub check_login($$)
while(<VMAIL>) {
chomp;
if (/include\s\"([^\"]+)\"$/) {
- ($tmp, $category) = &check_login("/etc/asterisk/$1", $category);
+ ($tmp, $category) = &check_login("@ASTETCDIR@/$1", $category);
if (length($tmp)) {
# print "Got '$tmp'\n";
return ($tmp, $category);
@@ -200,7 +200,7 @@ sub check_login_users {
my ($mbox, $context) = split(/\@/, param('mailbox'));
my $pass = param('password');
my ($found, $fullname) = (0, "");
- open VMAIL, "</etc/asterisk/users.conf";
+ open VMAIL, "<@ASTETCDIR@/users.conf";
while (<VMAIL>) {
chomp;
if (m/\[(.*)\]/) {
@@ -242,7 +242,7 @@ sub validmailbox($$$$)
$context = "default";
}
if (!$filename) {
- $filename = "/etc/asterisk/voicemail.conf";
+ $filename = "@ASTETCDIR@/voicemail.conf";
}
if (!$category) {
$category = "general";
@@ -251,7 +251,7 @@ sub validmailbox($$$$)
while (<VMAIL>) {
chomp;
if (/include\s\"([^\"]+)\"$/) {
- ($tmp, $category) = &validmailbox($mbox, $context, "/etc/asterisk/$1");
+ ($tmp, $category) = &validmailbox($mbox, $context, "@ASTETCDIR@/$1");
if ($tmp) {
return ($tmp, $category);
}
@@ -298,7 +298,7 @@ sub mailbox_options()
local $tmp2;
local $tmp;
if (!$filename) {
- $filename = "/etc/asterisk/voicemail.conf";
+ $filename = "@ASTETCDIR@/voicemail.conf";
}
if (!$category) {
$category = "general";
@@ -386,7 +386,7 @@ sub mailbox_list()
sub msgcount()
{
my ($context, $mailbox, $folder) = @_;
- my $path = "/var/spool/asterisk/voicemail/$context/$mailbox/$folder";
+ my $path = "@ASTSPOOLDIR@/voicemail/$context/$mailbox/$folder";
if (opendir(DIR, $path)) {
my @msgs = grep(/^msg....\.txt$/, readdir(DIR));
closedir(DIR);
@@ -410,7 +410,7 @@ sub msgcountstr()
sub messages()
{
my ($context, $mailbox, $folder) = @_;
- my $path = "/var/spool/asterisk/voicemail/$context/$mailbox/$folder";
+ my $path = "@ASTSPOOLDIR@/voicemail/$context/$mailbox/$folder";
if (opendir(DIR, $path)) {
my @msgs = sort grep(/^msg....\.txt$/, readdir(DIR));
closedir(DIR);
@@ -435,7 +435,7 @@ sub getfields()
{
my ($context, $mailbox, $folder, $msg) = @_;
my $fields;
- if (open(MSG, "</var/spool/asterisk/voicemail/$context/$mailbox/$folder/msg${msg}.txt")) {
+ if (open(MSG, "<@ASTSPOOLDIR@/voicemail/$context/$mailbox/$folder/msg${msg}.txt")) {
while(<MSG>) {
s/\#.*$//g;
if (/^(\w+)\s*\=\s*(.*)$/) {
@@ -560,7 +560,7 @@ _EOH
<input name="action" type=submit value="download">
</td></tr>
<tr><td colspan=2 align=center>
-<embed width=400 height=40 src="vmail.cgi?action=audio&folder=$folder&mailbox=$mbox&context=$context&password=$passwd&msgid=$msgid&format=$format&dontcasheme=$$.$format" autostart=yes loop=false></embed>
+<embed width=400 height=40 src="vmail?action=audio&folder=$folder&mailbox=$mbox&context=$context&password=$passwd&msgid=$msgid&format=$format&dontcasheme=$$.$format" autostart=yes loop=false></embed>
</td></tr></table>
</td></tr>
</table>
@@ -588,7 +588,7 @@ sub message_audio()
}
&untaint($format);
- my $path = "/var/spool/asterisk/voicemail/$context/$mailbox/$folder/msg${msgid}.$format";
+ my $path = "@ASTSPOOLDIR@/voicemail/$context/$mailbox/$folder/msg${msgid}.$format";
$msgid =~ /^\d\d\d\d$/ || die("Msgid Liar ($msgid)!");
grep(/^${format}$/, keys %formats) || die("Format Liar ($format)!");
@@ -809,11 +809,11 @@ sub message_rename()
die("Invalid old Message<BR>\n");
}
- my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$newfolder";
+ my $path = "@ASTSPOOLDIR@/voicemail/$context/$mbox/$newfolder";
$path =~ /^(.*)$/;
$path = $1;
mkdir $path, 0770;
- $path = "/var/spool/asterisk/voicemail/$context/$mbox/$oldfolder";
+ $path = "@ASTSPOOLDIR@/voicemail/$context/$mbox/$oldfolder";
opendir(DIR, $path) || die("Unable to open directory\n");
my @files = grep /^msg${old}\.\w+$/, readdir(DIR);
closedir(DIR);
@@ -823,7 +823,7 @@ sub message_rename()
$tmp = $1;
$oldfile = $path . "/$tmp";
$tmp =~ s/msg${old}/msg${new}/;
- $newfile = "/var/spool/asterisk/voicemail/$context/$mbox/$newfolder/$tmp";
+ $newfile = "@ASTSPOOLDIR@/voicemail/$context/$mbox/$newfolder/$tmp";
# print "Renaming $oldfile to $newfile<BR>\n";
rename($oldfile, $newfile);
}
@@ -884,15 +884,15 @@ sub message_copy()
die("Invalid old Message<BR>\n");
}
- my $path = "/var/spool/asterisk/voicemail/$context/$newmbox";
+ my $path = "@ASTSPOOLDIR@/voicemail/$context/$newmbox";
$path =~ /^(.*)$/;
$path = $1;
mkdir $path, 0770;
- $path = "/var/spool/asterisk/voicemail/$context/$newmbox/INBOX";
+ $path = "@ASTSPOOLDIR@/voicemail/$context/$newmbox/INBOX";
$path =~ /^(.*)$/;
$path = $1;
mkdir $path, 0770;
- $path = "/var/spool/asterisk/voicemail/$context/$mbox/$oldfolder";
+ $path = "@ASTSPOOLDIR@/voicemail/$context/$mbox/$oldfolder";
opendir(DIR, $path) || die("Unable to open directory\n");
my @files = grep /^msg${old}\.\w+$/, readdir(DIR);
closedir(DIR);
@@ -902,7 +902,7 @@ sub message_copy()
$tmp = $1;
$oldfile = $path . "/$tmp";
$tmp =~ s/msg${old}/msg${new}/;
- $newfile = "/var/spool/asterisk/voicemail/$context/$newmbox/INBOX/$tmp";
+ $newfile = "@ASTSPOOLDIR@/voicemail/$context/$newmbox/INBOX/$tmp";
# print "Copying $oldfile to $newfile<BR>\n";
&file_copy($oldfile, $newfile);
}
@@ -932,7 +932,7 @@ sub message_delete()
} else {
die("Invalid Message<BR>\n");
}
- my $path = "/var/spool/asterisk/voicemail/$context/$mbox/$folder";
+ my $path = "@ASTSPOOLDIR@/voicemail/$context/$mbox/$folder";
opendir(DIR, $path) || die("Unable to open directory\n");
my @files = grep /^msg${msg}\.\w+$/, readdir(DIR);
closedir(DIR);
@@ -968,7 +968,7 @@ sub message_forward()
my $txt;
$context = &untaint($context);
$newmbox = &untaint($newmbox);
- my $path = "/var/spool/asterisk/voicemail/$context/$newmbox/INBOX";
+ my $path = "@ASTSPOOLDIR@/voicemail/$context/$newmbox/INBOX";
if ($msgs[0]) {
if (&lock_path($path) == 0) {
$msgcount = &msgcount($context, $newmbox, "INBOX");
@@ -1018,7 +1018,7 @@ sub message_delete_or_move()
$context = &untaint($context);
$mbox = &untaint($mbox);
$folder = &untaint($folder);
- $path = "/var/spool/asterisk/voicemail/$context/$mbox/$folder";
+ $path = "@ASTSPOOLDIR@/voicemail/$context/$mbox/$folder";
if ($msgs[0]) {
if (&lock_path($path) == 0) {
my $msgcount = &msgcount($context, $mbox, $folder);

27
comms/asterisk10/patches/patch-include_asterisk_autoconfig.h.in
View File

@@ -1,27 +0,0 @@
$NetBSD: patch-include_asterisk_autoconfig.h.in,v 1.3 2013/06/14 23:53:03 jnemeth Exp $
--- include/asterisk/autoconfig.h.in.orig 2012-08-09 19:11:01.000000000 +0000
+++ include/asterisk/autoconfig.h.in
@@ -824,6 +824,12 @@
/* Define to 1 if you have the `strstr' function. */
#undef HAVE_STRSTR
+/* Define to 1 if you have the `strftime_l' function. */
+#undef HAVE_STRFTIME_L
+
+/* Define to 1 if you have the `strptime_l' function. */
+#undef HAVE_STRPTIME_L
+
/* Define to 1 if you have the `strtod' function. */
#undef HAVE_STRTOD
@@ -899,6 +905,9 @@
/* Define to 1 if you have the <syslog.h> header file. */
#undef HAVE_SYSLOG_H
+/* Define to 1 if sys/atomic.h atomic operations are supported. */
+#undef HAVE_SYS_ATOMIC_H
+
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
*/
#undef HAVE_SYS_DIR_H

16
comms/asterisk10/patches/patch-include_asterisk_endian.h
View File

@@ -1,16 +0,0 @@
$NetBSD: patch-include_asterisk_endian.h,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- include/asterisk/endian.h.orig 2008-10-09 17:48:53.000000000 +0000
+++ include/asterisk/endian.h
@@ -31,6 +31,11 @@
#ifndef __BYTE_ORDER
#ifdef __linux__
#include <endian.h>
+#elif defined(__DragonFly__)
+#include <sys/endian.h>
+#define __BYTE_ORDER BYTE_ORDER
+#define __LITTLE_ENDIAN LITTLE_ENDIAN
+#define __BIG_ENDIAN BIG_ENDIAN
#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
#if defined(__OpenBSD__)
#include "asterisk/compat.h"

17
comms/asterisk10/patches/patch-include_asterisk_inline__api.h
View File

@@ -1,17 +0,0 @@
$NetBSD: patch-include_asterisk_inline__api.h,v 1.1 2012/05/04 16:06:13 joerg Exp $
--- include/asterisk/inline_api.h.orig 2006-02-14 19:14:15.000000000 +0000
+++ include/asterisk/inline_api.h
@@ -46,7 +46,11 @@
#if !defined(LOW_MEMORY)
#if !defined(AST_API_MODULE)
-#define AST_INLINE_API(hdr, body) hdr; extern inline hdr body
+# ifndef __GNUC_STDC_INLINE__
+# define AST_INLINE_API(hdr, body) hdr; extern inline hdr body
+# else
+# define AST_INLINE_API(hdr, body) inline hdr body
+# endif
#else
#define AST_INLINE_API(hdr, body) hdr; hdr body
#endif

50
comms/asterisk10/patches/patch-include_asterisk_lock.h
View File

@@ -1,50 +0,0 @@
$NetBSD: patch-include_asterisk_lock.h,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- include/asterisk/lock.h.orig 2011-01-31 07:52:48.000000000 +0000
+++ include/asterisk/lock.h
@@ -569,7 +569,7 @@ static void __attribute__((destructor))
#define gethostbyname __gethostbyname__is__not__reentrant__use__ast_gethostbyname__instead__
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__DragonFly__)
#define pthread_create __use_ast_pthread_create_instead__
#endif
@@ -591,6 +591,10 @@ int ast_atomic_fetchadd_int_slow(volatil
#include "libkern/OSAtomic.h"
#endif
+#if defined(HAVE_SYS_ATOMIC_H)
+#include <sys/atomic.h>
+#endif
+
/*! \brief Atomically add v to *p and return * the previous value of *p.
* This can be used to handle reference counts, and the return value
* can be used to generate unique identifiers.
@@ -610,6 +614,12 @@ AST_INLINE_API(int ast_atomic_fetchadd_i
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
{
return OSAtomicAdd64(v, (int64_t *) p) - v;
+})
+#elif defined(HAVE_SYS_ATOMIC_H)
+AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
+{
+ return atomic_add_int_nv((unsigned int *)p, v) - v;
+})
#elif defined (__i386__) || defined(__x86_64__)
#ifdef sun
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
@@ -656,6 +666,12 @@ AST_INLINE_API(int ast_atomic_dec_and_te
AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
{
return OSAtomicAdd64( -1, (int64_t *) p) == 0;
+})
+#elif defined(HAVE_SYS_ATOMIC_H)
+AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
+{
+ return atomic_dec_uint_nv((unsigned int *)p) == 0;
+})
#else
AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
{

15
comms/asterisk10/patches/patch-main_Makefile
View File

@@ -1,15 +0,0 @@
$NetBSD: patch-main_Makefile,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- main/Makefile.orig 2012-09-08 05:21:41.000000000 +0000
+++ main/Makefile
@@ -85,6 +85,10 @@ ifeq ($(OSARCH),OpenBSD)
AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
endif
+ifeq ($(OSARCH),dragonfly)
+ AST_LIBS+=-lpthread
+endif
+
ifeq ($(OSARCH),SunOS)
AST_LIBS+=-lpthread -ldl -lrt -lnsl -lsocket -lresolv -L/opt/ssl/lib -L/usr/local/ssl/lib
ASTLINK=

40
comms/asterisk10/patches/patch-main_acl.c
View File

@@ -1,40 +0,0 @@
$NetBSD: patch-main_acl.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- main/acl.c.orig 2012-06-15 16:07:08.000000000 +0000
+++ main/acl.c
@@ -127,7 +127,7 @@ static int get_local_address(struct ast_
char *buf = NULL;
int bufsz, x;
#endif /* SOLARIS */
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__GLIBC__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__) || defined(__GLIBC__)
struct ifaddrs *ifap, *ifaphead;
int rtnerr;
const struct sockaddr_in *sin;
@@ -136,7 +136,7 @@ static int get_local_address(struct ast_
int best_score = -100;
memset(&best_addr, 0, sizeof(best_addr));
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__GLIBC__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__) || defined(__GLIBC__)
rtnerr = getifaddrs(&ifaphead);
if (rtnerr) {
perror(NULL);
@@ -147,7 +147,7 @@ static int get_local_address(struct ast_
s = socket(AF_INET, SOCK_STREAM, 0);
if (s > 0) {
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__GLIBC__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__) || defined(__GLIBC__)
for (ifap = ifaphead; ifap; ifap = ifap->ifa_next) {
if (ifap->ifa_addr && ifap->ifa_addr->sa_family == AF_INET) {
@@ -206,7 +206,7 @@ static int get_local_address(struct ast_
close(s);
}
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__linux__) || defined(__Darwin__) || defined(__DragonFly__)
freeifaddrs(ifaphead);
#endif /* BSD_OR_LINUX */

13
comms/asterisk10/patches/patch-main_asterisk.c
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-main_asterisk.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- main/asterisk.c.orig 2012-09-11 21:04:36.000000000 +0000
+++ main/asterisk.c
@@ -89,7 +89,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <sys/sysctl.h>
#if !defined(__OpenBSD__)
#include <sys/vmmeter.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
#include <vm/vm_param.h>
#endif
#endif

88
comms/asterisk10/patches/patch-main_features.c
View File

@@ -1,88 +0,0 @@
$NetBSD: patch-main_features.c,v 1.4 2012/10/09 01:36:32 jnemeth Exp $
--- main/features.c.orig 2012-09-11 15:30:37.000000000 +0000
+++ main/features.c
@@ -1578,14 +1578,14 @@ static int park_call_full(struct ast_cha
"Channel: %s\r\n"
"Parkinglot: %s\r\n"
"From: %s\r\n"
- "Timeout: %ld\r\n"
+ "Timeout: %jd\r\n"
"CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"ConnectedLineNum: %s\r\n"
"ConnectedLineName: %s\r\n"
"Uniqueid: %s\r\n",
pu->parkingexten, chan->name, pu->parkinglot->name, event_from,
- (long)pu->start.tv_sec + (long)(pu->parkingtime/1000) - (long)time(NULL),
+ (intmax_t)pu->start.tv_sec + (intmax_t)(pu->parkingtime/1000) - (intmax_t)time(NULL),
S_COR(chan->caller.id.number.valid, chan->caller.id.number.str, "<unknown>"),
S_COR(chan->caller.id.name.valid, chan->caller.id.name.str, "<unknown>"),
S_COR(chan->connected.id.number.valid, chan->connected.id.number.str, "<unknown>"),
@@ -2144,7 +2144,7 @@ static int builtin_automonitor(struct as
len = strlen(touch_monitor) + 50;
args = ast_alloca(len);
touch_filename = ast_alloca(len);
- snprintf(touch_filename, len, "%s-%ld-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), touch_monitor);
+ snprintf(touch_filename, len, "%s-%jd-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), touch_monitor);
snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
} else {
caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
@@ -2154,7 +2154,7 @@ static int builtin_automonitor(struct as
len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
args = ast_alloca(len);
touch_filename = ast_alloca(len);
- snprintf(touch_filename, len, "%s-%ld-%s-%s", S_OR(touch_monitor_prefix, "auto"), (long)time(NULL), caller_chan_id, callee_chan_id);
+ snprintf(touch_filename, len, "%s-%jd-%s-%s", S_OR(touch_monitor_prefix, "auto"), (intmax_t)time(NULL), caller_chan_id, callee_chan_id);
snprintf(args, len, "%s,%s,m", S_OR(touch_format, "wav"), touch_filename);
}
@@ -2256,7 +2256,7 @@ static int builtin_automixmonitor(struct
len = strlen(touch_monitor) + 50;
args = ast_alloca(len);
touch_filename = ast_alloca(len);
- snprintf(touch_filename, len, "auto-%ld-%s", (long)time(NULL), touch_monitor);
+ snprintf(touch_filename, len, "auto-%jd-%s", (intmax_t)time(NULL), touch_monitor);
snprintf(args, len, "%s.%s,b", touch_filename, (touch_format) ? touch_format : "wav");
} else {
caller_chan_id = ast_strdupa(S_COR(caller_chan->caller.id.number.valid,
@@ -2266,7 +2266,7 @@ static int builtin_automixmonitor(struct
len = strlen(caller_chan_id) + strlen(callee_chan_id) + 50;
args = ast_alloca(len);
touch_filename = ast_alloca(len);
- snprintf(touch_filename, len, "auto-%ld-%s-%s", (long)time(NULL), caller_chan_id, callee_chan_id);
+ snprintf(touch_filename, len, "auto-%jd-%s-%s", (intmax_t)time(NULL), caller_chan_id, callee_chan_id);
snprintf(args, len, "%s.%s,b", touch_filename, S_OR(touch_format, "wav"));
}
@@ -7067,10 +7067,10 @@ static char *handle_parkedcalls(struct a
AST_LIST_LOCK(&curlot->parkings);
AST_LIST_TRAVERSE(&curlot->parkings, cur, list) {
- ast_cli(a->fd, "%-10.10s %-25s (%-15s %-12s %4d) %6lds\n",
+ ast_cli(a->fd, "%-10.10s %-25s (%-15s %-12s %4d) %6jds\n",
cur->parkingexten, cur->chan->name, cur->context, cur->exten,
cur->priority,
- (long) (cur->start.tv_sec + (cur->parkingtime / 1000) - time(NULL)));
+ (intmax_t) (cur->start.tv_sec + (cur->parkingtime / 1000) - time(NULL)));
++lotparked;
}
AST_LIST_UNLOCK(&curlot->parkings);
@@ -7126,7 +7126,7 @@ static int manager_parking_status(struct
"Exten: %d\r\n"
"Channel: %s\r\n"
"From: %s\r\n"
- "Timeout: %ld\r\n"
+ "Timeout: %jd\r\n"
"CallerIDNum: %s\r\n"
"CallerIDName: %s\r\n"
"ConnectedLineNum: %s\r\n"
@@ -7135,7 +7135,7 @@ static int manager_parking_status(struct
"\r\n",
curlot->name,
cur->parkingnum, cur->chan->name, cur->peername,
- (long) cur->start.tv_sec + (long) (cur->parkingtime / 1000) - (long) time(NULL),
+ (intmax_t) cur->start.tv_sec + (intmax_t) (cur->parkingtime / 1000) - (intmax_t) time(NULL),
S_COR(cur->chan->caller.id.number.valid, cur->chan->caller.id.number.str, ""), /* XXX in other places it is <unknown> */
S_COR(cur->chan->caller.id.name.valid, cur->chan->caller.id.name.str, ""),
S_COR(cur->chan->connected.id.number.valid, cur->chan->connected.id.number.str, ""), /* XXX in other places it is <unknown> */

22
comms/asterisk10/patches/patch-main_manager.c
View File

@@ -1,22 +0,0 @@
$NetBSD: patch-main_manager.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- main/manager.c.orig 2012-09-05 19:22:08.000000000 +0000
+++ main/manager.c
@@ -1717,7 +1717,7 @@ static char *handle_showmanconn(struct a
struct mansession_session *session;
time_t now = time(NULL);
#define HSMCONN_FORMAT1 " %-15.15s %-15.15s %-10.10s %-10.10s %-8.8s %-8.8s %-5.5s %-5.5s\n"
-#define HSMCONN_FORMAT2 " %-15.15s %-15.15s %-10d %-10d %-8d %-8d %-5.5d %-5.5d\n"
+#define HSMCONN_FORMAT2 " %-15.15s %-15.15s %-10jd %-10jd %-8d %-8d %-5.5d %-5.5d\n"
int count = 0;
struct ao2_iterator i;
@@ -1738,7 +1738,7 @@ static char *handle_showmanconn(struct a
i = ao2_iterator_init(sessions, 0);
while ((session = ao2_iterator_next(&i))) {
ao2_lock(session);
- ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_inet_ntoa(session->sin.sin_addr), (int)(session->sessionstart), (int)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
+ ast_cli(a->fd, HSMCONN_FORMAT2, session->username, ast_inet_ntoa(session->sin.sin_addr), (intmax_t)(session->sessionstart), (intmax_t)(now - session->sessionstart), session->fd, session->inuse, session->readperm, session->writeperm);
count++;
ao2_unlock(session);
unref_mansession(session);

11
comms/asterisk10/patches/patch-main_netsock.c
View File

@@ -1,11 +0,0 @@
$NetBSD: patch-main_netsock.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- main/netsock.c.orig 2012-06-15 16:07:08.000000000 +0000
+++ main/netsock.c
@@ -35,5 +35,5 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#ifndef __linux__
-#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__GLIBC__)
+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__Darwin__) || defined(__DragonFly__) || defined(__GLIBC__)
#include <net/if_dl.h>
#endif

20
comms/asterisk10/patches/patch-main_sched.c
View File

@@ -1,20 +0,0 @@
$NetBSD: patch-main_sched.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- main/sched.c.orig 2012-06-15 16:07:08.000000000 +0000
+++ main/sched.c
@@ -557,12 +557,12 @@ void ast_sched_dump(struct ast_sched_con
struct timeval delta;
q = ast_heap_peek(con->sched_heap, x);
delta = ast_tvsub(q->when, when);
- ast_debug(1, "|%.4d | %-15p | %-15p | %.6ld : %.6ld |\n",
+ ast_debug(1, "|%.4d | %-15p | %-15p | %.6jd : %.6jd |\n",
q->id,
q->callback,
q->data,
- (long)delta.tv_sec,
- (long int)delta.tv_usec);
+ (intmax_t)delta.tv_sec,
+ (intmax_t)delta.tv_usec);
}
ast_mutex_unlock(&con->lock);
ast_debug(1, "=============================================================\n");

92
comms/asterisk10/patches/patch-main_stdtime_localtime.c
View File

@@ -1,92 +0,0 @@
$NetBSD: patch-main_stdtime_localtime.c,v 1.1 2013/06/14 23:53:03 jnemeth Exp $
--- main/stdtime/localtime.c.orig 2012-12-03 20:33:08.000000000 +0000
+++ main/stdtime/localtime.c
@@ -2213,6 +2213,23 @@ static struct locale_entry *find_by_name
return NULL;
}
+#if HAVE_STRFTIME_L || HAVE_STRPTIME_L
+static locale_t ast_getlocale(const char *locale)
+{
+ struct locale_entry *cur;
+
+ AST_LIST_LOCK(&localelist);
+ if ((cur = find_by_name(locale)) == NULL) {
+ cur->locale = newlocale(LC_ALL_MASK, locale, NULL);
+ strcpy(cur->name, locale); /* SAFE */
+ AST_LIST_INSERT_TAIL(&localelist, cur, list);
+ }
+ AST_LIST_UNLOCK(&localelist);
+ return(cur->locale);
+}
+#endif
+
+#if !HAVE_STRFTIME_L || !HAVE_STRPTIME_L
static const char *store_by_locale(locale_t prevlocale)
{
struct locale_entry *cur;
@@ -2270,6 +2287,7 @@ const char *ast_setlocale(const char *lo
AST_LIST_UNLOCK(&localelist);
return store_by_locale(prevlocale);
}
+#endif
#else
const char *ast_setlocale(const char *unused)
{
@@ -2283,7 +2301,9 @@ int ast_strftime_locale(char *buf, size_
char *format = ast_calloc(1, fmtlen), *fptr = format, *newfmt;
int decimals = -1, i, res;
long fraction;
+#if !HAVE_STRFTIME_L
const char *prevlocale;
+#endif
if (!format) {
return -1;
@@ -2337,6 +2357,14 @@ defcase: *fptr++ = *tmp;
}
*fptr = '\0';
#undef strftime
+#if HAVE_STRFTIME_L
+ if (locale) {
+ locale_t l = ast_getlocale(locale);
+ res = (int)strftime_l(buf, len, format, (struct tm *)tm, l);
+ } else {
+ res = (int)strftime(buf, len, format, (struct tm *)tm);
+ }
+#else
if (locale) {
prevlocale = ast_setlocale(locale);
}
@@ -2344,6 +2372,7 @@ defcase: *fptr++ = *tmp;
if (locale) {
ast_setlocale(prevlocale);
}
+#endif
ast_free(format);
return res;
}
@@ -2357,11 +2386,22 @@ char *ast_strptime_locale(const char *s,
{
struct tm tm2 = { 0, };
char *res;
+#if !HAVE_STRPTIME_L
const char *prevlocale;
+#endif
+#if HAVE_STRPTIME_L
+ if (locale) {
+ locale_t l = ast_getlocale(locale);
+ res = strptime_l(s, format, &tm2, l);
+ } else {
+ res = strptime(s, format, &tm2);
+ }
+#else
prevlocale = ast_setlocale(locale);
res = strptime(s, format, &tm2);
ast_setlocale(prevlocale);
+#endif
/* ast_time and tm are not the same size - tm is a subset of
* ast_time. Hence, the size of tm needs to be used for the
* memcpy

31
comms/asterisk10/patches/patch-main_utils.c
View File

@@ -1,31 +0,0 @@
$NetBSD: patch-main_utils.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- main/utils.c.orig 2012-08-27 13:57:10.000000000 +0000
+++ main/utils.c
@@ -488,7 +488,7 @@ const char *ast_inet_ntoa(struct in_addr
static int dev_urandom_fd;
#endif
-#ifndef __linux__
+#if !defined(__linux__) && !defined(__DragonFly__)
#undef pthread_create /* For ast_pthread_create function only */
#endif /* !__linux__ */
@@ -1399,13 +1399,13 @@ int ast_false(const char *s)
static struct timeval tvfix(struct timeval a)
{
if (a.tv_usec >= ONE_MILLION) {
- ast_log(LOG_WARNING, "warning too large timestamp %ld.%ld\n",
- (long)a.tv_sec, (long int) a.tv_usec);
+ ast_log(LOG_WARNING, "warning too large timestamp %jd.%ld\n",
+ (intmax_t)a.tv_sec, (long int) a.tv_usec);
a.tv_sec += a.tv_usec / ONE_MILLION;
a.tv_usec %= ONE_MILLION;
} else if (a.tv_usec < 0) {
- ast_log(LOG_WARNING, "warning negative timestamp %ld.%ld\n",
- (long)a.tv_sec, (long int) a.tv_usec);
+ ast_log(LOG_WARNING, "warning negative timestamp %jd.%ld\n",
+ (intmax_t)a.tv_sec, (long int) a.tv_usec);
a.tv_usec = 0;
}
return a;

13
comms/asterisk10/patches/patch-pbx_pbx__dundi.c
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-pbx_pbx__dundi.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- pbx/pbx_dundi.c.orig 2012-09-06 02:49:41.000000000 +0000
+++ pbx/pbx_dundi.c
@@ -38,7 +38,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
#include <pthread.h>
#include <net/if.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__DragonFly__)
#include <net/if_dl.h>
#include <ifaddrs.h>
#include <signal.h>

25
comms/asterisk10/patches/patch-sounds_Makefile
View File

@@ -1,25 +0,0 @@
$NetBSD: patch-sounds_Makefile,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- sounds/Makefile.orig 2012-01-24 20:35:38.000000000 +0000
+++ sounds/Makefile
@@ -119,20 +119,6 @@ endef # sound_format_lang_rule
all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH)
have_download:
- @if test "$(DOWNLOAD)" = ":" ; then \
- echo "**************************************************"; \
- echo "*** ***"; \
- echo "*** You must have either wget or fetch to be ***"; \
- echo "*** able to automatically download and install ***"; \
- echo "*** the requested sound packages. ***"; \
- echo "*** ***"; \
- echo "*** Please install one of these, or remove any ***"; \
- echo "*** extra sound package selections in ***"; \
- echo "*** menuselect before installing Asterisk. ***"; \
- echo "*** ***"; \
- echo "**************************************************"; \
- exit 1; \
- fi
$(eval $(call sound_format_lang_rule,$(SOUNDS_DIR),core-sounds,en,$(CORE_SOUNDS_VERSION)))

13
comms/asterisk10/patches/patch-tests_test__locale.c
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-tests_test__locale.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- tests/test_locale.c.orig 2011-09-29 21:14:34.000000000 +0000
+++ tests/test_locale.c
@@ -81,7 +81,7 @@ static char *handle_cli_test_locales(str
/* First we run a set of tests with the global locale, which isn't thread-safe. */
if (!(localedir = opendir(
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__DragonFly__)
"/usr/share/locale"
#else /* Linux */
"/usr/lib/locale"

24
comms/asterisk10/patches/patch-utils_Makefile
View File

@@ -1,24 +0,0 @@
$NetBSD: patch-utils_Makefile,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- utils/Makefile.orig 2011-10-10 22:38:06.000000000 +0000
+++ utils/Makefile
@@ -41,6 +41,10 @@ ifeq ($(OSARCH),SunOS)
UTILS:=$(filter-out muted,$(UTILS))
endif
+ifeq ($(OSARCH),NetBSD)
+ UTILS:=$(filter-out muted,$(UTILS))
+endif
+
ifeq ($(OSARCH),OpenBSD)
UTILS:=$(filter-out muted,$(UTILS))
endif
@@ -75,7 +79,7 @@ all: $(UTILS)
install:
for x in $(UTILS); do \
if [ "$$x" != "none" ]; then \
- $(INSTALL) -m 755 $$x "$(DESTDIR)$(ASTSBINDIR)/$$x"; \
+ $(BSD_INSTALL_PROGRAM) -m 755 $$x "$(DESTDIR)$(ASTSBINDIR)/$$x"; \
fi; \
done

13
comms/asterisk10/patches/patch-utils_db1-ast_include_db.h
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-utils_db1-ast_include_db.h,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- utils/db1-ast/include/db.h.orig 2011-07-06 20:58:12.000000000 +0000
+++ utils/db1-ast/include/db.h
@@ -55,7 +55,7 @@
#ifndef __BIT_TYPES_DEFINED__
#define __BIT_TYPES_DEFINED__
-#if (!defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__))
+#if (!defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(__DragonFly__))
typedef __signed char int8_t;
typedef short int16_t;
typedef int int32_t;

49
comms/asterisk10/patches/patch-utils_extconf.c
View File

@@ -1,49 +0,0 @@
$NetBSD: patch-utils_extconf.c,v 1.2 2012/10/09 01:36:32 jnemeth Exp $
--- utils/extconf.c.orig 2012-08-01 02:26:09.000000000 +0000
+++ utils/extconf.c
@@ -795,6 +795,10 @@ static void __attribute__((destructor))
#include "libkern/OSAtomic.h"
#endif
+#if defined(HAVE_SYS_ATOMIC_H)
+#include <sys/atomic.h>
+#endif
+
/*! \brief Atomically add v to *p and return * the previous value of *p.
* This can be used to handle reference counts, and the return value
* can be used to generate unique identifiers.
@@ -808,12 +812,18 @@ AST_INLINE_API(int ast_atomic_fetchadd_i
#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 4)
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
{
- return OSAtomicAdd32(v, (int32_t *) p);
+ return OSAtomicAdd32(v, (int32_t *) p) - v;
})
#elif defined(HAVE_OSX_ATOMICS) && (SIZEOF_INT == 8)
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
{
- return OSAtomicAdd64(v, (int64_t *) p);
+ return OSAtomicAdd64(v, (int64_t *) p) - v;
+})
+#elif defined(HAVE_SYS_ATOMIC_H)
+AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
+{
+ return atomic_add_int_nv((unsigned int *)p, v) - v;
+})
#elif defined (__i386__) || defined(__x86_64__)
AST_INLINE_API(int ast_atomic_fetchadd_int(volatile int *p, int v),
{
@@ -855,6 +865,12 @@ AST_INLINE_API(int ast_atomic_dec_and_te
AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
{
return OSAtomicAdd64( -1, (int64_t *) p) == 0;
+})
+#elif defined(HAVE_SYS_ATOMIC_H)
+AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
+{
+ return atomic_dec_uint_nv((unsigned int *)p) == 0;
+})
#else
AST_INLINE_API(int ast_atomic_dec_and_test(volatile int *p),
{

13
comms/asterisk10/patches/patch-utils_streamplayer.c
View File

@@ -1,13 +0,0 @@
$NetBSD: patch-utils_streamplayer.c,v 1.1.1.1 2012/01/15 18:36:21 jnemeth Exp $
--- utils/streamplayer.c.orig 2011-07-14 20:25:31.000000000 +0000
+++ utils/streamplayer.c
@@ -53,7 +53,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <sys/socket.h>
-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__)
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__Darwin__) || defined(__CYGWIN__) || defined(__DragonFly__)
#include <netinet/in.h>
#endif
#include <sys/time.h>

4
comms/asterisk18/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.98 2015/06/12 10:48:29 wiz Exp $
# $NetBSD: Makefile,v 1.99 2015/08/18 07:31:03 wiz Exp $
#
# NOTE: when updating this package, there are two places that sound
# tarballs need to be checked
@@ -7,7 +7,7 @@ DISTNAME= asterisk-1.8.32.3
DIST_SUBDIR= ${PKGNAME_NOREV}
DISTFILES= ${DEFAULT_DISTFILES}
EXTRACT_ONLY= ${DISTNAME}.tar.gz
PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= comms net audio
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \

17
comms/deforaos-phone/Makefile
View File

@@ -1,11 +1,9 @@
# $NetBSD: Makefile,v 1.20 2015/04/25 14:20:29 tnn Exp $
#
# $NetBSD: Makefile,v 1.22 2015/08/24 23:46:03 khorben Exp $
DISTNAME= Phone-0.4.2
PKGNAME= deforaos-phone-0.4.2
PKGREVISION= 1
DISTNAME= Phone-0.4.3
PKGNAME= deforaos-phone-0.4.3
CATEGORIES= comms net
MASTER_SITES= http://www.defora.org/os/download/download/4348/
MASTER_SITES= http://www.defora.org/os/download/download/4366/
MAINTAINER= khorben@defora.org
HOMEPAGE= http://www.defora.org/
@@ -21,6 +19,8 @@ BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
MAKE_FLAGS+= DESTDIR=${DESTDIR}
MAKE_FLAGS+= PREFIX=${PREFIX}
MAKE_FLAGS+= CFLAGS=${CFLAGS:Q}
MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}
AUTO_MKDIRS= yes
.include "../../mk/bsd.prefs.mk"
@@ -38,10 +38,7 @@ post-install:
${RMDIR} ${DESTDIR}${PREFIX}/share/man
.endif
.include "../../x11/deforaos-libdesktop/buildlink3.mk"
.include "../../chat/libpurple/buildlink3.mk"
.include "../../devel/sofia-sip/buildlink3.mk"
.include "../../x11/deforaos-locker/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/deforaos-libdesktop/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"

6
comms/deforaos-phone/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.4 2015/03/25 01:17:48 khorben Exp $
@comment $NetBSD: PLIST,v 1.5 2015/08/24 23:46:03 khorben Exp $
bin/gprs
bin/phone
bin/phonectl
@@ -9,14 +9,11 @@ include/Desktop/Phone/phone.h
include/Desktop/Phone/plugin.h
lib/Phone/modem/debug.so
lib/Phone/modem/hayes.so
lib/Phone/modem/purple.so
lib/Phone/modem/sofia.so
lib/Phone/plugins/blacklist.so
lib/Phone/plugins/debug.so
lib/Phone/plugins/engineering.so
lib/Phone/plugins/gprs.so
lib/Phone/plugins/gps.so
lib/Phone/plugins/locker.so
lib/Phone/plugins/n900.so
lib/Phone/plugins/openmoko.so
lib/Phone/plugins/oss.so
@@ -26,6 +23,7 @@ lib/Phone/plugins/profiles.so
lib/Phone/plugins/smscrypt.so
lib/Phone/plugins/systray.so
lib/Phone/plugins/ussd.so
lib/pkgconfig/Phone.pc
man/html1/gprs.html
man/html1/phone.html
man/html1/phonectl.html

15
comms/deforaos-phone/buildlink3.mk Normal file
View File

@@ -0,0 +1,15 @@
# $NetBSD: buildlink3.mk,v 1.1 2015/08/24 23:46:03 khorben Exp $
BUILDLINK_TREE+= deforaos-phone
.if !defined(DEFORAOS_PHONE_BUILDLINK3_MK)
DEFORAOS_PHONE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.deforaos-phone+= deforaos-phone>=0.4.3
BUILDLINK_ABI_DEPENDS.deforaos-phone?= deforaos-phone>=0.4.3
BUILDLINK_PKGSRCDIR.deforaos-phone?= ../../comms/deforaos-phone
.include "../../x11/deforaos-libdesktop/buildlink3.mk"
.endif # DEFORAOS_PHONE_BUILDLINK3_MK
BUILDLINK_TREE+= -deforaos-phone

8
comms/deforaos-phone/distinfo
View File

@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.5 2015/06/17 03:02:26 khorben Exp $
$NetBSD: distinfo,v 1.6 2015/08/24 23:46:03 khorben Exp $
SHA1 (Phone-0.4.2.tar.gz) = ecf2ff8edf578e4685f158aa20c1ff1d5ef4cc80
RMD160 (Phone-0.4.2.tar.gz) = 1a289508d2f0fe5901b676a3cd1fc7e46b54da19
Size (Phone-0.4.2.tar.gz) = 314119 bytes
SHA1 (Phone-0.4.3.tar.gz) = d5539cb265a13ecbe029ac05bd9c5b099d282de4
RMD160 (Phone-0.4.3.tar.gz) = fbebb82a515120763928f80b3e529f4d3a366962
Size (Phone-0.4.3.tar.gz) = 312446 bytes
SHA1 (patch-tests_tests.sh) = c05bcc660f119be2b1210671d368b3a3cc6ebbee

23
comms/gammu/Makefile
View File

@@ -1,9 +1,15 @@
# $NetBSD: Makefile,v 1.12 2014/11/23 09:45:57 mef Exp $
# $NetBSD: Makefile,v 1.14 2015/08/17 16:42:53 leot Exp $
#
.include "Makefile.common"
DISTNAME= gammu-1.36.4
CATEGORIES= comms
MASTER_SITES= http://dl.cihar.com/gammu/releases/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wammu.eu/gammu/
COMMENT= Command line utility and library to work with mobile phones
LICENSE= gnu-gpl-v2
# cmake tests for it; unclear for what it would be used
#BUILD_DEPENDS+= doxygen-[0-9]*:../../devel/doxygen
@@ -13,8 +19,6 @@ DEPENDS+= dialog-[0-9]*:../../misc/dialog
USE_CMAKE= yes
CMAKE_ARGS+= -DBUILD_SHARED_LIBS=ON
CMAKE_ARGS+= -DINSTALL_MAN_DIR:STRING=${PKGMANDIR}
# see py-gammu:
CMAKE_ARGS+= -DWITH_PYTHON:BOOL=OFF
# make sure some optional dependencies are not found:
CMAKE_ARGS+= -DWITH_MySQL:BOOL=OFF
CMAKE_ARGS+= -DWITH_Postgres:BOOL=OFF
@@ -24,8 +28,8 @@ CMAKE_ARGS+= -DBASH_BIN:FILEPATH=
#CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
# silence warning
CMAKE_ARGS+= -Wno-dev
CMAKE_ARGS+= -DINSTALL_DOC=ON
CMAKE_ARGS+= -Wno-dev
CMAKE_ARGS+= -DINSTALL_DOC=ON
USE_LANGUAGES= c c++
USE_TOOLS+= bash:run msgfmt
@@ -36,10 +40,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror
LDFLAGS.SunOS+= -lintl
# Remove garbage under PaxHeaders.* directory
post-install:
(cd ${DESTDIR}${PREFIX}/share/doc/gammu/manual; ${RM} -r */PaxHeaders*)
.include "../../devel/libusb/buildlink3.mk"
.include "../../databases/unixodbc/buildlink3.mk"
.include "../../devel/libusb1/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

14
comms/gammu/Makefile.common
View File

@@ -1,14 +0,0 @@
# $NetBSD: Makefile.common,v 1.9 2014/11/23 09:46:49 mef Exp $
#
# used by comms/gammu/Makefile
# used by comms/py-gammu/Makefile
DISTNAME= gammu-1.33.0
CATEGORIES= comms
MASTER_SITES= http://dl.cihar.com/gammu/releases/ \
http://dl.cihar.com.nyud.net/gammu/releases/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wammu.eu/gammu/
LICENSE= gnu-gpl-v2

9
comms/gammu/PLIST
View File

@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.5 2014/11/23 09:46:49 mef Exp $
@comment $NetBSD: PLIST,v 1.6 2015/08/17 16:42:53 leot Exp $
bin/gammu
bin/gammu-config
bin/gammu-smsd
@@ -63,7 +63,7 @@ man/man7/gammu-smsd-sql.7
man/man7/gammu-smsd-tables.7
share/doc/gammu/COPYING
share/doc/gammu/ChangeLog
share/doc/gammu/README
share/doc/gammu/README.rst
share/doc/gammu/examples/Makefile
share/doc/gammu/examples/config/gammurc
share/doc/gammu/examples/config/smsdrc
@@ -92,9 +92,6 @@ share/doc/gammu/examples/smsd.c
share/doc/gammu/examples/sql/mysql.sql
share/doc/gammu/examples/sql/pgsql.sql
share/doc/gammu/examples/sql/sqlite.sql
share/doc/gammu/manual/PaxHeaders.12815/contents.rst
share/doc/gammu/manual/PaxHeaders.12815/glossary.rst
share/doc/gammu/manual/PaxHeaders.12815/index.rst
share/doc/gammu/manual/c/api.rst
share/doc/gammu/manual/c/backup.rst
share/doc/gammu/manual/c/bitmap.rst
@@ -216,6 +213,8 @@ share/locale/ar/LC_MESSAGES/gammu.mo
share/locale/ar/LC_MESSAGES/libgammu.mo
share/locale/bg/LC_MESSAGES/gammu.mo
share/locale/bg/LC_MESSAGES/libgammu.mo
share/locale/bn/LC_MESSAGES/gammu.mo
share/locale/bn/LC_MESSAGES/libgammu.mo
share/locale/ca/LC_MESSAGES/gammu.mo
share/locale/ca/LC_MESSAGES/libgammu.mo
share/locale/cs/LC_MESSAGES/gammu.mo

4
comms/gammu/buildlink3.mk
View File

@@ -1,11 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.1 2009/05/26 21:31:21 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.2 2015/08/17 16:42:53 leot Exp $
BUILDLINK_TREE+= gammu
.if !defined(GAMMU_BUILDLINK3_MK)
GAMMU_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.gammu+= gammu>=1.24.0
BUILDLINK_API_DEPENDS.gammu+= gammu>=1.34.0
BUILDLINK_PKGSRCDIR.gammu?= ../../comms/gammu
.endif # GAMMU_BUILDLINK3_MK

12
comms/gammu/distinfo
View File

@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.9 2014/11/23 09:46:49 mef Exp $
$NetBSD: distinfo,v 1.10 2015/08/17 16:42:53 leot Exp $
SHA1 (gammu-1.33.0.tar.bz2) = b7ee28e7398ea578290588d94d69c295491ff86a
RMD160 (gammu-1.33.0.tar.bz2) = c84ac1acdc9d019576447e14414de99366794942
Size (gammu-1.33.0.tar.bz2) = 6535262 bytes
SHA1 (patch-contrib_smscgi_sms__cgi.c) = 32316e2c4e8cfcbb850c1f2551c424a8922494e6
SHA1 (patch-libgammu_phone_at_at-sms.c) = 05e834b5da6cebeb16d867df7059b7c715b5b676
SHA1 (gammu-1.36.4.tar.bz2) = 118a7f9670d42b4cdc19833c9df09cc50bd54e5a
RMD160 (gammu-1.36.4.tar.bz2) = cf609af4c4e2148bebe5d3dbeaea412163dfa754
Size (gammu-1.36.4.tar.bz2) = 2091893 bytes
SHA1 (patch-contrib_smscgi_sms__cgi.c) = 39598119eae4fd27d6d1844ca4a846fc79b126c1
SHA1 (patch-libgammu_phone_at_at-sms.c) = fb9dd703f822f20efa35303b15faba482e39538c

18
comms/gammu/patches/patch-contrib_smscgi_sms__cgi.c
View File

@@ -1,17 +1,17 @@
$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.2 2014/11/23 09:46:49 mef Exp $
$NetBSD: patch-contrib_smscgi_sms__cgi.c,v 1.3 2015/08/17 16:42:53 leot Exp $
Fix build on SunOS.
--- contrib/smscgi/sms_cgi.c.orig 2009-09-08 09:57:12.000000000 +0200
+++ contrib/smscgi/sms_cgi.c 2012-01-25 19:47:48.177845692 +0100
@@ -26,6 +26,10 @@
#include <signal.h>
#include <sys/wait.h>
--- contrib/smscgi/sms_cgi.c.orig 2015-08-14 12:32:29.000000000 +0000
+++ contrib/smscgi/sms_cgi.c
@@ -28,6 +28,10 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
+
+#ifdef __sun
+#include <alloca.h>
+#endif
+
#include "sms_cgi.h"
/* Some systems let waitpid(2) tell callers about stopped children. */

6
comms/gammu/patches/patch-libgammu_phone_at_at-sms.c
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.2 2014/11/23 09:46:50 mef Exp $
$NetBSD: patch-libgammu_phone_at_at-sms.c,v 1.3 2015/08/17 16:42:53 leot Exp $
Don't use strcharnul from the helper library, it doesn't end up as PIC
when compiled with Clang.
--- libgammu/phone/at/at-sms.c~ 2014-11-23 18:13:31.000000000 +0900
+++ libgammu/phone/at/at-sms.c 2014-11-23 18:15:42.000000000 +0900
--- libgammu/phone/at/at-sms.c.orig 2015-08-14 12:32:29.000000000 +0000
+++ libgammu/phone/at/at-sms.c
@@ -112,6 +112,9 @@ GSM_Error ATGEN_ReplyGetSMSMemories(GSM_
if (pos_start != NULL) {
/* Detect which memories we can use for saving */

4
comms/hylafax/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.26 2014/03/14 15:59:29 adam Exp $
$NetBSD: distinfo,v 1.27 2015/08/10 05:03:36 dholland Exp $
SHA1 (hylafax-6.0.6.tar.gz) = 8d8cc9a5f242ef83d7bc6f5cd200fec1351b280e
RMD160 (hylafax-6.0.6.tar.gz) = 1f6e3022fe9886f2cde9fb406277d5496ee24f1c
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 54f34633757a4925084d9e7e4c1e743bca48e4ba
SHA1 (patch-ab) = 5ee930814178223fa66dd308f365ff400559fd1d
SHA1 (patch-ac) = b2051ac2e43d0635797043605d96f128e535c976
SHA1 (patch-ad) = a7e361980c94a025be0b326c1cf694cce3cbff72
SHA1 (patch-ae) = 031813b7a130cb7ee99596be88aa933e6ec8786e
SHA1 (patch-ae) = 75024769daca0657e8c0ba4a655ee7993c453120
SHA1 (patch-af) = f1dd817fcd086bfdd354351dc0b92027250edcba
SHA1 (patch-ag) = 52024e0184e2607c6cfb2c6c19c9f31b3c37ec95
SHA1 (patch-ah) = 8558a0f9d970ce1cddbeb76fc87a1c450bd0941d

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

@@ -1,7 +1,11 @@
$NetBSD: patch-ae,v 1.18 2014/03/14 15:59:29 adam Exp $
$NetBSD: patch-ae,v 1.19 2015/08/10 05:03:36 dholland Exp $
* Customize paths.
* Configure for pkgsrc.
* LIBPORT needs to be specified with -L and -l (instead of the path to
the .a file) to match the other internal libraries. Otherwise the
wrappers reorder it relative to the other internal libraries and some
symbols aren't resolved at link time.
--- configure.orig 2012-06-06 00:58:38.000000000 +0000
+++ configure
@@ -160,6 +164,15 @@ $NetBSD: patch-ae,v 1.18 2014/03/14 15:59:29 adam Exp $
capture cat t.c
runMake t "t:; \${CC} t.c ${MACHDEPLIBS}"
}
@@ -3303,7 +3303,7 @@ else
Note "... emulate syslog&co."
PORTFUNCS="$PORTFUNCS syslog.c"
fi
-LIBPORT='${PORT}/libport.a'
+LIBPORT='-L${PORT} -lport'
Note "Done checking system libraries."
@@ -3314,19 +3314,13 @@ Note "Checking ZLIB support."
#
cat>t.c<<EOF

6
comms/java-rxtx/Makefile
View File

@@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.7 2015/06/27 06:30:03 dsainty Exp $
# $NetBSD: Makefile,v 1.8 2015/08/13 20:16:22 joerg Exp $
#
DISTNAME= rxtx-2.1-7r2
PKGNAME= java-rxtx-2.1.7r2
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= comms java
MASTER_SITES= http://rxtx.qbang.org/pub/rxtx/
EXTRACT_SUFX= .zip
@@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
# Configuration looks for certain versions of JDK - this list can be expanded
# if the patches are also appropriately updated.
PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
PKG_JVMS_ACCEPTED= oracle-jdk8 openjdk8 openjdk7 sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
.include "../../mk/bsd.prefs.mk"

6
comms/java-rxtx/distinfo
View File

@@ -1,12 +1,12 @@
$NetBSD: distinfo,v 1.2 2013/03/29 12:40:24 dsainty Exp $
$NetBSD: distinfo,v 1.3 2015/08/13 20:16:22 joerg Exp $
SHA1 (rxtx-2.1-7r2.zip) = 1d9ef2f80b23bc08b8fdeaa547ee78cb5f76e613
RMD160 (rxtx-2.1-7r2.zip) = dc569a654fbef58aa521013e170c0200b8b3668f
Size (rxtx-2.1-7r2.zip) = 1345757 bytes
SHA1 (patch-Makefile_am) = a0f4bdf62bab3c21bfe062cd489b5f9b8941194c
SHA1 (patch-configure_in) = 3a7917c8e418af2df3ae38fae24ab479d3b0f7f9
SHA1 (patch-configure_in) = 4cdfa8c7c870e1d03df1571071e898360496d970
SHA1 (patch-src_I2CImp_c) = 2d6bba8aa2f1460722dc69d17da091cb55f5c844
SHA1 (patch-src_RS485Imp_c) = 6606b79c629556fd010e8d38ec3a0f88c2d8ecfd
SHA1 (patch-src_RawImp_c) = eedc53a9f30e77a8a5437003177e9b20adf64f28
SHA1 (patch-src_SerialImp_c) = ea2751b5d5e97ef6255b3e01f45696e70a197b9d
SHA1 (patch-src_SerialImp_c) = 48090325853a39638e9f94f8413d9799b305a149
SHA1 (patch-src_SerialImp_cpp) = 8453cbc8a71ec00be4ce97e05ba4055af5e59079

21
comms/java-rxtx/patches/patch-configure_in
View File

@@ -1,4 +1,4 @@
$NetBSD: patch-configure_in,v 1.2 2013/03/29 12:40:25 dsainty Exp $
$NetBSD: patch-configure_in,v 1.3 2015/08/13 20:16:22 joerg Exp $
AM_CONFIG_HEADER is obsolete.
@@ -10,8 +10,8 @@ The printer port support is experimental, and only supported on some
platforms. Disable it for consistency, using a patch since
--disable-PRINTER only works on Linux.
--- configure.in.orig 2006-01-30 17:37:47.000000000 +1300
+++ configure.in 2013-03-30 01:16:29.425838439 +1300
--- configure.in.orig 2006-01-30 04:37:47.000000000 +0000
+++ configure.in
@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#-------------------------------------------------------------------------
@@ -21,7 +21,7 @@ platforms. Disable it for consistency, using a patch since
AC_CANONICAL_SYSTEM
AC_MSG_WARN(Trying libtool. If the following fails install libtool)
AC_PROG_CC
@@ -458,12 +458,12 @@
@@ -458,12 +458,12 @@ fi
[ case $OS_NAME in
Linux)
LDFLAGS=$LDFLAGS" -lpthread"
@@ -36,7 +36,14 @@ platforms. Disable it for consistency, using a patch since
#fix_parameters $JPATH/jre/lib/javax.comm.properties
CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
JHOME=$JPATH"/jre/lib/ext"
@@ -533,7 +533,7 @@
@@ -527,13 +527,13 @@ Linux)
;;
*BSD)
- LDFLAGS=$LDFLAGS" -lc_r"
+ LDFLAGS=$LDFLAGS" -lpthread"
JHOME=$JPATH/"lib"
CFLAGS=$CFLAGS" -D_NO_POSIX=1 -D_NO_XOPEN4=1"
TARGETLIB="\$(target_triplet)/librxtxSerial.la \
\$(target_triplet)/librxtxParallel.la"
case $JAVA_VERSION in
@@ -45,7 +52,7 @@ platforms. Disable it for consistency, using a patch since
#fix_parameters $JPATH/jre/lib/javax.comm.properties
CLASSPATH=".:\$(TOP):\$(TOP)/src:"`find $JPATH/ -name RXTXcomm.jar |head -n1`
RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
@@ -721,7 +721,7 @@
@@ -721,7 +721,7 @@ Solaris*)
CLASSPATH=".:\$(TOP):\$(TOP)/src:\$(JPATH)/lib/classes.zip:\$(JPATH)/lib/RXTXcomm.jar:$CLASSPATH"
case $JAVA_VERSION in
@@ -54,7 +61,7 @@ platforms. Disable it for consistency, using a patch since
RXTX_PATH="\$(JPATH)/jre/lib/\$(OS_ARCH)"
;;
1.1*)
@@ -816,6 +816,8 @@
@@ -816,6 +816,8 @@ QNX)
;;
esac ]

26
comms/java-rxtx/patches/patch-src_SerialImp_c
View File

@@ -1,10 +1,10 @@
$NetBSD: patch-src_SerialImp_c,v 1.1 2013/02/11 01:13:21 dsainty Exp $
$NetBSD: patch-src_SerialImp_c,v 1.2 2015/08/13 20:16:22 joerg Exp $
UTS_RELEASE isn't even reliably available on Linux, let alone portable.
--- src/SerialImp.c.orig 2011-11-29 00:22:44.514521000 +1300
+++ src/SerialImp.c 2011-11-29 00:23:01.778521001 +1300
@@ -279,7 +279,7 @@
--- src/SerialImp.c.orig 2006-01-29 22:19:04.000000000 +0000
+++ src/SerialImp.c
@@ -279,7 +279,7 @@ JNIEXPORT void JNICALL RXTXPort(Initiali
#if DEBUG_TIMING
gettimeofday(&seloop, NULL);
#endif /* DEBUG_TIMING */
@@ -13,3 +13,21 @@ UTS_RELEASE isn't even reliably available on Linux, let alone portable.
/* Lets let people who upgraded kernels know they may have problems */
if (uname (&name) == -1)
{
@@ -4946,7 +4946,7 @@ void throw_java_exception( JNIEnv *env,
void report_warning(char *msg)
{
#ifndef DEBUG_MW
- fprintf(stderr, msg);
+ fprintf(stderr, "%s", msg);
#else
mexWarnMsgTxt( (const char *) msg );
#endif /* DEBUG_MW */
@@ -4983,7 +4983,7 @@ void report_verbose(char *msg)
void report_error(char *msg)
{
#ifndef DEBUG_MW
- fprintf(stderr, msg);
+ fprintf(stderr, "%s", msg);
#else
mexWarnMsgTxt( msg );
#endif /* DEBUG_MW */

4
comms/kermit/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.87 2015/01/17 15:30:03 bsiegert Exp $
# $NetBSD: Makefile,v 1.88 2015/08/18 07:31:03 wiz Exp $
DISTNAME= cku302
PKGNAME= kermit-9.0.302
PKGREVISION= 7
PKGREVISION= 8
CATEGORIES= comms
MASTER_SITES= ftp://ftp.kermitproject.org/kermit/archives/

4
comms/mgetty+sendfax/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.92 2015/06/12 10:48:29 wiz Exp $
# $NetBSD: Makefile,v 1.94 2015/08/21 11:08:36 is Exp $
DISTNAME= mgetty1.1.37-Jun05
PKGNAME= mgetty-1.1.37
PKGREVISION= 13
PKGREVISION= 15
CATEGORIES= comms
MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/

7
comms/mgetty+sendfax/distinfo
View File

@@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.38 2013/03/28 21:17:56 joerg Exp $
$NetBSD: distinfo,v 1.39 2015/08/21 11:08:36 is Exp $
SHA1 (mgetty1.1.37-Jun05.tar.gz) = fec9672e8be29a41f1392c6bf90c0d5732cdb2c2
RMD160 (mgetty1.1.37-Jun05.tar.gz) = 56aa9e213e4bd79c13ace2b7222253d91e756865
@@ -10,7 +10,7 @@ SHA1 (patch-ad) = f02a92a3a9a46fe71d7541897da24470e38f68c7
SHA1 (patch-af) = 088be22c69f39ca099cbe497b7e845bf103bf1c7
SHA1 (patch-ag) = f12e39005c78a94f641ccbdbbfa51b5181821148
SHA1 (patch-ah) = 0a3e5b1375eb36610e6a97113a8e535bf2fd1c6b
SHA1 (patch-ai) = 0c3a6e5d067ff360789264f8be89710907f54403
SHA1 (patch-ai) = fad1cd82ceb3b02a3c1fd0f2b2fd8ea62e78c282
SHA1 (patch-aj) = 37d88c1a4f8d5826f7113dd120c32e89cc442e5d
SHA1 (patch-ak) = 18f9570f35909089a4083fa24903dfea14dcc475
SHA1 (patch-al) = 56c9e0ab12ece94e9f17a5770f30b3e46e074361
@@ -20,7 +20,8 @@ SHA1 (patch-aq) = 160e94001568a0a4025a0d26140f972ec0ed8648
SHA1 (patch-ar) = 313f76a5d989c4511935d6fdc2ea2aadcbed76a0
SHA1 (patch-as) = 85bcf39cf5323625bb71f1659413e87864c824cf
SHA1 (patch-fax_Makefile) = 4d4043d84dafe5993d546518b698b10af48f126a
SHA1 (patch-faxrec.c) = 8ce3b830140a77ad5880e455b442588fea8c3a2c
SHA1 (patch-faxrec.c) = 1619e26695f37575c52b412d8cce74d67604bf52
SHA1 (patch-g3_g3cat.c) = 139e200b12ba8a1a1e946ec6fae8ccda3dbb3a26
SHA1 (patch-g3_pbm2g3.c) = c4346b470b3aa492e236f06350859c2854d40b3f
SHA1 (patch-login.c) = 17aa1b49b0e162cdc76d7cf53003578e2ddb1ca6
SHA1 (patch-sendfax.c) = cceb410716f5241b1d6b331a54652255b95caa67

16
comms/mgetty+sendfax/patches/patch-ai
View File

@@ -1,5 +1,4 @@
$NetBSD: patch-ai,v 1.10 2013/01/29 16:56:39 is Exp $
$NetBSD: patch-ai,v 1.11 2015/08/21 11:03:44 is Exp $
- improve default configuration behavior for the modern world
- configure for pkgsrc
- DEVICE_GROUP is set from the pkgsrc makefile, so avoid compiler
@@ -7,7 +6,9 @@ $NetBSD: patch-ai,v 1.10 2013/01/29 16:56:39 is Exp $
- honor PREFIX and VARBASE in paths
- turn on AUTO_PPP (whatever that is...?)
--- policy.h.orig 2012-04-08 00:19:33.000000000 +0000
- no FLOW_HARD for fax-sending (for netbsd6)
--- policy.h.orig 2015-08-20 10:26:33.000000000 +0000
+++ policy.h
@@ -48,7 +48,12 @@
* Normally, this is "/bin/login", just a few systems put "login"
@@ -60,6 +61,15 @@ $NetBSD: patch-ai,v 1.10 2013/01/29 16:56:39 is Exp $
#if defined (SVR4) || defined(sunos4)
# define LOCK_PATH "/var/spool/locks"
# define LOCK "/var/spool/locks/LCK..%s"
@@ -439,7 +449,7 @@
* that fax sending will time out after the first page sent (no ACK received)
* and fail if FLOW_HARD is used. Use FLOW_SOFT instead.
*/
-#define FAXSEND_FLOW FLOW_HARD | FLOW_SOFT
+#define FAXSEND_FLOW FLOW_SOFT
/* if your faxmodem switches port bit rate just after sending the "+FCON"
* message to the host, define this to contain the baudrate used. (Not
@@ -459,7 +469,8 @@
* watch out: if you run 'sendfax' as non-privileged user (user 'fax' etc.)
* you might need to create this file manually and chown it to 'fax'

13
comms/mgetty+sendfax/patches/patch-faxrec.c
View File

@@ -1,6 +1,6 @@
$NetBSD: patch-faxrec.c,v 1.1 2013/03/28 21:17:57 joerg Exp $
$NetBSD: patch-faxrec.c,v 1.2 2015/08/21 11:08:36 is Exp $
--- faxrec.c.orig 2013-03-28 20:03:52.000000000 +0000
--- faxrec.c.orig 2006-01-01 17:13:18.000000000 +0000
+++ faxrec.c
@@ -22,6 +22,10 @@
#include <sys/times.h>
@@ -13,3 +13,12 @@ $NetBSD: patch-faxrec.c,v 1.1 2013/03/28 21:17:57 joerg Exp $
#ifndef sunos4
#include <sys/ioctl.h>
#endif
@@ -178,7 +182,7 @@ int pagenum = 0, ppagenum = 0; /* pages
"fax dev=%s, pid=%d, caller='%s', name='%s', id='%s', +FHNG=%03d, pages=%d/%d, time=%02d:%02d:%02d\n",
Device, getpid(), CallerId, CallName, fax_remote_id,
fax_hangup_code, pagenum, ppagenum,
- call_done / 3600, (call_done / 60) % 60, call_done % 60);
+ (int)(call_done / 3600), (int)(call_done / 60) % 60, (int)(call_done % 60));
}
void fax_notify_mail _P3( (pagenum, ppagenum, mail_to),

49
comms/mgetty+sendfax/patches/patch-sendfax.c Normal file
View File

@@ -0,0 +1,49 @@
$NetBSD: patch-sendfax.c,v 1.1 2015/08/21 11:08:36 is Exp $
--- sendfax.c.orig 2009-03-19 15:13:43.000000000 +0000
+++ sendfax.c
@@ -100,7 +100,7 @@ RETSIGTYPE fax_sig_goodbye _P1( (signo),
lprintf( L_AUDIT,
"failed: got signal %d, pid=%d, dev=%s, time=%ds, acct=\"%s\"",
signo, getpid(), Device,
- ( time(NULL)-call_start ), c_string(acct_handle));
+ (int)( time(NULL)-call_start ), c_string(acct_handle));
rmlocks();
exit(15); /* will close the fax device */
}
@@ -560,7 +560,7 @@ int main _P2( (argc, argv),
{
lprintf( L_AUDIT, "failed dialing, phone=\"%s\", +FHS:%02d, dev=%s, time=%ds, acct=\"%s\"",
fac_tel_no, fax_hangup_code, Device,
- ( time(NULL)-call_start ), c_string(acct_handle) );
+ (int)( time(NULL)-call_start ), c_string(acct_handle) );
/* certain combinations of ISDN modems and PABXes have funny
* failure modes - dial #1, NO CARRIER, dial #2, connect to #1 (!),
@@ -748,7 +748,7 @@ int main _P2( (argc, argv),
{
lprintf( L_AUDIT, "failed transmitting %s: phone=\"%s\", +FHS:%02d, dev=%s, time=%ds, pages=%d/%d(+%d), bytes=%d, acct=\"%s\"",
argv[argidx], fac_tel_no, fax_hangup_code, Device,
- ( time(NULL)-call_start ),
+ (int)( time(NULL)-call_start ),
total_pages-(argc-argidx)+1,
total_pages, total_resent, total_bytes,
c_string(acct_handle) );
@@ -798,7 +798,7 @@ int main _P2( (argc, argv),
fprintf( stderr, "warning: polling failed\n" );
lprintf( L_AUDIT, "failed: polling failed, phone=\"%s\", +FHS:%02d, dev=%s, time=%ds, acct=\"%s\"",
fac_tel_no, fax_hangup_code, Device,
- ( time(NULL)-call_start ), c_string(acct_handle) );
+ (int)( time(NULL)-call_start ), c_string(acct_handle) );
fax_close( fd );
exit(12);
}
@@ -809,7 +809,7 @@ int main _P2( (argc, argv),
fax_close( fd );
lprintf( L_AUDIT, "success, phone=\"%s\", dev=%s, time=%ds, pages=%d(+%d), bytes=%d, acct=\"%s\"",
- fac_tel_no, Device, ( time(NULL)-call_start ),
+ fac_tel_no, Device, (int)( time(NULL)-call_start ),
total_pages, total_resent, total_bytes,
c_string(acct_handle) );
return 0;

6
comms/minicom/Makefile
View File

@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.65 2014/10/09 14:06:03 wiz Exp $
# $NetBSD: Makefile,v 1.66 2015/07/24 10:33:27 adam Exp $
DISTNAME= minicom-2.6.2
DISTNAME= minicom-2.7
CATEGORIES= comms
MASTER_SITES= http://alioth.debian.org/frs/download.php/3869/
MASTER_SITES= http://alioth.debian.org/frs/download.php/file/3977/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://alioth.debian.org/projects/minicom/

9
comms/minicom/distinfo
View File

@@ -1,11 +1,12 @@
$NetBSD: distinfo,v 1.14 2013/10/09 10:53:24 adam Exp $
$NetBSD: distinfo,v 1.15 2015/07/24 10:33:27 adam Exp $
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 (minicom-2.7.tar.gz) = 939eef8ca1bda82ee801b087d9db4f16a19fbe6e
RMD160 (minicom-2.7.tar.gz) = a7947e2e45cc6655b55b70cb65f8784a606248ce
Size (minicom-2.7.tar.gz) = 863544 bytes
SHA1 (patch-ab) = e87dbe616958b2b1a01a9a7dfa8cb8f8c1a6978f
SHA1 (patch-ac) = b2ffa106989ea562b8ea85bfd15e516713a37f3f
SHA1 (patch-ad) = a3e50ae6dcacb6ae6a177e5b6e4d3d959d960eca
SHA1 (patch-ae) = ea2fb58212de7caaaed4c0817290ca3612212b6c
SHA1 (patch-ag) = 5f635b67e2e48d13c9df7f3ed4fdca83a1c7f7ef
SHA1 (patch-ah) = ae6048f6a8e81134a459aaf21527e944c68ae07f
SHA1 (patch-src_script.c) = 239d4e1b17429dfa28c6445a0ab3468f6d6804b8

12
comms/minicom/patches/patch-src_script.c Normal file
View File

@@ -0,0 +1,12 @@
$NetBSD: patch-src_script.c,v 1.1 2015/07/24 10:33:27 adam Exp $
--- src/script.c.orig 2015-07-24 10:31:38.000000000 +0000
+++ src/script.c
@@ -32,6 +32,7 @@
#include <config.h>
#endif
+#include <sys/wait.h>
#include <stdarg.h>
#include "port.h"

4
comms/pilotmgr/Makefile
View File

@@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.52 2015/06/12 10:48:30 wiz Exp $
# $NetBSD: Makefile,v 1.53 2015/07/12 18:56:07 wiz Exp $
DISTNAME= pilotmgr-1.109
PKGREVISION= 5
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://pilotmanager.sourceforge.net/
COMMENT= Synchronize databases on any 3Com Palm device
DEPENDS+= {perl>=5.7.3,p5-Digest-MD5-[0-9]*}:../../security/p5-Digest-MD5
#DEPENDS+= {perl>=5.7.3,p5-Digest-MD5-[0-9]*}:../../security/p5-Digest-MD5
DEPENDS+= p5-Tk-[0-9]*:../../x11/p5-Tk
DEPENDS+= p5-pilot-link-[0-9]*:../../comms/p5-pilot-link

31
comms/py-gammu/Makefile
View File

@@ -1,26 +1,21 @@
# $NetBSD: Makefile,v 1.6 2014/11/23 10:06:41 mef Exp $
#
# $NetBSD: Makefile,v 1.9 2015/08/28 10:24:23 wiz Exp $
.include "../../comms/gammu/Makefile.common"
DISTNAME= python-gammu-2.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//}
PKGREVISION= 1
MASTER_SITES= http://dl.cihar.com/python-gammu/
CATEGORIES= comms
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://wammu.eu/gammu/
COMMENT= Python bindings for gammu
LICENSE= gnu-gpl-v2
DISTINFO_FILE= ${.CURDIR}/../../comms/gammu/distinfo
PATCHDIR= ${.CURDIR}/../../comms/gammu/patches
USE_TOOLS+= pkg-config
USE_TOOLS+= pkg-config
CONFLICTS= gammu<=1.24.0
# UnicodeDecodeError: 'ascii' codec can't decode byte 0xc4 in position 1648: ordinal not in range(128)
PYTHON_VERSIONS_INCOMPATIBLE= 33 34
PYSETUPSUBDIR= python
PYSETUPBUILDTARGET= build_ext
PYSETUPBUILDARGS= --gammu-incs=${BUILDLINK_PREFIX.gammu}/include/gammu
PYSETUPBUILDARGS+= --gammu-libs=${BUILDLINK_PREFIX.gammu}/lib
PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 1.26.1
EGG_NAME= python_${DISTNAME}
.include "../../lang/python/distutils.mk"
.include "../../lang/python/egg.mk"
.include "../../comms/gammu/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

13
comms/py-gammu/PLIST
View File

@@ -1,10 +1,4 @@
@comment $NetBSD: PLIST,v 1.5 2014/11/23 10:06:41 mef Exp $
${PYSITELIB}/gammu/Data.py
${PYSITELIB}/gammu/Data.pyc
${PYSITELIB}/gammu/Data.pyo
${PYSITELIB}/gammu/Worker.py
${PYSITELIB}/gammu/Worker.pyc
${PYSITELIB}/gammu/Worker.pyo
@comment $NetBSD: PLIST,v 1.7 2015/08/23 20:20:03 leot Exp $
${PYSITELIB}/gammu/__init__.py
${PYSITELIB}/gammu/__init__.pyc
${PYSITELIB}/gammu/__init__.pyo
@@ -21,4 +15,7 @@ ${PYSITELIB}/gammu/smsd.pyo
${PYSITELIB}/gammu/worker.py
${PYSITELIB}/gammu/worker.pyc
${PYSITELIB}/gammu/worker.pyo
${PYSITELIB}/${EGG_FILE}
${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
${PYSITELIB}/${EGG_INFODIR}/top_level.txt

5
comms/py-gammu/distinfo Normal file
View File

@@ -0,0 +1,5 @@
$NetBSD: distinfo,v 1.1 2015/08/17 16:46:11 leot Exp $
SHA1 (python-gammu-2.3.tar.gz) = df7dd98c9688db8fc68681a403ac48c2cfcd1d99
RMD160 (python-gammu-2.3.tar.gz) = 957c538caf5ce124c73de3daff900c9795a40e94
Size (python-gammu-2.3.tar.gz) = 130112 bytes

4
comms/snooper/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.31 2013/07/12 10:44:54 jperkin Exp $
# $NetBSD: Makefile,v 1.32 2015/08/18 07:31:03 wiz Exp $
DISTNAME= snooper-19991202
PKGREVISION= 4
PKGREVISION= 5
CATEGORIES= comms
MASTER_SITES= ftp://ftp.foretune.co.jp/pub/tools/snooper/

2
comms/srtp/DESCR Normal file
View File

@@ -0,0 +1,2 @@
The libSRTP library is an open-source implementation of the Secure
Real-time Transport Protocol (SRTP).

21
comms/srtp/Makefile Normal file
View File

@@ -0,0 +1,21 @@
# $NetBSD: Makefile,v 1.1 2015/09/06 14:02:08 joerg Exp $
DISTNAME= srtp-1.4.4
CATEGORIES= comms security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=srtp/}
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://srtp.sourceforge.net/
COMMENT= Secure Real-time Transport Protocol library
USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
LDFLAGS.SunOS+= -lsocket -lnsl
TEST_TARGET= runtest
WRKSRC= ${WRKDIR}/srtp
.include "../../mk/bsd.pkg.mk"

36
comms/srtp/PLIST Normal file
View File

@@ -0,0 +1,36 @@
@comment $NetBSD: PLIST,v 1.1 2015/09/06 14:02:08 joerg Exp $
include/srtp/aes_cbc.h
include/srtp/aes_icm.h
include/srtp/aes.h
include/srtp/alloc.h
include/srtp/auth.h
include/srtp/cipher.h
include/srtp/config.h
include/srtp/crypto_kernel.h
include/srtp/crypto_math.h
include/srtp/crypto_types.h
include/srtp/crypto.h
include/srtp/cryptoalg.h
include/srtp/datatypes.h
include/srtp/err.h
include/srtp/getopt_s.h
include/srtp/gf2_8.h
include/srtp/hmac.h
include/srtp/integers.h
include/srtp/kernel_compat.h
include/srtp/key.h
include/srtp/null_auth.h
include/srtp/null_cipher.h
include/srtp/prng.h
include/srtp/rand_source.h
include/srtp/rdb.h
include/srtp/rdbx.h
include/srtp/rtp_priv.h
include/srtp/rtp.h
include/srtp/sha1.h
include/srtp/srtp_priv.h
include/srtp/srtp.h
include/srtp/stat.h
include/srtp/ut_sim.h
include/srtp/xfm.h
lib/libsrtp.la

12
comms/srtp/buildlink3.mk Normal file
View File

@@ -0,0 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.1 2015/09/06 14:02:08 joerg Exp $
BUILDLINK_TREE+= srtp
.if !defined(SRTP_BUILDLINK3_MK)
SRTP_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.srtp+= srtp>=1.4.4
BUILDLINK_PKGSRCDIR.srtp?= ../../comms/srtp
.endif # SRTP_BUILDLINK3_MK
BUILDLINK_TREE+= -srtp

15
comms/srtp/distinfo Normal file
View File

@@ -0,0 +1,15 @@
$NetBSD: distinfo,v 1.2 2015/09/14 13:30:03 joerg Exp $
SHA1 (srtp-1.4.4.tgz) = 299c6cfe0c9d6f1804bc5921cfbdb6a6bc76a521
RMD160 (srtp-1.4.4.tgz) = 64e58a3fc2cc30a8d7cba6b6ce59f807649d9dee
Size (srtp-1.4.4.tgz) = 502890 bytes
SHA1 (patch-Makefile.in) = 8e0e6d7bed257263e4609d305dfa6a27efc1906d
SHA1 (patch-configure) = d70d01b5f846b2f163ba2246511cf1314005fa35
SHA1 (patch-configure.in) = 217c066920fedaaba02d86e3c2017a368ea8fee7
SHA1 (patch-crypto_cipher_aes__icm.c) = 7e402b790678bd6c27daf8f56bf0a1123b087d07
SHA1 (patch-crypto_math_datatypes.c) = f5358856026b91ae40db4a7c38bae6138656d94e
SHA1 (patch-crypto_math_gf2__8.c) = 4e878e3debc2c287dcbce6ab1127ba8cd22352c3
SHA1 (patch-crypto_math_math.c) = 06961bd3184b0e47475f76a55d9669ce6d3a7149
SHA1 (patch-include_srtp.h) = 4e680a004d14a338c7ec4cc135f21da38490c315
SHA1 (patch-srtp_srtp.c) = 90f2674702dc2070350abc61f7773a4a6234ae33
SHA1 (patch-test_rtpw__test.sh) = 00f28ef1e91b963ab4d413ac10925150bff4b6be

106
comms/srtp/patches/patch-Makefile.in Normal file
View File

@@ -0,0 +1,106 @@
$NetBSD: patch-Makefile.in,v 1.1 2015/09/06 14:02:08 joerg Exp $
--- Makefile.in.orig 2006-07-18 17:42:42.000000000 +0000
+++ Makefile.in
@@ -66,44 +66,44 @@ libdir = @libdir@
# implicit rules for object files and test apps
+%.lo: %.c
+ libtool --mode=compile $(COMPILE) -c $< -o $@
%.o: %.c
$(COMPILE) -c $< -o $@
%$(EXE): %.c
- $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-
+ libtool --mode=link $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
# libcrypt.a (the crypto engine)
-ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o \
- crypto/cipher/aes.o crypto/cipher/aes_icm.o \
- crypto/cipher/aes_cbc.o
+ciphers = crypto/cipher/cipher.lo crypto/cipher/null_cipher.lo \
+ crypto/cipher/aes.lo crypto/cipher/aes_icm.lo \
+ crypto/cipher/aes_cbc.lo
-hashes = crypto/hash/null_auth.o crypto/hash/sha1.o \
- crypto/hash/hmac.o crypto/hash/auth.o # crypto/hash/tmmhv2.o
+hashes = crypto/hash/null_auth.lo crypto/hash/sha1.lo \
+ crypto/hash/hmac.lo crypto/hash/auth.lo # crypto/hash/tmmhv2.lo
-replay = crypto/replay/rdb.o crypto/replay/rdbx.o \
- crypto/replay/ut_sim.o
+replay = crypto/replay/rdb.lo crypto/replay/rdbx.lo \
+ crypto/replay/ut_sim.lo
-math = crypto/math/datatypes.o crypto/math/stat.o
+math = crypto/math/datatypes.lo crypto/math/stat.lo
-ust = crypto/ust/ust.o
+ust = crypto/ust/ust.lo
-rng = crypto/rng/$(RNG_OBJS) crypto/rng/prng.o crypto/rng/ctr_prng.o
+rng = crypto/rng/$(RNG_OBJS) crypto/rng/prng.lo crypto/rng/ctr_prng.lo
-err = crypto/kernel/err.o
+err = crypto/kernel/err.lo
-kernel = crypto/kernel/crypto_kernel.o crypto/kernel/alloc.o \
- crypto/kernel/key.o $(rng) $(err) # $(ust)
+kernel = crypto/kernel/crypto_kernel.lo crypto/kernel/alloc.lo \
+ crypto/kernel/key.lo $(rng) $(err) # $(ust)
cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
# libsrtp.a (implements srtp processing)
-srtpobj = srtp/srtp.o
+srtpobj = srtp/srtp.lo
-libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
- ar cr libsrtp.a $^
- $(RANLIB) libsrtp.a
+libsrtp.la: $(srtpobj) $(cryptobj) $(gdoi)
+ libtool --mode=link ${CC} -rpath ${libdir} -version-info 1 -o $@ $(srtpobj) $(cryptobj) $(gdoi)
# libcryptomath.a contains general-purpose routines that are used to
# generate tables and verify cryptoalgorithm implementations - this
@@ -127,19 +127,19 @@ testapp = $(crypto_testapp) test/srtp_dr
test/roc_driver$(EXE) test/rdbx_driver$(EXE) test/rtpw$(EXE) \
test/dtls_srtp_driver$(EXE)
-$(testapp): libsrtp.a
+$(testapp): libsrtp.la
-test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c
- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+test/rtpw$(EXE): test/rtpw.lo test/rtp.lo test/getopt_s.lo
+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-test/srtp_driver$(EXE): test/srtp_driver.c test/getopt_s.c
- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+test/srtp_driver$(EXE): test/srtp_driver.lo test/getopt_s.lo
+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-test/rdbx_driver$(EXE): test/rdbx_driver.c test/getopt_s.c
- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+test/rdbx_driver$(EXE): test/rdbx_driver.lo test/getopt_s.lo
+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.c test/getopt_s.c
- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
+test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.lo test/getopt_s.lo
+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
test: $(testapp)
@echo "Build done. Please run '$(MAKE) runtest' to run self tests."
@@ -196,7 +196,7 @@ install:
$(INSTALL) -d $(DESTDIR)$(libdir)
cp include/*.h $(DESTDIR)$(includedir)/srtp
cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
- if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
+ if [ -f libsrtp.la ]; then libtool --mode=install cp libsrtp.la $(DESTDIR)$(libdir)/; fi
uninstall:
rm -rf $(DESTDIR)$(includedir)/srtp

27
comms/srtp/patches/patch-configure Normal file
View File

@@ -0,0 +1,27 @@
$NetBSD: patch-configure,v 1.1 2015/09/06 14:02:08 joerg Exp $
--- configure.orig 2005-10-03 15:23:13.000000000 +0000
+++ configure
@@ -2493,11 +2493,11 @@ fi
echo "$as_me:$LINENO: checking which random device to use" >&5
echo $ECHO_N "checking which random device to use... $ECHO_C" >&6
if test "$enable_kernel_linux" = "yes"; then
- RNG_OBJS=rand_linux_kernel.o
+ RNG_OBJS=rand_linux_kernel.lo
echo "$as_me:$LINENO: result: Linux kernel builtin" >&5
echo "${ECHO_T}Linux kernel builtin" >&6
else
- RNG_OBJS=rand_source.o
+ RNG_OBJS=rand_source.lo
if test -n "$DEV_URANDOM"; then
cat >>confdefs.h <<_ACEOF
@@ -7158,7 +7158,7 @@ cat >>confdefs.h <<\_ACEOF
#define SRTP_GDOI 1
_ACEOF
- GDOI_OBJS=gdoi/srtp+gdoi.o
+ GDOI_OBJS=gdoi/srtp+gdoi.lo
fi
echo "$as_me:$LINENO: result: $enable_gdoi" >&5

26
comms/srtp/patches/patch-configure.in Normal file
View File

@@ -0,0 +1,26 @@
$NetBSD: patch-configure.in,v 1.1 2015/09/06 14:02:08 joerg Exp $
--- configure.in.orig 2005-10-03 15:19:02.000000000 +0000
+++ configure.in
@@ -34,10 +34,10 @@ fi
AC_MSG_CHECKING(which random device to use)
if test "$enable_kernel_linux" = "yes"; then
- RNG_OBJS=rand_linux_kernel.o
+ RNG_OBJS=rand_linux_kernel.lo
AC_MSG_RESULT([Linux kernel builtin])
else
- RNG_OBJS=rand_source.o
+ RNG_OBJS=rand_source.lo
if test -n "$DEV_URANDOM"; then
AC_DEFINE_UNQUOTED(DEV_URANDOM, "$DEV_URANDOM",[Path to random device])
AC_MSG_RESULT([$DEV_URANDOM])
@@ -182,7 +182,7 @@ AC_ARG_ENABLE(gdoi,
[], enable_gdoi=no)
if test "$enable_gdoi" = "yes"; then
AC_DEFINE(SRTP_GDOI, 1, [Define to use GDOI.])
- GDOI_OBJS=gdoi/srtp+gdoi.o
+ GDOI_OBJS=gdoi/srtp+gdoi.lo
AC_SUBST(GDOI_OBJS)
fi
AC_MSG_RESULT($enable_gdoi)

22
comms/srtp/patches/patch-crypto_cipher_aes__icm.c Normal file
View File

@@ -0,0 +1,22 @@
$NetBSD: patch-crypto_cipher_aes__icm.c,v 1.1 2015/09/14 13:30:03 joerg Exp $
--- crypto/cipher/aes_icm.c.orig 2015-09-13 19:21:36.000000000 +0000
+++ crypto/cipher/aes_icm.c
@@ -283,7 +283,7 @@ aes_icm_set_iv(aes_icm_ctx_t *c, void *i
* this is an internal, hopefully inlined function
*/
-inline void
+static inline void
aes_icm_advance_ismacryp(aes_icm_ctx_t *c, uint8_t forIsmacryp) {
/* fill buffer with new keystream */
v128_copy(&c->keystream_buffer, &c->counter);
@@ -308,7 +308,7 @@ aes_icm_advance_ismacryp(aes_icm_ctx_t *
}
}
-inline void aes_icm_advance(aes_icm_ctx_t *c) {
+static inline void aes_icm_advance(aes_icm_ctx_t *c) {
aes_icm_advance_ismacryp(c, 0);
}

13
comms/srtp/patches/patch-crypto_math_datatypes.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-crypto_math_datatypes.c,v 1.1 2015/09/14 13:30:03 joerg Exp $
--- crypto/math/datatypes.c.orig 2015-09-13 19:22:57.000000000 +0000
+++ crypto/math/datatypes.c
@@ -124,7 +124,7 @@ octet_string_hex_string(const void *s, i
return bit_string;
}
-inline int
+static inline int
hex_char_to_nibble(uint8_t c) {
switch(c) {
case ('0'): return 0x0;

13
comms/srtp/patches/patch-crypto_math_gf2__8.c Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-crypto_math_gf2__8.c,v 1.1 2015/09/14 13:30:03 joerg Exp $
--- crypto/math/gf2_8.c.orig 2015-09-13 19:22:59.000000000 +0000
+++ crypto/math/gf2_8.c
@@ -50,7 +50,7 @@
/* gf2_8_shift() moved to gf2_8.h as an inline function */
-inline gf2_8
+static inline gf2_8
gf2_8_multiply(gf2_8 x, gf2_8 y) {
gf2_8 z = 0;

47
comms/srtp/patches/patch-crypto_math_math.c Normal file
View File

@@ -0,0 +1,47 @@
$NetBSD: patch-crypto_math_math.c,v 1.1 2015/09/14 13:30:03 joerg Exp $
--- crypto/math/math.c.orig 2015-09-13 19:23:02.000000000 +0000
+++ crypto/math/math.c
@@ -173,7 +173,7 @@ v32_weight(v32_t a) {
return wt;
}
-inline unsigned char
+static inline unsigned char
v32_distance(v32_t x, v32_t y) {
x.value ^= y.value;
return v32_weight(x);
@@ -524,13 +524,13 @@ A_times_x_plus_b(uint8_t A[8], uint8_t x
return b;
}
-inline void
+static inline void
v16_copy_octet_string(v16_t *x, const uint8_t s[2]) {
x->v8[0] = s[0];
x->v8[1] = s[1];
}
-inline void
+static inline void
v32_copy_octet_string(v32_t *x, const uint8_t s[4]) {
x->v8[0] = s[0];
x->v8[1] = s[1];
@@ -538,7 +538,7 @@ v32_copy_octet_string(v32_t *x, const ui
x->v8[3] = s[3];
}
-inline void
+static inline void
v64_copy_octet_string(v64_t *x, const uint8_t s[8]) {
x->v8[0] = s[0];
x->v8[1] = s[1];
@@ -632,7 +632,7 @@ v128_set_bit_to(v128_t *x, int i, int y)
#endif /* DATATYPES_USE_MACROS */
-inline void
+static inline void
v128_left_shift2(v128_t *x, int num_bits) {
int i;
int word_shift = num_bits >> 5;

21
comms/srtp/patches/patch-include_srtp.h Normal file
View File

@@ -0,0 +1,21 @@
$NetBSD: patch-include_srtp.h,v 1.1 2015/09/06 14:02:08 joerg Exp $
--- include/srtp.h.orig 2006-07-12 22:22:10.000000000 +0000
+++ include/srtp.h
@@ -258,6 +258,16 @@ err_status_t
srtp_init(void);
/**
+ * @brief srtp_shutdown() releases allocated resources
+ *
+ * @warning After calling this function srtp functions are no longer
+ * available.
+ */
+
+err_status_t
+srtp_shutdown(void);
+
+/**
* @brief srtp_protect() is the Secure RTP sender-side packet processing
* function.
*

19
comms/srtp/patches/patch-srtp_srtp.c Normal file
View File

@@ -0,0 +1,19 @@
$NetBSD: patch-srtp_srtp.c,v 1.1 2015/09/06 14:02:08 joerg Exp $
--- srtp/srtp.c.orig 2006-07-18 19:45:46.000000000 +0000
+++ srtp/srtp.c
@@ -1905,3 +1905,14 @@ srtp_profile_get_master_salt_length(srtp
return 0; /* indicate error by returning a zero */
}
}
+
+err_status_t
+srtp_shutdown(void) {
+ err_status_t status;
+
+ /* shutdown the crypto kernel */
+ status = crypto_kernel_shutdown();
+ if (status)
+ return status;
+ return err_status_ok;
+}

13
comms/srtp/patches/patch-test_rtpw__test.sh Normal file
View File

@@ -0,0 +1,13 @@
$NetBSD: patch-test_rtpw__test.sh,v 1.1 2015/09/06 14:02:08 joerg Exp $
--- test/rtpw_test.sh.orig 2006-06-13 15:17:57.000000000 +0000
+++ test/rtpw_test.sh
@@ -4,7 +4,7 @@
#
# tests the rtpw sender and receiver functions
-RTPW=rtpw
+RTPW=./rtpw
DEST_PORT=9999
DURATION=3

4
comms/tn3270/Makefile
View File

@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.8 2013/10/10 16:31:28 roy Exp $
# $NetBSD: Makefile,v 1.9 2015/08/18 07:31:04 wiz Exp $
DISTNAME= tn3270-0.20100116
PKGREVISION= 1
PKGREVISION= 2
CATEGORIES= comms net
MASTER_SITES= ${MASTER_SITE_LOCAL}

5
comms/xfce4-modemlights-plugin/DESCR Normal file
View File

@@ -0,0 +1,5 @@
Xfce 4 Modem Lights panel plugin is intended to simplify establishing a ppp
connection via a modem. It is primarily designed to work with the debian ppp
package and the pon/poff scripts provided by that package, but should be usable
with any scripts that create a lock file during dialing and retain it through
the connection.

14
comms/xfce4-modemlights-plugin/Makefile Normal file
View File

@@ -0,0 +1,14 @@
# $NetBSD: Makefile,v 1.1 2015/07/13 19:54:26 youri Exp $
.include "../../meta-pkgs/xfce4/Makefile.common"
DISTNAME= xfce4-modemlights-plugin-0.1.3.99
CATEGORIES= comms
MASTER_SITES= http://archive.xfce.org/src/panel-plugins/xfce4-modemlights-plugin/0.1/
HOMEPAGE= http://goodies.xfce.org/projects/panel-plugins/xfce4-modemlights-plugin
COMMENT= Xfce modems monitoring plugin
.include "../../x11/libxfce4gui/buildlink3.mk"
.include "../../x11/xfce4-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

17
comms/xfce4-modemlights-plugin/PLIST Normal file
View File

@@ -0,0 +1,17 @@
@comment $NetBSD: PLIST,v 1.1 2015/07/13 19:54:26 youri Exp $
libexec/xfce4/panel/plugins/xfce4-modemlights-plugin
share/locale/ca/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/cs/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/eu/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/fr/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/hu/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/ja/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/ko/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/nl/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/pl/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/vi/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/locale/zh_TW/LC_MESSAGES/xfce4-modemlights-plugin.mo
share/pixmaps/modem-connected.png
share/pixmaps/modem-dialing.png
share/pixmaps/modem-disconnected.png
share/xfce4/panel/plugins/modemlights.desktop

6
comms/xfce4-modemlights-plugin/distinfo Normal file
View File

@@ -0,0 +1,6 @@
$NetBSD: distinfo,v 1.1 2015/07/13 19:54:26 youri Exp $
SHA1 (xfce4-modemlights-plugin-0.1.3.99.tar.bz2) = 2d37289918d27dce05fa1d12e5cce21f9e6088b3
RMD160 (xfce4-modemlights-plugin-0.1.3.99.tar.bz2) = 43abf5d8aa09e78fc103330923a7a3867f504ecc
Size (xfce4-modemlights-plugin-0.1.3.99.tar.bz2) = 157029 bytes
SHA1 (patch-panel-plugin_Makefile.in) = 1e7179cf11d0b5ad7959dd82afbc47dd03cb91d4

32
comms/xfce4-modemlights-plugin/patches/patch-panel-plugin_Makefile.in Normal file
View File

@@ -0,0 +1,32 @@
$NetBSD: patch-panel-plugin_Makefile.in,v 1.1 2015/07/13 19:54:26 youri Exp $
Adjust panel plugin path.
--- panel-plugin/Makefile.in.orig 2007-11-08 08:34:26.000000000 +0000
+++ panel-plugin/Makefile.in
@@ -237,7 +237,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-plugindir = $(libexecdir)/xfce4/panel-plugins
+plugindir = $(libexecdir)/xfce4/panel/plugins
xfce4_modemlights_plugin_SOURCES = \
panel-plugin.c
@@ -263,7 +263,7 @@ xfce4_modemlights_plugin_LDADD = \
#
desktop_in_in_files = modemlights.desktop.in.in
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-desktopdir = $(datadir)/xfce4/panel-plugins
+desktopdir = $(datadir)/xfce4/panel/plugins
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
$(desktop_in_in_files)
@@ -567,7 +567,7 @@ uninstall-am: uninstall-desktopDATA unin
# get full path into .desktop file
%.desktop.in: %.desktop.in.in
- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
+ sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel/plugins^" \
$< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

4
comms/xisp/distinfo
View File

@@ -1,8 +1,8 @@
$NetBSD: distinfo,v 1.11 2012/02/17 13:49:47 hans Exp $
$NetBSD: distinfo,v 1.12 2015/07/04 16:18:28 joerg Exp $
SHA1 (xisp-2.7p4.tar.gz) = d6b7cba0cbde2d8c42405108d69aa21c96e73659
RMD160 (xisp-2.7p4.tar.gz) = 617ad86157dc0bef19239359eb20d6f65ee8a00b
Size (xisp-2.7p4.tar.gz) = 300156 bytes
SHA1 (patch-aa) = 0c90fc26d937f5ab3cda0bcaaeffe99b2a8fdaad
SHA1 (patch-aa) = 703e2467587b845747666e35006ede0a51b9096d
SHA1 (patch-ab) = aebdef9938050ad251a4160f1d1d51b83c75c2c0
SHA1 (patch-ac) = 0c94e133d36024ea27b33c3cdbb8b3c2b387ceff

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