diff --git a/SOURCES/rhnsd-5.0.13-1-to-rhnsd-5.0.13-2-el7.patch b/SOURCES/rhnsd-5.0.13-1-to-rhnsd-5.0.13-2-el7.patch new file mode 100644 index 0000000..750606f --- /dev/null +++ b/SOURCES/rhnsd-5.0.13-1-to-rhnsd-5.0.13-2-el7.patch @@ -0,0 +1,87 @@ +diff --git a/Makefile.rhnsd b/Makefile.rhnsd +index 080f907..4d51b8e 100644 +--- a/Makefile.rhnsd ++++ b/Makefile.rhnsd +@@ -46,7 +46,7 @@ install:: all $(DIRS) + $(INSTALL_DATA) $(RHNSD).sysconfig $(CONFIG_DIR)/$(RHNSD) + + $(RHNSD): $(RHNSD).o +- $(CC) -o $@ $< ++ $(CC) $(CFLAGS) -o $@ $< + %.o : %.c + $(CC) -DVERSION=\"$(VERSION)\" -fPIC $(CFLAGS) -c -o $@ $< + +diff --git a/rhnsd.init b/rhnsd.init +index ac5fe89..ee3e811 100644 +--- a/rhnsd.init ++++ b/rhnsd.init +@@ -37,15 +37,6 @@ RHNSD=/usr/sbin/rhnsd + + # Sanity checks. + [ -x $RHNSD ] || exit 6 +-RHN_UP2DATE_FILE="/etc/sysconfig/rhn/up2date" +-[ -f $RHN_UP2DATE_FILE ] || exit 6 +-if [ -r $RHN_UP2DATE_FILE ]; then +- RHN_SYSTEMID_FILE=`awk -F '=[[:space:]]*' '/^[[:space:]]*systemIdPath[[:space:]]*=/ {print $2}' $RHN_UP2DATE_FILE` +- [ -f $RHN_SYSTEMID_FILE ] || exit 6 +-elif [ "$1" != "status" ]; then +- echo "Insufficient privilege. Cannot open file $RHN_UP2DATE_FILE for reading." +- exit 4 +-fi + + # Source function library. + . /etc/rc.d/init.d/functions +diff --git a/rhnsd.init.SUSE b/rhnsd.init.SUSE +index d310523..d96e764 100644 +--- a/rhnsd.init.SUSE ++++ b/rhnsd.init.SUSE +@@ -38,15 +38,6 @@ RHNSD_PIDFILE=/var/run/rhnsd.pid + + # Sanity checks. + [ -x $RHNSD ] || exit 6 +-RHN_UP2DATE_FILE="/etc/sysconfig/rhn/up2date" +-[ -f $RHN_UP2DATE_FILE ] || exit 6 +-if [ -r $RHN_UP2DATE_FILE ]; then +- RHN_SYSTEMID_FILE=`awk -F '=[[:space:]]*' '/^[[:space:]]*systemIdPath[[:space:]]*=/ {print $2}' $RHN_UP2DATE_FILE` +- [ -f $RHN_SYSTEMID_FILE ] || exit 6 +-elif [ "$1" != "status" ]; then +- echo "Insufficient privilege. Cannot open file $RHN_UP2DATE_FILE for reading." +- exit 4 +-fi + + # Source function library. + . /etc/rc.status +diff --git a/rhnsd.spec b/rhnsd.spec +index f39abb6..89bde9d 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: 1%{?dist} ++Release: 2%{?dist} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: gettext +@@ -46,7 +46,7 @@ your machine, and runs any actions. + %setup -q + + %build +-make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}" ++make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="-pie -fPIE -Wl,-z,relro,-z,now %{optflags}" + + %install + rm -rf $RPM_BUILD_ROOT +@@ -138,6 +138,11 @@ rm -fr $RPM_BUILD_ROOT + %doc LICENSE + + %changelog ++* Wed Jun 24 2015 Grant Gainey 5.0.13-2 ++- Resolves: #1138939 - up2date and systemid files are managed by rhnsd itself, ++ no need to break init script if they do not exist (jdobes@redhat.com) ++- Resolves: #1092518 - PIE+RELRO for rhnsd (mkollar@redhat.com) ++ + * Mon Jun 17 2013 Michael Mraka 5.0.13-1 + - removed old CVS/SVN version ids + diff --git a/SOURCES/rhnsd-5.0.13-2-el7-to-rhnsd-5.0.13-3-el7.patch b/SOURCES/rhnsd-5.0.13-2-el7-to-rhnsd-5.0.13-3-el7.patch new file mode 100644 index 0000000..9940eb4 --- /dev/null +++ b/SOURCES/rhnsd-5.0.13-2-el7-to-rhnsd-5.0.13-3-el7.patch @@ -0,0 +1,23 @@ +diff --git a/rhnsd.spec b/rhnsd.spec +index 89bde9d..9a3cf87 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: 2%{?dist} ++Release: 3%{?dist} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: gettext +@@ -138,6 +138,9 @@ rm -fr $RPM_BUILD_ROOT + %doc LICENSE + + %changelog ++* Wed Jun 24 2015 Grant Gainey 5.0.13-3 ++- ++ + * Wed Jun 24 2015 Grant Gainey 5.0.13-2 + - Resolves: #1138939 - up2date and systemid files are managed by rhnsd itself, + no need to break init script if they do not exist (jdobes@redhat.com) diff --git a/SOURCES/rhnsd-5.0.13-3-el7-to-rhnsd-5.0.13-4-el7.patch b/SOURCES/rhnsd-5.0.13-3-el7-to-rhnsd-5.0.13-4-el7.patch new file mode 100644 index 0000000..cde83c3 --- /dev/null +++ b/SOURCES/rhnsd-5.0.13-3-el7-to-rhnsd-5.0.13-4-el7.patch @@ -0,0 +1,24 @@ +diff --git a/rhnsd.spec b/rhnsd.spec +index 9a3cf87..e925d39 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: 3%{?dist} ++Release: 4%{?dist} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: gettext +@@ -138,8 +138,8 @@ rm -fr $RPM_BUILD_ROOT + %doc LICENSE + + %changelog +-* Wed Jun 24 2015 Grant Gainey 5.0.13-3 +-- ++* Thu Jun 25 2015 Grant Gainey 5.0.13-4 ++- Bump release to get past weirdness in brew-tags (ggainey@redhat.com) + + * Wed Jun 24 2015 Grant Gainey 5.0.13-2 + - Resolves: #1138939 - up2date and systemid files are managed by rhnsd itself, diff --git a/SOURCES/rhnsd-5.0.13-4-el7-to-rhnsd-5.0.13-5-el7.patch b/SOURCES/rhnsd-5.0.13-4-el7-to-rhnsd-5.0.13-5-el7.patch new file mode 100644 index 0000000..6d9c75f --- /dev/null +++ b/SOURCES/rhnsd-5.0.13-4-el7-to-rhnsd-5.0.13-5-el7.patch @@ -0,0 +1,35 @@ +diff --git a/rhnsd.spec b/rhnsd.spec +index e925d39..ee6085f 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: 4%{?dist} ++Release: 5%{?dist} + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: gettext +@@ -138,10 +138,18 @@ rm -fr $RPM_BUILD_ROOT + %doc LICENSE + + %changelog +-* Thu Jun 25 2015 Grant Gainey 5.0.13-4 ++* Thu Jun 25 2015 Grant Gainey 5.0.13-5 + - Bump release to get past weirdness in brew-tags (ggainey@redhat.com) +- +-* Wed Jun 24 2015 Grant Gainey 5.0.13-2 ++- Related: #1138939 - up2date and systemid files are managed by rhnsd itself, ++ no need to break init script if they do not exist (jdobes@redhat.com) ++- Related: #1092518 - PIE+RELRO for rhnsd (mkollar@redhat.com) ++- Revert changes in order to clean up tagging issues with brew ++ (ggainey@redhat.com) ++- Automatic commit of package [rhnsd] minor release [5.0.13-4-el7]. ++ (ggainey@redhat.com) ++- Bump release to get past weirdness in brew-tags (ggainey@redhat.com) ++- Automatic commit of package [rhnsd] minor release [5.0.13-2-el7]. ++ (ggainey@redhat.com) + - Resolves: #1138939 - up2date and systemid files are managed by rhnsd itself, + no need to break init script if they do not exist (jdobes@redhat.com) + - Resolves: #1092518 - PIE+RELRO for rhnsd (mkollar@redhat.com) diff --git a/SPECS/rhnsd.spec b/SPECS/rhnsd.spec index ed01869..a635f2f 100644 --- a/SPECS/rhnsd.spec +++ b/SPECS/rhnsd.spec @@ -2,10 +2,14 @@ Summary: Spacewalk query daemon License: GPLv2 Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz +Patch0: rhnsd-5.0.13-1-to-rhnsd-5.0.13-2-el7.patch +Patch1: rhnsd-5.0.13-2-el7-to-rhnsd-5.0.13-3-el7.patch +Patch2: rhnsd-5.0.13-3-el7-to-rhnsd-5.0.13-4-el7.patch +Patch3: rhnsd-5.0.13-4-el7-to-rhnsd-5.0.13-5-el7.patch URL: https://fedorahosted.org/spacewalk Name: rhnsd Version: 5.0.13 -Release: 3%{?dist} +Release: 5%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gettext @@ -44,9 +48,13 @@ your machine, and runs any actions. %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build -make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="%{optflags}" +make -f Makefile.rhnsd %{?_smp_mflags} CFLAGS="-pie -fPIE -Wl,-z,relro,-z,now %{optflags}" %install rm -rf $RPM_BUILD_ROOT @@ -138,11 +146,21 @@ rm -fr $RPM_BUILD_ROOT %doc LICENSE %changelog -* Fri Jan 24 2014 Daniel Mach - 5.0.13-3 -- Mass rebuild 2014-01-24 - -* Fri Dec 27 2013 Daniel Mach - 5.0.13-2 -- Mass rebuild 2013-12-27 +* Thu Jun 25 2015 Grant Gainey 5.0.13-5 +- Bump release to get past weirdness in brew-tags (ggainey@redhat.com) +- Related: #1138939 - up2date and systemid files are managed by rhnsd itself, + no need to break init script if they do not exist (jdobes@redhat.com) +- Related: #1092518 - PIE+RELRO for rhnsd (mkollar@redhat.com) +- Revert changes in order to clean up tagging issues with brew + (ggainey@redhat.com) +- Automatic commit of package [rhnsd] minor release [5.0.13-4-el7]. + (ggainey@redhat.com) +- Bump release to get past weirdness in brew-tags (ggainey@redhat.com) +- Automatic commit of package [rhnsd] minor release [5.0.13-2-el7]. + (ggainey@redhat.com) +- Resolves: #1138939 - up2date and systemid files are managed by rhnsd itself, + no need to break init script if they do not exist (jdobes@redhat.com) +- Resolves: #1092518 - PIE+RELRO for rhnsd (mkollar@redhat.com) * Mon Jun 17 2013 Michael Mraka 5.0.13-1 - removed old CVS/SVN version ids