* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5ac2ac488c809beafa6443e0410e573fb1be92b2
@ 2016-09-24 12:02 git
0 siblings, 0 replies; only message in thread
From: git @ 2016-09-24 12:02 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 8769 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 3.x development tree".
The branch, master has been updated
via 5ac2ac488c809beafa6443e0410e573fb1be92b2 (commit)
via b17a953bb55baa7c479b206af625fb6252c969e4 (commit)
via f36a146aa67af19cb05f8d37e6b076d11e0a8713 (commit)
via 93a6183b4c731aa4150f6dc721b784f67cea2e3a (commit)
via 45df5c83d2ea09f0676bb445ff22a72d42dc8cdd (commit)
via e3c3abe46b7364ab1f52d4a5787a8ecb729c5e9e (commit)
from 95ea13fd8f26d6e217ec1658e267ea2987b7bc91 (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 5ac2ac488c809beafa6443e0410e573fb1be92b2
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 12:59:51 2016 +0100
guile: Update to 2.0.11
Also fixes build error in the test stage
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b17a953bb55baa7c479b206af625fb6252c969e4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 12:02:52 2016 +0100
compat-guile: Fix FTBFS
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f36a146aa67af19cb05f8d37e6b076d11e0a8713
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 11:39:21 2016 +0100
gnutls: Update to 3.5.4
The old version did not build against nettle 3 and hence
required being updated.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 93a6183b4c731aa4150f6dc721b784f67cea2e3a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 11:37:43 2016 +0100
iperf: Update to 2.0.9
Project home has changed, too or project has been forked
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 45df5c83d2ea09f0676bb445ff22a72d42dc8cdd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 10:48:14 2016 +0100
iftop: Update to 1.0pre4
The old version FTBFS and is therefore updated
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e3c3abe46b7364ab1f52d4a5787a8ecb729c5e9e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Sep 24 10:16:32 2016 +0100
p11-kit: Update to 0.23.2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
compat-guile/compat-guile.nm | 4 +++-
gnutls/gnutls.nm | 9 +++++----
gnutls/patches/gnutls-3.1.11-nosrp.patch | 12 ------------
gnutls/patches/gnutls-3.2.7-rpath.patch | 12 ------------
guile/guile.nm | 6 ++++--
iftop/iftop.nm | 12 +++++-------
iperf/iperf.nm | 6 +++---
p11-kit/p11-kit.nm | 7 +++++--
8 files changed, 25 insertions(+), 43 deletions(-)
delete mode 100644 gnutls/patches/gnutls-3.1.11-nosrp.patch
delete mode 100644 gnutls/patches/gnutls-3.2.7-rpath.patch
Difference in files:
diff --git a/compat-guile/compat-guile.nm b/compat-guile/compat-guile.nm
index 8bac023..c350897 100644
--- a/compat-guile/compat-guile.nm
+++ b/compat-guile/compat-guile.nm
@@ -5,7 +5,7 @@
name = compat-guile
version = 1.8.8
-release = 1
+release = 2
thisapp = guile-%{version}
groups = Development/Tools
@@ -33,6 +33,8 @@ build
readline-devel
end
+ export LD_LIBRARY_PATH = %{DIR_APP}/libguile/.libs
+
configure_options += \
--disable-static \
--disable-error-on-warning
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index f3160f6..f30c2b8 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -5,8 +5,8 @@
name = gnutls
version = %{ver_maj}.%{ver_min}
-ver_maj = 3.3
-ver_min = 10
+ver_maj = 3.5
+ver_min = 4
release = 1
groups = System/Libraries
@@ -32,9 +32,10 @@ build
libidn-devel
libtasn1-devel >= 3.2
lzo-devel
- nettle-devel >= 2.7
+ net-tools
+ nettle-devel >= 3.2
perl
- p11-kit-devel >= 0.14
+ p11-kit-devel >= 0.23.1
readline-devel
texinfo
zlib-devel
diff --git a/gnutls/patches/gnutls-3.1.11-nosrp.patch b/gnutls/patches/gnutls-3.1.11-nosrp.patch
deleted file mode 100644
index 29227c0..0000000
--- a/gnutls/patches/gnutls-3.1.11-nosrp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c
---- gnutls-3.1.10/tests/srp/mini-srp.c.noecc 2013-03-21 21:42:28.000000000 +0100
-+++ gnutls-3.1.10/tests/srp/mini-srp.c 2013-03-25 13:42:20.753422209 +0100
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- #include <stdlib.h>
-
--#if defined(_WIN32)
-+#if defined(_WIN32) || !defined(ENABLE_SRP)
-
- int main()
- {
diff --git a/gnutls/patches/gnutls-3.2.7-rpath.patch b/gnutls/patches/gnutls-3.2.7-rpath.patch
deleted file mode 100644
index 4e6aed3..0000000
--- a/gnutls/patches/gnutls-3.2.7-rpath.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure
---- gnutls-3.2.7.orig/configure 2013-11-23 11:09:49.000000000 +0100
-+++ gnutls-3.2.7/configure 2013-11-25 16:53:05.559440656 +0100
-@@ -39652,7 +39652,7 @@
- shlibpath_overrides_runpath=unknown
- version_type=none
- dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"
- need_lib_prefix=unknown
- hardcode_into_libs=no
-
diff --git a/guile/guile.nm b/guile/guile.nm
index 06b7825..61e491f 100644
--- a/guile/guile.nm
+++ b/guile/guile.nm
@@ -4,8 +4,8 @@
###############################################################################
name = guile
-version = 2.0.9
-release = 3
+version = 2.0.11
+release = 1
groups = Development/Tools
url = http://www.gnu.org/software/guile/
@@ -36,6 +36,8 @@ build
--disable-static \
--disable-error-on-warning
+ export LD_LIBRARY_PATH = %{DIR_APP}/libguile/.libs
+
test
make check
end
diff --git a/iftop/iftop.nm b/iftop/iftop.nm
index 0f812e6..5f77d04 100644
--- a/iftop/iftop.nm
+++ b/iftop/iftop.nm
@@ -4,8 +4,10 @@
###############################################################################
name = iftop
-version = 0.17
-release = 2
+version = 1.0
+preversion = pre4
+release = 0.%{preversion}.1
+thisapp = %{name}-%{version}%{preversion}
groups = Applications/System
url = http://www.ex-parrot.com/pdw/iftop/
@@ -16,7 +18,7 @@ description
iftop is an interactive text-mode traffic viewer for Linux.
end
-source_dl =
+source_dl = http://www.ex-parrot.com/pdw/iftop/download/
sources = %{thisapp}.tar.gz
build
@@ -24,10 +26,6 @@ build
libpcap-devel
ncurses-devel
end
-
- configure_options += \
- --sysconfdir=/etc \
- --mandir=/usr/share/man
end
packages
diff --git a/iperf/iperf.nm b/iperf/iperf.nm
index 0fa375b..be93c9a 100644
--- a/iperf/iperf.nm
+++ b/iperf/iperf.nm
@@ -4,11 +4,11 @@
###############################################################################
name = iperf
-version = 2.0.5
+version = 2.0.9
release = 1
groups = Applications/Internet
-url = http://www..sourceforge.net/projects/iperf/files/
+url = http://www.sourceforge.net/projects/iperf2/
license = GPLv3+ and LGPLv3+
summary = Measurement tool for TCP/UDP bandwidth performance
@@ -18,7 +18,7 @@ description
jitter, datagram loss.
end
-source_dl = http://sourceforge.net/projects/iperf/files
+source_dl = http://sourceforge.net/projects/iperf2/files
build
requires
diff --git a/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm
index 16b754e..3b5945c 100644
--- a/p11-kit/p11-kit.nm
+++ b/p11-kit/p11-kit.nm
@@ -4,7 +4,7 @@
###############################################################################
name = p11-kit
-version = 0.14
+version = 0.23.2
release = 1
groups = System/Libraries
@@ -24,7 +24,10 @@ end
source_dl = http://p11-glue.freedesktop.org/releases/
build
- configure_options += --sysconfdir=/etc
+ requires
+ libffi-devel >= 3.0.0
+ libtasn1-devel >= 2.3
+ end
end
packages
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-09-24 12:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-24 12:02 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5ac2ac488c809beafa6443e0410e573fb1be92b2 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox