* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a6c59f7b68d1b2d8996d55a7497eb6f25ec0e54e
@ 2015-06-27 11:04 git
0 siblings, 0 replies; only message in thread
From: git @ 2015-06-27 11:04 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 11397 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via a6c59f7b68d1b2d8996d55a7497eb6f25ec0e54e (commit)
via 373788dcd2739e0cebf3247241db40e9803c6705 (commit)
via bdb1c525340f70fbc7e00615e23c6e4e22bd07ed (commit)
via 19fa533522078560ef17b0a79e2caeffc371b382 (commit)
via e265764bfbd332256981312a317b6812104a24ba (commit)
via 9cc5fe54aeb906a8183baf42aa34a414c73acc76 (commit)
via 25ed6b82c7d6e2ee799a4b69da046e4185333b35 (commit)
via dd13db416633e3fb4242c7ff39d235799cd28910 (commit)
via eeef5fa660454d9e838ea6e4db4395a2940bc2f4 (commit)
via 84c87c3387606a4c1dc8d3e9259755cce2ccfe06 (commit)
via 256dcf08cf10f157b038fd41fe7cdb0a5b79a83c (commit)
via f3194f517b922a98a5cad199d290169e2e0177f2 (commit)
via 5ad3e3d9714c6a951b25e4daed4f83f1fb1f71a2 (commit)
via ca263a0ea89342badd761076a334d1d427e17d0b (commit)
via 6709c69368acc8a240ef5bbc0f7cbf62fc321422 (commit)
via 79f2a76bc303276bf32f103ee081be949a4c69c2 (commit)
via 55b550dc1bf9835747013ca968c266226dcf6c46 (commit)
from 47437b0c07c31ad8941c893ff2058eeb487a5d63 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a6c59f7b68d1b2d8996d55a7497eb6f25ec0e54e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jun 27 13:03:42 2015 +0200
core92: Ship updated curl
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 373788dcd2739e0cebf3247241db40e9803c6705
Merge: e265764 bdb1c52
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Jun 27 13:01:25 2015 +0200
Merge remote-tracking branch 'mfischer/curl' into next
commit bdb1c525340f70fbc7e00615e23c6e4e22bd07ed
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Fri Jun 26 18:07:49 2015 +0200
curl: Update to 7.43.0
commit 19fa533522078560ef17b0a79e2caeffc371b382
Merge: 9cc5fe5 47437b0
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Fri Jun 26 18:06:47 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into curl
commit e265764bfbd332256981312a317b6812104a24ba
Author: Dirk Wagner <dirk.wagner(a)ipfire.org>
Date: Fri Jun 19 12:12:01 2015 +0200
asterisk addon: Update to 11.18.0
commit 9cc5fe54aeb906a8183baf42aa34a414c73acc76
Merge: 25ed6b8 1f02b6e
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sat Jun 20 23:08:05 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 25ed6b82c7d6e2ee799a4b69da046e4185333b35
Merge: dd13db4 5428eee
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Tue Jun 16 21:28:39 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit dd13db416633e3fb4242c7ff39d235799cd28910
Merge: eeef5fa ee299e2
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Tue Jun 16 12:02:42 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit eeef5fa660454d9e838ea6e4db4395a2940bc2f4
Merge: 84c87c3 1f15cc0
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Mon Jun 15 00:43:43 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 84c87c3387606a4c1dc8d3e9259755cce2ccfe06
Merge: 256dcf0 e80a7ef
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Fri May 29 09:18:34 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 256dcf08cf10f157b038fd41fe7cdb0a5b79a83c
Merge: f3194f5 031b9f7
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Thu May 28 21:16:06 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit f3194f517b922a98a5cad199d290169e2e0177f2
Merge: 5ad3e3d 38b8efd
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Thu May 28 13:23:47 2015 +0200
Merge remote-tracking branch 'origin' into next
commit 5ad3e3d9714c6a951b25e4daed4f83f1fb1f71a2
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sun May 17 15:12:16 2015 +0200
graphs.pl: bugfixes regarding rrdtool
commit ca263a0ea89342badd761076a334d1d427e17d0b
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Fri May 15 12:43:06 2015 +0200
rrdtool: Update to 1.5.3
commit 6709c69368acc8a240ef5bbc0f7cbf62fc321422
Merge: 79f2a76 81daa02
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Wed May 27 22:23:51 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 79f2a76bc303276bf32f103ee081be949a4c69c2
Merge: 55b550d 4ec8107
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Thu May 21 21:18:37 2015 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 55b550dc1bf9835747013ca968c266226dcf6c46
Author: Matthias Fischer <fischerm(a)ipfire.org>
Date: Sun May 17 15:12:16 2015 +0200
graphs.pl: bugfixes regarding rrdtool
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/curl | 8 ++++++++
config/rootfiles/{oldcore/90 => core/92}/filelists/curl | 0
config/rootfiles/packages/asterisk | 8 ++++----
lfs/asterisk | 6 +++---
lfs/curl | 4 ++--
5 files changed, 17 insertions(+), 9 deletions(-)
copy config/rootfiles/{oldcore/90 => core/92}/filelists/curl (100%)
Difference in files:
diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl
index af32dfa..0fd2819 100644
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -144,6 +144,9 @@ usr/lib/libcurl.so.4.3.0
#usr/share/man/man3/CURLOPT_OPENSOCKETDATA.3
#usr/share/man/man3/CURLOPT_OPENSOCKETFUNCTION.3
#usr/share/man/man3/CURLOPT_PASSWORD.3
+#usr/share/man/man3/CURLOPT_PATH_AS_IS.3
+#usr/share/man/man3/CURLOPT_PINNEDPUBLICKEY.3
+#usr/share/man/man3/CURLOPT_PIPEWAIT.3
#usr/share/man/man3/CURLOPT_PORT.3
#usr/share/man/man3/CURLOPT_POST.3
#usr/share/man/man3/CURLOPT_POSTFIELDS.3
@@ -164,6 +167,7 @@ usr/lib/libcurl.so.4.3.0
#usr/share/man/man3/CURLOPT_PROXYTYPE.3
#usr/share/man/man3/CURLOPT_PROXYUSERNAME.3
#usr/share/man/man3/CURLOPT_PROXYUSERPWD.3
+#usr/share/man/man3/CURLOPT_PROXY_SERVICE_NAME.3
#usr/share/man/man3/CURLOPT_PROXY_TRANSFER_MODE.3
#usr/share/man/man3/CURLOPT_PUT.3
#usr/share/man/man3/CURLOPT_QUOTE.3
@@ -185,6 +189,7 @@ usr/lib/libcurl.so.4.3.0
#usr/share/man/man3/CURLOPT_SASL_IR.3
#usr/share/man/man3/CURLOPT_SEEKDATA.3
#usr/share/man/man3/CURLOPT_SEEKFUNCTION.3
+#usr/share/man/man3/CURLOPT_SERVICE_NAME.3
#usr/share/man/man3/CURLOPT_SHARE.3
#usr/share/man/man3/CURLOPT_SOCKOPTDATA.3
#usr/share/man/man3/CURLOPT_SOCKOPTFUNCTION.3
@@ -209,10 +214,12 @@ usr/lib/libcurl.so.4.3.0
#usr/share/man/man3/CURLOPT_SSL_CTX_FUNCTION.3
#usr/share/man/man3/CURLOPT_SSL_ENABLE_ALPN.3
#usr/share/man/man3/CURLOPT_SSL_ENABLE_NPN.3
+#usr/share/man/man3/CURLOPT_SSL_FALSESTART.3
#usr/share/man/man3/CURLOPT_SSL_OPTIONS.3
#usr/share/man/man3/CURLOPT_SSL_SESSIONID_CACHE.3
#usr/share/man/man3/CURLOPT_SSL_VERIFYHOST.3
#usr/share/man/man3/CURLOPT_SSL_VERIFYPEER.3
+#usr/share/man/man3/CURLOPT_SSL_VERIFYSTATUS.3
#usr/share/man/man3/CURLOPT_STDERR.3
#usr/share/man/man3/CURLOPT_TCP_KEEPALIVE.3
#usr/share/man/man3/CURLOPT_TCP_KEEPIDLE.3
@@ -296,5 +303,6 @@ usr/lib/libcurl.so.4.3.0
#usr/share/man/man3/libcurl-errors.3
#usr/share/man/man3/libcurl-multi.3
#usr/share/man/man3/libcurl-share.3
+#usr/share/man/man3/libcurl-symbols.3
#usr/share/man/man3/libcurl-tutorial.3
#usr/share/man/man3/libcurl.3
diff --git a/config/rootfiles/core/92/filelists/curl b/config/rootfiles/core/92/filelists/curl
new file mode 120000
index 0000000..4b84bef
--- /dev/null
+++ b/config/rootfiles/core/92/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index 6654621..de75232 100755
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -835,15 +835,15 @@ var/lib/asterisk/sounds/digits/de/xh-8x.gsm
var/lib/asterisk/sounds/digits/de/xh-9x.gsm
var/lib/asterisk/sounds/digits/de/yesterday.gsm
var/lib/asterisk/sounds/en
-var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.26
+var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.4.27
var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.4.15
var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm
var/lib/asterisk/sounds/en/1-yes-2-no.gsm
-#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.27
#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.4.15
-#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.27
#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.4.15
-#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.26
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.27
#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.4.15
var/lib/asterisk/sounds/en/OfficeSpace.gsm
var/lib/asterisk/sounds/en/Randulo-allison.gsm
diff --git a/lfs/asterisk b/lfs/asterisk
index 7575246..154fe77 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -20,7 +20,7 @@
include Config
-VER = 11.17.1
+VER = 11.18.0
THISAPP = asterisk-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -28,7 +28,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = asterisk
-PAK_VER = 16
+PAK_VER = 17
DEPS = "libsrtp"
@@ -46,7 +46,7 @@ asterisk-extra-sounds-en-gsm-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds
asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
-$(DL_FILE)_MD5 = 2c6cd0f499152d0d5ff32f36e274fc2e
+$(DL_FILE)_MD5 = 3ddb42b54db200faccd68906df210a40
asterisk-extra-sounds-en-gsm-1.4.15.tar.gz_MD5 = 5099fc65f49008e33ba7fb043a4ec995
asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
diff --git a/lfs/curl b/lfs/curl
index 0fd92c1..7de9aa3 100644
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,7 +24,7 @@
include Config
-VER = 7.40.0
+VER = 7.43.0
THISAPP = curl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 58943642ea0ed050ab0431ea1caf3a6f
+$(DL_FILE)_MD5 = 3037f0b6ce03d434618e9db5506ae6be
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-06-27 11:04 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-27 11:04 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a6c59f7b68d1b2d8996d55a7497eb6f25ec0e54e git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox