Compare commits

..

5 commits

Author SHA1 Message Date
Fedora Release Engineering
225b8bbe22 dist-git conversion 2010-07-28 09:35:59 +00:00
Bill Nottingham
0c25b40897 Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:25:03 +00:00
Jesse Keating
1a0561b7eb Initialize branch F-9 for adjtimex 2008-04-20 11:53:17 +00:00
Jesse Keating
cca6f498eb - Autorebuild for GCC 4.3 2008-02-19 13:58:45 +00:00
Bill Nottingham
d87be0c99f makefile update to properly grab makefile.common 2007-10-15 18:35:29 +00:00
7 changed files with 53 additions and 178 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
adjtimex_1.29.orig.tar.gz
adjtimex-1.21.tar.gz

18
adjtimex-1.13-glibc.patch Normal file
View file

@ -0,0 +1,18 @@
--- adjtimex-1.20/adjtimex.c.glibc 2004-09-19 17:37:29.000000000 +0200
+++ adjtimex-1.20/adjtimex.c 2005-03-16 13:16:02.514052584 +0100
@@ -35,15 +35,7 @@
#include <sys/ioctl.h>
#include <linux/rtc.h>
-#ifdef __alpha__
extern int adjtimex(struct timex *);
-#else
-#ifdef __ia64__
-extern int adjtimex(struct timex *);
-#else
-_syscall1(int, adjtimex, struct timex *, txcp)
-#endif
-#endif
int F_print = 0;
#ifndef LOG_PATH

View file

@ -0,0 +1,11 @@
--- adjtimex-1.21/adjtimex.c.optstring 2006-10-16 13:09:45.000000000 +0200
+++ adjtimex-1.21/adjtimex.c 2006-10-16 13:13:26.000000000 +0200
@@ -270,7 +270,7 @@
txc.modes = 0;
while((c = getopt_long_only(argc, argv,
- "a::c::l::e:f:h:i:m:o:prPPsPS:RT:t:uvVw",
+ "a::c::l::e:f:h:i:m:o:pr::s:S:RT:t:uvVw",
longopt, NULL)) != -1)
{
switch(c)

View file

@ -1,12 +0,0 @@
diff -up adjtimex-1.29/adjtimex.c.decl adjtimex-1.29/adjtimex.c
--- adjtimex-1.29/adjtimex.c.decl 2025-01-07 10:50:34.218356076 +0100
+++ adjtimex-1.29/adjtimex.c 2025-01-07 10:50:42.286350666 +0100
@@ -185,7 +185,7 @@ static void cmos_read_time (time_t *cmos
static void busywait_uip_fall(struct timeval *timestamp);
static void busywait_second_change(struct tm *cmos, struct timeval *timestamp);
static void compare(void);
-static void failntpdate();
+static void failntpdate(char *s);
static void reset_time_status(void);
static struct cmos_adj *get_cmos_adjustment(void);
static void log_times(void);

View file

@ -1,21 +0,0 @@
diff -up adjtimex-1.29/adjtimex.8.manopts adjtimex-1.29/adjtimex.8
--- adjtimex-1.29/adjtimex.8.manopts 2009-03-12 01:31:07.000000000 +0100
+++ adjtimex-1.29/adjtimex.8 2013-03-25 17:19:10.243085242 +0100
@@ -106,7 +106,7 @@ follow.
.RI \-i " tim"
.RI \-\-interval " tim"
.RI \-l " file"
-.RI \-\-logfile " file"
+.RI \-\-log " file"
.RI \-h " timeserver"
.RI \-\-host " timeserver"
\-w
@@ -329,7 +329,7 @@ To correct the rest of the error, you co
in rc.local would approximately correct the system clock:
.nf
- adjtimex --tick 9999 --freq 485452
+ adjtimex --tick 9999 --frequency 485452
.fi
.PP
.\"}}}

View file

@ -1,13 +1,14 @@
Summary: A utility for adjusting kernel time variables
Name: adjtimex
Version: 1.29
Release: 35%{?dist}
License: GPL-2.0-or-later
Source: http://ftp.debian.org/debian/pool/main/a/adjtimex/%{name}_%{version}.orig.tar.gz
Patch1: adjtimex-manopts.patch
Patch2: adjtimex-decl.patch
BuildRequires: gcc
BuildRequires: make
Version: 1.21
Release: 4%{?dist}
ExclusiveOS: Linux
License: GPLv2+
Group: System Environment/Base
Source: http://ibiblio.org/pub/Linux/system/admin/time/adjtimex-%{version}.tar.gz
Patch1: adjtimex-1.13-glibc.patch
Patch2: adjtimex-1.21-optstring.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Adjtimex provides raw access to kernel time variables. On standalone
@ -19,152 +20,30 @@ adjtimex to view kernel time variables.
%prep
%setup -q
%patch -P1 -p1 -b .manopts
%patch -P2 -p1 -b .decl
%patch1 -p1 -b .glibc
%patch2 -p1 -b .optstring
%build
%configure
make %{?_smp_mflags} VERSION=%{version}
make
%install
mkdir -p ${RPM_BUILD_ROOT}{%{_sbindir},%{_mandir}/man8}
install -m755 adjtimex ${RPM_BUILD_ROOT}%{_sbindir}/adjtimex
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}/sbin
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
install -m755 adjtimex ${RPM_BUILD_ROOT}/sbin/adjtimex
install -m644 adjtimex.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/adjtimex.8
%clean
rm -rf ${RPM_BUILD_ROOT}
%files
%license COPYING
%doc README COPYRIGHT ChangeLog
%{_sbindir}/adjtimex
%defattr(-,root,root)
%doc README COPYING COPYRIGHT
/sbin/adjtimex
%{_mandir}/man8/adjtimex.8*
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Jan 07 2025 Miroslav Lichvar <mlichvar@redhat.com> 1.29-32
- fix build with new gcc (#2336031)
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-22
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue May 22 2018 Miroslav Lichvar <mlichvar@redhat.com> 1.29-16
- add gcc to build requirements
- use license macro
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.29-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Mon Mar 25 2013 Miroslav Lichvar <mlichvar@redhat.com> 1.29-6
- fix options in man page (#856521)
- move binary to /usr
- remove obsolete macros
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Mon Apr 19 2010 Miroslav Lichvar <mlichvar@redhat.com> 1.29-1
- update to 1.29
* Tue Dec 01 2009 Miroslav Lichvar <mlichvar@redhat.com> 1.28-1
- update to 1.28
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.27.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
* Wed Jun 17 2009 Miroslav Lichvar <mlichvar@redhat.com> 1.27.1-1
- update to 1.27.1
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Aug 25 2008 Miroslav Lichvar <mlichvar@redhat.com> 1.26-1
- update to 1.26
* Wed May 21 2008 Miroslav Lichvar <mlichvar@redhat.com> 1.24-1
- update to 1.24
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.21-4
- Autorebuild for GCC 4.3

View file

@ -1 +1 @@
7ff7731baf829fdf6ad9af963a526cda adjtimex_1.29.orig.tar.gz
9888b54f418d7cc120fd3a4222f01c9c adjtimex-1.21.tar.gz