diff --git a/srcpkgs/openntpd/patches/dont-override-our-cflags.patch b/srcpkgs/openntpd/patches/dont-override-our-cflags.patch deleted file mode 100644 index 8b72b374329..00000000000 --- a/srcpkgs/openntpd/patches/dont-override-our-cflags.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.orig 2015-03-25 10:02:22.047687295 +0100 -+++ configure.ac 2015-03-25 10:03:14.088230497 +0100 -@@ -26,7 +26,6 @@ AC_CONFIG_MACRO_DIR([m4]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - - AC_SUBST([USER_CFLAGS], "$CFLAGS") --CFLAGS="-O2 -Wall -std=gnu99 -g" - - case $host_os in - *darwin*) diff --git a/srcpkgs/openntpd/patches/portability.patch b/srcpkgs/openntpd/patches/portability.patch deleted file mode 100644 index 8e9f7077c82..00000000000 --- a/srcpkgs/openntpd/patches/portability.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/constraint.c.orig 2015-05-09 18:58:56.300462567 +0200 -+++ src/constraint.c 2015-05-09 18:59:02.979453950 +0200 -@@ -257,7 +257,7 @@ constraint_check_child(void) - pid_t pid; - - do { -- pid = waitpid(WAIT_ANY, &status, WNOHANG); -+ pid = waitpid(-1, &status, WNOHANG); - if (pid <= 0) - continue; - diff --git a/srcpkgs/openntpd/patches/resinit.patch b/srcpkgs/openntpd/patches/resinit.patch index 7fe394c606c..6215d102443 100644 --- a/srcpkgs/openntpd/patches/resinit.patch +++ b/srcpkgs/openntpd/patches/resinit.patch @@ -1,8 +1,8 @@ Reset transient resolver failures in glibc https://github.com/openntpd-portable/openntpd-portable/issues/12 ---- src/config.c.orig 2015-08-24 16:29:04.396307991 +0200 -+++ src/config.c 2015-08-24 16:29:27.791193789 +0200 +--- src/config.c.orig 2016-03-28 15:51:51.000000000 +0200 ++++ src/config.c 2016-03-30 16:03:00.816787846 +0200 @@ -23,6 +23,7 @@ #include @@ -18,6 +18,6 @@ https://github.com/openntpd-portable/openntpd-portable/issues/12 +#ifdef __GLIBC__ + res_init(); +#endif - bzero(&hints, sizeof(hints)); + memset(&hints, 0, sizeof(hints)); hints.ai_family = PF_UNSPEC; hints.ai_socktype = SOCK_DGRAM; /* DUMMY */ diff --git a/srcpkgs/openntpd/template b/srcpkgs/openntpd/template index 9fa3f85d51f..aee024732c3 100644 --- a/srcpkgs/openntpd/template +++ b/srcpkgs/openntpd/template @@ -1,7 +1,7 @@ # Template file for 'openntpd' pkgname=openntpd -version=5.7p4 -revision=11 +version=5.9p1 +revision=1 build_style=gnu-configure configure_args="--with-privsep-user=$pkgname --with-cacert=/etc/ssl/certs.pem" hostmakedepends="automake libtool" @@ -12,7 +12,7 @@ maintainer="Juan RP " license="BSD" homepage="http://openntpd.org/" distfiles="http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/${pkgname}-${version}.tar.gz" -checksum=a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23 +checksum=200c04056d4d6441653cac71d515611f3903aa7b15b8f5661a40dab3fb3697b3 conf_files="/etc/ntpd.conf" provides="ntp-daemon-0_1"