From c75e456e25a7e99dfb6b50fbd8427f848101c6a4 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar0@gmail.com>
Date: Sat, 17 Oct 2015 14:10:27 +0200
Subject: [PATCH] chrony: remove old files

Remove files that were accidentally included in the previous merge
(pull request #1802). The obsolete patches are breaking the build now.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
---
 net/chrony/files/ntpd.config                  |  6 ---
 net/chrony/files/ntpd.hotplug                 |  6 ---
 net/chrony/files/ntpd.init                    | 46 -------------------
 net/chrony/patches/001-crosscompile.patch     | 25 ----------
 .../patches/002-ipv6_disabled_fixes.patch     | 34 --------------
 5 files changed, 117 deletions(-)
 delete mode 100644 net/chrony/files/ntpd.config
 delete mode 100644 net/chrony/files/ntpd.hotplug
 delete mode 100644 net/chrony/files/ntpd.init
 delete mode 100644 net/chrony/patches/001-crosscompile.patch
 delete mode 100644 net/chrony/patches/002-ipv6_disabled_fixes.patch

diff --git a/net/chrony/files/ntpd.config b/net/chrony/files/ntpd.config
deleted file mode 100644
index 7a3b6fd59..000000000
--- a/net/chrony/files/ntpd.config
+++ /dev/null
@@ -1,6 +0,0 @@
-# Generic NTP configuration
-# Time servers and network(s) that may access the time service
-
-config ntpd
-	option TimeServers	"0.openwrt.pool.ntp.org 1.openwrt.pool.ntp.org 2.openwrt.pool.ntp.org 3.openwrt.pool.ntp.org"
-	option ClientAccessFrom	"lan"
diff --git a/net/chrony/files/ntpd.hotplug b/net/chrony/files/ntpd.hotplug
deleted file mode 100644
index 40843363a..000000000
--- a/net/chrony/files/ntpd.hotplug
+++ /dev/null
@@ -1,6 +0,0 @@
-COMMAND=/usr/bin/chronyc
-
-[ -x $COMMAND ] || exit 0
-
-[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && $COMMAND -a online
-[ "$ACTION" = "ifdown" -a "$INTERFACE" = "wan" ] && $COMMAND -a offline
diff --git a/net/chrony/files/ntpd.init b/net/chrony/files/ntpd.init
deleted file mode 100644
index 3450185ac..000000000
--- a/net/chrony/files/ntpd.init
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=60
-
-start() {
-	[ ! -f /var/run/chronyd.pid ] && (
-		/usr/sbin/chronyd -f /etc/chrony/chrony.conf
-
-		local NTP_SERVERS
-		local NTP_SERVER
-		local CLIENT_NETWORKS
-		local NETNAME
-		config_load ntpd
-		config_get NTP_SERVERS $CONFIG_SECTION TimeServers
-		config_get CLIENT_NETWORKS $CONFIG_SECTION ClientAccessFrom
-
-		. /lib/functions/network.sh
-
-		# Define servers with the iburst option to speed up the initial
-		# synchronization and allow clients to access the server
-		(
-			for NTP_SERVER in $NTP_SERVERS; do
-				echo add server $NTP_SERVER iburst
-			done
-
-			for NETNAME in $CLIENT_NETWORKS; do
-				local subnet
-				if network_get_subnet subnet "$NETNAME"; then
-					echo allow $subnet
-				fi
-			done
-		) | chronyc -a > /dev/null 2>&1
-	)
-}
-
-stop() {
-	[ -r /var/run/chronyd.pid ] && PID=$(cat /var/run/chronyd.pid)
-	[ -n "$PID" ] && kill $PID
-}
-
-restart() {
-	stop
-	while [ -r /var/run/chronyd.pid ] ; do sleep 1; done
-	start
-}
diff --git a/net/chrony/patches/001-crosscompile.patch b/net/chrony/patches/001-crosscompile.patch
deleted file mode 100644
index d712e06a7..000000000
--- a/net/chrony/patches/001-crosscompile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -254,6 +254,13 @@ do
-     --host-machine=* )
-       MACHINE=`echo $option | sed -e 's/^.*=//;'`
-     ;;
-+    --target=* )
-+      TARGET=`echo $option | sed -e 's/[^=]*=//;'`
-+      OPERATINGSYSTEM=`echo $TARGET | sed -e 's/.*-//;'`
-+      MACHINE=`echo $TARGET | sed -e 's/-.*//;'`
-+      VERSION=""
-+      SYSTEM=${OPERATINGSYSTEM}-${MACHINE}
-+    ;;
-     --help | -h )
-       usage
-       exit 0
-@@ -287,7 +294,7 @@ case $SYSTEM in
-         ;;
-     esac
-     ;;
--    Linux* )
-+    Linux* | linux* )
-         EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o"
-         try_linuxcaps=1
-         try_rtc=1
diff --git a/net/chrony/patches/002-ipv6_disabled_fixes.patch b/net/chrony/patches/002-ipv6_disabled_fixes.patch
deleted file mode 100644
index 629d2c711..000000000
--- a/net/chrony/patches/002-ipv6_disabled_fixes.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/ntp_io.c
-+++ b/ntp_io.c
-@@ -355,6 +355,7 @@ read_from_socket(void *anything)
-       }
- #endif
- 
-+#ifdef HAVE_IPV6
- #ifdef IPV6_PKTINFO
-       if (cmsg->cmsg_level == IPPROTO_IPV6 && cmsg->cmsg_type == IPV6_PKTINFO) {
-         struct in6_pktinfo ipi;
-@@ -365,6 +366,7 @@ read_from_socket(void *anything)
-         remote_addr.local_ip_addr.family = IPADDR_INET6;
-       }
- #endif
-+#endif
- 
- #ifdef SO_TIMESTAMP
-       if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SO_TIMESTAMP) {
-@@ -466,6 +468,7 @@ send_packet(void *packet, int packetlen,
-   }
- #endif
- 
-+#ifdef HAVE_IPV6
- #ifdef IPV6_PKTINFO
-   if (remote_addr->local_ip_addr.family == IPADDR_INET6) {
-     struct cmsghdr *cmsg;
-@@ -484,6 +487,7 @@ send_packet(void *packet, int packetlen,
-         sizeof(ipi->ipi6_addr.s6_addr));
-   }
- #endif
-+#endif
- 
- #if 0
-     LOG(LOGS_INFO, LOGF_NtpIO, "sending to %s:%d from %s",