From 2973afa12be5b9bc0805a55705dc8f911f72bb85 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 30 2017 13:45:29 +0000 Subject: import rhnsd-5.0.13-7.3.el7_4 --- diff --git a/SOURCES/rhnsd-5.0.13-7.1-el7-to-rhnsd-5.0.13-7.2-el7.patch b/SOURCES/rhnsd-5.0.13-7.1-el7-to-rhnsd-5.0.13-7.2-el7.patch new file mode 100644 index 0000000..cce3c73 --- /dev/null +++ b/SOURCES/rhnsd-5.0.13-7.1-el7-to-rhnsd-5.0.13-7.2-el7.patch @@ -0,0 +1,49 @@ +diff --git a/rhnsd.c b/rhnsd.c +index 493aac0..77cfeb3 100644 +--- a/rhnsd.c ++++ b/rhnsd.c +@@ -401,6 +401,10 @@ static int rhn_do_action(void) + + /* close the read end of the pipe */ + close(fds[0]); ++ ++ /* close syslog file descriptor */ ++ closelog(); ++ + /* redirect stdout */ + if (fds[1] != STDOUT_FILENO) { + dup2(fds[1], STDOUT_FILENO); +@@ -410,6 +414,9 @@ static int rhn_do_action(void) + /* make sure this child has a stderr */ + dup2(STDOUT_FILENO, STDERR_FILENO); + ++ /* open a new syslog connection for the child */ ++ openlog("rhnsd", LOG_CONS | LOG_ODELAY | LOG_PID, LOG_DAEMON); ++ + /* syslog for safekeeping */ + syslog(LOG_NOTICE, "running program %s with PID %d", RHN_CHECK, getpid()); + +diff --git a/rhnsd.spec b/rhnsd.spec +index 8ef3a39..b55ea15 100644 +--- a/rhnsd.spec ++++ b/rhnsd.spec +@@ -5,7 +5,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar. + URL: https://fedorahosted.org/spacewalk + Name: rhnsd + Version: 5.0.13 +-Release: 7.1%{?dist} ++Release: 7.2%{?dist} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: gettext +@@ -138,6 +138,10 @@ rm -fr $RPM_BUILD_ROOT + %doc LICENSE + + %changelog ++* Tue Oct 31 2017 Tomas Kasparek 5.0.13-7.2 ++- Resolves: #1506911 - close and reopen syslog when redirecting child output ++ (martin.matuska@axelspringer.de) ++ + * Tue Sep 12 2017 Gennadii Altukhov 5.0.13-7.1 + - Resolves: #1489119 - change permissions for rhnsd.pid (galt@redhat.com) + diff --git a/SOURCES/rhnsd-5.0.13-7.2-el7-to-rhnsd-5.0.13-7.3-el7.patch b/SOURCES/rhnsd-5.0.13-7.2-el7-to-rhnsd-5.0.13-7.3-el7.patch new file mode 100644 index 0000000..f58e492 --- /dev/null +++ b/SOURCES/rhnsd-5.0.13-7.2-el7-to-rhnsd-5.0.13-7.3-el7.patch @@ -0,0 +1,36 @@ +diff --git a/rhnsd.c b/rhnsd.c +index 77cfeb3..896b433 100644 +--- a/rhnsd.c ++++ b/rhnsd.c +@@ -176,7 +176,6 @@ int main (int argc, char **argv) + + if (setsid() < 0) + exit(EXIT_FAILURE); +- umask(0); + + chdir ("/"); + +diff --git a/rhnsd.spec b/rhnsd.spec +index b55ea15..c7ed440 100644 +--- a/rhnsd.spec ++++ b/rhnsd.spec +@@ -5,7 +5,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar. + URL: https://fedorahosted.org/spacewalk + Name: rhnsd + Version: 5.0.13 +-Release: 7.2%{?dist} ++Release: 7.3%{?dist} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: gettext +@@ -138,6 +138,10 @@ rm -fr $RPM_BUILD_ROOT + %doc LICENSE + + %changelog ++* Tue Oct 31 2017 Tomas Kasparek 5.0.13-7.3 ++- Resolves: #1506910 - umask(0) does not reset to default umask ++ (tkasparek@redhat.com) ++ + * Tue Oct 31 2017 Tomas Kasparek 5.0.13-7.2 + - Resolves: #1506911 - close and reopen syslog when redirecting child output + (martin.matuska@axelspringer.de) diff --git a/SPECS/rhnsd.spec b/SPECS/rhnsd.spec index 577b8f2..39907aa 100644 --- a/SPECS/rhnsd.spec +++ b/SPECS/rhnsd.spec @@ -8,10 +8,12 @@ Patch2: rhnsd-5.0.13-4-el7-to-rhnsd-5.0.13-5-el7.patch Patch3: rhnsd-5.0.13-5-el7-to-rhnsd-5.0.13-6-el7.patch Patch4: rhnsd-5.0.13-6-el7-to-rhnsd-5.0.13-7-el7.patch Patch5: rhnsd-5.0.13-7-el7-to-rhnsd-5.0.13-7.1-el7.patch +Patch6: rhnsd-5.0.13-7.1-el7-to-rhnsd-5.0.13-7.2-el7.patch +Patch7: rhnsd-5.0.13-7.2-el7-to-rhnsd-5.0.13-7.3-el7.patch URL: https://fedorahosted.org/spacewalk Name: rhnsd Version: 5.0.13 -Release: 7.1%{?dist} +Release: 7.3%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -56,6 +58,8 @@ your machine, and runs any actions. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="-pie -fPIE -Wl,-z,relro,-z,now %{optflags}" @@ -150,6 +154,14 @@ rm -fr $RPM_BUILD_ROOT %doc LICENSE %changelog +* Tue Oct 31 2017 Tomas Kasparek 5.0.13-7.3 +- Resolves: #1506910 - umask(0) does not reset to default umask + (tkasparek@redhat.com) + +* Tue Oct 31 2017 Tomas Kasparek 5.0.13-7.2 +- Resolves: #1506911 - close and reopen syslog when redirecting child output + (martin.matuska@axelspringer.de) + * Tue Sep 12 2017 Gennadii Altukhov 5.0.13-7.1 - Resolves: #1489119 - change permissions for rhnsd.pid (galt@redhat.com)