- SECURITY update to 1.6.0.25, fixing AST-2010-003. if you use ACL rules

with something like 'deny 0.0.0.0/0' then this affects you. workaround:
'deny 0.0.0.0/0.0.0.0'

- fix fullpkgpath's for the subpackages, they were including the flavour
and shouldn't have - fixes problems with dpb3 found by naddy. add @pkgpath
markers relating to this fix.

ok naddy@
(reminder, ports is not fully open, do not commit without specific permission)
This commit is contained in:
sthen 2010-02-26 12:44:14 +00:00
parent a435ac28e6
commit bb6fa8ee6c
11 changed files with 29 additions and 18 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.71 2010/02/03 00:18:44 sthen Exp $
# $OpenBSD: Makefile,v 1.72 2010/02/26 12:44:14 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 1.6.0.22
VER= 1.6.0.25
# you can set PATCHVER=p0, p1 etc to bump everything,
# this takes care of the subpackage/flavor maze
#PATCHVER= p0
@ -212,8 +212,10 @@ LIB_DEPENDS-fax= spandsp::telephony/spandsp \
tiff::graphics/tiff
.endif
.for i in ${MULTI_PACKAGES:S/-main//}
.for i in ${MULTI_PACKAGES:N-main}
# the subpackages aren't flavoured, so overwrite the default name/path
FULLPKGNAME$i ?= asterisk$i-${VER}${PATCHVER}
FULLPKGPATH$i ?= ${PKGPATH},$i
RUN_DEPENDS$i += :asterisk-${VER}:${PKGPATH}
.endfor
@ -232,7 +234,7 @@ post-patch:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asterisk
${INSTALL_DATA} ${WRKSRC}/{BUGS,CHANGES,COPYING,CREDITS} \
${WRKSRC}/{ChangeLog,LICENSE,README,UPGRADE*.txt} \
${WRKSRC}/{ChangeLog,LICENSE,README*,UPGRADE*.txt} \
${PREFIX}/share/doc/asterisk
${INSTALL_DATA} `find ${WRKSRC}/doc -type f` \
${PREFIX}/share/doc/asterisk

View File

@ -1,5 +1,5 @@
MD5 (asterisk-1.6.0.22.tar.gz) = h6I2N2PU90r8z/Vx/vn06Q==
RMD160 (asterisk-1.6.0.22.tar.gz) = F8+eLGi2W8MWkdcnvTDXa2U9Kp4=
SHA1 (asterisk-1.6.0.22.tar.gz) = hUKwiJ/dFPgF75LYRrCPsziTWUA=
SHA256 (asterisk-1.6.0.22.tar.gz) = +tBQvCIYa8BU4cr/x577O+OulX1tGcL7hOB6dRO9D1Q=
SIZE (asterisk-1.6.0.22.tar.gz) = 23139229
MD5 (asterisk-1.6.0.25.tar.gz) = yPvgsSR+hhGYYsuzMd3VfQ==
RMD160 (asterisk-1.6.0.25.tar.gz) = YH7LNd9SyDSDgrAlsuxDqwOk0gY=
SHA1 (asterisk-1.6.0.25.tar.gz) = qIIn5k04hNXYY6WTJ/QsaXwMgMI=
SHA256 (asterisk-1.6.0.25.tar.gz) = NqLk8vDbSga8izVK7++uK2KlYdVP2zCli/0+gDgJHVk=
SIZE (asterisk-1.6.0.25.tar.gz) = 23148292

View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PLIST-curl,v 1.2 2009/12/13 12:11:29 sthen Exp $
@comment $OpenBSD: PLIST-curl,v 1.3 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-curl,h323
lib/asterisk/modules/func_curl.so
lib/asterisk/modules/res_config_curl.so

View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-fax,v 1.1 2009/12/13 12:11:29 sthen Exp $
@comment $OpenBSD: PLIST-fax,v 1.2 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-fax,h323
lib/asterisk/modules/app_fax.so

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-jabber,v 1.2 2009/12/13 12:11:29 sthen Exp $
@comment $OpenBSD: PLIST-jabber,v 1.3 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-jabber,h323
include/asterisk/jabber.h
include/asterisk/jingle.h
lib/asterisk/modules/chan_gtalk.so

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-ldap,v 1.1 2009/12/13 12:11:29 sthen Exp $
@comment $OpenBSD: PLIST-ldap,v 1.2 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-ldap,h323
lib/asterisk/modules/res_config_ldap.so
share/doc/asterisk/ldap.txt
share/examples/asterisk/default/res_ldap.conf

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.24 2010/01/17 13:18:36 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.25 2010/02/26 12:44:14 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-ogg-*
@conflict chan_unistim-*
@ -1063,6 +1063,7 @@ share/doc/asterisk/LICENSE
share/doc/asterisk/Makefile
share/doc/asterisk/PEERING
share/doc/asterisk/README
share/doc/asterisk/README-SERIOUSLY.bestpractices.txt
share/doc/asterisk/README.txt
share/doc/asterisk/UPGRADE-1.2.txt
share/doc/asterisk/UPGRADE-1.4.txt

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-odbc,v 1.2 2009/12/13 12:11:29 sthen Exp $
@comment $OpenBSD: PLIST-odbc,v 1.3 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-odbc,h323
include/asterisk/res_odbc.h
lib/asterisk/modules/cdr_adaptive_odbc.so
lib/asterisk/modules/cdr_odbc.so

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-pgsql,v 1.1 2007/09/05 22:42:52 sthen Exp $
@comment $OpenBSD: PLIST-pgsql,v 1.2 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-pgsql,h323
lib/asterisk/modules/cdr_pgsql.so
lib/asterisk/modules/res_config_pgsql.so
share/examples/asterisk/default/cdr_pgsql.conf

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-snmp,v 1.1 2007/09/05 22:42:52 sthen Exp $
@comment $OpenBSD: PLIST-snmp,v 1.2 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-snmp,h323
lib/asterisk/modules/res_snmp.so
share/doc/asterisk/snmp.txt
share/examples/asterisk/default/res_snmp.conf

View File

@ -1,2 +1,3 @@
@comment $OpenBSD: PLIST-speex,v 1.1 2007/09/05 22:42:52 sthen Exp $
@comment $OpenBSD: PLIST-speex,v 1.2 2010/02/26 12:44:14 sthen Exp $
@pkgpath telephony/asterisk,-speex,h323
lib/asterisk/modules/codec_speex.so