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

Remove no longer needed relro patch 

Fix man pages
This commit is contained in:
Matej Muzila 2018-06-11 16:44:44 +02:00
parent 03c560c6e3
commit 0dd26c67ed
5 changed files with 78 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ypserv-2.21-path.patch
View File

@ -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

64
ypserv-2.24-manfix.patch
View File

@ -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),

48
ypserv-2.29-relro.patch
View File

@ -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@

65
ypserv-4.0-manfix.patch Normal file
View File

@ -0,0 +1,65 @@
diff -up ypserv-5bfba760283060087aefeb417342bcc66d349b2e/rpc.ypxfrd/rpc.ypxfrd.8.xml.manfix ypserv-5bfba760283060087aefeb417342bcc66d349b2e/rpc.ypxfrd/rpc.ypxfrd.8.xml
--- ypserv-5bfba760283060087aefeb417342bcc66d349b2e/rpc.ypxfrd/rpc.ypxfrd.8.xml.manfix 2018-06-11 14:52:20.441724121 +0200
+++ ypserv-5bfba760283060087aefeb417342bcc66d349b2e/rpc.ypxfrd/rpc.ypxfrd.8.xml 2018-06-11 15:07:10.266529912 +0200
@@ -58,6 +58,12 @@
since it starts very slowly, it should be started after
<command>ypserv</command> from <command>/etc/init.d/ypxfrd</command>.
</para>
+ <para>
+ It is possible to pass <emphasis remap='B'>OPTIONS</emphasis> to
+ <command>rpc.ypxfrd</command> using the environment variable
+ YPXFRD_ARGS and this variable can be set in
+ <filename>/etc/sysconfig/network</filename>.
+ </para>
</refsect1>
<refsect1 id='options'>
@@ -155,6 +161,14 @@
<para>Configuration file for access rights</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><filename>/etc/sysconfig/network</filename></term>
+ <listitem>
+ <para>
+ Setting additional arguments to <command>rpc.ypxfrd</command>
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
diff -up ypserv-5bfba760283060087aefeb417342bcc66d349b2e/ypserv/ypserv.8.xml.manfix ypserv-5bfba760283060087aefeb417342bcc66d349b2e/ypserv/ypserv.8.xml
--- ypserv-5bfba760283060087aefeb417342bcc66d349b2e/ypserv/ypserv.8.xml.manfix 2018-06-11 15:08:05.639332959 +0200
+++ ypserv-5bfba760283060087aefeb417342bcc66d349b2e/ypserv/ypserv.8.xml 2018-06-11 15:12:38.261286488 +0200
@@ -61,7 +61,16 @@ but must be running somewhere
on the network. On startup
<emphasis remap='B'>ypserv</emphasis>
parses the file
-<filename>/etc/ypserv.conf.</filename></para>
+<filename>/etc/ypserv.conf.</filename>
+It is also possible to pass
+<emphasis remap='B'>OPTIONS</emphasis>
+to
+<command>ypserv</command>
+using the environment variable
+YPSERV_ARGS
+and this variable can be set in
+<filename>/etc/sysconfig/network</filename>.
+</para>
</refsect1>
@@ -184,6 +193,12 @@ for a map.</para>
<para>which hosts are allowed to contact <command>ypserv</command>.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><filename>/etc/sysconfig/network</filename></term>
+ <listitem>
+<para>setting additional arguments to <command>ypserv</command>.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>

20
ypserv.spec
View File

@ -7,7 +7,7 @@ Summary: The NIS (Network Information Service) server
Url: http://www.linux-nis.org/nis/ypserv/index.html
Name: ypserv
Version: 4.0
Release: 6.20170331git%{shortcommit0}%{?dist}
Release: 7.20170331git%{shortcommit0}%{?dist}
License: GPLv2
Group: System Environment/Daemons
#Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2
@ -28,15 +28,13 @@ Requires(preun): systemd
Requires(postun): systemd
Patch0: ypserv-2.5-redhat.patch
Patch1: ypserv-2.21-path.patch
Patch2: ypserv-2.5-nfsnobody2.patch
Patch3: ypserv-2.13-ypxfr-zeroresp.patch
Patch4: ypserv-2.13-nonedomain.patch
Patch5: ypserv-2.19-slp-warning.patch
Patch6: ypserv-2.24-manfix.patch
Patch6: ypserv-4.0-manfix.patch
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-2.32-systemdso.patch
Patch12: ypserv-4.0-headers.patch
@ -72,20 +70,24 @@ machines.
%setup -n %{name}-%{commit0}
%patch0 -p1 -b .redhat
#%patch1 -p1 -b .path
%patch2 -p1 -b .nfsnobody
%patch3 -p1 -b .respzero
%patch4 -p1 -b .nonedomain
%patch5 -p1 -b .slp-warning
#%patch6 -p1 -b .manfix
%patch6 -p1 -b .manfix
%patch7 -p1 -b .aliases
%patch8 -p1 -b .confpost
#%patch9 -p1 -b .relro
%patch10 -p1 -b .netgrprecur
#%patch11 -p1 -b .systemdso
%patch12 -b .headers
%patch13 -p1 -b .oldaddr
# Delete generated man pages. They will be generated later from source.
rm makedbm/makedbm.8
rm mknetid/mknetid.8
rm etc/netgroup.5
rm etc/ypserv.conf.5
autoreconf -i
%build
@ -246,6 +248,10 @@ fi
%{_includedir}/rpcsvc
%changelog
* Mon Jun 11 2018 Matej Mužila <mmuzila@redhat.com> - 4.0-7.20170331git5bfba76
- Remove no longer needed relro patch
- Fix man pages
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.0-6.20170331git5bfba76
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild