* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. eb0a79e888bfd7abb91e14e5c901642630e35ff3
@ 2013-07-07 9:24 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-07-07 9:24 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7095 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 eb0a79e888bfd7abb91e14e5c901642630e35ff3 (commit)
via 5cf285fa87a5050e415bc4e47fc32ef5f3e35f1e (commit)
via 8eb73ff1680d75d048cd40031384a31aea694b67 (commit)
via f7dd43350987c29687784636133715aa26d93298 (commit)
via b99f56d75409aed3e58f285c765d4715ac961ced (commit)
via abd5008105115eabbf4a8f5890a1bcf1df812ef0 (commit)
from c84b55f63498f6676c5da561beda9340f656d3dc (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 eb0a79e888bfd7abb91e14e5c901642630e35ff3
Merge: c84b55f 5cf285f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jul 7 11:24:03 2013 +0200
Merge branch 'gcc-4.8'
commit 5cf285fa87a5050e415bc4e47fc32ef5f3e35f1e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jul 7 11:23:17 2013 +0200
gnutls: Update to 3.2.1.
commit 8eb73ff1680d75d048cd40031384a31aea694b67
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jul 7 11:14:37 2013 +0200
nettle: Update to 2.7.1.
commit f7dd43350987c29687784636133715aa26d93298
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jul 7 11:14:17 2013 +0200
samba: Update to 3.6.16.
commit b99f56d75409aed3e58f285c765d4715ac961ced
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jul 7 10:51:11 2013 +0200
pcre: Update to 8.33.
commit abd5008105115eabbf4a8f5890a1bcf1df812ef0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Jul 7 10:43:03 2013 +0200
gzip: Update to 1.6.
-----------------------------------------------------------------------
Summary of changes:
gnutls/gnutls.nm | 17 ++++++++---------
gzip/gzip.nm | 5 ++++-
gzip/patches/gzip-1.3.5-zforce.patch | 2 +-
gzip/patches/gzip-1.3.9-addsuffix.patch | 19 -------------------
nettle/nettle.nm | 3 +--
pcre/pcre.nm | 9 ++++++++-
samba/samba.nm | 5 ++---
7 files changed, 24 insertions(+), 36 deletions(-)
delete mode 100644 gzip/patches/gzip-1.3.9-addsuffix.patch
Difference in files:
diff --git a/gnutls/gnutls.nm b/gnutls/gnutls.nm
index f4c2b69..70158c7 100644
--- a/gnutls/gnutls.nm
+++ b/gnutls/gnutls.nm
@@ -5,8 +5,8 @@
name = gnutls
version = %{ver_maj}.%{ver_min}
-ver_maj = 3.1
-ver_min = 9
+ver_maj = 3.2
+ver_min = 1
release = 1
groups = System/Libraries
@@ -32,7 +32,7 @@ build
libidn-devel
libtasn1-devel >= 3.2
lzo-devel
- nettle-devel >= 2.5
+ nettle-devel >= 2.7
perl
p11-kit-devel >= 0.14
readline-devel
@@ -44,21 +44,20 @@ build
configure_options += \
--with-included-libcfg \
- --disable-srp-authentication \
--disable-openssl-compatibility \
--with-libgcrypt
# Test suite does not work when srp is disabled.
- #test
- # export LD_LIBRARY_PATH=$(pwd)/lib/.libs
- # make check
- #end
+ test
+ export LD_LIBRARY_PATH=$(pwd)/lib/.libs
+ make check
+ end
end
packages
package %{name}
requires
- nettle >= 2.5
+ nettle >= 2.7
p11-kit >= 0.14
end
end
diff --git a/gzip/gzip.nm b/gzip/gzip.nm
index 020e9d7..20c389b 100644
--- a/gzip/gzip.nm
+++ b/gzip/gzip.nm
@@ -4,7 +4,7 @@
###############################################################################
name = gzip
-version = 1.5
+version = 1.6
release = 1
groups = Applications/Compression
@@ -23,6 +23,9 @@ build
requires
coreutils
less
+ texinfo
+
+ /usr/bin/more
end
# NO_ASM is for textrels.
diff --git a/gzip/patches/gzip-1.3.5-zforce.patch b/gzip/patches/gzip-1.3.5-zforce.patch
index 5a9beca..b13c766 100644
--- a/gzip/patches/gzip-1.3.5-zforce.patch
+++ b/gzip/patches/gzip-1.3.5-zforce.patch
@@ -6,7 +6,7 @@ diff -up gzip-1.3.12/zforce.in.zforce gzip-1.3.12/zforce.in
fi
- if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then
-+ if gzip -l < "$i" 2>/dev/null | grep '^compressed' > /dev/null; then
++ if gzip -l < "$i" 2>/dev/null | grep 'compressed' > /dev/null; then
new="$i.gz"
if mv "$i" "$new"; then
diff --git a/gzip/patches/gzip-1.3.9-addsuffix.patch b/gzip/patches/gzip-1.3.9-addsuffix.patch
deleted file mode 100644
index 80a823d..0000000
--- a/gzip/patches/gzip-1.3.9-addsuffix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gzip-1.3.9/zmore.in.pom 2007-01-15 15:31:26.000000000 +0100
-+++ gzip-1.3.9/zmore.in 2007-01-15 15:34:06.000000000 +0100
-@@ -70,7 +70,7 @@
- --v*) exec echo "$version";;
- esac
-
-- < "$FILE" || continue
-+ if test -e $FILE || test -e $FILE.gz; then
- if test $FIRST -eq 0; then
- echo $n1 "--More--(Next file: $FILE)$n2"
- stty $cb -echo 2>/dev/null
-@@ -88,5 +88,7 @@
- if test -t 1; then
- FIRST=0
- fi
-+ else < $FILE
-+ fi
- done
- fi
diff --git a/nettle/nettle.nm b/nettle/nettle.nm
index 83d4acb..75becbe 100644
--- a/nettle/nettle.nm
+++ b/nettle/nettle.nm
@@ -4,7 +4,7 @@
###############################################################################
name = nettle
-version = 2.5
+version = 2.7.1
release = 1
groups = System/Libraries
@@ -25,7 +25,6 @@ build
requires
gmp-devel
m4
- openssl-devel
end
configure_options += \
diff --git a/pcre/pcre.nm b/pcre/pcre.nm
index 8e1797b..53e27eb 100644
--- a/pcre/pcre.nm
+++ b/pcre/pcre.nm
@@ -4,7 +4,7 @@
###############################################################################
name = pcre
-version = 8.32
+version = 8.33
release = 1
compat_version = 8.21
@@ -48,6 +48,13 @@ build
make %{PARALLELISMFLAGS}
end
+ test
+ make check
+
+ cd %{DIR_SRC}/%{name}-%{compat_version}
+ make check
+ end
+
install_cmds
cd %{DIR_SRC}/%{name}-%{compat_version}
install -m 755 .libs/libpcre.so.0.0.1 %{BUILDROOT}%{libdir}
diff --git a/samba/samba.nm b/samba/samba.nm
index 75274f2..39f4c84 100644
--- a/samba/samba.nm
+++ b/samba/samba.nm
@@ -4,10 +4,9 @@
###############################################################################
name = samba
-version = 3.6.5
-release = 2
+version = 3.6.16
+release = 1
-maintainer = Christian Schmidt <christian.schmidt(a)ipfire.org>
groups = Networking/Daemons
url = http://www.samba.org/
license = GPLv3+ and LGPLv3+
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-07-07 9:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-07 9:24 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. eb0a79e888bfd7abb91e14e5c901642630e35ff3 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox