Compare commits
No commits in common. "c8" and "c10s" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
SOURCES/v4.1.tar.gz
|
|
@ -1 +0,0 @@
|
|||||||
2778d0a8d83c2bffe443541fc25bf359dfe5c777 SOURCES/v4.1.tar.gz
|
|
3
README.md
Normal file
3
README.md
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Package Not Available
|
||||||
|
This package is not available on CentOS Stream 10.
|
||||||
|
It may be available on another branch.
|
@ -1,30 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
#
|
|
||||||
# Author: Honza Horak <hhorak@redhat.com>
|
|
||||||
# Date: 2011/11/25
|
|
||||||
# Package: ypserv
|
|
||||||
#
|
|
||||||
# This script is part of ypserv package.
|
|
||||||
# We need to pass all environment variables set in /etc/sysconfig/yppasswdd
|
|
||||||
# to rpc.yppasswdd daemon, but only if they are not empty. However, this
|
|
||||||
# simple logic is not supported by systemd.
|
|
||||||
# This script wraps the main binary, prepares YPPASSWDD_ARGS variable
|
|
||||||
# to include all necessary variables (ETCDIR, PASSWDFILE and SHADOWFILE)
|
|
||||||
# and passes this variable to daemon.
|
|
||||||
# The script ensures, that the rpc.yppasswdd arguments are not used in case
|
|
||||||
# the appropriate environment variables are empty.
|
|
||||||
|
|
||||||
if [ "$ETCDIR" ]; then
|
|
||||||
YPPASSWDD_ARGS="$YPPASSWDD_ARGS -D $ETCDIR"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$PASSWDFILE" ]; then
|
|
||||||
YPPASSWDD_ARGS="$YPPASSWDD_ARGS -p $PASSWDFILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$SHADOWFILE" ]; then
|
|
||||||
YPPASSWDD_ARGS="$YPPASSWDD_ARGS -s $SHADOWFILE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exec /usr/sbin/rpc.yppasswdd -f $YPPASSWDD_ARGS
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
#
|
|
||||||
# yppasswdd-pre-setdomain
|
|
||||||
#
|
|
||||||
# description: This is part of former ypserv init script, which is used
|
|
||||||
# to setup proper domainname before starting yppasswdd daemon
|
|
||||||
# itself. If $NISDOMAIN is not defined, it fails.
|
|
||||||
#
|
|
||||||
|
|
||||||
DOMAINNAME=`domainname`
|
|
||||||
if [ "$DOMAINNAME" = "(none)" -o "$DOMAINNAME" = "" ]; then
|
|
||||||
echo -n $"Setting NIS domain: "
|
|
||||||
if [ -n "$NISDOMAIN" ]; then
|
|
||||||
domainname $NISDOMAIN
|
|
||||||
echo $"'$NISDOMAIN' (environment variable)"
|
|
||||||
else # no domainname found
|
|
||||||
logger -t yppasswdd $"domain not found"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=NIS/YP (Network Information Service) Users Passwords Change Server
|
|
||||||
Requires=rpcbind.service
|
|
||||||
After=syslog.target network.target rpcbind.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=notify
|
|
||||||
NotifyAccess=all
|
|
||||||
EnvironmentFile=-/etc/sysconfig/network
|
|
||||||
EnvironmentFile=-/etc/sysconfig/yppasswdd
|
|
||||||
ExecStartPre=/usr/libexec/yppasswdd-pre-setdomain
|
|
||||||
ExecStart=/usr/libexec/rpc.yppasswdd.env
|
|
||||||
PrivateTmp=true
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
@ -1,22 +0,0 @@
|
|||||||
diff -up ./scripts/ypMakefile.in.nonedomain ./scripts/ypMakefile.in
|
|
||||||
--- ./scripts/ypMakefile.in.nonedomain 2013-05-06 18:30:46.772434725 +0200
|
|
||||||
+++ ./scripts/ypMakefile.in 2013-05-06 18:31:59.429495323 +0200
|
|
||||||
@@ -106,10 +106,18 @@ NETMASKS = $(YPSRCDIR)/netmasks
|
|
||||||
YPSERVERS = $(YPDIR)/ypservers # List of all NIS slave servers
|
|
||||||
|
|
||||||
target: Makefile
|
|
||||||
+ifeq ($(shell /bin/domainname), (none))
|
|
||||||
+ @echo "Domain name cannot be (none)"
|
|
||||||
+else
|
|
||||||
+ifeq ($(shell /bin/domainname), )
|
|
||||||
+ @echo "Domain name must be set"
|
|
||||||
+else
|
|
||||||
@test ! -d $(LOCALDOMAIN) && mkdir $(LOCALDOMAIN) ; \
|
|
||||||
cd $(LOCALDOMAIN) ; \
|
|
||||||
$(NOPUSH) || $(MAKE) -f ../Makefile ypservers; \
|
|
||||||
$(MAKE) -f ../Makefile all
|
|
||||||
+endif
|
|
||||||
+endif
|
|
||||||
|
|
||||||
# If you don't want some of these maps built, feel free to comment
|
|
||||||
# them out from this list.
|
|
@ -1,11 +0,0 @@
|
|||||||
diff -up ./ypxfr/ypxfr.c.ypxfr-zeroresp ./ypxfr/ypxfr.c
|
|
||||||
--- ./ypxfr/ypxfr.c.ypxfr-zeroresp 2013-04-10 16:43:21.000000000 +0200
|
|
||||||
+++ ./ypxfr/ypxfr.c 2013-05-06 18:31:36.875476520 +0200
|
|
||||||
@@ -415,6 +415,7 @@ ypxfr (char *map, char *source_host, cha
|
|
||||||
time_t masterOrderNum;
|
|
||||||
int result;
|
|
||||||
|
|
||||||
+ memset(&resp_val, '\0', sizeof(resp_val));
|
|
||||||
/* Name of the map file */
|
|
||||||
if (strlen (path_ypdb) + strlen (target_domain) + strlen (map) + 3 < MAXPATHLEN)
|
|
||||||
sprintf (dbName_orig, "%s/%s/%s", path_ypdb, target_domain, map);
|
|
@ -1,15 +0,0 @@
|
|||||||
diff -up ./etc/ypserv.conf.slp-warning ./etc/ypserv.conf
|
|
||||||
--- ./etc/ypserv.conf.slp-warning 2006-10-12 13:03:32.000000000 +0200
|
|
||||||
+++ ./etc/ypserv.conf 2013-05-06 18:32:16.581509617 +0200
|
|
||||||
@@ -13,9 +13,9 @@
|
|
||||||
|
|
||||||
# Should we register ypserv with SLP? Only available if SLP support
|
|
||||||
# is compiled in. Deprecated functionality.
|
|
||||||
-slp: no
|
|
||||||
+# slp: no
|
|
||||||
# After how many seconds we should re-register ypserv with SLP?
|
|
||||||
-slp_timeout: 3600
|
|
||||||
+# slp_timeout: 3600
|
|
||||||
|
|
||||||
# xfr requests are only allowed from ports < 1024
|
|
||||||
xfr_check_port: yes
|
|
@ -1,12 +0,0 @@
|
|||||||
diff -up ypserv-2.26/scripts/Makefile.am.path ypserv-2.26/scripts/Makefile.am
|
|
||||||
--- ypserv-2.26/scripts/Makefile.am.path 2012-01-12 15:46:16.868219281 +0100
|
|
||||||
+++ ypserv-2.26/scripts/Makefile.am 2012-01-12 15:46:34.786218054 +0100
|
|
||||||
@@ -8,7 +8,7 @@ CLEANFILES = *~ ${SCRIPTS}
|
|
||||||
|
|
||||||
EXTRA_DIST = ${MANS} ${XMLS}
|
|
||||||
|
|
||||||
-varypdir = /var/yp
|
|
||||||
+varypdir = $(prefix)/../var/yp
|
|
||||||
|
|
||||||
man_MANS = pwupdate.8 ypinit.8
|
|
||||||
XMLS = pwupdate.8.xml ypinit.8.xml
|
|
@ -1,34 +0,0 @@
|
|||||||
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],
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT($ac_cv___attribute__)
|
|
||||||
])
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+dnl
|
|
||||||
+dnl Find where aliases file is located
|
|
||||||
+dnl It can be in /etc/aliases or /etc/mail/aliases
|
|
||||||
+dnl If file path is specified in argument and file path exists, it is used.
|
|
||||||
+dnl
|
|
||||||
+AC_DEFUN([FIND_ALIASES_PATH], [
|
|
||||||
+AC_MSG_CHECKING(for aliases file path)
|
|
||||||
+tmp_aliases="$1"
|
|
||||||
+test -f /etc/mail/aliases && tmp_aliases="/etc/mail/aliases"
|
|
||||||
+test -f /etc/aliases && tmp_aliases="/etc/aliases"
|
|
||||||
+AC_MSG_RESULT($tmp_aliases)
|
|
||||||
+AC_SUBST(ALIASES, $tmp_aliases)
|
|
||||||
+])
|
|
||||||
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)
|
|
||||||
|
|
||||||
dnl Check for aliases path
|
|
||||||
-AC_PATH_PROG(ALIASES, aliases, /etc/mail/aliases, /etc/mail:/etc)
|
|
||||||
+FIND_ALIASES_PATH(/etc/aliases)
|
|
||||||
|
|
||||||
dnl Should we use a gethostbyname after gethostname to use FQDN ? default yes
|
|
||||||
AC_ARG_ENABLE(fqdn, AS_HELP_STRING([--disable-fqdn],
|
|
@ -1,64 +0,0 @@
|
|||||||
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
|
|
||||||
\fB/etc/init\.d/ypxfrd\fR\.
|
|
||||||
+
|
|
||||||
+It is possible to pass
|
|
||||||
+\fBOPTIONS\fR
|
|
||||||
+to
|
|
||||||
+\fBrpc.ypxfrd\fR
|
|
||||||
+using the environment variable
|
|
||||||
+YPXFRD_ARGS
|
|
||||||
+and this variable can be set in
|
|
||||||
+\fB/etc/sysconfig/network\&.\fR
|
|
||||||
+
|
|
||||||
.SH "OPTIONS"
|
|
||||||
.PP
|
|
||||||
\fB\-\-debug\fR
|
|
||||||
@@ -114,6 +124,12 @@ Configuration file for options and acces
|
|
||||||
.RS 4
|
|
||||||
Configuration file for access rights
|
|
||||||
.RE
|
|
||||||
+.PP
|
|
||||||
+\fI/etc/sysconfig/network\fR
|
|
||||||
+.RS 4
|
|
||||||
+Setting additional arguments to
|
|
||||||
+\fBrpc\.ypxfrd\fR\&.
|
|
||||||
+.RE
|
|
||||||
.SH "SEE ALSO"
|
|
||||||
.PP
|
|
||||||
|
|
||||||
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\&.
|
|
||||||
+It is also possible to pass
|
|
||||||
+\fBOPTIONS\fR
|
|
||||||
+to
|
|
||||||
+\fBypserv\fR
|
|
||||||
+using the environment variable
|
|
||||||
+YPSERV_ARGS
|
|
||||||
+and this variable can be set in
|
|
||||||
+\fB/etc/sysconfig/network\&.\fR
|
|
||||||
.SH "OPTIONS"
|
|
||||||
.PP
|
|
||||||
\fB\-d\fR, \fB\-\-debug \fR[\fIpath\fR]
|
|
||||||
@@ -151,6 +159,12 @@ configuration file\&.
|
|
||||||
which hosts are allowed to contact
|
|
||||||
\fBypserv\fR\&.
|
|
||||||
.RE
|
|
||||||
+.PP
|
|
||||||
+/etc/sysconfig/network
|
|
||||||
+.RS 4
|
|
||||||
+setting additional arguments to
|
|
||||||
+\fBypserv\fR\&.
|
|
||||||
+.RE
|
|
||||||
.SH "SEE ALSO"
|
|
||||||
.PP
|
|
||||||
\fBdomainname\fR(1),
|
|
@ -1,17 +0,0 @@
|
|||||||
diff -up ./conf_post.h.confpost ./conf_post.h
|
|
||||||
--- ./conf_post.h.confpost 2012-04-17 15:47:28.000000000 +0200
|
|
||||||
+++ ./conf_post.h 2013-05-06 18:34:54.274640856 +0200
|
|
||||||
@@ -8,3 +8,13 @@
|
|
||||||
#define HAVE_COMPAT_LIBGDBM
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
|
|
||||||
+ * libraries gdbm and qdbm have same symbol names. */
|
|
||||||
+#undef HAVE_COMPAT_LIBGDBM
|
|
||||||
+#ifdef HAVE_LIBGDBM
|
|
||||||
+#define HAVE_COMPAT_LIBGDBM
|
|
||||||
+#endif
|
|
||||||
+#ifdef HAVE_LIBQDBM
|
|
||||||
+#define HAVE_COMPAT_LIBGDBM
|
|
||||||
+#endif
|
|
||||||
+
|
|
@ -1,48 +0,0 @@
|
|||||||
diff -up ./rpc.yppasswdd/Makefile.am.relro ./rpc.yppasswdd/Makefile.am
|
|
||||||
--- ./rpc.yppasswdd/Makefile.am.relro 2013-04-11 11:25:34.000000000 +0200
|
|
||||||
+++ ./rpc.yppasswdd/Makefile.am 2013-05-06 18:48:10.888711995 +0200
|
|
||||||
@@ -24,6 +24,8 @@ sbin_PROGRAMS = rpc.yppasswdd
|
|
||||||
|
|
||||||
rpc_yppasswdd_SOURCES = update.c yppasswd_xdr.c yppasswdd.c
|
|
||||||
|
|
||||||
+rpc_yppasswdd_LDFLAGS = -Wl,-z,relro,-z,now
|
|
||||||
+
|
|
||||||
rpc_yppasswdd_LDADD = @PIE_LDFLAGS@ $(top_builddir)/lib/libyp.a $(LIBDBM) $(LIBCRYPT) $(LIBSYSTEMD_DAEMON)
|
|
||||||
rpc_yppasswdd_CFLAGS = @PIE_CFLAGS@
|
|
||||||
|
|
||||||
diff -up ./rpc.ypxfrd/Makefile.am.relro ./rpc.ypxfrd/Makefile.am
|
|
||||||
--- ./rpc.ypxfrd/Makefile.am.relro 2013-04-09 16:38:20.000000000 +0200
|
|
||||||
+++ ./rpc.ypxfrd/Makefile.am 2013-05-06 18:46:36.455683217 +0200
|
|
||||||
@@ -22,6 +22,8 @@ sbin_PROGRAMS = rpc.ypxfrd
|
|
||||||
|
|
||||||
rpc_ypxfrd_SOURCES = ypxfrd.c ypxfrd_server.c ypxfrd_svc.c
|
|
||||||
|
|
||||||
+rpc_ypxfrd_LDFLAGS = -Wl,-z,relro,-z,now
|
|
||||||
+
|
|
||||||
rpc_ypxfrd_LDADD = @PIE_LDFLAGS@ $(top_builddir)/lib/libyp.a @LIBDBM@ $(LIBSYSTEMD_DAEMON)
|
|
||||||
rpc_ypxfrd_CFLAGS = @PIE_CFLAGS@
|
|
||||||
|
|
||||||
diff -up ./yppush/Makefile.am.relro ./yppush/Makefile.am
|
|
||||||
--- ./yppush/Makefile.am.relro 2009-04-02 14:15:35.000000000 +0200
|
|
||||||
+++ ./yppush/Makefile.am 2013-05-06 18:46:36.456683217 +0200
|
|
||||||
@@ -21,6 +21,8 @@ sbin_PROGRAMS = yppush
|
|
||||||
|
|
||||||
yppush_SOURCES = yppush.c
|
|
||||||
|
|
||||||
+yppush_LDFLAGS = -Wl,-z,relro,-z,now
|
|
||||||
+
|
|
||||||
yppush_LDADD = @PIE_LDFLAGS@ @LIBDBM@ $(top_builddir)/lib/libyp.a
|
|
||||||
yppush_CFLAGS = @PIE_CFLAGS@
|
|
||||||
|
|
||||||
diff -up ./ypserv/Makefile.am.relro ./ypserv/Makefile.am
|
|
||||||
--- ./ypserv/Makefile.am.relro 2013-04-09 16:38:20.000000000 +0200
|
|
||||||
+++ ./ypserv/Makefile.am 2013-05-06 18:46:36.457683217 +0200
|
|
||||||
@@ -22,6 +22,8 @@ sbin_PROGRAMS = ypserv
|
|
||||||
|
|
||||||
ypserv_SOURCES = ypserv.c server.c ypserv_xdr.c reg_slp.c
|
|
||||||
|
|
||||||
+ypserv_LDFLAGS = -Wl,-z,relro,-z,now
|
|
||||||
+
|
|
||||||
ypserv_LDADD = @PIE_LDFLAGS@ $(top_builddir)/lib/libyp.a @LIBDBM@ @LIBSLP@ $(LIBSYSTEMD_DAEMON)
|
|
||||||
ypserv_CFLAGS = @PIE_CFLAGS@
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
|||||||
Upstream didn't accepted this patch and only replied that user should fix
|
|
||||||
the configuration. Since we believe that even if configuration is wrong,
|
|
||||||
program (especially daemon) shouldn't crash with segfault, we rather fix
|
|
||||||
this on our own to print a nice error when level of recursion exceeds 128.
|
|
||||||
|
|
||||||
diff -up ypserv-2.31/revnetgroup/getnetgrent.c.recursive ypserv-2.31/revnetgroup/getnetgrent.c
|
|
||||||
--- ypserv-2.31/revnetgroup/getnetgrent.c.recursive 2013-05-17 12:37:08.143675080 +0200
|
|
||||||
+++ ypserv-2.31/revnetgroup/getnetgrent.c 2013-05-17 14:20:49.376566354 +0200
|
|
||||||
@@ -31,6 +31,8 @@
|
|
||||||
|
|
||||||
#include "hash.h"
|
|
||||||
|
|
||||||
+#define NETGROUPENTRY_RECURSION_LIMIT 128
|
|
||||||
+
|
|
||||||
extern hash_t *input;
|
|
||||||
|
|
||||||
void rev_setnetgrent (const char *);
|
|
||||||
@@ -53,7 +55,7 @@ struct netgrlist
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
-static void rev_expand_netgroupentry (const char *, struct netgrlist *);
|
|
||||||
+static void rev_expand_netgroupentry (const char *, struct netgrlist *, int level);
|
|
||||||
static void rev_parse_entry (char *, char *, struct netgrlist *);
|
|
||||||
static void rev_netgr_free (struct netgrlist *);
|
|
||||||
static struct netgrlist list = {0, 0, NULL};
|
|
||||||
@@ -83,7 +85,7 @@ rev_setnetgrent (const char *netgr)
|
|
||||||
{
|
|
||||||
rev_endnetgrent ();
|
|
||||||
netgroup = strdup (netgr);
|
|
||||||
- rev_expand_netgroupentry (netgr, &list);
|
|
||||||
+ rev_expand_netgroupentry (netgr, &list, 0);
|
|
||||||
}
|
|
||||||
first = 1;
|
|
||||||
}
|
|
||||||
@@ -141,7 +143,7 @@ rev_netgr_free (struct netgrlist *list)
|
|
||||||
}
|
|
||||||
|
|
||||||
static void
|
|
||||||
-rev_expand_netgroupentry (const char *netgr, struct netgrlist *list)
|
|
||||||
+rev_expand_netgroupentry (const char *netgr, struct netgrlist *list, int level)
|
|
||||||
{
|
|
||||||
char *outval = NULL;
|
|
||||||
char *outptr = NULL;
|
|
||||||
@@ -156,6 +158,14 @@ rev_expand_netgroupentry (const char *ne
|
|
||||||
if (outptr == NULL)
|
|
||||||
return;
|
|
||||||
|
|
||||||
+ /* check the recursion - return if we exceed the recursion limit */
|
|
||||||
+ if (level >= NETGROUPENTRY_RECURSION_LIMIT)
|
|
||||||
+ {
|
|
||||||
+ fprintf (stderr, "WARNING: level of recursion in netgroup %s reached"
|
|
||||||
+ "%d, entry ignored\n", netgr, NETGROUPENTRY_RECURSION_LIMIT);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* make a copy to work with */
|
|
||||||
outval = strdup (outptr);
|
|
||||||
if (outval == NULL)
|
|
||||||
@@ -198,7 +208,7 @@ rev_expand_netgroupentry (const char *ne
|
|
||||||
*end = '\0';
|
|
||||||
|
|
||||||
/* recursion */
|
|
||||||
- rev_expand_netgroupentry (start, list);
|
|
||||||
+ rev_expand_netgroupentry (start, list, level+1);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* skip to the next entry */
|
|
@ -1,16 +0,0 @@
|
|||||||
diff -up ypserv-2.32.1/configure.ac.systemdso ypserv-2.32.1/configure.ac
|
|
||||||
--- ypserv-2.32.1/configure.ac.systemdso 2014-08-12 15:44:02.069991624 +0200
|
|
||||||
+++ ypserv-2.32.1/configure.ac 2014-08-12 15:46:20.086669886 +0200
|
|
||||||
@@ -272,10 +272,10 @@ fi
|
|
||||||
|
|
||||||
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
|
|
@ -1,96 +0,0 @@
|
|||||||
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=$(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
|
|
||||||
+NFSNOBODYUID=65534
|
|
||||||
+NFSNOBODYGID=65534
|
|
||||||
+
|
|
||||||
# Should we merge the passwd file with the shadow file ?
|
|
||||||
# MERGE_PASSWD=true|false
|
|
||||||
MERGE_PASSWD=true
|
|
||||||
@@ -294,7 +299,7 @@ passwd.byname: $(PASSWD) $(SHADOW) $(YPD
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
$(MERGER) -p $(PASSWD) $(SHADOW) | \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \
|
|
||||||
print $$1"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
|
|
||||||
-o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
@@ -303,7 +308,7 @@ passwd.byuid: $(PASSWD) $(SHADOW) $(YPDI
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
$(MERGER) -p $(PASSWD) $(SHADOW) | \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \
|
|
||||||
print $$3"\t"$$0 }' | $(DBLOAD) -i $(PASSWD) \
|
|
||||||
-o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
@@ -317,7 +322,7 @@ else
|
|
||||||
passwd.byname: $(PASSWD) $(YPDIR)/Makefile
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \
|
|
||||||
print $$1"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
|
|
||||||
-o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
@@ -325,7 +330,7 @@ passwd.byname: $(PASSWD) $(YPDIR)/Makefi
|
|
||||||
passwd.byuid: $(PASSWD) $(YPDIR)/Makefile
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINUID) && $$3 != $(NFSNOBODYUID) ) \
|
|
||||||
print $$3"\t"$$0 }' $(PASSWD) | $(DBLOAD) -i $(PASSWD) \
|
|
||||||
-o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
@@ -334,7 +339,7 @@ shadow.byname: $(SHADOW) $(YPDIR)/Makefi
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
$(AWK) -F: '{ if (FILENAME ~ /shadow$$/) { \
|
|
||||||
- if (UID[$$1] >= $(MINUID) ) print $$1"\t"$$0; \
|
|
||||||
+ if (UID[$$1] >= $(MINUID) && UID[$$1] != $(NFSNOBODYUID)) print $$1"\t"$$0; \
|
|
||||||
} else UID[$$1] = $$3; }' $(PASSWD) $(SHADOW) \
|
|
||||||
| $(DBLOAD) -s -i $(SHADOW) -o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
@@ -353,7 +358,7 @@ group.byname: $(GROUP) $(GSHADOW) $(YPDI
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
$(MERGER) -g $(GROUP) $(GSHADOW) | \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \
|
|
||||||
print $$1"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
|
|
||||||
@@ -361,7 +366,7 @@ group.bygid: $(GROUP) $(GSHADOW) $(YPDIR
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
$(MERGER) -g $(GROUP) $(GSHADOW) | \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \
|
|
||||||
print $$3"\t"$$0 }' | $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
|
|
||||||
@@ -370,7 +375,7 @@ else
|
|
||||||
group.byname: $(GROUP) $(YPDIR)/Makefile
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \
|
|
||||||
print $$1"\t"$$0 }' $(GROUP) \
|
|
||||||
| $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
||||||
@@ -378,7 +383,7 @@ group.byname: $(GROUP) $(YPDIR)/Makefile
|
|
||||||
group.bygid: $(GROUP) $(YPDIR)/Makefile
|
|
||||||
@echo "Updating $@..."
|
|
||||||
@$(UMASK); \
|
|
||||||
- $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) ) \
|
|
||||||
+ $(AWK) -F: '!/^[-+#]/ { if ($$1 != "" && $$3 >= $(MINGID) && $$3 != $(NFSNOBODYGID) ) \
|
|
||||||
print $$3"\t"$$0 }' $(GROUP) \
|
|
||||||
| $(DBLOAD) -i $(GROUP) -o $(YPMAPDIR)/$@ - $@
|
|
||||||
-@$(NOPUSH) || $(YPPUSH) -d $(DOMAIN) $@
|
|
@ -1,13 +0,0 @@
|
|||||||
--- ./scripts/ypMakefile.in.redhat 2017-03-31 16:43:23.318556329 +0200
|
|
||||||
+++ ./scripts/ypMakefile.in 2017-03-31 16:49:27.917561370 +0200
|
|
||||||
@@ -107,8 +107,8 @@ target: Makefile
|
|
||||||
# If you don't want some of these maps built, feel free to comment
|
|
||||||
# them out from this list.
|
|
||||||
|
|
||||||
-all: passwd group hosts rpc services netid protocols netgrp mail \
|
|
||||||
- shadow publickey # networks ethers bootparams printcap \
|
|
||||||
+all: passwd group hosts rpc services netid protocols mail \
|
|
||||||
+ # netgrp shadow publickey networks ethers bootparams printcap \
|
|
||||||
# amd.home autofs passwd.adjunct \
|
|
||||||
# timezone locale netmasks
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
|||||||
--- makedbm/makedbm.c.headers 2017-02-21 13:57:23.933293831 +0100
|
|
||||||
+++ makedbm/makedbm.c 2017-02-21 13:57:48.141286207 +0100
|
|
||||||
@@ -30,6 +30,7 @@
|
|
||||||
#include <netdb.h>
|
|
||||||
#include <rpc/rpc.h>
|
|
||||||
#include <rpcsvc/yp_prot.h>
|
|
||||||
+#include "yp.h"
|
|
||||||
|
|
||||||
#if defined (__NetBSD__) || (defined(__GLIBC__) && (__GLIBC__ == 2 && __GLIBC_MINOR__ == 0))
|
|
||||||
/* <rpc/rpc.h> is missing the prototype */
|
|
@ -1,14 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=NIS/YP (Network Information Service) Server
|
|
||||||
Requires=rpcbind.service
|
|
||||||
After=syslog.target network.target rpcbind.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
Type=notify
|
|
||||||
NotifyAccess=all
|
|
||||||
EnvironmentFile=-/etc/sysconfig/network
|
|
||||||
ExecStart=/usr/sbin/ypserv -f $YPSERV_ARGS
|
|
||||||
PrivateTmp=true
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
|||||||
|
ypserv package is retired on branch c10s for CS-2551
|
Loading…
Reference in New Issue
Block a user