2 commits - client/rhel client/solaris rel-eng/packages
Miroslav Suchý
msuchy at fedoraproject.org
Sat Jun 16 11:40:02 UTC 2012
client/rhel/rhn-client-tools/rhn-client-tools.spec | 5 ++-
client/rhel/rhn-client-tools/src/bin/rhn_check.py | 13 ++++++++-
client/rhel/rhn-client-tools/src/up2date_client/rhncli.py | 13 +++++++++
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 14 ++++++++++
client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 14 ++++++++++
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 13 +++++++++
client/rhel/rhnlib/rhn/SSL.py | 13 +++++++++
client/solaris/rhnclient/rhn_check.py | 13 +++++++++
rel-eng/packages/rhn-client-tools | 2 -
9 files changed, 97 insertions(+), 3 deletions(-)
New commits:
commit 916bd816068805cc02b8dccede2987e1ccf90310
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Sat Jun 16 13:39:46 2012 +0200
Automatic commit of package [rhn-client-tools] release [1.8.7-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 41ebf16..c3ef05b 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.8.6
+Version: 1.8.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Sat Jun 16 2012 Miroslav Suchý 1.8.7-1
+- allow linking against openssl (msuchy at redhat.com)
+
* Fri Jun 15 2012 Miroslav Suchý <msuchy at redhat.com> 1.8.6-1
- on Debian use Debian logo
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 87782ee..796619b 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.8.6-1 client/rhel/rhn-client-tools/
+1.8.7-1 client/rhel/rhn-client-tools/
commit 9b930abf494222ccf4c086bb354db73950c15217
Author: Miroslav Suchý <msuchy at redhat.com>
Date: Sat Jun 16 13:38:47 2012 +0200
allow linking against openssl
http://people.gnome.org/~markmc/openssl-and-the-gpl.html
diff --git a/client/rhel/rhn-client-tools/src/bin/rhn_check.py b/client/rhel/rhn-client-tools/src/bin/rhn_check.py
index a0e4978..802b102 100755
--- a/client/rhel/rhn-client-tools/src/bin/rhn_check.py
+++ b/client/rhel/rhn-client-tools/src/bin/rhn_check.py
@@ -16,7 +16,18 @@
# granted to use or replicate Red Hat trademarks that are incorporated
# in this software or its documentation.
#
-
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
import os
import sys
import socket
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
index 2d120a6..d71a22a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhncli.py
@@ -17,6 +17,19 @@
# Adrian Likins <alikins at redhat.com>
# Preston Brown <pbrown at redhat.com>
# James Bowes <jbowes at redhat.com>
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
import sys
import os
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index b10908b..d3059fd 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -12,6 +12,20 @@
# granted to use or replicate Red Hat trademarks that are incorporated
# in this software or its documentation.
#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
+
+
# this is a module containing classes for the registration related windows in
# gui.py. The code is split up so we can reuse it in the firstboot modules
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
index 7fe173f..a9c7186 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
@@ -16,6 +16,20 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
# 02110-1301 USA
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
+
import rpcServer
import up2dateErrors
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index ae5bdc8..f55e190 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -6,6 +6,19 @@
# Adrian Likins <alikins at redhat.com
# Cristian Gafton <gafton at redhat.com>
#
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
import up2dateLog
import gettext
diff --git a/client/rhel/rhnlib/rhn/SSL.py b/client/rhel/rhnlib/rhn/SSL.py
index 3cfbebc..1eaedb2 100644
--- a/client/rhel/rhnlib/rhn/SSL.py
+++ b/client/rhel/rhnlib/rhn/SSL.py
@@ -4,6 +4,19 @@
# Copyright (c) 2002--2010 Red Hat, Inc.
#
# Author: Mihai Ibanescu <misa at redhat.com>
+#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
# $Id$
diff --git a/client/solaris/rhnclient/rhn_check.py b/client/solaris/rhnclient/rhn_check.py
index d8fbe73..10a88fb 100755
--- a/client/solaris/rhnclient/rhn_check.py
+++ b/client/solaris/rhnclient/rhn_check.py
@@ -8,6 +8,19 @@
# Preston Brown <pbrown at redhat.com>
# Adrian Likins <alikins at redhat.com>
#
+# In addition, as a special exception, the copyright holders give
+# permission to link the code of portions of this program with the
+# OpenSSL library under certain conditions as described in each
+# individual source file, and distribute linked combinations
+# including the two.
+# You must obey the GNU General Public License in all respects
+# for all of the code used other than OpenSSL. If you modify
+# file(s) with this exception, you may extend this exception to your
+# version of the file(s), but you are not obligated to do so. If you
+# do not wish to do so, delete this exception statement from your
+# version. If you delete this exception statement from all source
+# files in the program, then also delete it here.
+#
# $Id: rhn_check.py,v 1.11 2004/12/07 17:09:10 misa Exp $
import os
More information about the spacewalk-commits
mailing list