update to 1.25-pre2
This commit is contained in:
parent
57710f68ac
commit
6f5cc9fafe
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
||||
/timepps.h
|
||||
/chrony-1.25-pre1.tar.gz
|
||||
/chrony-1.25-pre2.tar.gz
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up chrony-1.24/cmdparse.c.retryres chrony-1.24/cmdparse.c
|
||||
--- chrony-1.24/cmdparse.c.retryres 2010-04-29 15:22:23.000000000 +0200
|
||||
+++ chrony-1.24/cmdparse.c 2010-04-29 15:24:47.000000000 +0200
|
||||
@@ -68,7 +68,7 @@ CPS_ParseNTPSourceAdd(const char *line,
|
||||
if (s == DNS_Success) {
|
||||
ok = 1;
|
||||
src->name = NULL;
|
||||
- } else if (s == DNS_TryAgain) {
|
||||
+ } else {
|
||||
ok = 1;
|
||||
src->ip_addr.family = IPADDR_UNSPEC;
|
||||
}
|
@ -1,7 +1,7 @@
|
||||
%define prerelease -pre1
|
||||
%define prerelease -pre2
|
||||
Name: chrony
|
||||
Version: 1.25
|
||||
Release: 0.2.pre1%{?gitpatch}%{?dist}
|
||||
Release: 0.3.pre2%{?gitpatch}%{?dist}
|
||||
Summary: An NTP client/server
|
||||
|
||||
Group: System Environment/Daemons
|
||||
@ -18,7 +18,6 @@ Source6: timepps.h
|
||||
Source7: chrony.nm-dispatcher
|
||||
Source8: chrony.dhclient
|
||||
%{?gitpatch:Patch0: chrony-%{version}-%{gitpatch}.patch.gz}
|
||||
Patch1: chrony-retryres.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: libcap-devel libedit-devel bison texinfo
|
||||
@ -38,7 +37,6 @@ in permanently connected environments.
|
||||
%setup -q -n %{name}-%{version}%{?prerelease}
|
||||
mkdir pps; cp -p %{SOURCE6} pps
|
||||
%{?gitpatch:%patch0 -p1}
|
||||
%patch1 -p1 -b .retryres
|
||||
|
||||
%{?gitpatch: echo %{version}-%{gitpatch} > version.txt}
|
||||
|
||||
@ -52,7 +50,7 @@ CFLAGS="$CFLAGS -pie -fpie"
|
||||
export CFLAGS
|
||||
export CPPFLAGS="-Ipps"
|
||||
|
||||
%configure --docdir=%{_docdir}
|
||||
%configure --docdir=%{_docdir} --enable-forcednsretry
|
||||
make %{?_smp_mflags} getdate all docs
|
||||
|
||||
%install
|
||||
|
Loading…
Reference in New Issue
Block a user