diff --git a/yp-tools-4.2.3-yppasswd-exclamation_mark.patch b/yp-tools-4.2.3-yppasswd-exclamation_mark.patch deleted file mode 100644 index c85be96..0000000 --- a/yp-tools-4.2.3-yppasswd-exclamation_mark.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur yp-tools-4.2.3/src/yppasswd.c yp-tools-4.2.3/src/yppasswd.c ---- yp-tools-4.2.3/src/yppasswd.c 2018-03-27 15:47:48.000000000 +0200 -+++ yp-tools-4.2.3/src/yppasswd.c 2022-08-16 19:02:41.727441211 +0200 -@@ -689,6 +689,11 @@ - } - } - -+ if (strchr(pwd->pw_passwd, '!') != NULL || strchr(pwd->pw_passwd, '*') != NULL) { -+ printf("%s: The account is locked or has no password. Please unlock the account or set an initial password\n", progname); -+ return 1; -+ } -+ - /* Initialize password information */ - memset (&yppwd, '\0', sizeof (yppwd)); - yppwd.newpw.pw_passwd = pwd->pw_passwd; diff --git a/yp-tools.spec b/yp-tools.spec index 9e04312..1d899b4 100644 --- a/yp-tools.spec +++ b/yp-tools.spec @@ -1,21 +1,16 @@ Summary: NIS (or YP) client programs Name: yp-tools Version: 4.2.3 -Release: 23%{?dist} -License: GPL-2.0-only - -URL: https://www.thkukuk.de/nis/nis/yp-tools/ +Release: 13%{?dist} +License: GPLv2 Source: https://github.com/thkukuk/yp-tools/archive/v%{version}.tar.gz - Patch1: yp-tools-2.12-hash.patch Patch2: yp-tools-2.12-crypt.patch Patch3: yp-tools-2.12-adjunct.patch Patch4: yp-tools-4.2.2-strict-prototypes.patch Patch5: yp-tools-4.2.3-yppasswd.patch -Patch6: yp-tools-4.2.3-yppasswd-exclamation_mark.patch - +Url: http://www.linux-nis.org/nis/yp-tools/index.html BuildRequires: make -BuildRequires: libxcrypt-devel BuildRequires: autoconf, automake, gettext-devel, libtool, libtirpc-devel, libnsl2-devel Requires: ypbind >= 3:2.4-2 Requires: glibc @@ -51,7 +46,13 @@ Install yp-tools-devel package for developing applications that use yp-tools %prep -%autosetup -n %{name}-%{version} -p1 +%setup -q -n %{name}-%{version} +%patch1 -p1 -b .hash +%patch2 -p1 -b .crypt +%patch3 -p1 -b .adjunct +%patch4 -p1 -b .strict-prototypes +%patch5 -p1 + autoreconf -i -f -v @@ -59,7 +60,6 @@ autoreconf -i -f -v export CFLAGS="$CFLAGS %{optflags} -Wno-cast-function-type" -# If needed the yppasswd can be deprecated by --enable-call-passwd %configure --disable-domainname %make_build @@ -80,37 +80,6 @@ make DESTDIR="$RPM_BUILD_ROOT" INSTALL_PROGRAM=install install /var/yp/nicknames %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 4.2.3-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 4.2.3-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 4.2.3-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Feb 01 2025 Björn Esser - 4.2.3-20 -- Add explicit BR: libxcrypt-devel - -* Sun Jan 19 2025 Fedora Release Engineering - 4.2.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 4.2.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jan 30 2024 Ondrej Sloup - 4.2.3-17 -- Update license tag to the SPDX format (GPL-2.0-only) -- Fix /etc/passwd flags for locked and deactivated account (rhbz#2093381) - -* Sat Jan 27 2024 Fedora Release Engineering - 4.2.3-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 4.2.3-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 4.2.3-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Sat Jul 23 2022 Fedora Release Engineering - 4.2.3-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild