|
 |
b0d085 |
diff --git a/Makefile.rhnsd b/Makefile.rhnsd
|
|
|
b0d085 |
index 080f907..4d51b8e 100644
|
|
|
b0d085 |
--- a/Makefile.rhnsd
|
|
|
b0d085 |
+++ b/Makefile.rhnsd
|
|
|
b0d085 |
@@ -46,7 +46,7 @@ install:: all $(DIRS)
|
|
|
b0d085 |
$(INSTALL_DATA) $(RHNSD).sysconfig $(CONFIG_DIR)/$(RHNSD)
|
|
|
b0d085 |
|
|
|
b0d085 |
$(RHNSD): $(RHNSD).o
|
|
|
b0d085 |
- $(CC) -o $@ $<
|
|
|
b0d085 |
+ $(CC) $(CFLAGS) -o $@ $<
|
|
|
b0d085 |
%.o : %.c
|
|
|
b0d085 |
$(CC) -DVERSION=\"$(VERSION)\" -fPIC $(CFLAGS) -c -o $@ $<
|
|
|
b0d085 |
|
|
|
b0d085 |
diff --git a/rhnsd.init b/rhnsd.init
|
|
|
b0d085 |
index ac5fe89..ee3e811 100644
|
|
|
b0d085 |
--- a/rhnsd.init
|
|
|
b0d085 |
+++ b/rhnsd.init
|
|
|
b0d085 |
@@ -37,15 +37,6 @@ RHNSD=/usr/sbin/rhnsd
|
|
|
b0d085 |
|
|
|
b0d085 |
# Sanity checks.
|
|
|
b0d085 |
[ -x $RHNSD ] || exit 6
|
|
|
b0d085 |
-RHN_UP2DATE_FILE="/etc/sysconfig/rhn/up2date"
|
|
|
b0d085 |
-[ -f $RHN_UP2DATE_FILE ] || exit 6
|
|
|
b0d085 |
-if [ -r $RHN_UP2DATE_FILE ]; then
|
|
|
b0d085 |
- RHN_SYSTEMID_FILE=`awk -F '=[[:space:]]*' '/^[[:space:]]*systemIdPath[[:space:]]*=/ {print $2}' $RHN_UP2DATE_FILE`
|
|
|
b0d085 |
- [ -f $RHN_SYSTEMID_FILE ] || exit 6
|
|
|
b0d085 |
-elif [ "$1" != "status" ]; then
|
|
|
b0d085 |
- echo "Insufficient privilege. Cannot open file $RHN_UP2DATE_FILE for reading."
|
|
|
b0d085 |
- exit 4
|
|
|
b0d085 |
-fi
|
|
|
b0d085 |
|
|
|
b0d085 |
# Source function library.
|
|
|
b0d085 |
. /etc/rc.d/init.d/functions
|
|
|
b0d085 |
diff --git a/rhnsd.init.SUSE b/rhnsd.init.SUSE
|
|
|
b0d085 |
index d310523..d96e764 100644
|
|
|
b0d085 |
--- a/rhnsd.init.SUSE
|
|
|
b0d085 |
+++ b/rhnsd.init.SUSE
|
|
|
b0d085 |
@@ -38,15 +38,6 @@ RHNSD_PIDFILE=/var/run/rhnsd.pid
|
|
|
b0d085 |
|
|
|
b0d085 |
# Sanity checks.
|
|
|
b0d085 |
[ -x $RHNSD ] || exit 6
|
|
|
b0d085 |
-RHN_UP2DATE_FILE="/etc/sysconfig/rhn/up2date"
|
|
|
b0d085 |
-[ -f $RHN_UP2DATE_FILE ] || exit 6
|
|
|
b0d085 |
-if [ -r $RHN_UP2DATE_FILE ]; then
|
|
|
b0d085 |
- RHN_SYSTEMID_FILE=`awk -F '=[[:space:]]*' '/^[[:space:]]*systemIdPath[[:space:]]*=/ {print $2}' $RHN_UP2DATE_FILE`
|
|
|
b0d085 |
- [ -f $RHN_SYSTEMID_FILE ] || exit 6
|
|
|
b0d085 |
-elif [ "$1" != "status" ]; then
|
|
|
b0d085 |
- echo "Insufficient privilege. Cannot open file $RHN_UP2DATE_FILE for reading."
|
|
|
b0d085 |
- exit 4
|
|
|
b0d085 |
-fi
|
|
|
b0d085 |
|
|
|
b0d085 |
# Source function library.
|
|
|
b0d085 |
. /etc/rc.status
|
|
|
b0d085 |
diff --git a/rhnsd.spec b/rhnsd.spec
|
|
|
b0d085 |
index f39abb6..89bde9d 100644
|
|
|
b0d085 |
--- a/rhnsd.spec
|
|
|
b0d085 |
+++ b/rhnsd.spec
|
|
|
b0d085 |
@@ -5,7 +5,7 @@ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.
|
|
|
b0d085 |
URL: https://fedorahosted.org/spacewalk
|
|
|
b0d085 |
Name: rhnsd
|
|
|
b0d085 |
Version: 5.0.13
|
|
|
b0d085 |
-Release: 1%{?dist}
|
|
|
b0d085 |
+Release: 2%{?dist}
|
|
|
b0d085 |
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|
|
b0d085 |
|
|
|
b0d085 |
BuildRequires: gettext
|
|
|
b0d085 |
@@ -46,7 +46,7 @@ your machine, and runs any actions.
|
|
|
b0d085 |
%setup -q
|
|
|
b0d085 |
|
|
|
b0d085 |
%build
|
|
|
b0d085 |
-make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}"
|
|
|
b0d085 |
+make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="-pie -fPIE -Wl,-z,relro,-z,now %{optflags}"
|
|
|
b0d085 |
|
|
|
b0d085 |
%install
|
|
|
b0d085 |
rm -rf $RPM_BUILD_ROOT
|
|
|
b0d085 |
@@ -138,6 +138,11 @@ rm -fr $RPM_BUILD_ROOT
|
|
|
b0d085 |
%doc LICENSE
|
|
|
b0d085 |
|
|
|
b0d085 |
%changelog
|
|
|
b0d085 |
+* Wed Jun 24 2015 Grant Gainey 5.0.13-2
|
|
|
b0d085 |
+- Resolves: #1138939 - up2date and systemid files are managed by rhnsd itself,
|
|
|
b0d085 |
+ no need to break init script if they do not exist (jdobes@redhat.com)
|
|
|
b0d085 |
+- Resolves: #1092518 - PIE+RELRO for rhnsd (mkollar@redhat.com)
|
|
|
b0d085 |
+
|
|
|
b0d085 |
* Mon Jun 17 2013 Michael Mraka <michael.mraka@redhat.com> 5.0.13-1
|
|
|
b0d085 |
- removed old CVS/SVN version ids
|
|
|
b0d085 |
|