diff --git a/ntp-server.spec b/ntp-server.spec index 7f97187..a3b4d3d 100644 --- a/ntp-server.spec +++ b/ntp-server.spec @@ -1,7 +1,7 @@ %define majver %(echo %version | cut -d. -f1-2) Name: ntp-server Version: 4.2.8p17 -Release: 1mamba +Release: 2mamba Summary: Synchronizes system time using the Network Time Protocol (NTP) Group: System/Configuration Vendor: openmamba @@ -23,6 +23,7 @@ BuildRequires: glibc-devel BuildRequires: libcap-devel BuildRequires: libedit-devel BuildRequires: libevent-devel +BuildRequires: libmd-devel BuildRequires: libnetsnmp-devel BuildRequires: libnl-devel BuildRequires: libopenssl-devel @@ -31,13 +32,11 @@ BuildRequires: libpcre-devel BuildRequires: libperl BuildRequires: librpm-devel BuildRequires: libwrap-devel -BuildRequires: libwww-devel -BuildRequires: libz-devel BuildRequires: perl-IO-Socket-SSL BuildRequires: perl-Net-SSLeay BuildRequires: perl-devel ## AUTOBUILDREQ-END -BuildRequires: librpm-devel >= 4.16.1.2-1mamba +BuildConflicts: libwww-devel %description The Network Time Protocol (NTP) is used to synchronize a computer's time with another reference time source. @@ -53,12 +52,11 @@ Install the ntp package if you need tools for keeping your system's time synchro %build %configure \ - --bindir=%{_sbindir} \ - --with-binsubdir=sbin \ --with-openssl-libdir=%{_libdir} \ --enable-all-clocks \ --enable-parse-clocks \ --enable-linuxcaps \ + --enable-ntp-signd \ --enable-ipv6 %make \ @@ -104,21 +102,21 @@ install -D -m644 %{S:8} %{buildroot}%{_unitdir}/ntpdate.service %config(noreplace) %{_sysconfdir}/ntp.conf %config(noreplace) %{_sysconfdir}/ntp/keys %config %{_sysconfdir}/ntp/ntpservers -%{_sbindir}/calc_tickadj -%{_sbindir}/ntp-keygen -%{_sbindir}/ntp-wait -%{_sbindir}/ntpdate -%{_sbindir}/ntpd -%{_sbindir}/ntpdc -%{_sbindir}/ntpq +%{_bindir}/calc_tickadj +%{_bindir}/ntp-keygen +%{_bindir}/ntp-wait +%{_bindir}/ntpdate +%{_bindir}/ntpd +%{_bindir}/ntpdc +%{_bindir}/ntpq %if "%{stage1}" != "1" -%{_sbindir}/ntpsnmpd +%{_bindir}/ntpsnmpd %endif -%{_sbindir}/ntptime -%{_sbindir}/ntptrace -%{_sbindir}/sntp -%{_sbindir}/tickadj -%{_sbindir}/update-leap +%{_bindir}/ntptime +%{_bindir}/ntptrace +%{_bindir}/sntp +%{_bindir}/tickadj +%{_bindir}/update-leap %{_unitdir}/ntpd.service %{_unitdir}/ntpdate.service %{_sysusersdir}/ntp.conf @@ -147,6 +145,9 @@ install -D -m644 %{S:8} %{buildroot}%{_unitdir}/ntpdate.service #%doc ChangeLog NEWS *.y2kfixes README* TODO WHERE-TO-START %changelog +* Thu Oct 19 2023 Silvan Calarco 4.2.8p17-2mamba +- rebuilt without libwww dependency + * Fri Sep 08 2023 Automatic Build System 4.2.8p17-1mamba - automatic update by autodist diff --git a/ntpd.service b/ntpd.service index 706e662..267615c 100644 --- a/ntpd.service +++ b/ntpd.service @@ -6,7 +6,7 @@ Conflicts=systemd-timesyncd.service [Service] Type=forking PrivateTmp=true -ExecStart=/usr/sbin/ntpd -g -u ntp:ntp +ExecStart=/usr/bin/ntpd -g -u ntp:ntp Restart=always [Install] diff --git a/ntpdate.service b/ntpdate.service index 9d8a7ba..e85852e 100644 --- a/ntpdate.service +++ b/ntpdate.service @@ -6,7 +6,7 @@ Before=ntpd.service [Service] Type=oneshot PrivateTmp=true -ExecStart=/usr/sbin/ntpd -q -n -g -u ntp:ntp +ExecStart=/usr/bin/ntpd -q -n -g -u ntp:ntp [Install] WantedBy=multi-user.target