- added no-nisplus patch (disable obsolete NIS+ functionality, requires getsecretkey...

- drop oudated URLs, this project is abandoned

diff --git a/pwdutils-no-nisplus.patch b/pwdutils-no-nisplus.patch
new file mode 100644 (file)
index 0000000..199dc9c
--- /dev/null
+++ b/pwdutils-no-nisplus.patch
@@ -0,0 +1,35 @@
+--- pwdutils-3.2.19/lib/passwd_nisplus.c.orig  2021-12-04 16:36:18.968083529 +0100
++++ pwdutils-3.2.19/lib/passwd_nisplus.c       2021-12-04 16:36:21.648069010 +0100
+@@ -19,6 +19,8 @@
+ #include <config.h>
+ #endif
+ 
++#ifdef USE_NISPLUS
++
+ #include <pwd.h>
+ #include <time.h>
+ #include <ctype.h>
+@@ -615,3 +617,5 @@ npd_upd_pwd (const char *domainname, use
+   else
+     return update_npd (obj, data);
+ }
++
++#endif
+--- pwdutils-3.2.19/lib/user.c.orig    2011-05-23 10:13:39.000000000 +0200
++++ pwdutils-3.2.19/lib/user.c 2021-12-04 16:35:44.674935978 +0100
+@@ -983,6 +983,7 @@ write_user_data (user_t *data, int is_lo
+         retval = -1;
+       }
+     }
++#ifdef USE_NISPLUS
+   else if (data->service == S_NISPLUS)
+     {
+       retval = npd_upd_pwd ("", data);
+@@ -992,6 +993,7 @@ write_user_data (user_t *data, int is_lo
+         retval = -1;
+       }
+     }
++#endif
+ #ifdef USE_LDAP
+   else if (data->service == S_LDAP)
+     {

diff --git a/pwdutils.spec b/pwdutils.spec
index 4ce27dd2b536bce5962ce8e2874318f461794443..c815e8fa6e22e7de1a845162ec4b8bdf329bfabe 100644 (file)
--- a/pwdutils.spec
+++ b/pwdutils.spec
@@ -14,8 +14,9 @@ Version:      3.2.19
 Release:       7
 License:       GPL v2
 Group:         Base
-#Source0:      ftp://ftp.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
-Source0:       http://www.linux-nis.org/download/pwdutils/%{name}-%{version}.tar.bz2
+#Source0:      https://www.kernel.org/pub/linux/utils/net/NIS/%{name}-%{version}.tar.bz2
+#Source0:      http://www.linux-nis.org/download/pwdutils/%{name}-%{version}.tar.bz2
+Source0:       %{name}-%{version}.tar.bz2
 # Source0-md5: 25a77a0ab376eacf24ad5eab7af4cdce
 Source1:       %{name}.useradd
 Source2:       %{name}.rpasswdd.init
@@ -37,7 +38,7 @@ Patch6:               %{name}-libc-lock.patch
 Patch7:                %{name}-format-security.patch
 Patch8:                dlsym.patch
 Patch9:                build.patch
-URL:           http://www.thkukuk.de/pam/pwdutils/
+Patch10:       %{name}-no-nisplus.patch
 %{?with_audit:BuildRequires:   audit-libs-devel}
 BuildRequires: autoconf
 BuildRequires: automake >= 1:1.9
@@ -172,6 +173,7 @@ funkcjonalność tylko dla jednej grupy zarządzania PAM: zmiany haseł.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %{__rm} po/stamp-po
 
@@ -183,14 +185,14 @@ funkcjonalność tylko dla jednej grupy zarządzania PAM: zmiany haseł.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{?with_bioapi:CPPFLAGS="-I/usr/include/bioapi"} \
+       CPPFLAGS="%{rpmcppflags} %{?with_bioapi:-I/usr/include/bioapi}" \
        %{!?with_bioapi:ac_cv_header_bioapi_h=no ac_cv_lib_bioapi100_BioAPI_Init=no} \
        %{?with_audit:--enable-audit-plugin} \
        %{!?with_gnutls:--disable-gnutls} \
-       --%{?with_ldap:en}%{!?with_ldap:dis}able-ldap \
+       --enable-ldap%{!?with_ldap:=no} \
        --enable-nls \
        --enable-pam_rpasswd \
-       --%{?with_selinux:en}%{!?with_selinux:dis}able-selinux \
+       --enable-selinux%{!?with_selinux:=no} \
        --enable-slp \
        --disable-rpath
 %{__make}
@@ -198,10 +200,11 @@ funkcjonalność tylko dla jednej grupy zarządzania PAM: zmiany haseł.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pwdutils,security,skel/tmp}
+
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-mv -f $RPM_BUILD_ROOT%{_sbindir}/*.local $RPM_BUILD_ROOT%{_sysconfdir}/pwdutils
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/*.local $RPM_BUILD_ROOT%{_sysconfdir}/pwdutils
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/default/useradd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpasswdd
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/login.defs