summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2013-12-18 00:10:25 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2013-12-18 00:10:25 +0000
commita458e0d7dbca360d8cf0d0b251bb053c01a75b5c (patch)
treea2394476907501f66739e578a087250883511b15
parentMFH: r336790 (diff)
MFH: r336791release/10.0.0
- Update net/aserisk to 1.8.25.0 - Update net/aserisk10 to 10.12.4 - Update net/aserisk11 to 11.7.0 - mark net/aserisk10 DEPRECATED, it has reached its EOL Security: 0c39bafc-6771-11e3-868f-0025905a4771
Notes
Notes: svn path=/branches/2014Q1/; revision=336796 svn path=/tags/RELEASE_10_0_0/; revision=336829; tag=release/10.0.0
-rw-r--r--net/asterisk/Makefile5
-rw-r--r--net/asterisk/distinfo4
-rw-r--r--net/asterisk/files/patch-main__asterisk.exports.in12
-rw-r--r--net/asterisk10/Makefile8
-rw-r--r--net/asterisk10/distinfo4
-rw-r--r--net/asterisk11/Makefile9
-rw-r--r--net/asterisk11/distinfo4
-rw-r--r--net/asterisk11/files/patch-main__asterisk.exports.in12
-rw-r--r--net/asterisk11/files/patch-main__http.c11
9 files changed, 41 insertions, 28 deletions
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index fc05a4aaaf1b..5bfa9291bf9f 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 1.8.23.1
+PORTVERSION= 1.8.25.0
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -26,9 +26,8 @@ CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_CSTD= gnu89
-USE_GMAKE= yes
USE_GNOME= libxml2
-USES= bison
+USES= bison gmake
USE_RC_SUBR= asterisk
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/net/asterisk/distinfo b/net/asterisk/distinfo
index 86ffb5cc9e7c..b1ebc6f6e4de 100644
--- a/net/asterisk/distinfo
+++ b/net/asterisk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-1.8.23.1.tar.gz) = 22c7d54be24de0560ecca482674b85dbfac359faa63702084353074f40dc16a7
-SIZE (asterisk-1.8.23.1.tar.gz) = 25270506
+SHA256 (asterisk-1.8.25.0.tar.gz) = b218de8a7db9af370890b12c63863343f5459ae7a4ce23d386ec159c10241670
+SIZE (asterisk-1.8.25.0.tar.gz) = 29473304
diff --git a/net/asterisk/files/patch-main__asterisk.exports.in b/net/asterisk/files/patch-main__asterisk.exports.in
index 5e3ee4778877..374db8db9611 100644
--- a/net/asterisk/files/patch-main__asterisk.exports.in
+++ b/net/asterisk/files/patch-main__asterisk.exports.in
@@ -1,9 +1,9 @@
---- main/asterisk.exports.in.orig 2012-04-10 21:41:26.211743996 +0200
-+++ main/asterisk.exports.in 2012-04-10 21:41:49.229621831 +0200
-@@ -44,6 +44,8 @@
- LINKER_SYMBOL_PREFIXres_srtp;
- LINKER_SYMBOL_PREFIXres_srtp_policy;
- LINKER_SYMBOL_PREFIXsecure_call_info;
+--- main/asterisk.exports.in.orig 2013-08-22 10:19:02.000000000 +0200
++++ main/asterisk.exports.in 2013-10-27 13:37:29.053477896 +0100
+@@ -63,6 +63,8 @@
+
+ */
+ LINKER_SYMBOL_PREFIX_IO_stdin_used;
+ LINKER_SYMBOL_PREFIX__progname;
+ LINKER_SYMBOL_PREFIXenviron;
local:
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 3c5af74ce39c..f3166b2b2129 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 10.12.3
+PORTVERSION= 10.12.4
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -19,14 +19,16 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64
+DEPRECATED= asterisk 10 reached EOL on 2013-12-15
+EXPIRATION_DATE=2014-02-28
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-gsm=${LOCALBASE}
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_CSTD= gnu89
-USE_GMAKE= yes
USE_GNOME= libxml2
-USES= bison
+USES= bison gmake
USE_RC_SUBR= asterisk
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
diff --git a/net/asterisk10/distinfo b/net/asterisk10/distinfo
index 3a6006521f97..cdc2234d2f28 100644
--- a/net/asterisk10/distinfo
+++ b/net/asterisk10/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-10.12.3.tar.gz) = f4efd185c5e8d0e6b2e246e4afde8d2420da642e288fbc237bd90b1ab0d24757
-SIZE (asterisk-10.12.3.tar.gz) = 25119235
+SHA256 (asterisk-10.12.4.tar.gz) = d719e09677e2aa7866f506a8b3f83016aa27a3c652b975b7d2beebe5891e2ee9
+SIZE (asterisk-10.12.4.tar.gz) = 25120413
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index 9723d1ae1eff..08ccb79e5598 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
-PORTVERSION= 11.5.1
+PORTVERSION= 11.7.0
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -25,9 +25,8 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
CFLAGS+= -I${LOCALBASE}/include
USE_CSTD= gnu89
-USE_GMAKE= yes
USE_GNOME= libxml2
-USES= bison
+USES= bison gmake
USE_RC_SUBR= asterisk
MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
@@ -38,7 +37,9 @@ MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
NOISY_BUILD=YES \
DOCSDIR=${DOCSDIR} \
ASTCFLAGS="${CFLAGS}"
-MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
+MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8 astdb2bdb.8 \
+ astdb2sqlite3.8
+
CONFLICTS_BUILD= linuxthreads-*
CONFLICTS_INSTALL= asterisk*-1.4* asterisk*-1.6* asterisk*-1.8*
diff --git a/net/asterisk11/distinfo b/net/asterisk11/distinfo
index 939f32e738ac..0a94c78ea452 100644
--- a/net/asterisk11/distinfo
+++ b/net/asterisk11/distinfo
@@ -1,2 +1,2 @@
-SHA256 (asterisk-11.5.1.tar.gz) = fefa9def9c8f97c89931f12b29b3ac616ae1a8454c01c524678163061dcb42b2
-SIZE (asterisk-11.5.1.tar.gz) = 30580447
+SHA256 (asterisk-11.7.0.tar.gz) = 4fb283b96447f5d871632a14069f35643c8c34d08d6ec5fedf0ae3df30e0c397
+SIZE (asterisk-11.7.0.tar.gz) = 34779538
diff --git a/net/asterisk11/files/patch-main__asterisk.exports.in b/net/asterisk11/files/patch-main__asterisk.exports.in
index 438dd1034eca..185c0c8f1e6c 100644
--- a/net/asterisk11/files/patch-main__asterisk.exports.in
+++ b/net/asterisk11/files/patch-main__asterisk.exports.in
@@ -1,9 +1,9 @@
---- main/asterisk.exports.in.orig 2012-04-10 21:44:03.532803004 +0200
-+++ main/asterisk.exports.in 2012-04-10 21:44:41.134621539 +0200
-@@ -44,6 +44,8 @@
- LINKER_SYMBOL_PREFIXres_srtp;
- LINKER_SYMBOL_PREFIXres_srtp_policy;
- LINKER_SYMBOL_PREFIXsecure_call_info;
+--- main/asterisk.exports.in.orig 2013-08-22 10:22:39.000000000 +0200
++++ main/asterisk.exports.in 2013-10-27 13:38:56.825678450 +0100
+@@ -65,6 +65,8 @@
+
+ */
+ LINKER_SYMBOL_PREFIX_IO_stdin_used;
+ LINKER_SYMBOL_PREFIX__progname;
+ LINKER_SYMBOL_PREFIXenviron;
local:
diff --git a/net/asterisk11/files/patch-main__http.c b/net/asterisk11/files/patch-main__http.c
new file mode 100644
index 000000000000..f82a52bb8470
--- /dev/null
+++ b/net/asterisk11/files/patch-main__http.c
@@ -0,0 +1,11 @@
+--- main/http.c.orig 2013-12-17 23:42:58.982720307 +0100
++++ main/http.c 2013-12-17 23:43:16.054863909 +0100
+@@ -1024,7 +1024,7 @@
+ struct http_uri_redirect *redirect;
+ struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+ uint32_t bindport = DEFAULT_PORT;
+- RAII_VAR(struct ast_sockaddr *, addrs, NULL, ast_free);
++ struct ast_sockaddr *addrs = NULL;
+ int num_addrs = 0;
+ int http_tls_was_enabled = 0;
+