Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f5b3c7c47b1f1c93e3b1c0e1e4e3c4338b096813)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f5b3c7c47b1f1c93e3b1c0e1e4e3c4338b096813)
  • Date: Sat, 14 Mar 2015 09:35:54 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

dev/null |binary
utils/ntp/DETAILS | 6 +++---
utils/ntp/HISTORY | 8 ++++++++
utils/ntp/PRE_BUILD | 18 ++++++++++++++++--
utils/ntp/glibc-2.10.patch | 21 ---------------------
5 files changed, 27 insertions(+), 26 deletions(-)

New commits:
commit 110f92e0710e68072c62608a3fc9bff557d370b9
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ntp: bump to 4.2.8p1 for SECURITY

diff --git a/utils/ntp/DETAILS b/utils/ntp/DETAILS
index a6b1ab9..95d47a5 100755
--- a/utils/ntp/DETAILS
+++ b/utils/ntp/DETAILS
@@ -1,11 +1,11 @@
SPELL=ntp
- VERSION=4.2.6p5
- SECURITY_PATCH=1
+ VERSION=4.2.8p1
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.udel.edu/pub/ntp/ntp4/$SOURCE

SOURCE_URL[1]=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH="sha512:4075260dc8817c5b1ed04ec8a60316f938b2c188d95419eb1c3808a5b2854c91d40c62f36b8d3be30ea40cc92415e1b7326a9362a4c61c53c33abcca781b3f4f"
WEB_SITE=http://www.ntp.org/
ENTERED=20011004
LICENSE[0]=PD
diff --git a/utils/ntp/HISTORY b/utils/ntp/HISTORY
index 6024634..7095ef0 100644
--- a/utils/ntp/HISTORY
+++ b/utils/ntp/HISTORY
@@ -1,3 +1,11 @@
+2015-03-14 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 4.2.8p1, fixing multiple security issues
+ (see https://ics-cert.us-cert.gov/advisories/ICSA-14-353-01C),
+ SECURITY_PATCH++, switched to hash sum from non-upstream sig
+ * glibc-2.10.patch: removed
+ * PRE_BUILD: fix build with nasty sys/capability.h (known since
+ years, apparently, not fixed for whatever reason)
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/utils/ntp/PRE_BUILD b/utils/ntp/PRE_BUILD
index 528884b..01bf115 100755
--- a/utils/ntp/PRE_BUILD
+++ b/utils/ntp/PRE_BUILD
@@ -1,5 +1,19 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p1 -i "$SCRIPT_DIRECTORY/glibc-2.10.patch"
-
+patch -p0 <<EOT
+--- ntpd/ntpd.c.orig 2015-03-14 14:10:57.520666886 +0100
++++ ntpd/ntpd.c 2015-03-14 15:25:22.182850928 +0100
+@@ -105,6 +105,11 @@
+ # include <grp.h>
+ # include <pwd.h>
+ #ifdef HAVE_LINUX_CAPABILITIES
++/* sys/capabilities.h unconditionally
++ faking linux/types.h header guard,
++ breaking sys/prctl.h witout regard,
++ fixed by early linux/types.h, really */
++# include <linux/types.h>
+ # include <sys/capability.h>
+ # include <sys/prctl.h>
+ #endif /* HAVE_LINUX_CAPABILITIES */
+EOT
diff --git a/utils/ntp/glibc-2.10.patch b/utils/ntp/glibc-2.10.patch
deleted file mode 100644
index 99101e5..0000000
--- a/utils/ntp/glibc-2.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# From http://bugs.gentoo.org/show_bug.cgi?id=270483
-#
---- a/include/ntp_syscall.h 2009-05-19 16:44:55.048156467 -0400
-+++ b/include/ntp_syscall.h 2009-05-19 16:46:19.293323686 -0400
-@@ -14,6 +14,14 @@
- # include <sys/timex.h>
- #endif
-
-+#if defined(ADJ_NANO) && !defined(MOD_NANO)
-+#define MOD_NANO ADJ_NANO
-+#endif
-+
-+#if defined(ADJ_TAI) && !defined(MOD_TAI)
-+#define MOD_TAI ADJ_TAI
-+#endif
-+
- #ifndef NTP_SYSCALLS_LIBC
- #ifdef NTP_SYSCALLS_STD
- # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))
-
diff --git a/utils/ntp/ntp-4.2.6p5.tar.gz.sig
b/utils/ntp/ntp-4.2.6p5.tar.gz.sig
deleted file mode 100644
index ae7a6f2..0000000
Binary files a/utils/ntp/ntp-4.2.6p5.tar.gz.sig and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (f5b3c7c47b1f1c93e3b1c0e1e4e3c4338b096813), Thomas Orgis, 03/14/2015

Archive powered by MHonArc 2.6.24.

Top of Page