- fix building with broken libcap header (#483548)
This commit is contained in:
parent
6d806268a0
commit
f2a824a553
33
chrony-1.23-cap.patch
Normal file
33
chrony-1.23-cap.patch
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
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
|
@ -1,6 +1,6 @@
|
|||||||
Name: chrony
|
Name: chrony
|
||||||
Version: 1.23
|
Version: 1.23
|
||||||
Release: 3.20081106gitbe42b4%{?dist}
|
Release: 4.20081106gitbe42b4%{?dist}
|
||||||
Summary: An NTP client/server
|
Summary: An NTP client/server
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -18,6 +18,7 @@ Patch1: chrony-1.23-gitbe42b4.patch
|
|||||||
Patch2: chrony-1.23-ppc.patch
|
Patch2: chrony-1.23-ppc.patch
|
||||||
Patch3: chrony-1.23-gethost.patch
|
Patch3: chrony-1.23-gethost.patch
|
||||||
Patch4: chrony-1.23-res.patch
|
Patch4: chrony-1.23-res.patch
|
||||||
|
Patch5: chrony-1.23-cap.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
BuildRequires: libcap-devel readline-devel bison texinfo
|
BuildRequires: libcap-devel readline-devel bison texinfo
|
||||||
@ -40,6 +41,7 @@ cp -p %{SOURCE6} .
|
|||||||
%patch2 -p1 -b .ppc
|
%patch2 -p1 -b .ppc
|
||||||
%patch3 -p1 -b .gethost
|
%patch3 -p1 -b .gethost
|
||||||
%patch4 -p1 -b .res
|
%patch4 -p1 -b .res
|
||||||
|
%patch5 -p1 -b .cap
|
||||||
|
|
||||||
# don't link with ncurses
|
# don't link with ncurses
|
||||||
sed -i 's|-lncurses||' configure
|
sed -i 's|-lncurses||' configure
|
||||||
@ -121,6 +123,9 @@ fi
|
|||||||
%dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
|
%dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 09 2009 Miroslav Lichvar <mlichvar@redhat.com> 1.23-4.20081106gitbe42b4
|
||||||
|
- fix building with broken libcap header (#483548)
|
||||||
|
|
||||||
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23-3.20081106gitbe42b4
|
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23-3.20081106gitbe42b4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user