rpms
/
ypserv
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.32

This commit is contained in:
Honza Horák 2013-11-18 09:53:31 +01:00
parent 6d365f80ca
commit 9d41c44a07
8 changed files with 30 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ ypserv-2.23.tar.bz2
/ypserv-2.28.tar.bz2
/ypserv-2.29.tar.bz2
/ypserv-2.31.tar.bz2
/ypserv-2.32.tar.bz2

2
sources
View File

@ -1 +1 @@
4537b8f0e917edca8f57b70b9cbc37f3 ypserv-2.31.tar.bz2
0daf6a667dc310cf46a5c86908d62e1f ypserv-2.32.tar.bz2

12
ypserv-2.24-aliases.patch
View File

@ -1,6 +1,6 @@
diff -up ./acinclude.m4.aliases ./acinclude.m4
--- ./acinclude.m4.aliases 2005-04-07 14:38:44.000000000 +0200
+++ ./acinclude.m4 2013-05-06 18:32:54.423541141 +0200
diff -up ypserv-2.32/acinclude.m4.aliases ypserv-2.32/acinclude.m4
--- ypserv-2.32/acinclude.m4.aliases 2005-04-07 14:38:44.000000000 +0200
+++ ypserv-2.32/acinclude.m4 2013-11-18 09:57:05.082162773 +0100
@@ -92,3 +92,18 @@ AC_DEFUN([TYPE_SOCKLEN_T],
AC_DEFINE([socklen_t], [int], [Define if socklen_t is missing])
fi
@ -20,9 +20,9 @@ diff -up ./acinclude.m4.aliases ./acinclude.m4
+AC_MSG_RESULT($tmp_aliases)
+AC_SUBST(ALIASES, $tmp_aliases)
+])
diff -up ./configure.in.aliases ./configure.in
--- ./configure.in.aliases 2013-04-11 11:26:22.000000000 +0200
+++ ./configure.in 2013-05-06 18:32:54.482541191 +0200
diff -up ypserv-2.32/configure.ac.aliases ypserv-2.32/configure.ac
--- ypserv-2.32/configure.ac.aliases 2013-11-18 09:51:17.094758957 +0100
+++ ypserv-2.32/configure.ac 2013-11-18 09:52:07.859844276 +0100
@@ -151,7 +151,7 @@ fi
AC_SUBST(MAKE)

24
ypserv-2.24-manfix.patch
View File

@ -1,6 +1,6 @@
diff -up ./rpc.yppasswdd/rpc.yppasswdd.8.manfix ./rpc.yppasswdd/rpc.yppasswdd.8
--- ./rpc.yppasswdd/rpc.yppasswdd.8.manfix 2013-04-10 10:30:53.000000000 +0200
+++ ./rpc.yppasswdd/rpc.yppasswdd.8 2013-05-06 18:32:35.682525532 +0200
diff -up ypserv-2.32/rpc.yppasswdd/rpc.yppasswdd.8.manfix ypserv-2.32/rpc.yppasswdd/rpc.yppasswdd.8
--- ypserv-2.32/rpc.yppasswdd/rpc.yppasswdd.8.manfix 2013-04-10 10:30:53.000000000 +0200
+++ ypserv-2.32/rpc.yppasswdd/rpc.yppasswdd.8 2013-11-18 09:47:11.982160697 +0100
@@ -53,6 +53,15 @@ customized for that NIS domain\. If no s
\fBMakefile\fR
is found, the scripts uses the generic one in
@ -26,9 +26,9 @@ diff -up ./rpc.yppasswdd/rpc.yppasswdd.8.manfix ./rpc.yppasswdd/rpc.yppasswdd.8
.SH "SEE ALSO"
.PP
diff -up ./rpc.ypxfrd/rpc.ypxfrd.8.manfix ./rpc.ypxfrd/rpc.ypxfrd.8
--- ./rpc.ypxfrd/rpc.ypxfrd.8.manfix 2013-04-10 10:30:53.000000000 +0200
+++ ./rpc.ypxfrd/rpc.ypxfrd.8 2013-05-06 18:32:35.693525541 +0200
diff -up ypserv-2.32/rpc.ypxfrd/rpc.ypxfrd.8.manfix ypserv-2.32/rpc.ypxfrd/rpc.ypxfrd.8
--- ypserv-2.32/rpc.ypxfrd/rpc.ypxfrd.8.manfix 2013-04-10 10:30:53.000000000 +0200
+++ ypserv-2.32/rpc.ypxfrd/rpc.ypxfrd.8 2013-11-18 09:47:11.982160697 +0100
@@ -47,6 +47,16 @@ could be started by inetd\. But since it
\fBypserv\fR
from
@ -59,10 +59,10 @@ diff -up ./rpc.ypxfrd/rpc.ypxfrd.8.manfix ./rpc.ypxfrd/rpc.ypxfrd.8
.SH "SEE ALSO"
.PP
diff -up ./ypserv/ypserv.8.manfix ./ypserv/ypserv.8
--- ./ypserv/ypserv.8.manfix 2013-04-10 10:30:53.000000000 +0200
+++ ./ypserv/ypserv.8 2013-05-06 18:32:35.705525551 +0200
@@ -56,6 +56,14 @@ may or may not be running on the same no
diff -up ypserv-2.32/ypserv/ypserv.8.manfix ypserv-2.32/ypserv/ypserv.8
--- ypserv-2.32/ypserv/ypserv.8.manfix 2013-11-06 13:56:25.000000000 +0100
+++ ypserv-2.32/ypserv/ypserv.8 2013-11-18 09:47:11.983160700 +0100
@@ -65,6 +65,14 @@ may or may not be running on the same no
\fBypserv\fR
parses the file
/etc/ypserv\&.conf\&.
@ -76,8 +76,8 @@ diff -up ./ypserv/ypserv.8.manfix ./ypserv/ypserv.8
+\fB/etc/sysconfig/network\&.\fR
.SH "OPTIONS"
.PP
\fB\-d\fR, \fB\-\-debug
@@ -149,6 +157,12 @@ configuration file\&.
\fB\-d\fR, \fB\-\-debug \fR[\fIpath\fR]
@@ -151,6 +159,12 @@ configuration file\&.
which hosts are allowed to contact
\fBypserv\fR\&.
.RE

10
ypserv-2.5-nfsnobody2.patch
View File

@ -1,9 +1,9 @@
diff -up ./scripts/ypMakefile.in.nfsnobody2 ./scripts/ypMakefile.in
--- ./scripts/ypMakefile.in.nfsnobody2 2013-05-06 18:28:38.558327612 +0200
+++ ./scripts/ypMakefile.in 2013-05-06 18:30:46.772434725 +0200
diff -up ypserv-2.32/scripts/ypMakefile.in.nfsnobody ypserv-2.32/scripts/ypMakefile.in
--- ypserv-2.32/scripts/ypMakefile.in.nfsnobody 2013-11-18 09:19:58.092797179 +0100
+++ ypserv-2.32/scripts/ypMakefile.in 2013-11-18 09:20:39.885790669 +0100
@@ -40,6 +40,11 @@ YPPUSH_ARGS =
MINUID=500
MINGID=500
MINUID=$(shell TMP=`egrep '^UID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^UID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000)
MINGID=$(shell TMP=`egrep '^GID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^GID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000)
+# Don't export this uid/guid (nfsnobody).
+# Set to 0 if you want to

28
ypserv-minuid.patch
View File

@ -1,28 +0,0 @@
MINUID and MINGID should match the values UID_MIN and GID_MIN in
/etc/login.defs to be consistent and to not distribute uids and gids
used by the linux system.
However, we can't simply change values to 1000 since on upgraded systems
that keep using UIDs 501+ and haven't changed /var/yp/Makefile, the Makefile
would actually be updated and UIDs lower than 1000 won't be included in maps.
Thus, we will read MINUID and MINGID values from /etc/login.defs
RHBZ#1004090
diff -up ypserv-2.31/scripts/ypMakefile.in.minuid ypserv-2.31/scripts/ypMakefile.in
--- ypserv-2.31/scripts/ypMakefile.in.minuid 2013-09-04 13:29:12.294945130 +0200
+++ ypserv-2.31/scripts/ypMakefile.in 2013-09-04 13:31:07.308820321 +0200
@@ -37,8 +37,10 @@ YPPUSH_ARGS =
# the passwd file. If no entry is found, this shadow entry is
# ignored.
# MINGID is the lowest gid that will be included in the group maps.
-MINUID=500
-MINGID=500
+# You can either set values directly (e.g. MINUID=1000) or pick up
+# current values from /etc/login.defs
+MINUID=$(shell TMP=`egrep '^UID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^UID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000)
+MINGID=$(shell TMP=`egrep '^GID_MIN\s+[0-9]+' /etc/login.defs|sed -e 's/^GID_MIN//'` ; [ -n "$$TMP" ] && echo "$$TMP" || echo 1000)
# Don't export this uid/guid (nfsnobody).
# Set to 0 if you want to

23
ypserv-tcopenfail.patch
View File

@ -1,23 +0,0 @@
When tcbdbopen fails to open a database file wrong pointer is returned
instead of NULL pointer.
Patch by Edgar Hoch
RHBZ#1004110
--- ypserv-2.31/lib/yp_db.c.orig 2013-04-10 16:42:21.000000000 +0200
+++ ypserv-2.31/lib/yp_db.c 2013-09-04 02:38:04.515428554 +0200
@@ -181,6 +181,12 @@
}
else if (debug_flag)
log_msg ("\t\t->Returning OK!");
+ if ( !isok )
+ {
+ /* DB not successful opened. Close database object and set return value to NULL. */
+ tcbdbdel (dbp);
+ dbp = NULL;
+ }
}
else
{

11
ypserv.spec
View File

@ -3,8 +3,8 @@
Summary: The NIS (Network Information Service) server
Url: http://www.linux-nis.org/nis/ypserv/index.html
Name: ypserv
Version: 2.31
Release: 5%{?dist}
Version: 2.32
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2
@ -31,8 +31,6 @@ Patch7: ypserv-2.24-aliases.patch
Patch8: ypserv-2.27-confpost.patch
Patch9: ypserv-2.29-relro.patch
Patch10: ypserv-2.31-netgrprecur.patch
Patch11: ypserv-tcopenfail.patch
Patch12: ypserv-minuid.patch
BuildRequires: tokyocabinet-devel
BuildRequires: systemd
@ -68,8 +66,6 @@ machines.
%patch8 -p1 -b .confpost
%patch9 -p1 -b .relro
%patch10 -p1 -b .netgrprecur
%patch11 -p1 -b .tcopenfail
%patch12 -p1 -b .minuid
autoreconf
@ -226,6 +222,9 @@ fi
%{_includedir}/*/*
%changelog
* Mon Nov 18 2013 Honza Horak <hhorak@redhat.com> - 2.32-1
- Update to new upstream version 2.32
* Wed Sep 4 2013 Honza Horak <hhorak@redhat.com> - 2.31-5
- Return proper error code when map file opening did not succeeded
RHBZ#1004110