Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f5abc3247a082a6583657b34a6ad193d803470b2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f5abc3247a082a6583657b34a6ad193d803470b2)
  • Date: Tue, 10 Jan 2017 09:43:43 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/gnutls/BUILD | 2 +-
crypto/gnutls/DETAILS | 12 ++++++------
crypto/gnutls/HISTORY | 5 +++++
net/iputils-ping/0001-build-ping.patch | 25 +++++++++++++++++++++++++
net/iputils-ping/BUILD | 2 +-
net/iputils-ping/DETAILS | 8 ++++----
net/iputils-ping/HISTORY | 4 ++++
net/iputils-ping/INSTALL | 6 ++++--
net/iputils-ping/PRE_BUILD | 3 +++
9 files changed, 53 insertions(+), 14 deletions(-)

New commits:
commit f5abc3247a082a6583657b34a6ad193d803470b2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

net/iputils-ping: version 20161105

commit 12ec861a5f0595b48830fc336e4b33196ebd9834
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/gnutls: version 3.5.8, security update

diff --git a/crypto/gnutls/BUILD b/crypto/gnutls/BUILD
index 7cf3bf0..1dc6a68 100755
--- a/crypto/gnutls/BUILD
+++ b/crypto/gnutls/BUILD
@@ -1,4 +1,4 @@
-if [[ "$GNUTLS_BRANCH" != stable-next ]]; then
+if [[ "$GNUTLS_BRANCH" == stable-old ]]; then
OPTS="--enable-openssl-compatibility ${OPTS}"
fi &&
default_build
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index 3887ee6..3cf62f9 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -5,17 +5,17 @@ if [[ -z $GNUTLS_BRANCH ]]; then
fi

case $GNUTLS_BRANCH in
- stable)
+ stable-old)
VERSION=3.4.17
SECURITY_PATCH=18
;;
- stable-old)
- VERSION=3.3.26
- SECURITY_PATCH=16
+ stable)
+ VERSION=3.5.8
+ SECURITY_PATCH=4
;;
stable-next)
- VERSION=3.5.7
- SECURITY_PATCH=3
+ VERSION=3.5.8
+ SECURITY_PATCH=4
;;
esac
SOURCE=$SPELL-$VERSION.tar.xz
diff --git a/crypto/gnutls/HISTORY b/crypto/gnutls/HISTORY
index db05b7f..d2781a8 100644
--- a/crypto/gnutls/HISTORY
+++ b/crypto/gnutls/HISTORY
@@ -1,3 +1,8 @@
+2017-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5.8, security update, fixes GNUTLS-SA-2017-1 and
+ GNUTLS-SA-2017-2
+ * DETAILS, BUILD: 3.5 is the stable branch now
+
2017-01-05 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: optionally depends on libunistring

diff --git a/net/iputils-ping/0001-build-ping.patch
b/net/iputils-ping/0001-build-ping.patch
new file mode 100644
index 0000000..6a5085e
--- /dev/null
+++ b/net/iputils-ping/0001-build-ping.patch
@@ -0,0 +1,25 @@
+From cce5ff737c67ed319b7d146c117ddeaa04969257 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Tue, 10 Jan 2017 10:35:52 +0100
+Subject: [PATCH] build ping
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 3a4198e..b7de60e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -116,7 +116,7 @@ endif
+ endif
+
+ # -------------------------------------
+-TARGETS=ping tracepath traceroute6 clockdiff rdisc arping tftpd rarpd
++TARGETS=ping
+
+ LDLIBS=$(LDLIB) $(ADDLIB)
+
+--
+2.11.0
+
diff --git a/net/iputils-ping/BUILD b/net/iputils-ping/BUILD
index a0342b1..9858370 100755
--- a/net/iputils-ping/BUILD
+++ b/net/iputils-ping/BUILD
@@ -1,4 +1,4 @@
-make TARGETS="ping ping6" &&
+default_build_make &&
if is_depends_enabled $SPELL opensp ; then
make_single &&
make -C doc man &&
diff --git a/net/iputils-ping/DETAILS b/net/iputils-ping/DETAILS
index 9f871ca..531cace 100755
--- a/net/iputils-ping/DETAILS
+++ b/net/iputils-ping/DETAILS
@@ -1,11 +1,11 @@
SPELL=iputils-ping
- VERSION=s20121221
+ VERSION=s20161105
SOURCE=iputils-${VERSION}.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/iputils-${VERSION}
-
SOURCE_URL[0]=http://sourceforge.net/projects/iputils/files/$SOURCE/download
- WEB_SITE=http://iputils.sourceforge.net/
+ SOURCE_URL[0]=https://github.com/iputils/iputils/archive/${VERSION}.tar.gz
+ WEB_SITE=https://github.com/iputils/iputils
ENTERED=20030509
-
SOURCE_HASH=sha512:693d240becd766c345c3af2053fc0699b9358e54d667d40738c21d731b70e779112d81476a220d8300ca54250120385414a13610d445996f95a90571047389f4
+
SOURCE_HASH=sha512:1593077b6eff1e57eb8a32897dd9624a745d0c87db1501a96436b168b109ef22d41ee69406a4a2154d8d72c823c1df723b4c52eeec8d82ba2762fb01dc0d4797
LICENSE[0]=GPL
DOCS="README"
KEYWORDS="net"
diff --git a/net/iputils-ping/HISTORY b/net/iputils-ping/HISTORY
index 6e1a51d..ede8654 100644
--- a/net/iputils-ping/HISTORY
+++ b/net/iputils-ping/HISTORY
@@ -1,3 +1,7 @@
+2017-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, 0001-build-ping.patch, BUILD, INSTALL, PRE_BUILD:
+ version 20161105
+
2015-08-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: use make_single when building documentation

diff --git a/net/iputils-ping/INSTALL b/net/iputils-ping/INSTALL
index 85547cb..db68ee0 100755
--- a/net/iputils-ping/INSTALL
+++ b/net/iputils-ping/INSTALL
@@ -1,5 +1,7 @@
-install -m 4755 ping ping6 $INSTALL_ROOT/usr/bin &&
+install -m 4755 ping $INSTALL_ROOT/usr/bin &&
+ln -sfn /usr/bin/ping "$INSTALL_ROOT/usr/bin/ping6" &&
+
if is_depends_enabled $SPELL opensp ; then
install -m 644 doc/ping.8 $INSTALL_ROOT/usr/share/man/man8/ping.8 &&
- install -m 644 doc/ping.8 $INSTALL_ROOT/usr/share/man/man8/ping6.8
+ ln -sfn /usr/share/man/man8/ping.8
"$INSTALL_ROOT/usr/share/man/man8/ping6.8"
fi
diff --git a/net/iputils-ping/PRE_BUILD b/net/iputils-ping/PRE_BUILD
index 2b1c652..8796c62 100755
--- a/net/iputils-ping/PRE_BUILD
+++ b/net/iputils-ping/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-build-ping.patch" &&
+
if ! is_depends_enabled $SPELL licap; then
sed -i -e 's/USE_CAP=yes/USE_CAP=no/' Makefile
fi &&



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (f5abc3247a082a6583657b34a6ad193d803470b2), Florian Franzmann, 01/10/2017

Archive powered by MHonArc 2.6.24.

Top of Page