diff --git a/.gitignore b/.gitignore index 122d7e5..25b9b2d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ ypbind-mt-1.32.tar.bz2 /ypbind-mt-1.38.tar.bz2 /ypbind-mt-2.4.tar.gz /ypbind-mt-2.5.tar.gz +/ypbind-mt-2.6.1.tar.gz +/ypbind-mt-2.7.2.tar.gz diff --git a/sources b/sources index 73e000f..69c0d78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ypbind-mt-2.5.tar.gz) = 100e36e062135ed2b80e27b1b62e8ca5c1eb0d49233bae7814c41e65268971c6631daf3ba75a1667e36e438870c730eb8ba7a2b63b6589a40114d2c34a5642a7 +SHA512 (ypbind-mt-2.7.2.tar.gz) = 415013ea003bb3d6162b1dac76462d13d1264a2a0dd3c4de057cf7239b9706a76d1f14ee1e3dcfba697aa48e25e3a972772c8210d87bbf847344e4a6c708a5b4 diff --git a/ypbind-2.4-gettext_version.patch b/ypbind-2.4-gettext_version.patch deleted file mode 100644 index c8a520d..0000000 --- a/ypbind-2.4-gettext_version.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.ac.gettext_version 2016-03-02 15:10:26.000000000 +0100 -+++ configure.ac 2017-02-15 13:39:12.295019148 +0100 -@@ -59,7 +60,6 @@ JH_CHECK_XML_CATALOG([http://docbook.sou - AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) - - dnl internationalization macros --AM_GNU_GETTEXT_VERSION - AM_GNU_GETTEXT([external]) - - AC_OUTPUT(Makefile lib/Makefile src/Makefile man/Makefile po/Makefile.in) diff --git a/ypbind-systemdso.patch b/ypbind-systemdso.patch deleted file mode 100644 index b540a89..0000000 --- a/ypbind-systemdso.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur ypbind-mt-1.38.orig/configure.ac ypbind-mt-1.38/configure.ac ---- ypbind-mt-1.38.orig/configure.ac 2014-10-20 12:20:33.000000000 +0200 -+++ ypbind-mt-1.38/configure.ac 2016-11-23 18:15:58.473713436 +0100 -@@ -44,6 +44,7 @@ - AC_CHECK_LIB(socket, bind) - AC_CHECK_LIB(pthread, pthread_create) - -+AC_CHECK_HEADERS([systemd/sd-daemon.h]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0]) - AC_SUBST(USE_SD_NOTIFY) - -@@ -105,7 +106,7 @@ - AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) - - dnl internationalization macros --AM_GNU_GETTEXT_VERSION -+AM_GNU_GETTEXT_VERSION(0.19) - AM_GNU_GETTEXT([external]) - - dnl By default, don't send a ping to all server at the same time diff --git a/ypbind.service b/ypbind.service index 16a4cf8..2c45afe 100644 --- a/ypbind.service +++ b/ypbind.service @@ -13,7 +13,7 @@ NotifyAccess=all EnvironmentFile=-/etc/sysconfig/network EnvironmentFile=-/etc/sysconfig/ypbind ExecStartPre=/usr/libexec/ypbind-pre-setdomain -ExecStartPre=-/usr/sbin/setsebool allow_ypbind=1 +ExecStartPre=-/bin/bash -c 'selinuxenabled && /usr/sbin/setsebool allow_ypbind=1' ExecStart=/usr/sbin/ypbind -n $OTHER_YPBIND_OPTS ExecStartPost=/usr/libexec/ypbind-post-waitbind PrivateTmp=true diff --git a/ypbind.spec b/ypbind.spec index 575fce8..77e5fc6 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,24 +1,24 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 -Version: 2.5 -Release: 2%{?dist} -License: GPLv2 -Group: System Environment/Daemons +Version: 2.7.2 +Release: 16%{?dist} +License: GPL-2.0-only +Url: https://www.thkukuk.de/nis/nis/ypbind-mt/ + Source0: https://github.com/thkukuk/ypbind-mt/archive/v%{version}.tar.gz#/ypbind-mt-%{version}.tar.gz -Url: http://www.linux-nis.org/nis/ypbind-mt/index.html #Source1: ypbind.init Source2: nis.sh Source3: ypbind.service Source4: ypbind-pre-setdomain Source5: ypbind-post-waitbind + # Fedora-specific patch. Renaming 'ypbind' package to proper # 'ypbind-mt' would allow us to drop it. Patch1: ypbind-1.11-gettextdomain.patch # Not sent to upstream. Patch2: ypbind-2.5-helpman.patch -Patch3: ypbind-systemdso.patch -Patch4: ypbind-2.4-gettext_version.patch + # This is for /bin/systemctl Requires(post): systemd Requires(preun): systemd @@ -27,6 +27,8 @@ Requires: rpcbind Requires: yp-tools >= 4.2.2-2 # New nss_nis package in F25+ Requires: nss_nis +BuildRequires: make +BuildRequires: gcc BuildRequires: dbus-glib-devel, docbook-style-xsl BuildRequires: systemd BuildRequires: systemd-devel @@ -54,11 +56,7 @@ Install the ypbind package on any machines running NIS client programs also need to install the ypserv package to a machine on your network. %prep -%setup -q -n ypbind-mt-%{version} -%patch1 -p1 -b .gettextdomain -%patch2 -p1 -b .helpman -#%patch3 -p1 -b .systemdso -%patch4 -b .gettext_version +%autosetup -p1 -n ypbind-mt-%{version} autoreconf -fiv @@ -75,7 +73,6 @@ export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" %configure %make_build - %install %make_install @@ -112,6 +109,73 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3:2.7.2-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 3:2.7.2-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 3:2.7.2-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jan 30 2024 Ondrej Sloup - 3:2.7.2-13 +- Update license tag to the SPDX format (GPL-2.0-only) + +* Sat Jan 27 2024 Fedora Release Engineering - 3:2.7.2-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 3:2.7.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 3:2.7.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 3:2.7.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 3:2.7.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Nov 12 2021 Björn Esser - 3:2.7.2-7 +- Rebuild(libnsl2) + +* Tue Sep 28 2021 Marek Kulik - 3:2.7.2-6 +- Fix setsebool message in logs, resolves: #1882069 + +* Fri Jul 23 2021 Fedora Release Engineering - 3:2.7.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 3:2.7.2-4 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Thu Jan 28 2021 Fedora Release Engineering - 3:2.7.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 3:2.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Apr 20 2020 Filip Januš - 2.7.2-1 +- Update version to 2.7.2 +- Resolves: #1796030 +- Removing obsolete patches + +* Fri Jan 31 2020 Fedora Release Engineering - 3:2.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Jul 30 2019 Matej Mužila - 3:2.6.1-1 +- Update to version 2.6.1 +- Resolves: #1668439 + +* Sat Jul 27 2019 Fedora Release Engineering - 3:2.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 3:2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 3:2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 07 2018 Matej Mužila - 3:2.5-2 - Fix man pages