[yum-rhn-plugin] Rebase to yum-rhn-plugin-2.1.7-1.fc20 in rawhide.

Miroslav Suchý msuchy at fedoraproject.org
Tue Mar 4 13:16:33 UTC 2014


commit 5fb363ac4f70235d8bf7cf4af5fec3bd75ffb843
Author: Miroslav Suchý <msuchy at redhat.com>
Date:   Tue Mar 4 14:10:18 2014 +0100

    Rebase to yum-rhn-plugin-2.1.7-1.fc20 in rawhide.

 .gitignore          |    1 +
 sources             |    2 +-
 yum-rhn-plugin.spec |   33 ++++++++++++++++++++++++++-------
 3 files changed, 28 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c74467..ce9315e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ yum-rhn-plugin-1.1.3.tar.gz
 /yum-rhn-plugin-1.8.8.tar.gz
 /yum-rhn-plugin-1.9.4.tar.gz
 /yum-rhn-plugin-2.0.1.tar.gz
+/yum-rhn-plugin-2.1.7.tar.gz
diff --git a/sources b/sources
index 9bd596d..80697a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-523035d6b63d4645621b991f15565865  yum-rhn-plugin-2.0.1.tar.gz
+da9135c888e23cf344a0215c59c8f401  yum-rhn-plugin-2.1.7.tar.gz
diff --git a/yum-rhn-plugin.spec b/yum-rhn-plugin.spec
index ddec8e8..efac3be 100644
--- a/yum-rhn-plugin.spec
+++ b/yum-rhn-plugin.spec
@@ -1,7 +1,7 @@
 Summary: Spacewalk support for yum
 Name: yum-rhn-plugin
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.1.7
+Release: 1%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -49,16 +49,16 @@ export pluginconf='/etc/yum/pluginconf.d/rhnplugin.conf'
 if [ $1 -gt 1 ] && [ -f /etc/sysconfig/rhn/systemid ] && [ -f "$pluginconf" ]; then
     if grep -q '^[[:space:]]*enabled[[:space:]]*=[[:space:]]*1[[:space:]]*$' \
        "$pluginconf"; then
-        touch /var/tmp/enable-yum-rhn-plugin
+        echo "1" > /etc/enable-yum-rhn-plugin
     fi
 fi
 
 %post
 # 682820 - re-enable yum-rhn-plugin after package upgrade if the system is already registered
 export pluginconf='/etc/yum/pluginconf.d/rhnplugin.conf'
-if [ $1 -gt 1 ] && [ -f "$pluginconf" ] && [ -f "/var/tmp/enable-yum-rhn-plugin" ]; then
+if [ $1 -gt 1 ] && [ -f "$pluginconf" ] && [ -f "/etc/enable-yum-rhn-plugin" ]; then
     sed -i '/\[main]/,/^$/{/enabled/s/0/1/}' "$pluginconf"
-    rm -f /var/tmp/enable-yum-rhn-plugin
+    rm -f /etc/enable-yum-rhn-plugin
 fi
 
 %files -f %{name}.lang
@@ -70,8 +70,27 @@ fi
 %doc LICENSE
 
 %changelog
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Fri Feb 14 2014 Matej Kollar <mkollar at redhat.com> 2.1.7-1
+- 1043850 - avoid insecure use of /var/tmp
+
+* Tue Jan 14 2014 Matej Kollar <mkollar at redhat.com> 2.1.6-1
+- Update .po and .pot files for yum-rhn-plugin.
+
+* Thu Oct 17 2013 Michael Mraka <michael.mraka at redhat.com> 2.1.5-1
+- 1018929 - removed redundant exception
+
+* Mon Sep 30 2013 Michael Mraka <michael.mraka at redhat.com> 2.1.4-1
+- removed trailing whitespaces
+
+* Mon Sep 09 2013 Stephen Herr <sherr at redhat.com> 2.1.3-1
+- 1006037 - keep yum-rhn-plugins higher default timeout
+
+* Tue Aug 13 2013 Stephen Herr <sherr at redhat.com> 2.1.2-1
+- 996761 - package profile sync actions should not fail with empty transaction
+
+* Tue Aug 06 2013 Tomas Kasparek <tkasparek at redhat.com> 2.1.1-1
+- Branding clean-up of proxy stuff in client dir
+- Bumping package versions for 2.1.
 
 * Wed Jul 17 2013 Tomas Kasparek <tkasparek at redhat.com> 2.0.1-1
 - Bumping package versions for 2.0.


More information about the scm-commits mailing list