rpms/chrony/devel chrony-1.23-cap.patch, NONE, 1.1 chrony.spec, 1.2, 1.3
Miroslav Lichvar
mlichvar at fedoraproject.org
Mon Mar 9 14:16:11 UTC 2009
Author: mlichvar
Update of /cvs/pkgs/rpms/chrony/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4168
Modified Files:
chrony.spec
Added Files:
chrony-1.23-cap.patch
Log Message:
- fix building with broken libcap header (#483548)
chrony-1.23-cap.patch:
--- NEW FILE chrony-1.23-cap.patch ---
diff -up chrony-1.23/sys_linux.c.cap chrony-1.23/sys_linux.c
--- chrony-1.23/sys_linux.c.cap 2009-03-09 14:56:29.000000000 +0100
+++ chrony-1.23/sys_linux.c 2009-03-09 14:57:24.000000000 +0100
@@ -39,14 +39,6 @@
#include <assert.h>
#include <sys/utsname.h>
-#ifdef FEAT_LINUXCAPS
-#include <sys/types.h>
-#include <pwd.h>
-#include <sys/prctl.h>
-#include <sys/capability.h>
-#include <grp.h>
-#endif
-
#include "localp.h"
#include "sys_linux.h"
#include "sched.h"
@@ -55,6 +47,14 @@
#include "logging.h"
#include "wrap_adjtimex.h"
+#ifdef FEAT_LINUXCAPS
+#include <sys/types.h>
+#include <pwd.h>
+#include <sys/prctl.h>
+#include <sys/capability.h>
+#include <grp.h>
+#endif
+
static long current_tick;
/* This is the value of tick, in seconds, including the current vernier
Index: chrony.spec
===================================================================
RCS file: /cvs/pkgs/rpms/chrony/devel/chrony.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- chrony.spec 24 Feb 2009 07:31:16 -0000 1.2
+++ chrony.spec 9 Mar 2009 14:15:41 -0000 1.3
@@ -1,6 +1,6 @@
Name: chrony
Version: 1.23
-Release: 3.20081106gitbe42b4%{?dist}
+Release: 4.20081106gitbe42b4%{?dist}
Summary: An NTP client/server
Group: System Environment/Daemons
@@ -18,6 +18,7 @@
Patch2: chrony-1.23-ppc.patch
Patch3: chrony-1.23-gethost.patch
Patch4: chrony-1.23-res.patch
+Patch5: chrony-1.23-cap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libcap-devel readline-devel bison texinfo
@@ -40,6 +41,7 @@
%patch2 -p1 -b .ppc
%patch3 -p1 -b .gethost
%patch4 -p1 -b .res
+%patch5 -p1 -b .cap
# don't link with ncurses
sed -i 's|-lncurses||' configure
@@ -121,6 +123,9 @@
%dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
%changelog
+* Mon Mar 09 2009 Miroslav Lichvar <mlichvar at redhat.com> 1.23-4.20081106gitbe42b4
+- fix building with broken libcap header (#483548)
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.23-3.20081106gitbe42b4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list