Skip to contentSkip to conversation

ntp: bump to version 4.2.6p3 and fix glibc build failure

PATCH New Gustavo Zacarias 3 participants 4 messages Jan 27, 2011 – Jan 29, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ntp: bump to version 4.2.6p3 and fix glibc build failure

Bump to version 4.2.6p3 and fix a build failure with external toolchains that use certain glibc versions as point out by speakman on IRC.

---
 ...-4.2.6_p2-adjtimex.patch => ntp-adjtimex.patch} |    0
 package/ntp/ntp-nano.patch                         |   23 ++++++++++++++++++++
 package/ntp/ntp.mk                                 |    2 +-
 3 files changed, 24 insertions(+), 1 deletions(-)
 rename package/ntp/{ntp-4.2.6_p2-adjtimex.patch => ntp-adjtimex.patch} (100%)
 create mode 100644 package/ntp/ntp-nano.patch
package/ntp/ntp-adjtimex.patch renamed from package/ntp/ntp-4.2.6_p2-adjtimex.patch +0 -0
similarity index 100%
rename from package/ntp/ntp-4.2.6_p2-adjtimex.patch
rename to package/ntp/ntp-adjtimex.patch
package/ntp/ntp-nano.patch new file +23 -0
new file mode 100644
index 0000000..d16046c
@@ -0,0 +1,23 @@
+Fixes issues with glibc header files, see
+http://bugs.gentoo.org/show_bug.cgi?id=270483
+
+Signed-off-by: Gustavo Zacarias <[email protected]>
+
+diff -Nura ntp-4.2.6p2.orig/include/ntp_syscall.h ntp-4.2.6p2/include/ntp_syscall.h
+--- ntp-4.2.6p2.orig/include/ntp_syscall.h	2009-12-09 04:36:37.000000000 -0300
++++ ntp-4.2.6p2/include/ntp_syscall.h	2011-01-27 13:09:05.072336628 -0300
+@@ -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))
package/ntp/ntp.mk +1 -1
index 51e3956..7e09b5e 100644
@@ -3,7 +3,7 @@
 # ntp
 #
 #############################################################
-NTP_VERSION = 4.2.6p2
+NTP_VERSION = 4.2.6p3
 NTP_SOURCE = ntp-$(NTP_VERSION).tar.gz
 NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
 
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH v2 1/1 ocf: new package

---
 package/Config.in                    |    1 +
 package/ocf/Config.in                |   19 ++
 package/ocf/ocf-cryptodev-20101223.h |  480 ++++++++++++++++++++++++++++++++++
 package/ocf/ocf.mk                   |   39 +++
 4 files changed, 539 insertions(+), 0 deletions(-)
 create mode 100644 package/ocf/Config.in
 create mode 100644 package/ocf/ocf-cryptodev-20101223.h
 create mode 100644 package/ocf/ocf.mk
package/Config.in +1 -0
index 8154907..c82e6ce 100644
@@ -245,6 +245,7 @@ menu "Crypto"
 source "package/beecrypt/Config.in"
 source "package/libgcrypt/Config.in"
 source "package/libgpg-error/Config.in"
+source "package/ocf/Config.in"
 source "package/openssl/Config.in"
 endmenu
 
package/ocf/Config.in new file +19 -0
new file mode 100644
index 0000000..a09c6eb
@@ -0,0 +1,19 @@
+config BR2_PACKAGE_OCF
+	bool "ocf"
+	help
+	  OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic
+	  Framework (OCF). This port aims to bring full asynchronous HW/SW
+	  crypto acceleration to the Linux kernel and applications
+	  running under Linux.
+	  
+	  http://ocf-linux.sourceforge.net/
+
+config BR2_PACKAGE_OPENSSL_OCF
+	bool "openssl ocf support"
+	depends on BR2_PACKAGE_OPENSSL
+	help
+	  Enable openssl cryptodev (OCF) hardware acceleration support.
+	  This requires kernel patches from the ocf-linux project otherwise
+	  you'll just have a bigger openssl library that works as usual.
+
+	  http://ocf-linux.sourceforge.net/
package/ocf/ocf-cryptodev-20101223.h new file +480 -0

480 lines not on this page · raw message

package/ocf/ocf.mk new file +39 -0
new file mode 100644
index 0000000..7a3a344
@@ -0,0 +1,39 @@
+#############################################################
+#
+# ocf
+#
+#############################################################
+
+# FIXME: Since it's an interim release we don't have tarballs to fetch
+# Do the right thing when there's a new release.
+OCF_VERSION = 20101223
+OCF_INSTALL_STAGING = YES
+
+define OCF_INSTALL_STAGING_CMDS
+	$(INSTALL) -D package/ocf/ocf-cryptodev-$(OCF_VERSION).h \
+		$(STAGING_DIR)/usr/include/crypto/cryptodev.h
+endef
+
+define OCF_UNINSTALL_STAGING_CMDS
+	rm -f $(STAGING_DIR)/usr/include/crypto/cryptodev.h
+endef
+
+define OCF_INSTALL_TARGET_CMDS
+	$(INSTALL) -D package/ocf/ocf-cryptodev-$(OCF_VERSION).h \
+		$(TARGET_DIR)/usr/include/crypto/cryptodev.h
+endef
+
+define OCF_UNINSTALL_TARGET_CMDS
+	rm -f $(TARGET_DIR)/usr/include/crypto/cryptodev.h
+endef
+
+$(eval $(call GENTARGETS,package,ocf))
+
+# Nuke below when gentargets infra can disable download (or a proper release)
+
+$(OCF_DIR)/.stamp_downloaded:
+	$(Q)mkdir -p $(@D)
+	$(Q)touch $@
+
+$(OCF_DIR)/.stamp_extracted:
+	$(Q)touch $@
Signature · 1 line
1.7.3.4
#3 lore raw

PATCH 1/1 ntp: bump to version 4.2.6p3 and fix glibc build failure

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Bump to version 4.2.6p3 and fix a build failure with external toolchains Gustavo> that use certain glibc versions as point out by speakman on IRC.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard