From 92f9e184a3c06df5ca857071261a5924f1773c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Fri, 30 Nov 2012 09:02:31 +0100 Subject: [PATCH 01/67] Build with full relro --- ypbind.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 8d99ddb..e8b607a 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.36 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -61,6 +61,12 @@ also need to install the ypserv package to a machine on your network. autoreconf %build +%ifarch s390 s390x +export CFLAGS="$RPM_OPT_FLAGS -fPIC" +%else +export CFLAGS="$RPM_OPT_FLAGS -fpic" +%endif +export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" %configure --enable-dbus-nm make @@ -133,6 +139,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Fri Nov 30 2012 Honza Horak - 3:1.36-8 +- Build with full relro + * Thu Oct 04 2012 Honza Horak - 3:1.36-7 - Run %%triggerun regardless of systemd_post variable definition From 70ff89b4cff13d1d3f7ab4e4b51d9addb155818c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Wed, 19 Dec 2012 17:41:32 +0100 Subject: [PATCH 02/67] Check presence of ypbind in /etc/rpc Related: #888778 --- ypbind-pre-setdomain | 7 +++++++ ypbind.spec | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ypbind-pre-setdomain b/ypbind-pre-setdomain index 7ef5fc8..1d5dbed 100755 --- a/ypbind-pre-setdomain +++ b/ypbind-pre-setdomain @@ -27,5 +27,12 @@ if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then fi fi +#/etc/rpc check +grep ypbind /etc/rpc > /dev/null 2>&1 +if [ $? -ne 0 ]; then + logger -t ypbind $"Error: Missing ypbind entry in /etc/rpc." + exit 1 +fi + echo diff --git a/ypbind.spec b/ypbind.spec index e8b607a..30fa951 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.36 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -139,6 +139,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Wed Dec 19 2012 Honza Horak - 3:1.36-9 +- Check presence of ypbind in /etc/rpc + Related: #888778 + * Fri Nov 30 2012 Honza Horak - 3:1.36-8 - Build with full relro From 2eda4a4739a63ab0ddce9317455c253e82f7f523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Tue, 29 Jan 2013 13:17:51 +0100 Subject: [PATCH 03/67] Make re-bind interval a tune-able option --- ypbind.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 30fa951..f506896 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.36 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -20,6 +20,7 @@ Patch3: ypbind-mt-1.32-typo2.patch Patch4: ypbind-sigpipe.patch Patch5: ypbind-mt-1.36-nistimeout.patch Patch6: ypbind-sdnotify.patch +Patch7: ypbind-rebind.patch # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units @@ -57,6 +58,7 @@ also need to install the ypserv package to a machine on your network. %patch4 -p1 -b .sigpipe %patch5 -p1 -b .nistimeout %patch6 -p1 -b .sdnotify +%patch7 -p1 -b .rebind autoreconf @@ -139,6 +141,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Tue Jan 29 2013 Honza Horak - 3:1.36-10 +- Make re-bind interval a tune-able option + * Wed Dec 19 2012 Honza Horak - 3:1.36-9 - Check presence of ypbind in /etc/rpc Related: #888778 From 6ec684c1e0e6ead556806b0fb6c7dd9c681c4be5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Tue, 29 Jan 2013 13:26:20 +0100 Subject: [PATCH 04/67] added forgotten patch --- ypbind-rebind.patch | 121 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 ypbind-rebind.patch diff --git a/ypbind-rebind.patch b/ypbind-rebind.patch new file mode 100644 index 0000000..581621b --- /dev/null +++ b/ypbind-rebind.patch @@ -0,0 +1,121 @@ +diff -up ypbind-mt-1.36/man/ypbind.8.rebind ypbind-mt-1.36/man/ypbind.8 +--- ypbind-mt-1.36/man/ypbind.8.rebind 2011-08-31 15:26:32.000000000 +0200 ++++ ypbind-mt-1.36/man/ypbind.8 2013-01-29 09:38:13.461922067 +0100 +@@ -171,7 +171,7 @@ ypbind \- NIS binding process + .SH "Synopsis" + .fam C + .HP \w'\fBypbind\fR\ 'u +-\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus] ++\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-rebind\-interval\fR] [\-no\-dbus] + .fam + .fam C + .HP \w'\fBypbind\fR\ 'u +@@ -345,6 +345,13 @@ The default value for + to check, if a NIS server is still reacheable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. + .RE + .PP ++\fB\-rebind\-interval\fR ++.RS 4 ++The default value for ++\fBypbind\fR ++to search for the fastest NIS server is 900 seconds (15 minutes)\&. With this options another frequency in seconds can be specified\&. ++.RE ++.PP + \fB\-no\-dbus\fR + .RS 4 + Disables DBUS support if compiled in\&. +diff -up ypbind-mt-1.36/man/ypbind.8.xml.rebind ypbind-mt-1.36/man/ypbind.8.xml +--- ypbind-mt-1.36/man/ypbind.8.xml.rebind 2011-08-31 15:23:56.000000000 +0200 ++++ ypbind-mt-1.36/man/ypbind.8.xml 2013-01-29 09:38:13.461922067 +0100 +@@ -51,6 +51,7 @@ + -f configfile + -local-only + -ping-interval ping-interval ++ -rebind-interval + -no-dbus + + +@@ -273,6 +274,15 @@ to check, if a NIS server is still reach + With this options another frequency in seconds can be specified. + + ++ ++ ++ ++The default value for ++ypbind ++to search for the fastest NIS server is 900 seconds (15 minutes). ++With this options another frequency in seconds can be specified. ++ ++ + + + +diff -up ypbind-mt-1.36/src/local.h.rebind ypbind-mt-1.36/src/local.h +--- ypbind-mt-1.36/src/local.h.rebind 2012-07-11 14:02:46.000000000 +0200 ++++ ypbind-mt-1.36/src/local.h 2013-01-29 09:38:13.461922067 +0100 +@@ -9,6 +9,7 @@ extern int ping_interval; + extern int use_broadcast; + extern int localhost_used; + extern char *domain; ++extern int rebind_interval; + + extern void find_domain (const char *domain, ypbind_resp *result); + extern void clear_server (void); +diff -up ypbind-mt-1.36/src/serv_list.c.rebind ypbind-mt-1.36/src/serv_list.c +--- ypbind-mt-1.36/src/serv_list.c.rebind 2012-07-11 14:02:46.000000000 +0200 ++++ ypbind-mt-1.36/src/serv_list.c 2013-01-29 09:38:13.462922067 +0100 +@@ -1145,7 +1145,7 @@ test_bindings (void *param __attribute__ + pthread_exit (&success); + + lastcheck += ping_interval; +- if (lastcheck >= 900) /* 900 = 15min. */ ++ if (lastcheck >= rebind_interval) /* default 900 = 15min. */ + lastcheck = 0; + + #if USE_DBUS_NM +diff -up ypbind-mt-1.36/src/ypbind-mt.c.rebind ypbind-mt-1.36/src/ypbind-mt.c +--- ypbind-mt-1.36/src/ypbind-mt.c.rebind 2012-07-11 14:02:46.000000000 +0200 ++++ ypbind-mt-1.36/src/ypbind-mt.c 2013-01-29 10:12:58.742779476 +0100 +@@ -76,6 +76,7 @@ int ping_interval = 20; + int local_only = 0; + int localhost_used = 1; + int port = -1; ++int rebind_interval = 900; /* 900 = 15min. */ + static int lock_fd; + static int pid_is_written = 0; + static pthread_mutex_t mutex_pid = PTHREAD_MUTEX_INITIALIZER; +@@ -508,7 +509,7 @@ usage (int ret) + output = stdout; + + fputs (_("Usage:\n"), output); +- fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n\t [-verbose] [-n | -foreground]\n"), output); ++ fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval]\n\t [-r rebind-interval] [-debug] [-verbose] [-n | -foreground]\n"), output); + #ifdef USE_DBUS_NM + fputs (_("\t [-no-dbus]\n"), output); + #endif +@@ -746,6 +747,16 @@ main (int argc, char **argv) + else if (strcmp ("-no-dbus", argv[i]) == 0) + disable_dbus = 1; + #endif ++ else if (strcmp ("-rebind-interval", argv[i]) == 0 || ++ strcmp ("-r", argv[i]) == 0) ++ { ++ if (i+1 == argc || argv[i+1][0] == '-') ++ usage (1); ++ ++i; ++ rebind_interval = atoi (argv[i]); ++ if (rebind_interval < 1) ++ usage (1); ++ } + else if (strcmp ("--help", argv[i]) == 0) + usage (0); + else +@@ -837,6 +848,7 @@ main (int argc, char **argv) + { + log_msg (LOG_DEBUG, "[Welcome to ypbind-mt, version %s]\n", VERSION); + log_msg (LOG_DEBUG, "ping interval is %d seconds\n", ping_interval); ++ log_msg (LOG_DEBUG, "rebind interval is %d seconds\n", rebind_interval); + } + else if (! foreground_flag) + { From 8dbed4e7a62a86713dd046a773d5ec6a9295a3ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Tue, 29 Jan 2013 14:10:01 +0100 Subject: [PATCH 05/67] Fixed bogus dates in changelog --- ypbind-rebind.patch | 30 +++++++++++++++--------------- ypbind.spec | 9 +++++---- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ypbind-rebind.patch b/ypbind-rebind.patch index 581621b..7d31f8d 100644 --- a/ypbind-rebind.patch +++ b/ypbind-rebind.patch @@ -1,6 +1,6 @@ diff -up ypbind-mt-1.36/man/ypbind.8.rebind ypbind-mt-1.36/man/ypbind.8 ---- ypbind-mt-1.36/man/ypbind.8.rebind 2011-08-31 15:26:32.000000000 +0200 -+++ ypbind-mt-1.36/man/ypbind.8 2013-01-29 09:38:13.461922067 +0100 +--- ypbind-mt-1.36/man/ypbind.8.rebind 2013-01-29 14:02:15.806838768 +0100 ++++ ypbind-mt-1.36/man/ypbind.8 2013-01-29 14:02:15.810838767 +0100 @@ -171,7 +171,7 @@ ypbind \- NIS binding process .SH "Synopsis" .fam C @@ -10,8 +10,8 @@ diff -up ypbind-mt-1.36/man/ypbind.8.rebind ypbind-mt-1.36/man/ypbind.8 .fam .fam C .HP \w'\fBypbind\fR\ 'u -@@ -345,6 +345,13 @@ The default value for - to check, if a NIS server is still reacheable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. +@@ -370,6 +370,13 @@ The default value for + to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. .RE .PP +\fB\-rebind\-interval\fR @@ -25,8 +25,8 @@ diff -up ypbind-mt-1.36/man/ypbind.8.rebind ypbind-mt-1.36/man/ypbind.8 .RS 4 Disables DBUS support if compiled in\&. diff -up ypbind-mt-1.36/man/ypbind.8.xml.rebind ypbind-mt-1.36/man/ypbind.8.xml ---- ypbind-mt-1.36/man/ypbind.8.xml.rebind 2011-08-31 15:23:56.000000000 +0200 -+++ ypbind-mt-1.36/man/ypbind.8.xml 2013-01-29 09:38:13.461922067 +0100 +--- ypbind-mt-1.36/man/ypbind.8.xml.rebind 2013-01-29 14:02:15.802838768 +0100 ++++ ypbind-mt-1.36/man/ypbind.8.xml 2013-01-29 14:02:15.810838767 +0100 @@ -51,6 +51,7 @@ -f configfile -local-only @@ -53,7 +53,7 @@ diff -up ypbind-mt-1.36/man/ypbind.8.xml.rebind ypbind-mt-1.36/man/ypbind.8.xml diff -up ypbind-mt-1.36/src/local.h.rebind ypbind-mt-1.36/src/local.h --- ypbind-mt-1.36/src/local.h.rebind 2012-07-11 14:02:46.000000000 +0200 -+++ ypbind-mt-1.36/src/local.h 2013-01-29 09:38:13.461922067 +0100 ++++ ypbind-mt-1.36/src/local.h 2013-01-29 14:02:15.810838767 +0100 @@ -9,6 +9,7 @@ extern int ping_interval; extern int use_broadcast; extern int localhost_used; @@ -63,8 +63,8 @@ diff -up ypbind-mt-1.36/src/local.h.rebind ypbind-mt-1.36/src/local.h extern void find_domain (const char *domain, ypbind_resp *result); extern void clear_server (void); diff -up ypbind-mt-1.36/src/serv_list.c.rebind ypbind-mt-1.36/src/serv_list.c ---- ypbind-mt-1.36/src/serv_list.c.rebind 2012-07-11 14:02:46.000000000 +0200 -+++ ypbind-mt-1.36/src/serv_list.c 2013-01-29 09:38:13.462922067 +0100 +--- ypbind-mt-1.36/src/serv_list.c.rebind 2013-01-29 14:02:15.799838768 +0100 ++++ ypbind-mt-1.36/src/serv_list.c 2013-01-29 14:02:15.810838767 +0100 @@ -1145,7 +1145,7 @@ test_bindings (void *param __attribute__ pthread_exit (&success); @@ -75,9 +75,9 @@ diff -up ypbind-mt-1.36/src/serv_list.c.rebind ypbind-mt-1.36/src/serv_list.c #if USE_DBUS_NM diff -up ypbind-mt-1.36/src/ypbind-mt.c.rebind ypbind-mt-1.36/src/ypbind-mt.c ---- ypbind-mt-1.36/src/ypbind-mt.c.rebind 2012-07-11 14:02:46.000000000 +0200 -+++ ypbind-mt-1.36/src/ypbind-mt.c 2013-01-29 10:12:58.742779476 +0100 -@@ -76,6 +76,7 @@ int ping_interval = 20; +--- ypbind-mt-1.36/src/ypbind-mt.c.rebind 2013-01-29 14:02:15.808838768 +0100 ++++ ypbind-mt-1.36/src/ypbind-mt.c 2013-01-29 14:02:15.811838767 +0100 +@@ -79,6 +79,7 @@ int ping_interval = 20; int local_only = 0; int localhost_used = 1; int port = -1; @@ -85,7 +85,7 @@ diff -up ypbind-mt-1.36/src/ypbind-mt.c.rebind ypbind-mt-1.36/src/ypbind-mt.c static int lock_fd; static int pid_is_written = 0; static pthread_mutex_t mutex_pid = PTHREAD_MUTEX_INITIALIZER; -@@ -508,7 +509,7 @@ usage (int ret) +@@ -512,7 +513,7 @@ usage (int ret) output = stdout; fputs (_("Usage:\n"), output); @@ -94,7 +94,7 @@ diff -up ypbind-mt-1.36/src/ypbind-mt.c.rebind ypbind-mt-1.36/src/ypbind-mt.c #ifdef USE_DBUS_NM fputs (_("\t [-no-dbus]\n"), output); #endif -@@ -746,6 +747,16 @@ main (int argc, char **argv) +@@ -750,6 +751,16 @@ main (int argc, char **argv) else if (strcmp ("-no-dbus", argv[i]) == 0) disable_dbus = 1; #endif @@ -111,7 +111,7 @@ diff -up ypbind-mt-1.36/src/ypbind-mt.c.rebind ypbind-mt-1.36/src/ypbind-mt.c else if (strcmp ("--help", argv[i]) == 0) usage (0); else -@@ -837,6 +848,7 @@ main (int argc, char **argv) +@@ -841,6 +852,7 @@ main (int argc, char **argv) { log_msg (LOG_DEBUG, "[Welcome to ypbind-mt, version %s]\n", VERSION); log_msg (LOG_DEBUG, "ping interval is %d seconds\n", ping_interval); diff --git a/ypbind.spec b/ypbind.spec index f506896..fc7ac9d 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -143,6 +143,7 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %changelog * Tue Jan 29 2013 Honza Horak - 3:1.36-10 - Make re-bind interval a tune-able option +- Fixed bogus dates in changelog * Wed Dec 19 2012 Honza Horak - 3:1.36-9 - Check presence of ypbind in /etc/rpc @@ -233,10 +234,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind * Tue Jun 07 2011 Honza Horak - 3:1.33-3 - Fixed ypbind.service when selinux is disabled -* Wed May 10 2011 Honza Horak - 3:1.33-2 +* Tue May 10 2011 Honza Horak - 3:1.33-2 - Added /etc/sysconfig/network to systemd service file -* Wed May 10 2011 Honza Horak - 3:1.33-1 +* Tue May 10 2011 Honza Horak - 3:1.33-1 - Update to new version * Fri Apr 29 2011 Honza Horak - 3:1.32-11 @@ -318,7 +319,7 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind the documentation, and it is also removed from the usage string in this version -* Fri Nov 19 2009 Karel Klic - 3:1.29.91-2 +* Thu Nov 19 2009 Karel Klic - 3:1.29.91-2 - Added signalstate patch, which fixes compilation with NetworkManaged-devel headers installed. Resolves #537064. @@ -400,7 +401,7 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind * Mon Sep 17 2007 Steve Dickson - 3:1.20.4-2 - Fixed a couple of typos in initscript (bz 281951) -* Wed May 3 2007 Steve Dickson - 3:1.20.4-1 +* Thu May 3 2007 Steve Dickson - 3:1.20.4-1 - updated to latest upstream version ypbind-mt-1.20.4 * Tue Apr 17 2007 Steve Dickson - 3:1.19-9 From 777a854757e82d64941316ac941702edb1204007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 6 May 2013 22:23:25 +0200 Subject: [PATCH 06/67] Update to new version 1.37.1 --- .gitignore | 1 + sources | 2 +- ypbind-1.11-gettextdomain.patch | 5 +- ypbind-mt-1.32-typo.patch | 12 ---- ypbind-mt-1.32-typo2.patch | 42 ----------- ypbind-mt-1.35-nmsignal.patch | 30 -------- ypbind-mt-1.36-nistimeout.patch | 8 +-- ypbind-nmlocal.patch | 114 ------------------------------ ypbind-rebind.patch | 121 -------------------------------- ypbind-sdnotify.patch | 81 --------------------- ypbind-sigpipe.patch | 11 --- ypbind.spec | 17 ++--- 12 files changed, 14 insertions(+), 430 deletions(-) delete mode 100644 ypbind-mt-1.32-typo.patch delete mode 100644 ypbind-mt-1.32-typo2.patch delete mode 100644 ypbind-mt-1.35-nmsignal.patch delete mode 100644 ypbind-nmlocal.patch delete mode 100644 ypbind-rebind.patch delete mode 100644 ypbind-sdnotify.patch delete mode 100644 ypbind-sigpipe.patch diff --git a/.gitignore b/.gitignore index 656f344..59db7d9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ ypbind-mt-1.32.tar.bz2 /ypbind-mt-1.33.tar.bz2 /ypbind-mt-1.35.tar.bz2 /ypbind-mt-1.36.tar.bz2 +/ypbind-mt-1.37.1.tar.bz2 diff --git a/sources b/sources index 076e335..99399a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -135834db97d78ff6d79fdee2810b4056 ypbind-mt-1.36.tar.bz2 +8af8d35e7b9a7fcc3a1576697a04bd82 ypbind-mt-1.37.1.tar.bz2 diff --git a/ypbind-1.11-gettextdomain.patch b/ypbind-1.11-gettextdomain.patch index 2a96820..0891dd5 100644 --- a/ypbind-1.11-gettextdomain.patch +++ b/ypbind-1.11-gettextdomain.patch @@ -1,5 +1,6 @@ ---- ypbind-mt-1.11/po/Makevars.fixit Tue Jun 11 07:19:05 2002 -+++ ypbind-mt-1.11/po/Makevars Tue Jun 11 07:19:07 2002 +diff -up ./po/Makevars.gettextdomain ./po/Makevars +--- ./po/Makevars.gettextdomain 2004-01-14 20:25:25.000000000 +0100 ++++ ./po/Makevars 2013-05-06 19:07:24.961484803 +0200 @@ -1,7 +1,7 @@ # Makefile variables for PO directory in any package using GNU gettext. diff --git a/ypbind-mt-1.32-typo.patch b/ypbind-mt-1.32-typo.patch deleted file mode 100644 index be7a4fd..0000000 --- a/ypbind-mt-1.32-typo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ypbind-mt-1.32/src/serv_list.c.typo ypbind-mt-1.32/src/serv_list.c ---- ypbind-mt-1.32/src/serv_list.c.typo 2010-11-29 11:28:51.701891385 +0100 -+++ ypbind-mt-1.32/src/serv_list.c 2010-11-29 11:30:29.682891306 +0100 -@@ -830,7 +830,7 @@ ping_all (struct binding *list) - if (s_in.sin_port == 0) - { - if (verbose_flag && list->active == i) -- log_msg (LOG_NOTICE, "NIS server '%s' not repsonding " -+ log_msg (LOG_NOTICE, "NIS server '%s' not responding " - "for domain '%s'", list->server[i].host, list->domain); - - if (debug_flag) diff --git a/ypbind-mt-1.32-typo2.patch b/ypbind-mt-1.32-typo2.patch deleted file mode 100644 index f8f6096..0000000 --- a/ypbind-mt-1.32-typo2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up ypbind-mt-1.32/man/ypbind.8.typo2 ypbind-mt-1.32/man/ypbind.8 ---- ypbind-mt-1.32/man/ypbind.8.typo2 2011-03-18 13:13:11.263707644 +0100 -+++ ypbind-mt-1.32/man/ypbind.8 2011-03-18 13:16:59.170866034 +0100 -@@ -313,7 +313,7 @@ versions\&. - \fBypbind\fR - will not check if the binding is alive\&. This option is for use with dialup connections to prevent - \fBypbind\fR --from keeping the connection unnecessarily open or causing autodials\&. -+from keeping the connection unnecessarily open or causing auto-dials\&. - .RE - .PP - \fB\-f\fR configfile -@@ -335,7 +335,7 @@ will only bind to the loopback device an - .RS 4 - The default value for - \fBypbind\fR --to check, if a NIS server is still reacheable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. -+to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. - .RE - .PP - \fB\-no\-dbus\fR -diff -up ypbind-mt-1.32/man/ypbind.8.xml.typo2 ypbind-mt-1.32/man/ypbind.8.xml ---- ypbind-mt-1.32/man/ypbind.8.xml.typo2 2011-03-18 13:18:01.643651666 +0100 -+++ ypbind-mt-1.32/man/ypbind.8.xml 2011-03-18 13:19:03.137658398 +0100 -@@ -234,7 +234,7 @@ versions. - will not check if the binding is alive. This option is for use with - dialup connections to prevent - ypbind --from keeping the connection unnecessarily open or causing autodials. -+from keeping the connection unnecessarily open or causing auto-dials. - - - -@@ -260,7 +260,7 @@ a remote network. - - The default value for - ypbind --to check, if a NIS server is still reacheable, is 20 seconds. -+to check, if a NIS server is still reachable, is 20 seconds. - With this options another frequency in seconds can be specified. - - diff --git a/ypbind-mt-1.35-nmsignal.patch b/ypbind-mt-1.35-nmsignal.patch deleted file mode 100644 index 5c27683..0000000 --- a/ypbind-mt-1.35-nmsignal.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmsignal ypbind-mt-1.35/src/ypbind_dbus_nm.c ---- ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmsignal 2012-03-23 13:48:21.000000000 +0100 -+++ ypbind-mt-1.35/src/ypbind_dbus_nm.c 2012-04-18 14:40:50.574569893 +0200 -@@ -32,6 +32,9 @@ - #include - #include - -+/* We have our own constant, NM uses directly "StateChanged" string */ -+#define NM_DBUS_SIGNAL_STATE_CHANGED "StateChanged" -+ - #ifdef HAVE_NETWORKMANAGER_NETWORKMANAGER_H - #include - #include -@@ -39,7 +42,6 @@ - #define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" - #define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" - #define NM_DBUS_PATH "/org/freedesktop/NetworkManager" --#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange" - - typedef enum NMState { - NM_STATE_UNKNOWN = 0, -@@ -160,7 +162,7 @@ dbus_filter (DBusConnection *connection, - handled = DBUS_HANDLER_RESULT_HANDLED; - } - else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, -- NM_DBUS_VPN_SIGNAL_STATE_CHANGE)) -+ NM_DBUS_SIGNAL_STATE_CHANGED)) - { - NMState state = NM_STATE_UNKNOWN; - diff --git a/ypbind-mt-1.36-nistimeout.patch b/ypbind-mt-1.36-nistimeout.patch index f3525ca..64a8eae 100644 --- a/ypbind-mt-1.36-nistimeout.patch +++ b/ypbind-mt-1.36-nistimeout.patch @@ -1,7 +1,7 @@ -diff -up ypbind-mt-1.36/man/ypbind.8.nistimeout ypbind-mt-1.36/man/ypbind.8 ---- ypbind-mt-1.36/man/ypbind.8.nistimeout 2012-08-23 13:55:01.296453226 +0200 -+++ ypbind-mt-1.36/man/ypbind.8 2012-08-23 15:11:23.900115478 +0200 -@@ -248,6 +248,31 @@ will behave as usual and assumes there i +diff -up ./man/ypbind.8.nistimeout ./man/ypbind.8 +--- ./man/ypbind.8.nistimeout 2013-04-09 14:31:04.000000000 +0200 ++++ ./man/ypbind.8 2013-05-06 19:11:20.509665809 +0200 +@@ -104,6 +104,31 @@ will behave as usual and assumes there i will reread all configuration files, registers at the local portmapper and try to search NIS servers\&. If NetworkManager drops a connection, \fBypbind\fR will unregister from portmapper\&. diff --git a/ypbind-nmlocal.patch b/ypbind-nmlocal.patch deleted file mode 100644 index 6734d0b..0000000 --- a/ypbind-nmlocal.patch +++ /dev/null @@ -1,114 +0,0 @@ -diff -up ypbind-mt-1.35/src/local.h.nmlocal ypbind-mt-1.35/src/local.h ---- ypbind-mt-1.35/src/local.h.nmlocal 2009-03-30 14:24:40.000000000 +0200 -+++ ypbind-mt-1.35/src/local.h 2012-06-11 19:31:42.297661066 +0200 -@@ -7,6 +7,7 @@ extern int broken_server; - extern int port; - extern int ping_interval; - extern int use_broadcast; -+extern int localhost_used; - extern char *domain; - - extern void find_domain (const char *domain, ypbind_resp *result); -diff -up ypbind-mt-1.35/src/serv_list.c.nmlocal ypbind-mt-1.35/src/serv_list.c ---- ypbind-mt-1.35/src/serv_list.c.nmlocal 2012-06-11 19:31:41.970660463 +0200 -+++ ypbind-mt-1.35/src/serv_list.c 2012-06-11 19:39:15.177987490 +0200 -@@ -108,6 +108,28 @@ static pthread_mutex_t search_lock = PTH - static void do_broadcast (struct binding *list); - static int ping_all (struct binding *list); - -+/* We have localhost defined in one of the domains. -+ * If so, we don't need to be connected to outer network. */ -+void -+check_localhost() -+{ -+ int i, s; -+ localhost_used = 0; -+ for (i = 0; i < max_domains; ++i) -+ { -+ for (s = 0; s < _MAXSERVER; ++s) -+ { -+ if (domainlist[i].server[s].host == NULL) -+ break; -+ if (strncmp(inet_ntoa(domainlist[i].server[s].addr), "127", 3) == 0) -+ { -+ localhost_used = 1; -+ return; -+ } -+ } -+ } -+} -+ - static void - remove_bindingfile (struct binding *entry) - { -@@ -220,6 +242,7 @@ update_bindingfile (struct binding *entr - } - else - log_msg (LOG_ERR, "open(%s): %s", path2, strerror (errno)); -+ check_localhost(); - } - - /* this is called from the RPC thread (ypset). */ -@@ -562,6 +585,7 @@ add_server (const char *domain, const ch - If there is none, use the first one. */ - memcpy (&entry->server[active].addr, hent->h_addr_list[0], - hent->h_length); -+ check_localhost(); - res = 1; - } - -@@ -1105,7 +1129,7 @@ test_bindings (void *param __attribute__ - int lastcheck = 0; - - #ifdef USE_DBUS_NM -- if (is_online) -+ if (is_online || localhost_used) - #endif - do_binding (); - -@@ -1125,7 +1149,7 @@ test_bindings (void *param __attribute__ - lastcheck = 0; - - #if USE_DBUS_NM -- if (is_online) -+ if (is_online || localhost_used) - - #endif - lastcheck = test_bindings_once (lastcheck, NULL); -diff -up ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmlocal ypbind-mt-1.35/src/ypbind_dbus_nm.c ---- ypbind-mt-1.35/src/ypbind_dbus_nm.c.nmlocal 2012-06-11 19:31:42.296661064 +0200 -+++ ypbind-mt-1.35/src/ypbind_dbus_nm.c 2012-06-11 19:31:42.300661070 +0200 -@@ -92,8 +92,11 @@ go_offline (void) - if (debug_flag) - log_msg (LOG_DEBUG, _("Switch to offline mode")); - is_online = 0; -- portmapper_disconnect (); -- clear_server (); -+ if (!localhost_used) -+ { -+ portmapper_disconnect (); -+ clear_server (); -+ } - } - - static void -diff -up ypbind-mt-1.35/src/ypbind-mt.c.nmlocal ypbind-mt-1.35/src/ypbind-mt.c ---- ypbind-mt-1.35/src/ypbind-mt.c.nmlocal 2011-08-31 15:21:11.000000000 +0200 -+++ ypbind-mt-1.35/src/ypbind-mt.c 2012-06-11 19:40:02.419996267 +0200 -@@ -74,6 +74,7 @@ int broken_server = 0; - int foreground_flag = 0; - int ping_interval = 20; - int local_only = 0; -+int localhost_used = 1; - int port = -1; - static int lock_fd; - static int pid_is_written = 0; -@@ -945,7 +946,7 @@ main (int argc, char **argv) - } - - #ifdef USE_DBUS_NM -- if (!is_online) -+ if (!is_online && !localhost_used) - portmapper_disconnect (); - #endif - diff --git a/ypbind-rebind.patch b/ypbind-rebind.patch deleted file mode 100644 index 7d31f8d..0000000 --- a/ypbind-rebind.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -up ypbind-mt-1.36/man/ypbind.8.rebind ypbind-mt-1.36/man/ypbind.8 ---- ypbind-mt-1.36/man/ypbind.8.rebind 2013-01-29 14:02:15.806838768 +0100 -+++ ypbind-mt-1.36/man/ypbind.8 2013-01-29 14:02:15.810838767 +0100 -@@ -171,7 +171,7 @@ ypbind \- NIS binding process - .SH "Synopsis" - .fam C - .HP \w'\fBypbind\fR\ 'u --\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus] -+\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-rebind\-interval\fR] [\-no\-dbus] - .fam - .fam C - .HP \w'\fBypbind\fR\ 'u -@@ -370,6 +370,13 @@ The default value for - to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. - .RE - .PP -+\fB\-rebind\-interval\fR -+.RS 4 -+The default value for -+\fBypbind\fR -+to search for the fastest NIS server is 900 seconds (15 minutes)\&. With this options another frequency in seconds can be specified\&. -+.RE -+.PP - \fB\-no\-dbus\fR - .RS 4 - Disables DBUS support if compiled in\&. -diff -up ypbind-mt-1.36/man/ypbind.8.xml.rebind ypbind-mt-1.36/man/ypbind.8.xml ---- ypbind-mt-1.36/man/ypbind.8.xml.rebind 2013-01-29 14:02:15.802838768 +0100 -+++ ypbind-mt-1.36/man/ypbind.8.xml 2013-01-29 14:02:15.810838767 +0100 -@@ -51,6 +51,7 @@ - -f configfile - -local-only - -ping-interval ping-interval -+ -rebind-interval - -no-dbus - - -@@ -273,6 +274,15 @@ to check, if a NIS server is still reach - With this options another frequency in seconds can be specified. - - -+ -+ -+ -+The default value for -+ypbind -+to search for the fastest NIS server is 900 seconds (15 minutes). -+With this options another frequency in seconds can be specified. -+ -+ - - - -diff -up ypbind-mt-1.36/src/local.h.rebind ypbind-mt-1.36/src/local.h ---- ypbind-mt-1.36/src/local.h.rebind 2012-07-11 14:02:46.000000000 +0200 -+++ ypbind-mt-1.36/src/local.h 2013-01-29 14:02:15.810838767 +0100 -@@ -9,6 +9,7 @@ extern int ping_interval; - extern int use_broadcast; - extern int localhost_used; - extern char *domain; -+extern int rebind_interval; - - extern void find_domain (const char *domain, ypbind_resp *result); - extern void clear_server (void); -diff -up ypbind-mt-1.36/src/serv_list.c.rebind ypbind-mt-1.36/src/serv_list.c ---- ypbind-mt-1.36/src/serv_list.c.rebind 2013-01-29 14:02:15.799838768 +0100 -+++ ypbind-mt-1.36/src/serv_list.c 2013-01-29 14:02:15.810838767 +0100 -@@ -1145,7 +1145,7 @@ test_bindings (void *param __attribute__ - pthread_exit (&success); - - lastcheck += ping_interval; -- if (lastcheck >= 900) /* 900 = 15min. */ -+ if (lastcheck >= rebind_interval) /* default 900 = 15min. */ - lastcheck = 0; - - #if USE_DBUS_NM -diff -up ypbind-mt-1.36/src/ypbind-mt.c.rebind ypbind-mt-1.36/src/ypbind-mt.c ---- ypbind-mt-1.36/src/ypbind-mt.c.rebind 2013-01-29 14:02:15.808838768 +0100 -+++ ypbind-mt-1.36/src/ypbind-mt.c 2013-01-29 14:02:15.811838767 +0100 -@@ -79,6 +79,7 @@ int ping_interval = 20; - int local_only = 0; - int localhost_used = 1; - int port = -1; -+int rebind_interval = 900; /* 900 = 15min. */ - static int lock_fd; - static int pid_is_written = 0; - static pthread_mutex_t mutex_pid = PTHREAD_MUTEX_INITIALIZER; -@@ -512,7 +513,7 @@ usage (int ret) - output = stdout; - - fputs (_("Usage:\n"), output); -- fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n\t [-verbose] [-n | -foreground]\n"), output); -+ fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval]\n\t [-r rebind-interval] [-debug] [-verbose] [-n | -foreground]\n"), output); - #ifdef USE_DBUS_NM - fputs (_("\t [-no-dbus]\n"), output); - #endif -@@ -750,6 +751,16 @@ main (int argc, char **argv) - else if (strcmp ("-no-dbus", argv[i]) == 0) - disable_dbus = 1; - #endif -+ else if (strcmp ("-rebind-interval", argv[i]) == 0 || -+ strcmp ("-r", argv[i]) == 0) -+ { -+ if (i+1 == argc || argv[i+1][0] == '-') -+ usage (1); -+ ++i; -+ rebind_interval = atoi (argv[i]); -+ if (rebind_interval < 1) -+ usage (1); -+ } - else if (strcmp ("--help", argv[i]) == 0) - usage (0); - else -@@ -841,6 +852,7 @@ main (int argc, char **argv) - { - log_msg (LOG_DEBUG, "[Welcome to ypbind-mt, version %s]\n", VERSION); - log_msg (LOG_DEBUG, "ping interval is %d seconds\n", ping_interval); -+ log_msg (LOG_DEBUG, "rebind interval is %d seconds\n", rebind_interval); - } - else if (! foreground_flag) - { diff --git a/ypbind-sdnotify.patch b/ypbind-sdnotify.patch deleted file mode 100644 index 7efef9a..0000000 --- a/ypbind-sdnotify.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -up ypbind-mt-1.36/configure.in.sdnotify ypbind-mt-1.36/configure.in ---- ypbind-mt-1.36/configure.in.sdnotify 2012-07-09 16:41:36.000000000 +0200 -+++ ypbind-mt-1.36/configure.in 2012-07-12 13:28:25.221031367 +0200 -@@ -103,6 +103,18 @@ JH_CHECK_XML_CATALOG([http://docbook.sou - [DocBook XSL Stylesheets], [], enable_man=no) - AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) - -+USE_SD_NOTIFY=0 -+AC_SUBST(USE_SD_NOTIFY) -+AC_CHECK_LIB(systemd-daemon,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd-daemon", -+ LIBSYSTEMD_DAEMON="") -+if test -n "$LIBSYSTEMD_DAEMON" ; then -+ AC_CHECK_HEADERS(systemd/sd-daemon.h) -+ if test "$ac_cv_header_systemd_sd_notify_h" = yes; then -+ USE_SD_NOTIFY=1 -+ fi -+fi -+AC_SUBST(USE_SD_NOTIFY) -+AC_SUBST(LIBSYSTEMD_DAEMON) - - dnl internationalization macros - AM_GNU_GETTEXT_VERSION -diff -up ypbind-mt-1.36/src/Makefile.am.sdnotify ypbind-mt-1.36/src/Makefile.am ---- ypbind-mt-1.36/src/Makefile.am.sdnotify 2009-06-15 16:30:45.000000000 +0200 -+++ ypbind-mt-1.36/src/Makefile.am 2012-07-12 13:28:25.288029189 +0200 -@@ -8,8 +8,9 @@ localedir = $(datadir)/locale - - WARNFLAGS = @WARNFLAGS@ - AM_CFLAGS = -D_REENTRANT=1 $(WARNFLAGS) -DUSE_BROADCAST=@USE_BROADCAST@ \ -- -DLOCALEDIR=\"$(localedir)\" @DBUS_CFLAGS@ @GLIB_CFLAGS@ --ypbind_LDADD = ../lib/libcompat.a @LIBINTL@ @SLP_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ -+ -DLOCALEDIR=\"$(localedir)\" @DBUS_CFLAGS@ @GLIB_CFLAGS@ -DUSE_SD_NOTIFY=@USE_SD_NOTIFY@ -+ypbind_LDADD = ../lib/libcompat.a @LIBINTL@ @SLP_LIBS@ @DBUS_LIBS@ @GLIB_LIBS@ \ -+ $(LIBSYSTEMD_DAEMON) - - CLEANFILES = *~ - -diff -up ypbind-mt-1.36/src/ypbind-mt.c.sdnotify ypbind-mt-1.36/src/ypbind-mt.c ---- ypbind-mt-1.36/src/ypbind-mt.c.sdnotify 2012-07-11 14:02:46.000000000 +0200 -+++ ypbind-mt-1.36/src/ypbind-mt.c 2012-07-12 13:57:52.479549892 +0200 -@@ -49,6 +49,9 @@ - #if defined(HAVE_NSS_H) - #include - #endif -+#if defined(HAVE_SYSTEMD_SD_DAEMON_H) -+#include -+#endif - - #include "ypbind.h" - #include "log_msg.h" -@@ -952,6 +955,30 @@ main (int argc, char **argv) - - pthread_create (&ping_thread, NULL, &test_bindings, NULL); - -+#ifdef USE_SD_NOTIFY -+ { -+ /* -+ * If we use systemd as an init process we may want to give it -+ * a message, that ypbind daemon is ready to accept connections. -+ * At this time, sockets for receiving connections are already -+ * created, so we can say we're ready now. -+ */ -+ int result; -+ result = sd_notifyf(0, "READY=1\n" -+ "STATUS=Processing requests...\n" -+ "MAINPID=%lu", (unsigned long) getpid()); -+ -+ /* -+ * Return code from sd_notifyf can be ignored, as per sd_notifyf(3). -+ * However, if we use systemd's native unit file, we need to send -+ * this message to let systemd know that daemon is ready. -+ * Thus, we want to know that the call had some issues. -+ */ -+ if (result < 0) -+ log_msg ("sd_notifyf failed: %s\n", strerror(-result)); -+ } -+#endif -+ - svc_run (); - log_msg (LOG_ERR, _("svc_run returned.")); - unlink (_YPBIND_PIDFILE); diff --git a/ypbind-sigpipe.patch b/ypbind-sigpipe.patch deleted file mode 100644 index ce3ced6..0000000 --- a/ypbind-sigpipe.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ypbind-mt-1.36/src/ypbind-mt.c.sigpipe ypbind-mt-1.36/src/ypbind-mt.c ---- ypbind-mt-1.36/src/ypbind-mt.c.sigpipe 2012-07-23 10:02:12.275896834 +0200 -+++ ypbind-mt-1.36/src/ypbind-mt.c 2012-07-23 10:02:47.430632798 +0200 -@@ -432,6 +432,7 @@ sig_handler (void *v_param __attribute_ - sigaddset (&sigs_to_catch, SIGQUIT); - sigaddset (&sigs_to_catch, SIGSEGV); - sigaddset (&sigs_to_catch, SIGHUP); -+ sigaddset (&sigs_to_catch, SIGPIPE); - - while (1) - { diff --git a/ypbind.spec b/ypbind.spec index fc7ac9d..0d8e1de 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind -Version: 1.36 -Release: 10%{?dist} +Version: 1.37.1 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -15,12 +15,7 @@ Source5: ypbind-post-waitbind # 'ypbind-mt' would allow us to drop it. Patch1: ypbind-1.11-gettextdomain.patch # Not sent to upstream. -Patch2: ypbind-mt-1.32-typo.patch -Patch3: ypbind-mt-1.32-typo2.patch -Patch4: ypbind-sigpipe.patch Patch5: ypbind-mt-1.36-nistimeout.patch -Patch6: ypbind-sdnotify.patch -Patch7: ypbind-rebind.patch # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units @@ -53,12 +48,7 @@ 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 .typo -%patch3 -p1 -b .typo2 -%patch4 -p1 -b .sigpipe %patch5 -p1 -b .nistimeout -%patch6 -p1 -b .sdnotify -%patch7 -p1 -b .rebind autoreconf @@ -141,6 +131,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon May 06 2013 Honza Horak - 3:1.37.1-1 +- Update to new version 1.37.1 + * Tue Jan 29 2013 Honza Horak - 3:1.36-10 - Make re-bind interval a tune-able option - Fixed bogus dates in changelog From 9ea112dbec0287d895d7f1fc4cbcb20421d1f0c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Tue, 7 May 2013 11:29:38 +0200 Subject: [PATCH 07/67] Syncing help and man pages --- ypbind-helpman.patch | 114 +++++++++++++++++++++++++++++++++++++++++++ ypbind.spec | 11 +++-- 2 files changed, 122 insertions(+), 3 deletions(-) create mode 100644 ypbind-helpman.patch diff --git a/ypbind-helpman.patch b/ypbind-helpman.patch new file mode 100644 index 0000000..82771b3 --- /dev/null +++ b/ypbind-helpman.patch @@ -0,0 +1,114 @@ +diff -up ./man/ypbind.8.helpman ./man/ypbind.8 +--- ./man/ypbind.8.helpman 2013-05-07 11:22:51.178888612 +0200 ++++ ./man/ypbind.8 2013-05-07 11:23:20.497891948 +0200 +@@ -31,9 +31,11 @@ + ypbind \- NIS binding process + .SH "SYNOPSIS" + .HP \w'\fBypbind\fR\ 'u +-\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-rebind\-interval] [\-no\-dbus] ++\fBypbind\fR [\-broadcast\ |\ \-ypset\ |\ \-ypsetme] [\-c] [\-f\ \fIconfigfile\fR] [\-no\-ping] [\-broken\-server] [\-local\-only] [\-i\ |\ \-ping\-interval\ \fIping\-interval\fR] [\-r\ |\ \-rebind\-interval\ \fIrebind\-interval\fR] [\-d\ |\ \-debug] [\-v\ |\ \-verbose] [\-n\ |\ \-foreground] [\-p\ \fIport\fR] [\-log\ \fIlog\-options\fR] [\-no\-dbus] + .HP \w'\fBypbind\fR\ 'u + \fBypbind\fR \-\-version ++.HP \w'\fBypbind\fR\ 'u ++\fBypbind\fR \-\-help + .SH "DESCRIPTION" + .PP + \fBypbind\fR +@@ -164,7 +166,7 @@ on the local machine is allowed to chang + only checks if the config file has syntax errors and exits\&. + .RE + .PP +-\fB\-debug\fR ++\fB\-d, \-debug\fR + .RS 4 + starts + \fBypbind\fR +@@ -173,13 +175,13 @@ in debug mode\&. + will not put itself into background, and error messages and debug output are written to standard error\&. + .RE + .PP +-\fB\-foreground\fR ++\fB\-n, \-foreground\fR + .RS 4 + \fBypbind\fR + will not put itself into backgroun\&. + .RE + .PP +-\fB\-verbose\fR ++\fB\-v, \-verbose\fR + .RS 4 + Causes + \fBypbind\fR +@@ -188,7 +190,7 @@ to syslog(2) any and all changes in the + .PP + \fB\-broken\-server\fR + .RS 4 +-lets ++Lets + \fBypbind\fR + accept answers from servers running on an illegal port number\&. This should usually be avoided, but is required by some + \fBypserv\fR(8) +@@ -218,20 +220,36 @@ and not + will only bind to the loopback device and is not reachable from a remote network\&. + .RE + .PP +-\fB\-ping\-interval\fR ping\-interval ++\fB\-p port\fR ++.RS 4 ++Lets ++\fBypbind\fR ++listen on a specified ++\fBport\fR ++number, rather than asking portmapper to assing a port for it\&. ++.RE ++.PP ++\fB\-i, \-ping\-interval\fR ping\-interval + .RS 4 + The default value for + \fBypbind\fR + to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. + .RE + .PP +-\fB\-rebind\-interval\fR ++\fB\-r, \-rebind\-interval\fR rebind\-interval + .RS 4 + The default value for + \fBypbind\fR + to search for the fastest NIS server is 900 seconds (15 minutes)\&. With this options another frequency in seconds can be specified\&. + .RE + .PP ++\fB\-log\fR log\-options ++.RS 4 ++Allows to log special events\&. ++\fBlog\-options\fR ++is a logical sum of values for particular events \- 1 for logging rpc calls, 2 for logging broken server calls, 4 for logging server changes\&. ++.RE ++.PP + \fB\-no\-dbus\fR + .RS 4 + Disables DBUS support if compiled in\&. +diff -up ./src/ypbind-mt.c.helpman ./src/ypbind-mt.c +--- ./src/ypbind-mt.c.helpman 2013-04-09 16:03:47.000000000 +0200 ++++ ./src/ypbind-mt.c 2013-05-07 11:22:51.180888612 +0200 +@@ -513,12 +513,17 @@ usage (int ret) + output = stdout; + + fputs (_("Usage:\n"), output); +- fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval]\n\t [-r rebind-interval] [-debug] [-verbose] [-n | -foreground]\n"), output); ++ fputs ("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile] [-no-ping]\n" ++ "\t [-broken-server] [-local-only] [-i | -ping-interval ping-interval]\n" ++ "\t [-r | -rebind-interval rebind-interval] [-d | -debug] [-v | -verbose]\n" ++ "\t [-n | -foreground] [-p port] [-log log-options]", output); + #ifdef USE_DBUS_NM +- fputs (_("\t [-no-dbus]\n"), output); ++ fputs (" [-no-dbus]", output); + #endif +- fputs (_("\typbind -c [-f configfile]\n"), output); +- fputs (_("\typbind --version\n"), output); ++ fputs ("\n", output); ++ fputs ("\typbind -c [-f configfile]\n", output); ++ fputs ("\typbind --version\n", output); ++ fputs ("\typbind --help\n", output); + exit (ret); + } + diff --git a/ypbind.spec b/ypbind.spec index 0d8e1de..0acb192 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.37.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -15,7 +15,8 @@ Source5: ypbind-post-waitbind # 'ypbind-mt' would allow us to drop it. Patch1: ypbind-1.11-gettextdomain.patch # Not sent to upstream. -Patch5: ypbind-mt-1.36-nistimeout.patch +Patch2: ypbind-mt-1.36-nistimeout.patch +Patch3: ypbind-helpman.patch # This is for /bin/systemctl Requires(post): systemd-units Requires(preun): systemd-units @@ -48,7 +49,8 @@ also need to install the ypserv package to a machine on your network. %prep %setup -q -n ypbind-mt-%{version} %patch1 -p1 -b .gettextdomain -%patch5 -p1 -b .nistimeout +%patch2 -p1 -b .nistimeout +%patch3 -p1 -b .helpman autoreconf @@ -131,6 +133,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Tue May 07 2013 Honza Horak - 3:1.37.1-2 +- Syncing help and man pages + * Mon May 06 2013 Honza Horak - 3:1.37.1-1 - Update to new version 1.37.1 From a0b4e0ffb71fc538c7b959121170e9cf04bf1606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Fri, 10 May 2013 10:44:00 +0200 Subject: [PATCH 08/67] Enable PrivateTmp feature, just for the case --- ypbind.service | 1 + ypbind.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ypbind.service b/ypbind.service index 29978d4..9e8d2ec 100644 --- a/ypbind.service +++ b/ypbind.service @@ -13,6 +13,7 @@ ExecStartPre=/usr/libexec/ypbind-pre-setdomain ExecStartPre=-/usr/sbin/setsebool allow_ypbind=1 ExecStart=/usr/sbin/ypbind -n $OTHER_YPBIND_OPTS ExecStartPost=/usr/libexec/ypbind-post-waitbind +PrivateTmp=true [Install] WantedBy=multi-user.target diff --git a/ypbind.spec b/ypbind.spec index 0acb192..c596278 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.37.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -133,6 +133,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Thu May 09 2013 Honza Horak - 3:1.37.1-3 +- Enable PrivateTmp feature, just for the case + * Tue May 07 2013 Honza Horak - 3:1.37.1-2 - Syncing help and man pages From ba2c17a9dbd41b810b02dafb894d0f1c308e511a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 29 Jul 2013 17:53:18 +0200 Subject: [PATCH 09/67] Remove SysV init conversion and systemd macros compatible code --- ypbind.spec | 61 +++++++++++++---------------------------------------- 1 file changed, 15 insertions(+), 46 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index c596278..c25a0a5 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,7 +1,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Version: 1.37.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -68,11 +68,11 @@ make make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/var/yp/binding -mkdir -p $RPM_BUILD_ROOT/etc/dhcp/dhclient.d +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d mkdir -p $RPM_BUILD_ROOT%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_libexecdir} -install -m 644 etc/yp.conf $RPM_BUILD_ROOT/etc/yp.conf -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/dhcp/dhclient.d/nis.sh +install -m 644 etc/yp.conf $RPM_BUILD_ROOT%{_sysconfdir}/yp.conf +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d/nis.sh install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/ypbind.service install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-pre-setdomain install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind @@ -80,59 +80,28 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %{find_lang} %{name} %post -%if 0%{?systemd_post:1} - %systemd_post %{name}.service -%else - # Package install, not upgrade - if [ $1 -eq 1 ]; then - /bin/systemctl daemon-reload >dev/null || : - fi -%endif - -# Package with native systemd unit file is installed for the first time -%triggerun -- %{name} < 3:1.32-9 -# Save the current service runlevel info -# User must manually run systemd-sysv-convert --apply httpd -# to migrate them to systemd targets -/usr/bin/systemd-sysv-convert --save %{name} >/dev/null 2>&1 ||: - -# Run these because the SysV package being removed won't do them -/sbin/chkconfig --del %{name} >/dev/null 2>&1 || : -/bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : +%systemd_post %{name}.service %preun -%if 0%{?systemd_preun:1} - %systemd_preun %{name}.service -%else - if [ $1 -eq 0 ] ; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable %{name}.service >/dev/null 2>&1 || : - /bin/systemctl stop %{name}.service >/dev/null 2>&1 || : - fi -%endif +%systemd_preun %{name}.service %postun -%if 0%{?systemd_postun_with_restart:1} - %systemd_postun_with_restart %{name}.service -%else - /bin/systemctl daemon-reload >/dev/null 2>&1 || : - if [ "$1" -ge "1" ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart %{name}.service >/dev/null 2>&1 || : - fi -%endif +%systemd_postun_with_restart %{name}.service %files -f %{name}.lang %{_sbindir}/* %{_mandir}/*/* %{_libexecdir}/* %{_unitdir}/* -/etc/dhcp/dhclient.d/* -%config(noreplace) /etc/yp.conf +%{_sysconfdir}/dhcp/dhclient.d/* +%config(noreplace) %{_sysconfdir}/yp.conf %dir /var/yp/binding %doc README NEWS COPYING %changelog +* Mon Jul 29 2013 Honza Horak - 3:1.37.1-4 +- Remove SysV init conversion and systemd macros compatible code + * Thu May 09 2013 Honza Horak - 3:1.37.1-3 - Enable PrivateTmp feature, just for the case @@ -246,11 +215,11 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind NM_DBUS_SIGNAL_STATE_CHANGED. (rhbz#696629) -* Wed Apr 28 2011 Honza Horak - 3:1.32-10 +* Thu Apr 28 2011 Honza Horak - 3:1.32-10 - Made EnvironmentFile in systemd definition optional (rhbz#632620) -* Wed Apr 14 2011 Honza Horak - 3:1.32-9 +* Thu Apr 14 2011 Honza Horak - 3:1.32-9 - Add native systemd unit file. (rhbz#693873) @@ -548,7 +517,7 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind * Sun Jun 24 2001 Elliot Lee - Bump release + rebuild. -* Fri Jun 4 2001 Preston Brown +* Mon Jun 4 2001 Preston Brown - small fixes for initscript. Sometimes had trouble on slower systems (#37463) * Sat Mar 3 2001 Preston Brown From ec5d7086154896199bdde5deda942d09a2d9faeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 29 Jul 2013 17:55:13 +0200 Subject: [PATCH 10/67] Require systemd instead systemd-units --- ypbind.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index c25a0a5..1c0dfcd 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,5 +1,6 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind +Epoch: 3 Version: 1.37.1 Release: 4%{?dist} License: GPLv2 @@ -18,14 +19,13 @@ Patch1: ypbind-1.11-gettextdomain.patch Patch2: ypbind-mt-1.36-nistimeout.patch Patch3: ypbind-helpman.patch # This is for /bin/systemctl -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +Requires(post): systemd +Requires(preun): systemd +Requires(postun): systemd Requires: rpcbind, yp-tools Requires(post): systemd-sysv -Epoch: 3 BuildRequires: dbus-glib-devel, docbook-style-xsl -BuildRequires: systemd-units +BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: autoconf, automake @@ -101,6 +101,7 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %changelog * Mon Jul 29 2013 Honza Horak - 3:1.37.1-4 - Remove SysV init conversion and systemd macros compatible code +- Require systemd instead systemd-units * Thu May 09 2013 Honza Horak - 3:1.37.1-3 - Enable PrivateTmp feature, just for the case From 5eaffcc1462635adca29f81bcef079e40dcd8938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 29 Jul 2013 18:01:40 +0200 Subject: [PATCH 11/67] Remove systemd-sysv --- ypbind.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index 1c0dfcd..6d3e4f1 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -23,7 +23,6 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires: rpcbind, yp-tools -Requires(post): systemd-sysv BuildRequires: dbus-glib-devel, docbook-style-xsl BuildRequires: systemd BuildRequires: systemd-devel @@ -99,9 +98,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog -* Mon Jul 29 2013 Honza Horak - 3:1.37.1-4 +* Mon Jul 29 2013 Honza Horak - 3:1.37.1-5 - Remove SysV init conversion and systemd macros compatible code - Require systemd instead systemd-units +- Remove systemd-sysv * Thu May 09 2013 Honza Horak - 3:1.37.1-3 - Enable PrivateTmp feature, just for the case From 11825e7cc10bc395b0498c2dbc430d719918b373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 19 Aug 2013 15:01:34 +0200 Subject: [PATCH 12/67] Improve systemd documentation --- ypbind-helpman.patch | 20 ++++++++++---------- ypbind-mt-1.36-nistimeout.patch | 17 +++++++++++------ ypbind.service | 1 + ypbind.spec | 5 ++++- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/ypbind-helpman.patch b/ypbind-helpman.patch index 82771b3..d727b9c 100644 --- a/ypbind-helpman.patch +++ b/ypbind-helpman.patch @@ -1,6 +1,6 @@ -diff -up ./man/ypbind.8.helpman ./man/ypbind.8 ---- ./man/ypbind.8.helpman 2013-05-07 11:22:51.178888612 +0200 -+++ ./man/ypbind.8 2013-05-07 11:23:20.497891948 +0200 +diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8 +--- ypbind-mt-1.37.1/man/ypbind.8.helpman 2013-08-19 14:54:57.322653921 +0200 ++++ ypbind-mt-1.37.1/man/ypbind.8 2013-08-19 14:54:57.325653921 +0200 @@ -31,9 +31,11 @@ ypbind \- NIS binding process .SH "SYNOPSIS" @@ -14,7 +14,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8 .SH "DESCRIPTION" .PP \fBypbind\fR -@@ -164,7 +166,7 @@ on the local machine is allowed to chang +@@ -169,7 +171,7 @@ on the local machine is allowed to chang only checks if the config file has syntax errors and exits\&. .RE .PP @@ -23,7 +23,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8 .RS 4 starts \fBypbind\fR -@@ -173,13 +175,13 @@ in debug mode\&. +@@ -178,13 +180,13 @@ in debug mode\&. will not put itself into background, and error messages and debug output are written to standard error\&. .RE .PP @@ -39,7 +39,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8 .RS 4 Causes \fBypbind\fR -@@ -188,7 +190,7 @@ to syslog(2) any and all changes in the +@@ -193,7 +195,7 @@ to syslog(2) any and all changes in the .PP \fB\-broken\-server\fR .RS 4 @@ -48,7 +48,7 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8 \fBypbind\fR accept answers from servers running on an illegal port number\&. This should usually be avoided, but is required by some \fBypserv\fR(8) -@@ -218,20 +220,36 @@ and not +@@ -223,20 +225,36 @@ and not will only bind to the loopback device and is not reachable from a remote network\&. .RE .PP @@ -87,9 +87,9 @@ diff -up ./man/ypbind.8.helpman ./man/ypbind.8 \fB\-no\-dbus\fR .RS 4 Disables DBUS support if compiled in\&. -diff -up ./src/ypbind-mt.c.helpman ./src/ypbind-mt.c ---- ./src/ypbind-mt.c.helpman 2013-04-09 16:03:47.000000000 +0200 -+++ ./src/ypbind-mt.c 2013-05-07 11:22:51.180888612 +0200 +diff -up ypbind-mt-1.37.1/src/ypbind-mt.c.helpman ypbind-mt-1.37.1/src/ypbind-mt.c +--- ypbind-mt-1.37.1/src/ypbind-mt.c.helpman 2013-04-09 16:03:47.000000000 +0200 ++++ ypbind-mt-1.37.1/src/ypbind-mt.c 2013-08-19 14:54:57.326653921 +0200 @@ -513,12 +513,17 @@ usage (int ret) output = stdout; diff --git a/ypbind-mt-1.36-nistimeout.patch b/ypbind-mt-1.36-nistimeout.patch index 64a8eae..b3dbc84 100644 --- a/ypbind-mt-1.36-nistimeout.patch +++ b/ypbind-mt-1.36-nistimeout.patch @@ -1,7 +1,7 @@ -diff -up ./man/ypbind.8.nistimeout ./man/ypbind.8 ---- ./man/ypbind.8.nistimeout 2013-04-09 14:31:04.000000000 +0200 -+++ ./man/ypbind.8 2013-05-06 19:11:20.509665809 +0200 -@@ -104,6 +104,31 @@ will behave as usual and assumes there i +diff -up ypbind-mt-1.37.1/man/ypbind.8.nistimeout ypbind-mt-1.37.1/man/ypbind.8 +--- ypbind-mt-1.37.1/man/ypbind.8.nistimeout 2013-04-09 14:31:04.000000000 +0200 ++++ ypbind-mt-1.37.1/man/ypbind.8 2013-08-19 14:53:53.837656513 +0200 +@@ -104,6 +104,36 @@ will behave as usual and assumes there i will reread all configuration files, registers at the local portmapper and try to search NIS servers\&. If NetworkManager drops a connection, \fBypbind\fR will unregister from portmapper\&. @@ -25,11 +25,16 @@ diff -up ./man/ypbind.8.nistimeout ./man/ypbind.8 +in /etc/sysconfig/ypbind. For example NISTIMEOUT=180 means ypbind will wait up to 180 seconds for binding to a NIS server. +Another option is to enable NetworkManager-wait-online.service and add an ordering rule into +\fBypbind.service\fR, -+ideally by creating /etc/systemd/system/ypbind.service with the following content: ++ideally by creating /etc/systemd/system/ypbind.service.d/wait-online.conf with the following content: + -+ .include /lib/systemd/system/ypbind.service + [Service] + After=NetworkManager-wait-online.service ++ ++If you need to pass other arguments to ++\fBypbind\fR ++daemon withing systemd unit file, you can set these arguments as ++\fBOTHER_YPBIND_OPTS\fR ++environment variable in /etc/sysconfig/ypbind. For example in order to set a fixed port ypbind should run on, you can specify OTHER_YPBIND_OPTS="-p 876" in /etc/sysconfig/ypbind\&. .SH "OPTIONS" .PP \fB\-broadcast\fR diff --git a/ypbind.service b/ypbind.service index 9e8d2ec..f58ae3c 100644 --- a/ypbind.service +++ b/ypbind.service @@ -1,3 +1,4 @@ +# For details how to adjust this file or change daemon settings, please, read ypbind(8). [Unit] Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder Requires=rpcbind.service diff --git a/ypbind.spec b/ypbind.spec index 6d3e4f1..374578d 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -98,6 +98,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon Aug 19 2013 Honza Horak - 3:1.37.1-6 +- Improve systemd documentation + * Mon Jul 29 2013 Honza Horak - 3:1.37.1-5 - Remove SysV init conversion and systemd macros compatible code - Require systemd instead systemd-units From 87e6f907ebe8aab7ce1d7549590e4b33b3bf18d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 19 Aug 2013 15:02:14 +0200 Subject: [PATCH 13/67] Clean up helper script --- ypbind-pre-setdomain | 2 -- 1 file changed, 2 deletions(-) diff --git a/ypbind-pre-setdomain b/ypbind-pre-setdomain index 1d5dbed..2c97541 100755 --- a/ypbind-pre-setdomain +++ b/ypbind-pre-setdomain @@ -7,8 +7,6 @@ # itself. If $NISDOMAIN is not defined, it reads config file. # -OTHER_YPBIND_OPTS="" - DOMAINNAME=`domainname` if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then echo -n $"Setting NIS domain: " From d733717f89a0d0d9eee3af0a80977c6fb7ae3cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Fri, 30 Aug 2013 12:03:06 +0200 Subject: [PATCH 14/67] Add network-online.target dependency Resolves: #1002295 --- ypbind.service | 2 +- ypbind.spec | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ypbind.service b/ypbind.service index f58ae3c..b24ac88 100644 --- a/ypbind.service +++ b/ypbind.service @@ -2,7 +2,7 @@ [Unit] Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder Requires=rpcbind.service -After=syslog.target network.target rpcbind.service ypserv.service NetworkManager-wait-online.service +After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service Before=systemd-user-sessions.service [Service] diff --git a/ypbind.spec b/ypbind.spec index 374578d..5ff1670 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -66,7 +66,7 @@ make %install make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/yp/binding +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/yp/binding mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d mkdir -p $RPM_BUILD_ROOT%{_unitdir} mkdir -p $RPM_BUILD_ROOT%{_libexecdir} @@ -94,10 +94,14 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %{_unitdir}/* %{_sysconfdir}/dhcp/dhclient.d/* %config(noreplace) %{_sysconfdir}/yp.conf -%dir /var/yp/binding +%dir %{_localstatedir}/yp/binding %doc README NEWS COPYING %changelog +* Thu Aug 29 2013 Honza Horak - 3:1.37.1-7 +- Add network-online.target dependency + Resolves: #1002295 + * Mon Aug 19 2013 Honza Horak - 3:1.37.1-6 - Improve systemd documentation From c81b08de2db71065377fa4b412022c53a07b9b90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 18 Nov 2013 13:05:19 +0100 Subject: [PATCH 15/67] DHCP changes documented Related: #1031093 --- ypbind-helpman.patch | 113 +++++++++++++++++++++++++++++--- ypbind-mt-1.36-nistimeout.patch | 40 ----------- ypbind.spec | 12 ++-- 3 files changed, 110 insertions(+), 55 deletions(-) delete mode 100644 ypbind-mt-1.36-nistimeout.patch diff --git a/ypbind-helpman.patch b/ypbind-helpman.patch index d727b9c..65497b6 100644 --- a/ypbind-helpman.patch +++ b/ypbind-helpman.patch @@ -1,6 +1,6 @@ -diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8 ---- ypbind-mt-1.37.1/man/ypbind.8.helpman 2013-08-19 14:54:57.322653921 +0200 -+++ ypbind-mt-1.37.1/man/ypbind.8 2013-08-19 14:54:57.325653921 +0200 +diff -rup ypbind-mt-1.37.1-orig/man/ypbind.8 ypbind-mt-1.37.1/man/ypbind.8 +--- ypbind-mt-1.37.1-orig/man/ypbind.8 2013-04-09 14:31:04.000000000 +0200 ++++ ypbind-mt-1.37.1/man/ypbind.8 2013-11-18 13:00:13.901578756 +0100 @@ -31,9 +31,11 @@ ypbind \- NIS binding process .SH "SYNOPSIS" @@ -14,7 +14,82 @@ diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8 .SH "DESCRIPTION" .PP \fBypbind\fR -@@ -169,7 +171,7 @@ on the local machine is allowed to chang +@@ -58,6 +60,8 @@ will send a ping to all servers and bind + .PP + Unless the option + \fB\-debug\fR ++or ++\fB\-foreground\fR + is used, ypbind detaches itself from the controlling terminal and puts itself into background\&. + \fBypbind\fR + uses +@@ -103,7 +107,64 @@ will behave as usual and assumes there i + \fBypbind\fR + will reread all configuration files, registers at the local portmapper and try to search NIS servers\&. If NetworkManager drops a connection, + \fBypbind\fR +-will unregister from portmapper\&. ++will unregister from portmapper\&. Option ++\fB\-no\-dbus\fR ++disables this feature and ++\fBypbind\fR ++behaves like no NetworkManager is running at startup. Also in case one of the NIS servers ++\fBypbind\fR ++is configured to connect to is a localhost, ++\fBypbind\fR ++behaves like it is a working network connection. ++.PP ++In Fedora we use ++\fBsystemd\fR ++for starting services. We need to finish starting process of ++\fBypbind\fR ++service not before service is fully started, which means ++\fBypbind\fR ++daemon is prepared to answer. There is a test script /usr/libexec/ypbind-post-waitbind used in ++\fBypbind.service\fR, ++that waits for ++\fBypbind\fR ++daemon to be fully connected to NIS server and waits by default up to 45s. Sometimes this is not enough, because network set up can take longer than 45s during boot, so starting ++\fBypbind.service\fR ++fails. User can increase the ++\fBtimeout\fR ++by setting an environment variable ++\fBNISTIMEOUT\fR ++in /etc/sysconfig/ypbind. For example NISTIMEOUT=180 means ypbind will wait up to 180 seconds for binding to a NIS server. ++Another option is to enable NetworkManager-wait-online.service, which will make ++\fBypbind\fR ++to wait until network is properly set up. ++.PP ++In case something needs to be changed in the ++\fBypbind.service\fR, ++it is adviced not to change the ++\fBypbind.service\fR ++directly, but rather to create a new file under /etc/systemd/system/ypbind.service.d/\&, i.e. if we need to start ++\fBypbind\fR ++before service foo.service, we can create file /etc/systemd/system/ypbind.service.d/wait-foo.conf with the following content: ++ ++ [Service] ++ Before=foo.service ++.PP ++If you need to pass other arguments to ++\fBypbind\fR ++daemon withing systemd unit file, you can set these arguments as ++\fBOTHER_YPBIND_OPTS\fR ++environment variable in /etc/sysconfig/ypbind. For example in order to set a fixed port ypbind should run on, you can specify OTHER_YPBIND_OPTS="-p 876" in /etc/sysconfig/ypbind\&. ++.PP ++DHCP client by defualt changes ++\fB/etc/yp.conf\fR ++in case DHCP server sends NIS configuration in the respond. In that case /etc/dhcp/dhclient.d/nis.sh changes ++\fB/etc/yp.conf\fR ++according such configuration and creates a back\-up copy of the original configuration file into /var/lib/dhclient/nis.conf.predhclient.$interface. ++In order to disable changing ++\fB/etc/yp.conf\fR ++by DHCP client, add ++\fBPEERNIS=no\fR ++into /etc/sysconfig/network. + .SH "OPTIONS" + .PP + \fB\-broadcast\fR +@@ -139,7 +200,7 @@ on the local machine is allowed to chang only checks if the config file has syntax errors and exits\&. .RE .PP @@ -23,7 +98,7 @@ diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8 .RS 4 starts \fBypbind\fR -@@ -178,13 +180,13 @@ in debug mode\&. +@@ -148,13 +209,13 @@ in debug mode\&. will not put itself into background, and error messages and debug output are written to standard error\&. .RE .PP @@ -39,7 +114,7 @@ diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8 .RS 4 Causes \fBypbind\fR -@@ -193,7 +195,7 @@ to syslog(2) any and all changes in the +@@ -163,7 +224,7 @@ to syslog(2) any and all changes in the .PP \fB\-broken\-server\fR .RS 4 @@ -48,7 +123,7 @@ diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8 \fBypbind\fR accept answers from servers running on an illegal port number\&. This should usually be avoided, but is required by some \fBypserv\fR(8) -@@ -223,20 +225,36 @@ and not +@@ -193,20 +254,36 @@ and not will only bind to the loopback device and is not reachable from a remote network\&. .RE .PP @@ -87,9 +162,26 @@ diff -up ypbind-mt-1.37.1/man/ypbind.8.helpman ypbind-mt-1.37.1/man/ypbind.8 \fB\-no\-dbus\fR .RS 4 Disables DBUS support if compiled in\&. -diff -up ypbind-mt-1.37.1/src/ypbind-mt.c.helpman ypbind-mt-1.37.1/src/ypbind-mt.c ---- ypbind-mt-1.37.1/src/ypbind-mt.c.helpman 2013-04-09 16:03:47.000000000 +0200 -+++ ypbind-mt-1.37.1/src/ypbind-mt.c 2013-08-19 14:54:57.326653921 +0200 +Only in ypbind-mt-1.37.1/man: ypbind.8.helpman +Only in ypbind-mt-1.37.1/man: ypbind.8.nisdomain +diff -rup ypbind-mt-1.37.1-orig/man/yp.conf.5 ypbind-mt-1.37.1/man/yp.conf.5 +--- ypbind-mt-1.37.1-orig/man/yp.conf.5 2013-04-09 14:31:05.000000000 +0200 ++++ ypbind-mt-1.37.1/man/yp.conf.5 2013-11-18 13:00:13.902578756 +0100 +@@ -74,6 +74,10 @@ If no other server is given or all of th + If for a specific domain the broadcast option and fixed server are given, + \fBypbind\-mt\fR + tries at first the given servers before falling back to broadcasting for a running server\&. ++.PP ++Content of ++\fB/etc/yp.conf\fR ++can be changed by DHCP client, for more info see \fBypbind\fR(8). + .SH "SEE ALSO" + .PP + \fBypbind\fR(8) +Only in ypbind-mt-1.37.1/man: yp.conf.5.helpman +diff -rup ypbind-mt-1.37.1-orig/src/ypbind-mt.c ypbind-mt-1.37.1/src/ypbind-mt.c +--- ypbind-mt-1.37.1-orig/src/ypbind-mt.c 2013-04-09 16:03:47.000000000 +0200 ++++ ypbind-mt-1.37.1/src/ypbind-mt.c 2013-11-18 13:00:13.902578756 +0100 @@ -513,12 +513,17 @@ usage (int ret) output = stdout; @@ -112,3 +204,4 @@ diff -up ypbind-mt-1.37.1/src/ypbind-mt.c.helpman ypbind-mt-1.37.1/src/ypbind-mt exit (ret); } +Only in ypbind-mt-1.37.1/src: ypbind-mt.c.helpman diff --git a/ypbind-mt-1.36-nistimeout.patch b/ypbind-mt-1.36-nistimeout.patch deleted file mode 100644 index b3dbc84..0000000 --- a/ypbind-mt-1.36-nistimeout.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -up ypbind-mt-1.37.1/man/ypbind.8.nistimeout ypbind-mt-1.37.1/man/ypbind.8 ---- ypbind-mt-1.37.1/man/ypbind.8.nistimeout 2013-04-09 14:31:04.000000000 +0200 -+++ ypbind-mt-1.37.1/man/ypbind.8 2013-08-19 14:53:53.837656513 +0200 -@@ -104,6 +104,36 @@ will behave as usual and assumes there i - will reread all configuration files, registers at the local portmapper and try to search NIS servers\&. If NetworkManager drops a connection, - \fBypbind\fR - will unregister from portmapper\&. -+.PP -+In Fedora we use -+\fBsystemd\fR -+for starting services. We need to finish starting process of -+\fBypbind\fR -+service not before service is fully started, which means -+\fBypbind\fR -+daemon is prepared to answer. There is a test script /usr/libexec/ypbind-post-waitbind used in -+\fBypbind.service\fR, -+that waits for -+\fBypbind\fR -+daemon to be fully connected to NIS server and waits by default up to 45s. Sometimes this is not enough, because network set up can take longer than 45s during boot, so starting -+\fBypbind.service\fR -+fails. User can increase the -+\fBtimeout\fR -+by setting an environment variable -+\fBNISTIMEOUT\fR -+in /etc/sysconfig/ypbind. For example NISTIMEOUT=180 means ypbind will wait up to 180 seconds for binding to a NIS server. -+Another option is to enable NetworkManager-wait-online.service and add an ordering rule into -+\fBypbind.service\fR, -+ideally by creating /etc/systemd/system/ypbind.service.d/wait-online.conf with the following content: -+ -+ [Service] -+ After=NetworkManager-wait-online.service -+ -+If you need to pass other arguments to -+\fBypbind\fR -+daemon withing systemd unit file, you can set these arguments as -+\fBOTHER_YPBIND_OPTS\fR -+environment variable in /etc/sysconfig/ypbind. For example in order to set a fixed port ypbind should run on, you can specify OTHER_YPBIND_OPTS="-p 876" in /etc/sysconfig/ypbind\&. - .SH "OPTIONS" - .PP - \fB\-broadcast\fR diff --git a/ypbind.spec b/ypbind.spec index 5ff1670..24e53c6 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -16,8 +16,7 @@ Source5: ypbind-post-waitbind # 'ypbind-mt' would allow us to drop it. Patch1: ypbind-1.11-gettextdomain.patch # Not sent to upstream. -Patch2: ypbind-mt-1.36-nistimeout.patch -Patch3: ypbind-helpman.patch +Patch2: ypbind-helpman.patch # This is for /bin/systemctl Requires(post): systemd Requires(preun): systemd @@ -48,8 +47,7 @@ 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 .nistimeout -%patch3 -p1 -b .helpman +%patch2 -p1 -b .helpman autoreconf @@ -98,6 +96,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon Nov 18 2013 Honza Horak - 3:1.37.1-8 +- DHCP changes documented + Related: #1031093 + * Thu Aug 29 2013 Honza Horak - 3:1.37.1-7 - Add network-online.target dependency Resolves: #1002295 From 756cfdd7e1658d30f6419fa038156dbe0abbf3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Hor=C3=A1k?= Date: Mon, 18 Nov 2013 15:10:17 +0100 Subject: [PATCH 16/67] Replace autoreconf with autoconf --- ypbind.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index 24e53c6..8c607da 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -49,7 +49,7 @@ also need to install the ypserv package to a machine on your network. %patch1 -p1 -b .gettextdomain %patch2 -p1 -b .helpman -autoreconf +autoconf %build %ifarch s390 s390x @@ -96,6 +96,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon Nov 18 2013 Honza Horak - 3:1.37.1-9 +- Replace autoreconf with autoconf + * Mon Nov 18 2013 Honza Horak - 3:1.37.1-8 - DHCP changes documented Related: #1031093 From 5b78ccf59a76c2ced5ac80c21c5bf6efba45e908 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 12:51:12 -0500 Subject: [PATCH 17/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 8c607da..0fddcb5 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -96,6 +96,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3:1.37.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon Nov 18 2013 Honza Horak - 3:1.37.1-9 - Replace autoreconf with autoconf From 793231fb502f8004a6f8ca5adabc8a2eafe85e5f Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Fri, 15 Aug 2014 10:43:32 +0200 Subject: [PATCH 18/67] Update to 1.37.2 --- .gitignore | 1 + sources | 2 +- ypbind-helpman.patch | 73 ++++++++------------------------------------ ypbind.spec | 7 +++-- 4 files changed, 20 insertions(+), 63 deletions(-) diff --git a/.gitignore b/.gitignore index 59db7d9..2efa6ca 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ ypbind-mt-1.32.tar.bz2 /ypbind-mt-1.35.tar.bz2 /ypbind-mt-1.36.tar.bz2 /ypbind-mt-1.37.1.tar.bz2 +/ypbind-mt-1.37.2.tar.bz2 diff --git a/sources b/sources index 99399a8..499741c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8af8d35e7b9a7fcc3a1576697a04bd82 ypbind-mt-1.37.1.tar.bz2 +406e2885e592f4740b8e3870e0e231f1 ypbind-mt-1.37.2.tar.bz2 diff --git a/ypbind-helpman.patch b/ypbind-helpman.patch index 65497b6..a02af07 100644 --- a/ypbind-helpman.patch +++ b/ypbind-helpman.patch @@ -1,6 +1,6 @@ -diff -rup ypbind-mt-1.37.1-orig/man/ypbind.8 ypbind-mt-1.37.1/man/ypbind.8 ---- ypbind-mt-1.37.1-orig/man/ypbind.8 2013-04-09 14:31:04.000000000 +0200 -+++ ypbind-mt-1.37.1/man/ypbind.8 2013-11-18 13:00:13.901578756 +0100 +diff -up ypbind-mt-1.37.2/man/ypbind.8.helpman ypbind-mt-1.37.2/man/ypbind.8 +--- ypbind-mt-1.37.2/man/ypbind.8.helpman 2013-11-06 16:02:42.000000000 +0100 ++++ ypbind-mt-1.37.2/man/ypbind.8 2014-08-15 10:40:21.261195488 +0200 @@ -31,9 +31,11 @@ ypbind \- NIS binding process .SH "SYNOPSIS" @@ -89,45 +89,10 @@ diff -rup ypbind-mt-1.37.1-orig/man/ypbind.8 ypbind-mt-1.37.1/man/ypbind.8 .SH "OPTIONS" .PP \fB\-broadcast\fR -@@ -139,7 +200,7 @@ on the local machine is allowed to chang - only checks if the config file has syntax errors and exits\&. +@@ -200,6 +261,15 @@ The default value for + to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. .RE .PP --\fB\-debug\fR -+\fB\-d, \-debug\fR - .RS 4 - starts - \fBypbind\fR -@@ -148,13 +209,13 @@ in debug mode\&. - will not put itself into background, and error messages and debug output are written to standard error\&. - .RE - .PP --\fB\-foreground\fR -+\fB\-n, \-foreground\fR - .RS 4 - \fBypbind\fR - will not put itself into backgroun\&. - .RE - .PP --\fB\-verbose\fR -+\fB\-v, \-verbose\fR - .RS 4 - Causes - \fBypbind\fR -@@ -163,7 +224,7 @@ to syslog(2) any and all changes in the - .PP - \fB\-broken\-server\fR - .RS 4 --lets -+Lets - \fBypbind\fR - accept answers from servers running on an illegal port number\&. This should usually be avoided, but is required by some - \fBypserv\fR(8) -@@ -193,20 +254,36 @@ and not - will only bind to the loopback device and is not reachable from a remote network\&. - .RE - .PP --\fB\-ping\-interval\fR ping\-interval +\fB\-p port\fR +.RS 4 +Lets @@ -137,18 +102,10 @@ diff -rup ypbind-mt-1.37.1-orig/man/ypbind.8 ypbind-mt-1.37.1/man/ypbind.8 +number, rather than asking portmapper to assing a port for it\&. +.RE +.PP -+\fB\-i, \-ping\-interval\fR ping\-interval + \fB\-r\fR, \fB\-rebind\-interval\fR .RS 4 The default value for - \fBypbind\fR - to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. - .RE - .PP --\fB\-rebind\-interval\fR -+\fB\-r, \-rebind\-interval\fR rebind\-interval - .RS 4 - The default value for - \fBypbind\fR +@@ -207,6 +277,13 @@ The default value for to search for the fastest NIS server is 900 seconds (15 minutes)\&. With this options another frequency in seconds can be specified\&. .RE .PP @@ -162,11 +119,9 @@ diff -rup ypbind-mt-1.37.1-orig/man/ypbind.8 ypbind-mt-1.37.1/man/ypbind.8 \fB\-no\-dbus\fR .RS 4 Disables DBUS support if compiled in\&. -Only in ypbind-mt-1.37.1/man: ypbind.8.helpman -Only in ypbind-mt-1.37.1/man: ypbind.8.nisdomain -diff -rup ypbind-mt-1.37.1-orig/man/yp.conf.5 ypbind-mt-1.37.1/man/yp.conf.5 ---- ypbind-mt-1.37.1-orig/man/yp.conf.5 2013-04-09 14:31:05.000000000 +0200 -+++ ypbind-mt-1.37.1/man/yp.conf.5 2013-11-18 13:00:13.902578756 +0100 +diff -up ypbind-mt-1.37.2/man/yp.conf.5.helpman ypbind-mt-1.37.2/man/yp.conf.5 +--- ypbind-mt-1.37.2/man/yp.conf.5.helpman 2013-04-09 14:31:05.000000000 +0200 ++++ ypbind-mt-1.37.2/man/yp.conf.5 2014-08-15 10:38:21.610870737 +0200 @@ -74,6 +74,10 @@ If no other server is given or all of th If for a specific domain the broadcast option and fixed server are given, \fBypbind\-mt\fR @@ -178,10 +133,9 @@ diff -rup ypbind-mt-1.37.1-orig/man/yp.conf.5 ypbind-mt-1.37.1/man/yp.conf.5 .SH "SEE ALSO" .PP \fBypbind\fR(8) -Only in ypbind-mt-1.37.1/man: yp.conf.5.helpman -diff -rup ypbind-mt-1.37.1-orig/src/ypbind-mt.c ypbind-mt-1.37.1/src/ypbind-mt.c ---- ypbind-mt-1.37.1-orig/src/ypbind-mt.c 2013-04-09 16:03:47.000000000 +0200 -+++ ypbind-mt-1.37.1/src/ypbind-mt.c 2013-11-18 13:00:13.902578756 +0100 +diff -up ypbind-mt-1.37.2/src/ypbind-mt.c.helpman ypbind-mt-1.37.2/src/ypbind-mt.c +--- ypbind-mt-1.37.2/src/ypbind-mt.c.helpman 2013-04-09 16:03:47.000000000 +0200 ++++ ypbind-mt-1.37.2/src/ypbind-mt.c 2014-08-15 10:38:21.610870737 +0200 @@ -513,12 +513,17 @@ usage (int ret) output = stdout; @@ -204,4 +158,3 @@ diff -rup ypbind-mt-1.37.1-orig/src/ypbind-mt.c ypbind-mt-1.37.1/src/ypbind-mt.c exit (ret); } -Only in ypbind-mt-1.37.1/src: ypbind-mt.c.helpman diff --git a/ypbind.spec b/ypbind.spec index 0fddcb5..11f4e19 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,8 +1,8 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 -Version: 1.37.1 -Release: 10%{?dist} +Version: 1.37.2 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -96,6 +96,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Fri Aug 15 2014 Honza Horak - 3:1.37.2-1 +- Update to 1.37.2 + * Sat Jun 07 2014 Fedora Release Engineering - 3:1.37.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 892ab7c8f21d76f00add948c7dd1028be099fa86 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Fri, 15 Aug 2014 10:49:36 +0200 Subject: [PATCH 19/67] link with systemd.so --- ypbind-systemdso.patch | 16 ++++++++++++++++ ypbind.spec | 7 ++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ypbind-systemdso.patch diff --git a/ypbind-systemdso.patch b/ypbind-systemdso.patch new file mode 100644 index 0000000..ab8f0c6 --- /dev/null +++ b/ypbind-systemdso.patch @@ -0,0 +1,16 @@ +diff -up ypbind-mt-1.37.2/configure.in.systemdso ypbind-mt-1.37.2/configure.in +--- ypbind-mt-1.37.2/configure.in.systemdso 2014-08-15 10:47:04.183182884 +0200 ++++ ypbind-mt-1.37.2/configure.in 2014-08-15 10:47:37.182232398 +0200 +@@ -105,10 +105,10 @@ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, te + + USE_SD_NOTIFY=0 + AC_SUBST(USE_SD_NOTIFY) +-AC_CHECK_LIB(systemd-daemon,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd-daemon", ++AC_CHECK_LIB(systemd,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd", + LIBSYSTEMD_DAEMON="") + if test -z "$LIBSYSTEMD_DAEMON" ; then +- AC_CHECK_LIB(systemd,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd", ++ AC_CHECK_LIB(systemd-daemon,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd-daemon", + LIBSYSTEMD_DAEMON="") + fi + if test -n "$LIBSYSTEMD_DAEMON" ; then diff --git a/ypbind.spec b/ypbind.spec index 11f4e19..9fe100e 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -17,6 +17,7 @@ Source5: ypbind-post-waitbind Patch1: ypbind-1.11-gettextdomain.patch # Not sent to upstream. Patch2: ypbind-helpman.patch +Patch3: ypbind-systemdso.patch # This is for /bin/systemctl Requires(post): systemd Requires(preun): systemd @@ -48,6 +49,7 @@ also need to install the ypserv package to a machine on your network. %setup -q -n ypbind-mt-%{version} %patch1 -p1 -b .gettextdomain %patch2 -p1 -b .helpman +%patch3 -p1 -b .systemdso autoconf @@ -96,6 +98,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Fri Aug 15 2014 Honza Horak - 3:1.37.2-2 +- link with systemd.so + * Fri Aug 15 2014 Honza Horak - 3:1.37.2-1 - Update to 1.37.2 From 7ced839de6eccad44860c60d43b9d0706317a916 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Fri, 15 Aug 2014 13:51:15 +0200 Subject: [PATCH 20/67] add aclocal and automake --- ypbind.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ypbind.spec b/ypbind.spec index 9fe100e..61293f9 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -52,6 +52,8 @@ also need to install the ypserv package to a machine on your network. %patch3 -p1 -b .systemdso autoconf +aclocal +automake --add-missing %build %ifarch s390 s390x From 2da2ba756f21ed8fad92ca2a053085a729217f08 Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Mon, 18 Aug 2014 10:27:44 +0200 Subject: [PATCH 21/67] Run autoreconf and gettext-devel added to solve FTBFS --- ypbind-systemdso.patch | 12 ++++++++++++ ypbind.spec | 5 ++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ypbind-systemdso.patch b/ypbind-systemdso.patch index ab8f0c6..a0230dd 100644 --- a/ypbind-systemdso.patch +++ b/ypbind-systemdso.patch @@ -14,3 +14,15 @@ diff -up ypbind-mt-1.37.2/configure.in.systemdso ypbind-mt-1.37.2/configure.in LIBSYSTEMD_DAEMON="") fi if test -n "$LIBSYSTEMD_DAEMON" ; then +diff -up ypbind-mt-1.37.2/configure.in.debug ypbind-mt-1.37.2/configure.in +--- ypbind-mt-1.37.2/configure.in.debug 2014-08-18 10:14:39.068078086 +0200 ++++ ypbind-mt-1.37.2/configure.in 2014-08-18 10:15:03.259077698 +0200 +@@ -121,7 +121,7 @@ AC_SUBST(USE_SD_NOTIFY) + AC_SUBST(LIBSYSTEMD_DAEMON) + + dnl internationalization macros +-AM_GNU_GETTEXT_VERSION ++AM_GNU_GETTEXT_VERSION(0.17) + AM_GNU_GETTEXT([external]) + + dnl By default, don't send a ping to all server at the same time diff --git a/ypbind.spec b/ypbind.spec index 61293f9..28d323c 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -27,6 +27,7 @@ BuildRequires: dbus-glib-devel, docbook-style-xsl BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: autoconf, automake +BuildRequires: gettext-devel %description The Network Information Service (NIS) is a system that provides @@ -51,9 +52,7 @@ also need to install the ypserv package to a machine on your network. %patch2 -p1 -b .helpman %patch3 -p1 -b .systemdso -autoconf -aclocal -automake --add-missing +autoreconf -fiv %build %ifarch s390 s390x From adb4dde06134fa571a63c50a1d708ddeb5e0fa82 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 11:23:54 +0000 Subject: [PATCH 22/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 28d323c..31a8bfb 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.37.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -99,6 +99,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 3:1.37.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Aug 15 2014 Honza Horak - 3:1.37.2-2 - link with systemd.so From 5daad707893e2c47fc83faa45b189097ee74469f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Mu=C5=BEila?= Date: Tue, 21 Oct 2014 18:11:16 +0200 Subject: [PATCH 23/67] Update to 1.38 --- .gitignore | 1 + sources | 2 +- ypbind-systemdso.patch | 34 ++++++++++++++-------------------- ypbind.spec | 7 +++++-- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 2efa6ca..9c9c6d6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ypbind-mt-1.32.tar.bz2 /ypbind-mt-1.36.tar.bz2 /ypbind-mt-1.37.1.tar.bz2 /ypbind-mt-1.37.2.tar.bz2 +/ypbind-mt-1.38.tar.bz2 diff --git a/sources b/sources index 499741c..fe5d1ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -406e2885e592f4740b8e3870e0e231f1 ypbind-mt-1.37.2.tar.bz2 +094088c0e282fa7f3b3dd6cc51d0a4e1 ypbind-mt-1.38.tar.bz2 diff --git a/ypbind-systemdso.patch b/ypbind-systemdso.patch index a0230dd..15be552 100644 --- a/ypbind-systemdso.patch +++ b/ypbind-systemdso.patch @@ -1,28 +1,22 @@ -diff -up ypbind-mt-1.37.2/configure.in.systemdso ypbind-mt-1.37.2/configure.in ---- ypbind-mt-1.37.2/configure.in.systemdso 2014-08-15 10:47:04.183182884 +0200 -+++ ypbind-mt-1.37.2/configure.in 2014-08-15 10:47:37.182232398 +0200 -@@ -105,10 +105,10 @@ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, te +diff -ru a/configure.ac b/configure.ac +--- a/configure.ac 2014-10-21 17:37:20.526628827 +0200 ++++ b/configure.ac 2014-10-21 17:51:39.649362686 +0200 +@@ -44,7 +44,8 @@ + AC_CHECK_LIB(socket, bind) + AC_CHECK_LIB(pthread, pthread_create) - USE_SD_NOTIFY=0 +-PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0]) ++PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209] [libsystemd-daemon >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0]) ++ AC_SUBST(USE_SD_NOTIFY) --AC_CHECK_LIB(systemd-daemon,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd-daemon", -+AC_CHECK_LIB(systemd,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd", - LIBSYSTEMD_DAEMON="") - if test -z "$LIBSYSTEMD_DAEMON" ; then -- AC_CHECK_LIB(systemd,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd", -+ AC_CHECK_LIB(systemd-daemon,sd_notify,LIBSYSTEMD_DAEMON="-lsystemd-daemon", - LIBSYSTEMD_DAEMON="") - fi - if test -n "$LIBSYSTEMD_DAEMON" ; then -diff -up ypbind-mt-1.37.2/configure.in.debug ypbind-mt-1.37.2/configure.in ---- ypbind-mt-1.37.2/configure.in.debug 2014-08-18 10:14:39.068078086 +0200 -+++ ypbind-mt-1.37.2/configure.in 2014-08-18 10:15:03.259077698 +0200 -@@ -121,7 +121,7 @@ AC_SUBST(USE_SD_NOTIFY) - AC_SUBST(LIBSYSTEMD_DAEMON) + + AC_ARG_ENABLE([dbus-nm], +@@ -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.17) ++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.spec b/ypbind.spec index 31a8bfb..da1982d 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,8 +1,8 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 -Version: 1.37.2 -Release: 3%{?dist} +Version: 1.38 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -99,6 +99,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Tue Oct 21 2014 Matej Mužila - 3:1.38-1 +- Update to 1.38 + * Mon Aug 18 2014 Fedora Release Engineering - 3:1.37.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 7f1c55bbf589268b7e74e6405ca7b5cfee77ecf7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:38:19 +0000 Subject: [PATCH 24/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index da1982d..4b2aa14 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -99,6 +99,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 3:1.38-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Oct 21 2014 Matej Mužila - 3:1.38-1 - Update to 1.38 From 3bc9fb9d13c451d6400a1f9ebf5301110799a0e4 Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Mon, 16 Nov 2015 13:32:29 +0100 Subject: [PATCH 25/67] Load ypbind.service before nss-user-lookup.target Resolves: rhbz#1282440 --- ypbind.service | 1 + ypbind.spec | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ypbind.service b/ypbind.service index b24ac88..67d1a06 100644 --- a/ypbind.service +++ b/ypbind.service @@ -4,6 +4,7 @@ Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder Requires=rpcbind.service After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service Before=systemd-user-sessions.service +Before=nss-user-lookup.target [Service] Type=notify diff --git a/ypbind.spec b/ypbind.spec index 4b2aa14..726e14f 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -99,6 +99,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon Nov 16 2015 Matej Muzila 3:1.38-3 +- Load ypbind.service before nss-user-lookup.target + Resolves: rhbz#1282440 + * Fri Jun 19 2015 Fedora Release Engineering - 3:1.38-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 5e336ad6900a9fbc5da0e435008e789908a6a93e Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Mon, 25 Jan 2016 20:39:56 +0100 Subject: [PATCH 26/67] Do not resstart ypbind on dhcp renew if nis domain or nis servers haven't changed Resolves: rhbz#1301708 --- nis.sh | 18 +++++++----------- ypbind.spec | 7 ++++++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/nis.sh b/nis.sh index 03cb976..6f37461 100755 --- a/nis.sh +++ b/nis.sh @@ -52,38 +52,34 @@ nis_config() { if [ -n "${new_nis_domain}" ]; then domainname "${new_nis_domain}" save_config_file - let contents=0 echo '# generated by /sbin/dhclient-script' > ${CONF} fix_context ${CONF} if [ -n "${new_nis_servers}" ]; then for i in ${new_nis_servers} ; do echo "domain ${new_nis_domain} server ${i}" >> ${CONF} - let contents=contents+1 done else echo "domain ${new_nis_domain} broadcast" >> ${CONF} - let contents=contents+1 fi - if [ ${contents} -gt 0 ]; then - service ypbind condrestart >/dev/null 2>&1 - fi elif [ -n "${new_nis_servers}" ]; then save_config_file echo '# generated by /sbin/dhclient-script' > ${CONF} fix_context ${CONF} - let contents=0 for i in ${new_nis_servers} ; do echo "ypserver ${i}" >> ${CONF} - let contents=contents+1 done - if [ $contents -gt 0 ]; then - service ypbind condrestart >/dev/null 2>&1 - fi fi + + # dimainname or servers changed, restart ypbind + if [ "${old_nis_domain}" != "${new_nis_domain}" ] \ + || [ "${old_nis_servers}" != "${new_nis_servers}" ] + then + service ypbind condrestart >/dev/null 2>&1 + fi fi } diff --git a/ypbind.spec b/ypbind.spec index 726e14f..e2498dd 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -99,6 +99,11 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon Jan 25 2016 Matej Muzila 3:1.38-4 +- Do not resstart ypbind on dhcp renew if nis domain or nis servers + haven't changed + Resolves: rhbz#1301708 + * Mon Nov 16 2015 Matej Muzila 3:1.38-3 - Load ypbind.service before nss-user-lookup.target Resolves: rhbz#1282440 From 3c72a929eddf87a36882fbd5feb4a5eef0f03133 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:59:07 +0000 Subject: [PATCH 27/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index e2498dd..54de5ea 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -99,6 +99,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 3:1.38-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 25 2016 Matej Muzila 3:1.38-4 - Do not resstart ypbind on dhcp renew if nis domain or nis servers haven't changed From a6f05e62222a1f0792414f916b6b39a66a1438c3 Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Tue, 8 Nov 2016 15:07:30 +0100 Subject: [PATCH 28/67] Add runtime dependency on nss_nis --- ypbind.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 54de5ea..197d39e 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -23,6 +23,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd Requires: rpcbind, yp-tools +# New nss_nis package in F25+ +Requires: nss_nis BuildRequires: dbus-glib-devel, docbook-style-xsl BuildRequires: systemd BuildRequires: systemd-devel @@ -99,6 +101,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %doc README NEWS COPYING %changelog +* Mon Nov 07 2016 Petr Kubat - 3:1.38-6 +- Add runtime depenedncy on nss_nis + * Fri Feb 05 2016 Fedora Release Engineering - 3:1.38-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 215d292297bbedbd034a481b8110bb6921060b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Wed, 23 Nov 2016 18:49:33 +0100 Subject: [PATCH 29/67] Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893). - Add check for systemd/sd-daemon.h to ypbind-systemdso.patch. - Spec file cosmetics. - Add %license tag. --- ypbind-systemdso.patch | 14 ++++++-------- ypbind.spec | 15 +++++++++++---- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/ypbind-systemdso.patch b/ypbind-systemdso.patch index 15be552..b540a89 100644 --- a/ypbind-systemdso.patch +++ b/ypbind-systemdso.patch @@ -1,16 +1,14 @@ -diff -ru a/configure.ac b/configure.ac ---- a/configure.ac 2014-10-21 17:37:20.526628827 +0200 -+++ b/configure.ac 2014-10-21 17:51:39.649362686 +0200 -@@ -44,7 +44,8 @@ +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) --PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0]) -+PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209] [libsystemd-daemon >= 209], [USE_SD_NOTIFY=1], [USE_SD_NOTIFY=0]) -+ ++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) - AC_ARG_ENABLE([dbus-nm], @@ -105,7 +106,7 @@ AM_CONDITIONAL(ENABLE_REGENERATE_MAN, test x$enable_man != xno) diff --git a/ypbind.spec b/ypbind.spec index 197d39e..f4031f3 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -98,17 +98,24 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %{_sysconfdir}/dhcp/dhclient.d/* %config(noreplace) %{_sysconfdir}/yp.conf %dir %{_localstatedir}/yp/binding -%doc README NEWS COPYING +%doc README NEWS +%license COPYING %changelog +* Wed Nov 23 2016 Ralf Corsépius - 3:1.38-7 +- Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893). +- Add check for systemd/sd-daemon.h to ypbind-systemdso.patch. +- Spec file cosmetics. +- Add %license tag. + * Mon Nov 07 2016 Petr Kubat - 3:1.38-6 -- Add runtime depenedncy on nss_nis +- Add runtime dependency on nss_nis * Fri Feb 05 2016 Fedora Release Engineering - 3:1.38-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild * Mon Jan 25 2016 Matej Muzila 3:1.38-4 -- Do not resstart ypbind on dhcp renew if nis domain or nis servers +- Do not restart ypbind on dhcp renew if nis domain or nis servers haven't changed Resolves: rhbz#1301708 From 1c9847cd89ed86acf155cf009bbfce5917bfe411 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 18:17:43 +0000 Subject: [PATCH 30/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index f4031f3..02e603e 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -102,6 +102,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 3:1.38-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Nov 23 2016 Ralf Corsépius - 3:1.38-7 - Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893). - Add check for systemd/sd-daemon.h to ypbind-systemdso.patch. From 65637308eae8de3e1d7500dd47131e19177eeb9c Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Mon, 20 Mar 2017 09:15:47 +0100 Subject: [PATCH 31/67] Add a Wants dependency on nss-user-lookup.target Related: #1282440 --- ypbind.service | 1 + ypbind.spec | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ypbind.service b/ypbind.service index 67d1a06..23f6b0b 100644 --- a/ypbind.service +++ b/ypbind.service @@ -2,6 +2,7 @@ [Unit] Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder Requires=rpcbind.service +Wants=nss-user-lookup.target After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service Before=systemd-user-sessions.service Before=nss-user-lookup.target diff --git a/ypbind.spec b/ypbind.spec index 02e603e..168c93e 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -102,6 +102,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Mon Mar 20 2017 Petr Kubat - 3:1.38-9 +- Add a Wants dependency on nss-user-lookup.target (#1282440) + * Sat Feb 11 2017 Fedora Release Engineering - 3:1.38-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 469ed59ebd31695232540aaa24ce9bef97ace420 Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Wed, 29 Mar 2017 12:13:22 +0200 Subject: [PATCH 32/67] Wait a while for dhcp to set up the domain Resolves: #1170400 --- ypbind-pre-setdomain | 26 +++++++++++++++++--------- ypbind.spec | 5 ++++- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ypbind-pre-setdomain b/ypbind-pre-setdomain index 2c97541..9b22a8c 100755 --- a/ypbind-pre-setdomain +++ b/ypbind-pre-setdomain @@ -7,22 +7,30 @@ # itself. If $NISDOMAIN is not defined, it reads config file. # +TIMEOUT=5 DOMAINNAME=`domainname` if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then echo -n $"Setting NIS domain: " + seconds=0 + while [ $seconds -lt $TIMEOUT ]; do if [ -n "$NISDOMAIN" ]; then - domainname $NISDOMAIN - echo $"'$NISDOMAIN' (environment variable)" + domainname $NISDOMAIN + echo $"'$NISDOMAIN' (environment variable)" + break else # See if the domain is set in config file - NISDOMAIN=`awk '{ if ($1 == "domain") {print $2; exit} }' /etc/yp.conf` - if [ -n "$NISDOMAIN" ]; then - domainname $NISDOMAIN - echo $"'$NISDOMAIN' (/etc/yp.conf)" - else - logger -t ypbind $"domain not found" - exit 1 + NISDOMAIN=`awk '{ if ($1 == "domain") {print $2; exit} }' /etc/yp.conf` + if [ -n "$NISDOMAIN" ]; then + domainname $NISDOMAIN + echo $"'$NISDOMAIN' (/etc/yp.conf)" + break + else + seconds=$(($seconds+1)) + sleep 1 fi fi + done + # Give up if NISDOMAIN is still not set + [ -z "$NISDOMAIN" ] && logger -t ypbind $"domain not found" && exit 1 fi #/etc/rpc check diff --git a/ypbind.spec b/ypbind.spec index 168c93e..f0c9a8a 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 1.38 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 @@ -102,6 +102,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Wed Mar 29 2017 Petr Kubat - 3:1.38-10 +- Wait a while for dhcp to set up the domain (#1170400) + * Mon Mar 20 2017 Petr Kubat - 3:1.38-9 - Add a Wants dependency on nss-user-lookup.target (#1282440) From feb6de6078c30e7c8be9eb8d7cae53efa69e7752 Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Fri, 19 May 2017 16:38:24 +0200 Subject: [PATCH 33/67] Update to version 2.4 supporting IPv6 --- .gitignore | 1 + sources | 2 +- ypbind-2.4-gettext_version.patch | 10 ++++++++++ ypbind.spec | 22 ++++++++++++++++------ 4 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 ypbind-2.4-gettext_version.patch diff --git a/.gitignore b/.gitignore index 9c9c6d6..fa15382 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ypbind-mt-1.32.tar.bz2 /ypbind-mt-1.37.1.tar.bz2 /ypbind-mt-1.37.2.tar.bz2 /ypbind-mt-1.38.tar.bz2 +/ypbind-mt-2.4.tar.gz diff --git a/sources b/sources index fe5d1ea..6cd83d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -094088c0e282fa7f3b3dd6cc51d0a4e1 ypbind-mt-1.38.tar.bz2 +SHA512 (ypbind-mt-2.4.tar.gz) = 6665aa9e80d036fa0b9a585abe30a992f1a2f4640c69a7f2ed65ffc7f22dd6a31ebd022f8214fbd816e7a06605fa1e0f639e010bfd0f61b91c87d6851dafcb7b diff --git a/ypbind-2.4-gettext_version.patch b/ypbind-2.4-gettext_version.patch new file mode 100644 index 0000000..c8a520d --- /dev/null +++ b/ypbind-2.4-gettext_version.patch @@ -0,0 +1,10 @@ +--- 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.spec b/ypbind.spec index f4031f3..3eacb33 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,11 +1,11 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 -Version: 1.38 -Release: 7%{?dist} +Version: 2.4 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons -Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2 +Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz Url: http://www.linux-nis.org/nis/ypbind-mt/index.html #Source1: ypbind.init Source2: nis.sh @@ -18,6 +18,7 @@ Patch1: ypbind-1.11-gettextdomain.patch # Not sent to upstream. Patch2: ypbind-helpman.patch Patch3: ypbind-systemdso.patch +Patch4: ypbind-2.4-gettext_version.patch # This is for /bin/systemctl Requires(post): systemd Requires(preun): systemd @@ -30,6 +31,8 @@ BuildRequires: systemd BuildRequires: systemd-devel BuildRequires: autoconf, automake BuildRequires: gettext-devel +BuildRequires: libtirpc-devel +BuildRequires: libnsl2-devel %description The Network Information Service (NIS) is a system that provides @@ -51,8 +54,9 @@ 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 +#%patch2 -p1 -b .helpman +#%patch3 -p1 -b .systemdso +%patch4 -b .gettext_version autoreconf -fiv @@ -63,7 +67,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fPIC" export CFLAGS="$RPM_OPT_FLAGS -fpic" %endif export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" -%configure --enable-dbus-nm + +#export CFLAGS="$CFLAGS -H" + +%configure make %install @@ -102,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Fri May 19 2017 Matej Mužila - 3:2.4-1 +- Update to version 2.4 supporting IPv6 + * Wed Nov 23 2016 Ralf Corsépius - 3:1.38-7 - Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893). - Add check for systemd/sd-daemon.h to ypbind-systemdso.patch. From f71605e10946fa8a218315debbf13eacbc138ead Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Mon, 29 May 2017 16:12:47 +0200 Subject: [PATCH 34/67] Require yp-tools >= 4.2.2-2 --- ypbind.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index 1c1f4ee..12a9bb6 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz @@ -23,7 +23,8 @@ Patch4: ypbind-2.4-gettext_version.patch Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -Requires: rpcbind, yp-tools +Requires: rpcbind +Requires: yp-tools >= 4.2.2-2 # New nss_nis package in F25+ Requires: nss_nis BuildRequires: dbus-glib-devel, docbook-style-xsl @@ -109,6 +110,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Mon May 29 2017 Matej Mužila - 3:2.4-2 +- Require yp-tools >= 4.2.2-2 + * Fri May 19 2017 Matej Mužila - 3:2.4-1 - Update to version 2.4 supporting IPv6 From 48f1e8346c9380c99f7106ee47f4be98d5884f5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:36:08 +0000 Subject: [PATCH 35/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 12a9bb6..b087401 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz @@ -110,6 +110,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3:2.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon May 29 2017 Matej Mužila - 3:2.4-2 - Require yp-tools >= 4.2.2-2 From 1359a8e79eeadd0f6ddb303a894e38ec89fe1b70 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 11:06:24 +0000 Subject: [PATCH 36/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index b087401..d7f16c0 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz @@ -110,6 +110,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 3:2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 3:2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 27a4e958fed66c03e23b8a17af97cf73c0ca123c Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Thu, 21 Sep 2017 14:45:22 +0200 Subject: [PATCH 37/67] Add "Wants" dependency on network-online.target Remove "After" dependency on NetworkManager-wait-online.service --- ypbind.service | 4 ++-- ypbind.spec | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ypbind.service b/ypbind.service index 23f6b0b..16a4cf8 100644 --- a/ypbind.service +++ b/ypbind.service @@ -2,8 +2,8 @@ [Unit] Description=NIS/YP (Network Information Service) Clients to NIS Domain Binder Requires=rpcbind.service -Wants=nss-user-lookup.target -After=syslog.target network-online.target rpcbind.service ypserv.service NetworkManager-wait-online.service +Wants=nss-user-lookup.target network-online.target +After=syslog.target rpcbind.service ypserv.service Before=systemd-user-sessions.service Before=nss-user-lookup.target diff --git a/ypbind.spec b/ypbind.spec index 12a9bb6..d4f4b64 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.4 -Release: 2%{?dist} +Release: 5%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz @@ -110,10 +110,14 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog -* Mon May 29 2017 Matej Mužila - 3:2.4-2 +* Thu Jul 20 2017 Matej Mužila - 3:2.4-3 +- Add "Wants" dependency on network-online.target +- Remove "After" dependency on NetworkManager-wait-online.service + +* Mon May 29 2017 Matej Mužila - 3:2.4-2 - Require yp-tools >= 4.2.2-2 -* Fri May 19 2017 Matej Mužila - 3:2.4-1 +* Fri May 19 2017 Matej Mužila - 3:2.4-1 - Update to version 2.4 supporting IPv6 * Wed Mar 29 2017 Petr Kubat - 3:1.38-10 From 03f4831b3e964d78b0e5f9cfa5a52c6f5425ca0b Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Tue, 16 Jan 2018 08:45:51 +0100 Subject: [PATCH 38/67] Temporarily remove nss_nis dependency Resolves: #1534599 --- ypbind.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index 4345526..843f849 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz @@ -26,7 +26,8 @@ Requires(postun): systemd Requires: rpcbind Requires: yp-tools >= 4.2.2-2 # New nss_nis package in F25+ -Requires: nss_nis +# FIXME: Uncomment once nss_nis is packaged again +# Requires: nss_nis BuildRequires: dbus-glib-devel, docbook-style-xsl BuildRequires: systemd BuildRequires: systemd-devel @@ -110,6 +111,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Tue Jan 16 2018 Petr Kubat - 3:2.4-6 +- Temporarily remove nss_nis dependency as it got removed from glibc (#1534599) + * Thu Sep 21 2017 Matej Mužila - 3:2.4-5 - Add "Wants" dependency on network-online.target - Remove "After" dependency on NetworkManager-wait-online.service From bb039605b003e0864758950f477c2b80993c659b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:06:33 +0100 Subject: [PATCH 39/67] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- ypbind.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index 843f849..3760e07 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz @@ -111,6 +111,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Fri Feb 09 2018 Igor Gnatenko - 3:2.4-7 +- Escape macros in %%changelog + * Tue Jan 16 2018 Petr Kubat - 3:2.4-6 - Temporarily remove nss_nis dependency as it got removed from glibc (#1534599) @@ -143,7 +146,7 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind - Remove check for libsystemd-daemon from ypbind-systemdso.patch (RHBZ#1396893). - Add check for systemd/sd-daemon.h to ypbind-systemdso.patch. - Spec file cosmetics. -- Add %license tag. +- Add %%license tag. * Mon Nov 07 2016 Petr Kubat - 3:1.38-6 - Add runtime dependency on nss_nis From 9579fe89b1eabb9f537fdb23d5f4d44abfb8fc8b Mon Sep 17 00:00:00 2001 From: Petr Kubat Date: Mon, 30 Apr 2018 13:02:22 +0200 Subject: [PATCH 40/67] Add the runtime dependency on nss_nis back --- ypbind.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index 3760e07..0b8c886 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz @@ -26,8 +26,7 @@ Requires(postun): systemd Requires: rpcbind Requires: yp-tools >= 4.2.2-2 # New nss_nis package in F25+ -# FIXME: Uncomment once nss_nis is packaged again -# Requires: nss_nis +Requires: nss_nis BuildRequires: dbus-glib-devel, docbook-style-xsl BuildRequires: systemd BuildRequires: systemd-devel @@ -111,6 +110,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Mon Apr 30 2018 Petr Kubat - 3:2.4-8 +- Add the runtime dependency on nss_nis back + * Fri Feb 09 2018 Igor Gnatenko - 3:2.4-7 - Escape macros in %%changelog From 4d50da87b84cf282cf2443fb1e8fc8dafd49e832 Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Wed, 6 Jun 2018 15:22:49 +0200 Subject: [PATCH 41/67] Update to version 2.5 --- .gitignore | 1 + sources | 2 +- ypbind.spec | 15 ++++++++++----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index fa15382..122d7e5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ ypbind-mt-1.32.tar.bz2 /ypbind-mt-1.37.2.tar.bz2 /ypbind-mt-1.38.tar.bz2 /ypbind-mt-2.4.tar.gz +/ypbind-mt-2.5.tar.gz diff --git a/sources b/sources index 6cd83d8..73e000f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ypbind-mt-2.4.tar.gz) = 6665aa9e80d036fa0b9a585abe30a992f1a2f4640c69a7f2ed65ffc7f22dd6a31ebd022f8214fbd816e7a06605fa1e0f639e010bfd0f61b91c87d6851dafcb7b +SHA512 (ypbind-mt-2.5.tar.gz) = 100e36e062135ed2b80e27b1b62e8ca5c1eb0d49233bae7814c41e65268971c6631daf3ba75a1667e36e438870c730eb8ba7a2b63b6589a40114d2c34a5642a7 diff --git a/ypbind.spec b/ypbind.spec index 0b8c886..6b4f8eb 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,11 +1,11 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 -Version: 2.4 -Release: 8%{?dist} +Version: 2.5 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Daemons -Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.gz +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 @@ -34,6 +34,7 @@ BuildRequires: autoconf, automake BuildRequires: gettext-devel BuildRequires: libtirpc-devel BuildRequires: libnsl2-devel +BuildRequires: libxslt %description The Network Information Service (NIS) is a system that provides @@ -72,10 +73,11 @@ export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" #export CFLAGS="$CFLAGS -H" %configure -make +%make_build + %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/yp/binding mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/dhcp/dhclient.d @@ -110,6 +112,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Tue Jun 05 2018 Matej Mužila - 3:2.5-1 +- Update to version 2.5 + * Mon Apr 30 2018 Petr Kubat - 3:2.4-8 - Add the runtime dependency on nss_nis back From fd0e3c2bcef7f876c9f21a4789d6a72c5c865d4b Mon Sep 17 00:00:00 2001 From: Matej Muzila Date: Thu, 7 Jun 2018 16:51:39 +0200 Subject: [PATCH 42/67] Fix man pages --- ypbind-2.5-helpman.patch | 148 ++++++++++++++++++++++++++++++++++++ ypbind-helpman.patch | 160 --------------------------------------- ypbind.spec | 9 ++- 3 files changed, 154 insertions(+), 163 deletions(-) create mode 100644 ypbind-2.5-helpman.patch delete mode 100644 ypbind-helpman.patch diff --git a/ypbind-2.5-helpman.patch b/ypbind-2.5-helpman.patch new file mode 100644 index 0000000..1d5c663 --- /dev/null +++ b/ypbind-2.5-helpman.patch @@ -0,0 +1,148 @@ +diff -up ypbind-mt-2.5/man/ypbind.8.xml.helpman ypbind-mt-2.5/man/ypbind.8.xml +--- ypbind-mt-2.5/man/ypbind.8.xml.helpman 2018-06-04 15:30:38.000000000 +0200 ++++ ypbind-mt-2.5/man/ypbind.8.xml 2018-06-07 16:16:56.967024495 +0200 +@@ -39,21 +39,33 @@ + + + ypbind +- -c +- -d -debug +- -verbose +- -n -forground +- -broadcast +- -broken-server +- -ypset +- -ypsetme +- -no-ping ++ ++ -broadcast ++ -ypset ++ -ypsetme ++ + -f configfile ++ -no-ping ++ -broken-server + -local-only +- -ping-interval ping-interval ++ ++ ++ -ping-interval ping-interval ++ -i ping-interval ++ ++ ++ -d -debug ++ -v -verbose ++ -n -foreground ++ -p port + + + ypbind ++ -c ++ -f configfile ++ ++ ++ ypbind + --version + + +@@ -88,6 +100,8 @@ + + Unless the option + ++or ++ + is used, ypbind detaches itself from the controlling terminal and puts + itself into background. + ypbind +@@ -132,6 +146,57 @@ If the file does not exist or if there a + ypbind + exit. + ++ ++In Fedora we use systemd for starting services. We need to finish starting ++process of ypbind service not before service is fully ++started, which means ypbind daemon is prepared to answer. ++There is a test script /usr/libexec/ypbind-post-waitbind ++used in ypbind.service, that waits for ypbind daemon to be ++fully connected to NIS server and waits by default up to 45s. Sometimes this ++is not enough, because network set up can take longer than 45s during boot, so ++starting ypbind.service fails. User can increase the timeout by setting an ++environment variable NISTIMEOUT in /etc/sysconfig/ypbind. ++For example NISTIMEOUT=180 means ypbind will wait up to 180 ++seconds for binding to a NIS server. Another option is to enable ++NetworkManager-wait- online.service, which will make ypbind ++to wait until network is properly set up. ++ ++ ++ ++In case something needs to be changed in the ypbind.service, it is adviced not ++to change the ypbind.service directly, but rather to create a new file under ++/etc/systemd/system/ypbind.service.d/, i.e. if we need to ++start ypbind before service foo.service, we can create file ++/etc/systemd/system/ypbind.service.d/wait-foo.conf with ++the following content: ++ ++ ++ ++ ++[Service] ++Before=foo.service ++ ++ ++ ++If you need to pass other arguments to ypbind daemon withing ++systemd unit file, you can set these arguments as OTHER_YPBIND_OPTS environment ++variable in /etc/sysconfig/ypbind. For example in order to ++set a fixed port ypbind should run on, you can specify ++OTHER_YPBIND_OPTS="-p 876" in /etc/sysconfig/ypbind. ++ ++ ++ ++DHCP client by defualt changes /etc/yp.conf in case DHCP ++server sends NIS configuration in the respond. In that case ++/etc/dhcp/dhclient.d/nis.sh changes ++/etc/yp.conf according such configuration and creates a ++back-up copy of the original configuration file into ++/var/lib/dhclient/nis.conf.predhclient.$interface. In ++order to disable changing /etc/yp.conf by DHCP client, add ++PEERNIS=no into /etc/sysconfig/network. ++ ++ ++ + + + +@@ -256,6 +321,15 @@ With this options another frequency in s + + + ++ port ++ ++Lets ++ypbind ++listen on a specified port number, rather than asking portmapper to assingn a ++port for it. ++ ++ ++ + + + Prints the version number +diff -up ypbind-mt-2.5/man/yp.conf.5.xml.helpman ypbind-mt-2.5/man/yp.conf.5.xml +--- ypbind-mt-2.5/man/yp.conf.5.xml.helpman 2018-06-07 16:29:01.853560699 +0200 ++++ ypbind-mt-2.5/man/yp.conf.5.xml 2018-06-07 16:33:59.302833043 +0200 +@@ -97,6 +97,14 @@ + first the given servers before falling back to broadcasting + for a running server. + ++ ++ Content of /etc/yp.conf can be changed by DHCP client, ++ for more info see ++ ++ ypbind ++ 8 ++ . ++ + + + diff --git a/ypbind-helpman.patch b/ypbind-helpman.patch deleted file mode 100644 index a02af07..0000000 --- a/ypbind-helpman.patch +++ /dev/null @@ -1,160 +0,0 @@ -diff -up ypbind-mt-1.37.2/man/ypbind.8.helpman ypbind-mt-1.37.2/man/ypbind.8 ---- ypbind-mt-1.37.2/man/ypbind.8.helpman 2013-11-06 16:02:42.000000000 +0100 -+++ ypbind-mt-1.37.2/man/ypbind.8 2014-08-15 10:40:21.261195488 +0200 -@@ -31,9 +31,11 @@ - ypbind \- NIS binding process - .SH "SYNOPSIS" - .HP \w'\fBypbind\fR\ 'u --\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-rebind\-interval] [\-no\-dbus] -+\fBypbind\fR [\-broadcast\ |\ \-ypset\ |\ \-ypsetme] [\-c] [\-f\ \fIconfigfile\fR] [\-no\-ping] [\-broken\-server] [\-local\-only] [\-i\ |\ \-ping\-interval\ \fIping\-interval\fR] [\-r\ |\ \-rebind\-interval\ \fIrebind\-interval\fR] [\-d\ |\ \-debug] [\-v\ |\ \-verbose] [\-n\ |\ \-foreground] [\-p\ \fIport\fR] [\-log\ \fIlog\-options\fR] [\-no\-dbus] - .HP \w'\fBypbind\fR\ 'u - \fBypbind\fR \-\-version -+.HP \w'\fBypbind\fR\ 'u -+\fBypbind\fR \-\-help - .SH "DESCRIPTION" - .PP - \fBypbind\fR -@@ -58,6 +60,8 @@ will send a ping to all servers and bind - .PP - Unless the option - \fB\-debug\fR -+or -+\fB\-foreground\fR - is used, ypbind detaches itself from the controlling terminal and puts itself into background\&. - \fBypbind\fR - uses -@@ -103,7 +107,64 @@ will behave as usual and assumes there i - \fBypbind\fR - will reread all configuration files, registers at the local portmapper and try to search NIS servers\&. If NetworkManager drops a connection, - \fBypbind\fR --will unregister from portmapper\&. -+will unregister from portmapper\&. Option -+\fB\-no\-dbus\fR -+disables this feature and -+\fBypbind\fR -+behaves like no NetworkManager is running at startup. Also in case one of the NIS servers -+\fBypbind\fR -+is configured to connect to is a localhost, -+\fBypbind\fR -+behaves like it is a working network connection. -+.PP -+In Fedora we use -+\fBsystemd\fR -+for starting services. We need to finish starting process of -+\fBypbind\fR -+service not before service is fully started, which means -+\fBypbind\fR -+daemon is prepared to answer. There is a test script /usr/libexec/ypbind-post-waitbind used in -+\fBypbind.service\fR, -+that waits for -+\fBypbind\fR -+daemon to be fully connected to NIS server and waits by default up to 45s. Sometimes this is not enough, because network set up can take longer than 45s during boot, so starting -+\fBypbind.service\fR -+fails. User can increase the -+\fBtimeout\fR -+by setting an environment variable -+\fBNISTIMEOUT\fR -+in /etc/sysconfig/ypbind. For example NISTIMEOUT=180 means ypbind will wait up to 180 seconds for binding to a NIS server. -+Another option is to enable NetworkManager-wait-online.service, which will make -+\fBypbind\fR -+to wait until network is properly set up. -+.PP -+In case something needs to be changed in the -+\fBypbind.service\fR, -+it is adviced not to change the -+\fBypbind.service\fR -+directly, but rather to create a new file under /etc/systemd/system/ypbind.service.d/\&, i.e. if we need to start -+\fBypbind\fR -+before service foo.service, we can create file /etc/systemd/system/ypbind.service.d/wait-foo.conf with the following content: -+ -+ [Service] -+ Before=foo.service -+.PP -+If you need to pass other arguments to -+\fBypbind\fR -+daemon withing systemd unit file, you can set these arguments as -+\fBOTHER_YPBIND_OPTS\fR -+environment variable in /etc/sysconfig/ypbind. For example in order to set a fixed port ypbind should run on, you can specify OTHER_YPBIND_OPTS="-p 876" in /etc/sysconfig/ypbind\&. -+.PP -+DHCP client by defualt changes -+\fB/etc/yp.conf\fR -+in case DHCP server sends NIS configuration in the respond. In that case /etc/dhcp/dhclient.d/nis.sh changes -+\fB/etc/yp.conf\fR -+according such configuration and creates a back\-up copy of the original configuration file into /var/lib/dhclient/nis.conf.predhclient.$interface. -+In order to disable changing -+\fB/etc/yp.conf\fR -+by DHCP client, add -+\fBPEERNIS=no\fR -+into /etc/sysconfig/network. - .SH "OPTIONS" - .PP - \fB\-broadcast\fR -@@ -200,6 +261,15 @@ The default value for - to check, if a NIS server is still reachable, is 20 seconds\&. With this options another frequency in seconds can be specified\&. - .RE - .PP -+\fB\-p port\fR -+.RS 4 -+Lets -+\fBypbind\fR -+listen on a specified -+\fBport\fR -+number, rather than asking portmapper to assing a port for it\&. -+.RE -+.PP - \fB\-r\fR, \fB\-rebind\-interval\fR - .RS 4 - The default value for -@@ -207,6 +277,13 @@ The default value for - to search for the fastest NIS server is 900 seconds (15 minutes)\&. With this options another frequency in seconds can be specified\&. - .RE - .PP -+\fB\-log\fR log\-options -+.RS 4 -+Allows to log special events\&. -+\fBlog\-options\fR -+is a logical sum of values for particular events \- 1 for logging rpc calls, 2 for logging broken server calls, 4 for logging server changes\&. -+.RE -+.PP - \fB\-no\-dbus\fR - .RS 4 - Disables DBUS support if compiled in\&. -diff -up ypbind-mt-1.37.2/man/yp.conf.5.helpman ypbind-mt-1.37.2/man/yp.conf.5 ---- ypbind-mt-1.37.2/man/yp.conf.5.helpman 2013-04-09 14:31:05.000000000 +0200 -+++ ypbind-mt-1.37.2/man/yp.conf.5 2014-08-15 10:38:21.610870737 +0200 -@@ -74,6 +74,10 @@ If no other server is given or all of th - If for a specific domain the broadcast option and fixed server are given, - \fBypbind\-mt\fR - tries at first the given servers before falling back to broadcasting for a running server\&. -+.PP -+Content of -+\fB/etc/yp.conf\fR -+can be changed by DHCP client, for more info see \fBypbind\fR(8). - .SH "SEE ALSO" - .PP - \fBypbind\fR(8) -diff -up ypbind-mt-1.37.2/src/ypbind-mt.c.helpman ypbind-mt-1.37.2/src/ypbind-mt.c ---- ypbind-mt-1.37.2/src/ypbind-mt.c.helpman 2013-04-09 16:03:47.000000000 +0200 -+++ ypbind-mt-1.37.2/src/ypbind-mt.c 2014-08-15 10:38:21.610870737 +0200 -@@ -513,12 +513,17 @@ usage (int ret) - output = stdout; - - fputs (_("Usage:\n"), output); -- fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval]\n\t [-r rebind-interval] [-debug] [-verbose] [-n | -foreground]\n"), output); -+ fputs ("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile] [-no-ping]\n" -+ "\t [-broken-server] [-local-only] [-i | -ping-interval ping-interval]\n" -+ "\t [-r | -rebind-interval rebind-interval] [-d | -debug] [-v | -verbose]\n" -+ "\t [-n | -foreground] [-p port] [-log log-options]", output); - #ifdef USE_DBUS_NM -- fputs (_("\t [-no-dbus]\n"), output); -+ fputs (" [-no-dbus]", output); - #endif -- fputs (_("\typbind -c [-f configfile]\n"), output); -- fputs (_("\typbind --version\n"), output); -+ fputs ("\n", output); -+ fputs ("\typbind -c [-f configfile]\n", output); -+ fputs ("\typbind --version\n", output); -+ fputs ("\typbind --help\n", output); - exit (ret); - } - diff --git a/ypbind.spec b/ypbind.spec index 6b4f8eb..575fce8 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: https://github.com/thkukuk/ypbind-mt/archive/v%{version}.tar.gz#/ypbind-mt-%{version}.tar.gz @@ -16,7 +16,7 @@ Source5: ypbind-post-waitbind # 'ypbind-mt' would allow us to drop it. Patch1: ypbind-1.11-gettextdomain.patch # Not sent to upstream. -Patch2: ypbind-helpman.patch +Patch2: ypbind-2.5-helpman.patch Patch3: ypbind-systemdso.patch Patch4: ypbind-2.4-gettext_version.patch # This is for /bin/systemctl @@ -56,7 +56,7 @@ 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 +%patch2 -p1 -b .helpman #%patch3 -p1 -b .systemdso %patch4 -b .gettext_version @@ -112,6 +112,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* Thu Jun 07 2018 Matej Mužila - 3:2.5-2 +- Fix man pages + * Tue Jun 05 2018 Matej Mužila - 3:2.5-1 - Update to version 2.5 From d8975063ba3e57925f1b53db70e86bbf734f8064 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 43/67] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- ypbind.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ypbind.spec b/ypbind.spec index 575fce8..4708961 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -27,6 +27,7 @@ Requires: rpcbind Requires: yp-tools >= 4.2.2-2 # New nss_nis package in F25+ Requires: nss_nis +BuildRequires: gcc BuildRequires: dbus-glib-devel, docbook-style-xsl BuildRequires: systemd BuildRequires: systemd-devel From cb4a7aef1a137e864f8e1276a7c9058cffc9cf7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:43:54 +0000 Subject: [PATCH 44/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 4708961..6f98ef6 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: System Environment/Daemons Source0: https://github.com/thkukuk/ypbind-mt/archive/v%{version}.tar.gz#/ypbind-mt-%{version}.tar.gz @@ -113,6 +113,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 03ee821c68ff2560529ae742518bbf285e11e7e5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:32 +0100 Subject: [PATCH 45/67] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- ypbind.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 6f98ef6..7380532 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -4,7 +4,6 @@ Epoch: 3 Version: 2.5 Release: 3%{?dist} License: GPLv2 -Group: System Environment/Daemons 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 From d7e04829ecfbca4c957ca14d293c3a21eefecd77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:00:51 +0000 Subject: [PATCH 46/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 7380532..453ffdb 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 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 @@ -112,6 +112,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 00b6678a56150f4ab6b197c978eab4507878fbbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:51:15 +0000 Subject: [PATCH 47/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 453ffdb..55795c0 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 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 @@ -112,6 +112,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 472d9004febc56aa4c2412db7af861d27619f42d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Mu=C5=BEila?= Date: Tue, 30 Jul 2019 18:24:28 +0200 Subject: [PATCH 48/67] Update to version 2.6.1 Resolves: #1668439 --- .gitignore | 1 + sources | 2 +- ypbind.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 122d7e5..d636d77 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ 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 diff --git a/sources b/sources index 73e000f..2e95c7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ypbind-mt-2.5.tar.gz) = 100e36e062135ed2b80e27b1b62e8ca5c1eb0d49233bae7814c41e65268971c6631daf3ba75a1667e36e438870c730eb8ba7a2b63b6589a40114d2c34a5642a7 +SHA512 (ypbind-mt-2.6.1.tar.gz) = 5d5a15bfdcf93683f309c5c6ddabe785bda274474cf8a68d7034ea4ade35f30efeff5aa9c1087945823ff1f28a85eb2965924189cd1c7d9495b437df26b79b8c diff --git a/ypbind.spec b/ypbind.spec index 55795c0..8fd245d 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,8 +1,8 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 -Version: 2.5 -Release: 5%{?dist} +Version: 2.6.1 +Release: 1%{?dist} License: GPLv2 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 @@ -112,6 +112,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 04e81c56fd39e868221304f0e954edaa4c7a73cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:09:41 +0000 Subject: [PATCH 49/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 8fd245d..3fd3f19 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.6.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 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 @@ -112,6 +112,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 875b6014c7f5e1fff4de9b30d1756dbb4d0397fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Mon, 20 Apr 2020 19:05:32 +0200 Subject: [PATCH 50/67] Update onto 2.7.2 Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1796030 Removing obsolete patches --- .gitignore | 1 + sources | 2 +- ypbind.spec | 13 +++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d636d77..25b9b2d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ ypbind-mt-1.32.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 2e95c7f..69c0d78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ypbind-mt-2.6.1.tar.gz) = 5d5a15bfdcf93683f309c5c6ddabe785bda274474cf8a68d7034ea4ade35f30efeff5aa9c1087945823ff1f28a85eb2965924189cd1c7d9495b437df26b79b8c +SHA512 (ypbind-mt-2.7.2.tar.gz) = 415013ea003bb3d6162b1dac76462d13d1264a2a0dd3c4de057cf7239b9706a76d1f14ee1e3dcfba697aa48e25e3a972772c8210d87bbf847344e4a6c708a5b4 diff --git a/ypbind.spec b/ypbind.spec index 3fd3f19..f302405 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,8 +1,8 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 -Version: 2.6.1 -Release: 2%{?dist} +Version: 2.7.2 +Release: 1%{?dist} License: GPLv2 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 @@ -16,8 +16,6 @@ Source5: ypbind-post-waitbind 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 @@ -57,8 +55,6 @@ also need to install the ypserv package to a machine on your network. %setup -q -n ypbind-mt-%{version} %patch1 -p1 -b .gettextdomain %patch2 -p1 -b .helpman -#%patch3 -p1 -b .systemdso -%patch4 -b .gettext_version autoreconf -fiv @@ -112,6 +108,11 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 8914cf412bf522a93d2f87422b32b78bf03880f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Mon, 20 Apr 2020 19:07:36 +0200 Subject: [PATCH 51/67] Remove old patches --- ypbind-2.4-gettext_version.patch | 10 ---------- ypbind-systemdso.patch | 20 -------------------- 2 files changed, 30 deletions(-) delete mode 100644 ypbind-2.4-gettext_version.patch delete mode 100644 ypbind-systemdso.patch 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 From e4a251a4eac56eecd026c9dc137f76349164bfc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:15:56 +0000 Subject: [PATCH 52/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index f302405..4994c92 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 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 @@ -108,6 +108,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From e5f119d352f22b649581e560bc4d3367f26e1b31 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:48:01 +0000 Subject: [PATCH 53/67] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- ypbind.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ypbind.spec b/ypbind.spec index 4994c92..80bbfac 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -24,6 +24,7 @@ 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 From 6f39fa085372d64b177fcf410ba714dcb39d5d81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:34:47 +0000 Subject: [PATCH 54/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 80bbfac..9e3600c 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From cffd0123696851609e1e811e518d5a37639214e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:12:00 +0100 Subject: [PATCH 55/67] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- ypbind.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 9e3600c..f945bd9 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 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 @@ -109,6 +109,10 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 0f165ba4e87ad1d066c720c3b389da0aed50ece7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:10:07 +0000 Subject: [PATCH 56/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index f945bd9..d82dc7d 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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. From dd659bf840c4cf5f1c6230f426fe1ddda4f5ce13 Mon Sep 17 00:00:00 2001 From: Marek Kulik Date: Mon, 27 Sep 2021 11:43:51 +0200 Subject: [PATCH 57/67] Fix setsebool log message with selinux disabled This is cosmetic fix, that's prevent execution of setsebool during ypbind service start when selinux is disabled. As a result invalid boolean message should not occur in logs anymore: systemd[1]: Starting NIS/YP (Network Information Service) Clients to NIS Domain Binder... setsebool[1581714]: Could not change active booleans: Invalid boolean Resolves: #1882069 --- ypbind.service | 2 +- ypbind.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) 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 d82dc7d..434db87 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 9c8d1c730a7baba83390482aa5e10d2fda90f872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Fri, 12 Nov 2021 22:26:59 +0100 Subject: [PATCH 58/67] Rebuild(libnsl2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 434db87..70f3a2a 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From c8e5bb11ff65c1f0f3ada84509b836c3191c5077 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:43:39 +0000 Subject: [PATCH 59/67] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 70f3a2a..39f3345 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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) From 70148df8e22f743a3887ce65c1024bbfb049968f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:46:44 +0000 Subject: [PATCH 60/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 39f3345..73783f0 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From e8bedaf5bf3c652e5a825a78a56e44e1403b9fe5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:07:25 +0000 Subject: [PATCH 61/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 73783f0..b01bb3c 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 13276c032243dab0714e817b25ccc4cb8181dec5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:32:42 +0000 Subject: [PATCH 62/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index b01bb3c..24ca265 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 48d7eadb2cb7fdc32974bd266529e207377dcfa1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 10:50:37 +0000 Subject: [PATCH 63/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 24ca265..7cc0aa4 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 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 @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 307377a249fb38c73d318f85eea9959758b1c776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Tue, 30 Jan 2024 19:41:22 +0100 Subject: [PATCH 64/67] Update license tag to the SPDX format (GPL-2.0-only) --- ypbind.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ypbind.spec b/ypbind.spec index 7cc0aa4..0642fed 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,20 +2,23 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 12%{?dist} -License: GPLv2 +Release: 13%{?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 + # This is for /bin/systemctl Requires(post): systemd Requires(preun): systemd @@ -53,9 +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 +%autosetup -p1 -n ypbind-mt-%{version} autoreconf -fiv @@ -72,7 +73,6 @@ export LDFLAGS="$LDFLAGS -pie -Wl,-z,relro,-z,now" %configure %make_build - %install %make_install @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From b3767f7b0a876d6a21c4a99439526c2b9ada1ba2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:43:48 +0000 Subject: [PATCH 65/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 0642fed..574490f 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL-2.0-only Url: https://www.thkukuk.de/nis/nis/ypbind-mt/ @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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) From 3f90d57db51a6bd150aa7cf3378d831192b7ece2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:36:18 +0000 Subject: [PATCH 66/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index 574490f..d9c8621 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL-2.0-only Url: https://www.thkukuk.de/nis/nis/ypbind-mt/ @@ -109,6 +109,9 @@ install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_libexecdir}/ypbind-post-waitbind %license COPYING %changelog +* 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 From 2b10648b4c8472d7db32ac12329a127ce064b960 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:13:27 +0000 Subject: [PATCH 67/67] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ypbind.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ypbind.spec b/ypbind.spec index d9c8621..77e5fc6 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -2,7 +2,7 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain Name: ypbind Epoch: 3 Version: 2.7.2 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL-2.0-only Url: https://www.thkukuk.de/nis/nis/ypbind-mt/ @@ -109,6 +109,9 @@ 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