3 commits - backend/common client/rhel client/tools
by Michael Mraka
backend/common/test/unit-test/test_rhnCache.py | 18 --------------
client/rhel/rhnlib/rhn/SSL.py | 2 +
client/tools/rhncfg/config_client/rhncfgcli_elist.py | 24 ++++++++++++++-----
3 files changed, 20 insertions(+), 24 deletions(-)
New commits:
commit 044b2756a48c724e20ea0252e49599d6915bd025
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 20 11:58:08 2010 +0100
628846 - fixed symlink info
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_elist.py b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
index a88822f..6da4730 100755
--- a/client/tools/rhncfg/config_client/rhncfgcli_elist.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_elist.py
@@ -1,14 +1,19 @@
from config_common.rhn_log import log_debug, die
import handler_base, base64, stat
+FILETYPE2CHAR = {
+ 'file' : '-',
+ 'directory' : 'd',
+ 'symlink' : 'l',
+ 'chardev' : 'c',
+ 'blockdev' : 'b',
+}
+
class Handler(handler_base.HandlerBase):
def ostr_to_sym(self, octstr, ftype):
mode = int(str(octstr), 8)
- if ftype == 'directory':
- symstr = 'd'
- else:
- symstr = '-'
+ symstr = FILETYPE2CHAR.get(ftype, '?')
if mode & stat.S_IRUSR:
symstr += 'r'
@@ -100,7 +105,14 @@ class Handler(handler_base.HandlerBase):
# * indicates raw 'unencoded' size
fsize = '*' + str(len(finfo['file_contents']))
- permstr = finfo['filetype'] != 'symlink' and self.ostr_to_sym(finfo['filemode'], finfo['filetype']) or ''
- dest = finfo['filetype'] != 'symlink' and file[1] or "%s -> %s" % (file[1], finfo['symlink'])
+ if finfo['filetype'] == 'symlink':
+ permstr = self.ostr_to_sym('777', finfo['filetype'])
+ dest = "%s -> %s" % (file[1], finfo['symlink'])
+ fsize = str(len(finfo['symlink']))
+ finfo['username'] = 'root'
+ finfo['groupname'] = 'root'
+ else:
+ permstr = self.ostr_to_sym(finfo['filemode'], finfo['filetype']) or ''
+ dest = file[1]
print "%10s %8s %-8s %10s %+3s %*s %s" % (permstr, finfo['username'], finfo['groupname'], fsize, finfo['revision'], maxlen, file[0], dest)
commit dd9d94bc2c1a5dac2ff9a8de729cea82d6b93ec7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Nov 29 22:02:36 2010 +0100
removed no more valid test
fixing
E1123: 83:Tests.no_test_as_streams_1: Passing unexpected keyword argument 'stream' in function call
E1123: 86:Tests.no_test_as_streams_1: Passing unexpected keyword argument 'as_stream' in function call
diff --git a/backend/common/test/unit-test/test_rhnCache.py b/backend/common/test/unit-test/test_rhnCache.py
index fe7d38b..9faa4e3 100644
--- a/backend/common/test/unit-test/test_rhnCache.py
+++ b/backend/common/test/unit-test/test_rhnCache.py
@@ -72,24 +72,6 @@ class Tests(unittest.TestCase):
self.failIf(rhnCache.has_key(self.key, modified='20001122112233'))
self._cleanup(self.key)
- def no_test_as_streams_1(self):
- "Tests storing and retrieval as streams"
- t = tempfile.TemporaryFile()
- content = self.content * 100
- t.write(content)
- t.seek(0, 0)
-
- self._cleanup(self.key)
- rhnCache.set(self.key, None, raw=1, stream=t)
- self.failUnless(rhnCache.has_key(self.key))
-
- ss = rhnCache.get(self.key, as_stream=1)
- self.failUnless(hasattr(ss, "read"))
- content2 = ss.read()
-
- self.assertEquals(content, content2)
- self._cleanup(self.key)
-
def test_missing_1(self):
"Tests exceptions raised by the code"
self._cleanup(self.key)
commit a83e2686459ffebe102d6b8611e74cfca959faca
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 20 14:34:42 2010 +0100
put crypto back
diff --git a/client/rhel/rhnlib/rhn/SSL.py b/client/rhel/rhnlib/rhn/SSL.py
index d5ca7da..817ca3d 100644
--- a/client/rhel/rhnlib/rhn/SSL.py
+++ b/client/rhel/rhnlib/rhn/SSL.py
@@ -12,6 +12,8 @@ rhn.SSL builds an abstraction on top of the objects provided by pyOpenSSL
"""
from OpenSSL import SSL
+# SSL.crypto is provided to other modules
+from OpenSSL import crypto
import os
import socket
13 years, 5 months
Changes to 'refs/tags/rhnpush-5.5.11-1'
by Miroslav Suchý
Tag 'rhnpush-5.5.11-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-12-20 15:26 +0000
Tagging package [rhnpush] version [5.5.11-1] in directory [client/tools/rhnpush/].
Changes since rhnlib-2.5.30-1:
Miroslav Suchý (2):
648403 - do not call getPackageChecksumBySession directly
Automatic commit of package [rhnpush] release [5.5.11-1].
---
client/tools/rhnpush/rhnpush.py | 4 ++--
client/tools/rhnpush/rhnpush.spec | 6 +++++-
client/tools/rhnpush/uploadLib.py | 24 +++++++-----------------
rel-eng/packages/rhnpush | 2 +-
4 files changed, 15 insertions(+), 21 deletions(-)
---
13 years, 5 months
client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhnpush/rhnpush.spec | 5 ++++-
rel-eng/packages/rhnpush | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 21259bfcf522846aa7f5ae0462da88985e8c0fea
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Dec 20 16:26:17 2010 +0100
Automatic commit of package [rhnpush] release [5.5.11-1].
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index 553a655..62819ce 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -5,7 +5,7 @@ Summary: Common programs needed to be installed on the RHN servers/proxies
Group: Applications/System
License: GPLv2
URL: http://fedorahosted.org/spacewalk
-Version: 5.5.10
+Version: 5.5.11
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/solaris2mpm.8*
%changelog
+* Mon Dec 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 5.5.11-1
+- 648403 - do not call getPackageChecksumBySession directly
+
* Wed Dec 08 2010 Michael Mraka <michael.mraka(a)redhat.com> 5.5.10-1
- import Fault, ResponseError and ProtocolError directly from xmlrpclib
diff --git a/rel-eng/packages/rhnpush b/rel-eng/packages/rhnpush
index a141ee8..2a1f677 100644
--- a/rel-eng/packages/rhnpush
+++ b/rel-eng/packages/rhnpush
@@ -1 +1 @@
-5.5.10-1 client/tools/rhnpush/
+5.5.11-1 client/tools/rhnpush/
13 years, 5 months
client/tools
by Miroslav Suchý
client/tools/rhnpush/rhnpush.py | 4 ++--
client/tools/rhnpush/rhnpush.spec | 1 +
client/tools/rhnpush/uploadLib.py | 24 +++++++-----------------
3 files changed, 10 insertions(+), 19 deletions(-)
New commits:
commit 62a945eaee0360167baf5f7542678613319d5bd5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Dec 20 16:14:36 2010 +0100
648403 - do not call getPackageChecksumBySession directly
while we can use it to determine if the call is implemented, it will
cause traceback on target satellite. In this case:
Exception Handler Information
Traceback (most recent call last):
File "/usr/share/rhn/server/apacheRequest.py", line 118, in call_function
func = self.method_ref(method)
File "/usr/share/rhn/server/apacheRequest.py", line 439, in method_ref
raise UnknownXML("function: %s invalid" % (method,))
UnknownXML: Invalid request received (function: packages.getPackageChecksumBySession invalid).
We should rather use capabilities. However we could not travel back in time
and set some capability in past. But just two months before introducing call
getPackageChecksumBySession we created new capability xmlrpc.packages.extended_profile
in version 2. We can use it instead.
And you may ask why removing server from function arguments and instead creating
new one? Well... that is because that argument is type of up2date_client.rpcServer.RetryServer
while this new one server is of type up2date_client.rhnserver.RhnServer. That previous one
do not have capabilities defined and populated.
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index 5a74fd6..bb1c289 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -534,7 +534,7 @@ class UploadClass(uploadLib.UploadClass):
# computing checksum and other info is expensive process and session
# could have expired.Make sure its re-authenticated.
self.authenticate()
- if uploadLib.exists_getPackageChecksumBySession(self.server):
+ if uploadLib.exists_getPackageChecksumBySession():
checksum_data = uploadLib.getPackageChecksumBySession(self.server, self.session.getSessionString(), info)
else:
# old server only md5 capable
@@ -547,7 +547,7 @@ class UploadClass(uploadLib.UploadClass):
# computing checksum and other info is expensive process and session
# could have expired.Make sure its re-authenticated.
self.authenticate()
- if uploadLib.exists_getPackageChecksumBySession(self.server):
+ if uploadLib.exists_getPackageChecksumBySession():
checksum_data = uploadLib.getSourcePackageChecksumBySession(self.server, self.session.getSessionString(), info)
else:
# old server only md5 capable
diff --git a/client/tools/rhnpush/rhnpush.spec b/client/tools/rhnpush/rhnpush.spec
index c2dd5dd..553a655 100644
--- a/client/tools/rhnpush/rhnpush.spec
+++ b/client/tools/rhnpush/rhnpush.spec
@@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: rpm-python, rhnlib
Requires: spacewalk-backend-libs >= 0.8.3
+Requires: rhn-client-tools
BuildRequires: docbook-utils, gettext
Summary: Package uploader for the Red Hat Network Satellite Server
diff --git a/client/tools/rhnpush/uploadLib.py b/client/tools/rhnpush/uploadLib.py
index e43c174..78c04e6 100644
--- a/client/tools/rhnpush/uploadLib.py
+++ b/client/tools/rhnpush/uploadLib.py
@@ -24,6 +24,7 @@ import struct
import xmlrpclib
from spacewalk.common import rhn_mpm
from spacewalk.common.checksum import getFileChecksum
+from up2date_client import rhnserver
try:
from rhn import rpclib
@@ -709,24 +710,13 @@ def getServer(uri, proxy=None, username=None, password=None, ca_chain=None):
s.add_trusted_cert(ca_chain)
return s
-def exists_getPackageChecksumBySession(server):
+def exists_getPackageChecksumBySession():
""" check whether server supports getPackageChecksumBySession function"""
- ret = True
- try:
- raw_call(server.packages.getPackageChecksumBySession, '', {})
- except xmlrpclib.Fault, e:
- if e.faultCode in [-2, -33]:
- # Fault -33: session token is invalid
- # i.e. function exists but we supplied wrong data
- # Fault -2 session is unknown - expected when empty
- pass
- elif e.faultCode == -1:
- # Fault -1: function invalid
- ret = False
- else:
- # pass through anything else
- raise
- return ret
+ # unfortunatelly we do not have capability for getPackageChecksumBySession function,
+ # but extended_profile in version 2 has been created just 2 months before getPackageChecksumBySession
+ # lets use it instead
+ server = rhnserver.RhnServer()
+ return server.capabilities.hasCapability('xmlrpc.packages.extended_profile', 2)
# compare two package [n,v,r,e] tuples
def packageCompare(pkg1, pkg2, is_mpm=None):
13 years, 5 months
Changes to 'refs/tags/rhnlib-2.5.30-1'
by Miroslav Suchý
Tag 'rhnlib-2.5.30-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-12-20 13:22 +0000
Tagging package [rhnlib] version [2.5.30-1] in directory [client/rhel/rhnlib/].
Changes since spacewalk-branding-1.3.2-1:
Miroslav Suchý (3):
653163 - sort child channels
conflitcs with older versions
Automatic commit of package [rhnlib] release [2.5.30-1].
Tomas Lestach (1):
adding jpam spec to spec-tree
---
backend/satellite_tools/satsync.py | 2
client/rhel/rhnlib/rhnlib.spec | 12 +
rel-eng/packages/rhnlib | 2
spec-tree/jpam/bug219916_expired_password_hang.patch | 112 ++++++++++++++++
spec-tree/jpam/jpam-0.4-no_checkstyle.patch | 11 +
spec-tree/jpam/jpam-0.4-ppc.patch | 33 ++++
spec-tree/jpam/jpam-0.4-s390x.patch | 32 ++++
spec-tree/jpam/jpam.spec | 131 +++++++++++++++++++
8 files changed, 332 insertions(+), 3 deletions(-)
---
13 years, 5 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhnlib/rhnlib.spec | 12 +++++++++++-
rel-eng/packages/rhnlib | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit d64b6a07b8aa0f8f4d471fbe1bc68553ec1339ad
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Dec 20 14:22:12 2010 +0100
Automatic commit of package [rhnlib] release [2.5.30-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index e1af6a8..b4da1f5 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.29
+Version: 2.5.30
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Mon Dec 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 2.5.30-1
+- conflitcs with older versions
+
* Wed Nov 24 2010 Michael Mraka <michael.mraka(a)redhat.com> 2.5.29-1
- removed unused imports
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 39ec535..29d4f26 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.29-1 client/rhel/rhnlib/
+2.5.30-1 client/rhel/rhnlib/
commit 320ffb51b9011f2d0895746d2296875058437b5e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Dec 20 14:15:13 2010 +0100
conflitcs with older versions
we could not require new one, but do not allow to have old packages
on system. That will lead to traceback with error
rpclib has no object rhnFault.
This is due commits:
bc50966463f364e010fc9c09ef502b6eb7cf62b6 .. c4cbea5dd3d79eee887905c3388d4c36a145e1cf
and
c07a57afbbeb7c70b551a634a4dfdec50a1847a8
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 9c7722a..e1af6a8 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -17,6 +17,13 @@ BuildArch: noarch
BuildRequires: python-devel
Requires: pyOpenSSL
+Conflicts: rhncfg < 5.9.37
+Conflicts: spacewalk-proxy-installer < 1.3.2
+Conflicts: rhn-client-tools < 1.3.3
+Conflicts: rhn-custom-info < 5.4.7
+Conflicts: rhnpush < 5.5.10
+Conflicts: rhnclient < 0.10
+Conflicts: spacewalk-proxy < 1.3.6
%description
rhnlib is a collection of python modules used by the
13 years, 5 months
backend/satellite_tools
by Miroslav Suchý
backend/satellite_tools/satsync.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit ec7c3391503e8f2d00f3ecc81076c3a11645252c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Dec 20 11:46:06 2010 +0100
653163 - sort child channels
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index f825ca3..0db1594 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -770,7 +770,7 @@ Please contact your RHN representative""") % (generation, sat_cert.generation))
# No child channels, skip
continue
log(1, t_format % plabel)
- for clabel, ctimestamp in chns:
+ for clabel, ctimestamp in sorted(chns):
channel_object = self._channel_collection.get_channel(clabel,
ctimestamp)
self._printChannel(clabel, channel_object, p_format, (clabel in ch_requested_imported))
13 years, 5 months
spec-tree/jpam
by Tomas Lestach
spec-tree/jpam/bug219916_expired_password_hang.patch | 112 ++++++++++++++++
spec-tree/jpam/jpam-0.4-no_checkstyle.patch | 11 +
spec-tree/jpam/jpam-0.4-ppc.patch | 33 ++++
spec-tree/jpam/jpam-0.4-s390x.patch | 32 ++++
spec-tree/jpam/jpam.spec | 131 +++++++++++++++++++
5 files changed, 319 insertions(+)
New commits:
commit 1885864748021ef2b98f2d501016c5b92fe31b36
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Dec 17 17:53:59 2010 +0100
adding jpam spec to spec-tree
diff --git a/spec-tree/jpam/bug219916_expired_password_hang.patch b/spec-tree/jpam/bug219916_expired_password_hang.patch
new file mode 100644
index 0000000..b84f916
--- /dev/null
+++ b/spec-tree/jpam/bug219916_expired_password_hang.patch
@@ -0,0 +1,112 @@
+--- jpam-0.4/src/c/Pam.c.pam_conv 2006-12-15 14:31:54.000000000 +0100
++++ jpam-0.4/src/c/Pam.c 2006-12-18 17:55:33.000000000 +0100
+@@ -94,6 +94,11 @@
+ #define CS_SUCCESS 0
+ #define COPY_STRING(s) (s) ? strdup(s) : NULL
+
++/* Expected prompts on pam_authenticate / pam_conv */
++#define PASS_PROMPT_SECUREID "Enter PASSCODE: "
++#define PASS_PROMPT_DEFAULT "Password: "
++#define PASS_PROMPT_MACOSX "Password:"
++
+ /* DEFINE STATIC EXTERNAL STRUCTURES AND VARIABLES SO THAT
+ THEY ONLY HAVE SCOPE WITHIN THE METHODS AND FUNCTIONS OF
+ THIS SOURCE FILE */
+@@ -101,7 +106,7 @@ static const char* service_name;
+ static const char* username;
+ static const char* password;
+ static jboolean debug;
+-static int PAM_conv (int, const struct pam_message**,
++static int PAM_conv (int, struct pam_message**,
+ struct pam_response**, void*);
+ static struct pam_conv PAM_converse = {
+ // misc_conv,
+@@ -118,7 +123,7 @@ static void* libpam_misc;
+ ** PAM Conversation function **
+ *************************************************/
+
+-static int PAM_conv (int num_msg, const struct pam_message **msg,
++static int PAM_conv (int num_msg, struct pam_message **msg,
+ struct pam_response **resp, void *appdata_ptr) {
+ int replies = 0;
+ struct pam_response *reply = NULL;
+@@ -127,32 +132,62 @@ static int PAM_conv (int num_msg, const
+ reply = malloc(sizeof(struct pam_response) * num_msg);
+ if (!reply) return PAM_CONV_ERR;
+
+- for (replies = 0; replies < num_msg; replies++) {
+- if (debug) {
++ for (replies = 0; replies < num_msg; replies++)
++ {
++ if (debug) {
+ printf("***Message from PAM is: |%s|\n", msg[replies]->msg);
+ printf("***Msg_style to PAM is: |%d|\n", msg[replies]->msg_style);
+ }
+- //SecurId requires this syntax.
+- if (! strcmp(msg[replies]->msg,"Enter PASSCODE: ")) {
+- if (debug)
+- printf("***Sending password\n");
+- reply[replies].resp = COPY_STRING(password);
+- }
+- if (! strcmp(msg[replies]->msg,"Password: ")) {
+- if (debug)
+- printf("***Sending password\n");
+- reply[replies].resp = COPY_STRING(password);
+- }
+- //Mac OS X
+- if (! strcmp(msg[replies]->msg,"Password:")) {
+- if (debug)
+- printf("***Sending password\n");
+- reply[replies].resp = COPY_STRING(password);
++
++ switch (msg[replies]->msg_style) {
++ case PAM_ERROR_MSG:
++ if (debug)
++ printf("***Received PAM_ERROR_MESSAGE, modifying strings\n");
++ reply[replies].resp = strdup("\0");
++ msg[replies]->msg = strdup("\0");
++ break;
++
++ case PAM_TEXT_INFO:
++ if (debug)
++ printf("***Received PAM_TEXT_INFO, modifying strings\n");
++ reply[replies].resp = strdup("\0");
++ msg[replies]->msg = strdup("\0");
++ break;
++
++ /* jpam does not yet support password changing, we just copy password */
++ case PAM_PROMPT_ECHO_OFF:
++ case PAM_PROMPT_ECHO_ON:
++ /* Get a prompt, fill the password */
++ if ( (! strcmp(msg[replies]->msg, PASS_PROMPT_SECUREID)) ||
++ (! strcmp(msg[replies]->msg, PASS_PROMPT_DEFAULT)) ||
++ (! strcmp(msg[replies]->msg, PASS_PROMPT_MACOSX)) )
++ {
++ if (debug)
++ printf("***Sending password\n");
++ reply[replies].resp = COPY_STRING(password);
++ }
++ break;
++
++ /* XXX Not implemented yet. Just ignore.*/
++ case PAM_BINARY_PROMPT:
++ if (debug)
++ printf("***Received PAM_BINARY_PROMPT, not implemented yet, modifying strings\n");
++ reply[replies].resp = strdup("\0");
++ msg[replies]->msg = strdup("\0");
++ break;
++
++ default:
++ if (debug)
++ fprintf(stderr, "***erroneous conversation (%d)\n", msg[replies]->msg_style);
++ /* Fixme: Need to cleanup the message stack, first this needs testing. (jmp) */
++ reply[replies].resp = strdup("\0");
++ msg[replies]->msg = strdup("\0");
+ }
+ if (debug)
+ printf("***Response to PAM is: |%s|\n", reply[replies].resp);
+ }
+ *resp = reply;
++ reply = NULL;
+ return PAM_SUCCESS;
+ }
diff --git a/spec-tree/jpam/jpam-0.4-no_checkstyle.patch b/spec-tree/jpam/jpam-0.4-no_checkstyle.patch
new file mode 100644
index 0000000..5b79f8a
--- /dev/null
+++ b/spec-tree/jpam/jpam-0.4-no_checkstyle.patch
@@ -0,0 +1,11 @@
+diff -up ./build.xml ./build.xml
+--- ./build.xml 2005-04-23 15:00:42.000000000 +0200
++++ ./build.xml 2010-12-17 17:37:55.000000000 +0100
+@@ -27,7 +27,7 @@
+ <target name="build" depends="clean, test, dist" description="Builds a clean distribution"/>
+
+ <!-- compiles -->
+- <target name="compile" depends="checkstyle, compile-src, compile-tests" description="Performs a compile"/>
++ <target name="compile" depends="compile-src, compile-tests" description="Performs a compile"/>
+
+ <target name="shared-object" depends="compile, generate-c-headers" description="Creates the shared library">
diff --git a/spec-tree/jpam/jpam-0.4-ppc.patch b/spec-tree/jpam/jpam-0.4-ppc.patch
new file mode 100644
index 0000000..bcdf04a
--- /dev/null
+++ b/spec-tree/jpam/jpam-0.4-ppc.patch
@@ -0,0 +1,33 @@
+diff -Nur jpam-0.4-orig/Linux_ppc64.properties jpam-0.4/Linux_ppc64.properties
+--- jpam-0.4-orig/Linux_ppc64.properties 1969-12-31 18:00:00.000000000 -0600
++++ jpam-0.4/Linux_ppc64.properties 2009-02-28 01:06:32.459827294 -0600
+@@ -0,0 +1,4 @@
++shared.library.name=libjpam.so
++native.pam.library.path=/lib64
++native.java.library.path=${java.home}/lib/ppc64/server
++make.target=libjpam.ppc64
+diff -Nur jpam-0.4-orig/Linux_ppc.properties jpam-0.4/Linux_ppc.properties
+--- jpam-0.4-orig/Linux_ppc.properties 1969-12-31 18:00:00.000000000 -0600
++++ jpam-0.4/Linux_ppc.properties 2009-02-28 01:05:40.750818150 -0600
+@@ -0,0 +1,4 @@
++shared.library.name=libjpam.so
++native.pam.library.path=/lib
++native.java.library.path=${java.home}/lib/ppc/client
++make.target=libjpam.ppc
+diff -Nur jpam-0.4-orig/src/c/makefile jpam-0.4/src/c/makefile
+--- jpam-0.4-orig/src/c/makefile 2009-02-28 01:03:13.097064197 -0600
++++ jpam-0.4/src/c/makefile 2009-02-28 01:08:52.134068117 -0600
+@@ -67,3 +67,13 @@
+ libjpam.s390x: Pam.c
+ gcc -fPIC -Wall -g -c -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux Pam.c
+ gcc -g -shared -fPIC -o libjpam.so Pam.o -lpam -lpam_misc -ldl
++
++# Linux ppc
++libjpam.ppc: Pam.c
++ gcc -fPIC -Wall -g -c -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux Pam.c
++ gcc -g -shared -fPIC -o libjpam.so Pam.o -lpam -lpam_misc -ldl
++
++# Linux ppc64
++libjpam.ppc64: Pam.c
++ gcc -fPIC -Wall -g -c -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux Pam.c
++ gcc -g -shared -fPIC -o libjpam.so Pam.o -lpam -lpam_misc -ldl
diff --git a/spec-tree/jpam/jpam-0.4-s390x.patch b/spec-tree/jpam/jpam-0.4-s390x.patch
new file mode 100644
index 0000000..09a3b5b
--- /dev/null
+++ b/spec-tree/jpam/jpam-0.4-s390x.patch
@@ -0,0 +1,32 @@
+--- jpam-0.4/Linux_s390.properties.orig
++++ jpam-0.4/Linux_s390.properties
+@@ -0,0 +1,4 @@
++shared.library.name=libjpam.so
++native.pam.library.path=/lib
++native.java.library.path=${java.home}/lib/i386/client
++make.target=libjpam.s390
+
+--- jpam-0.4/Linux_s390x.properties.orig
++++ jpam-0.4/Linux_s390x.properties
+@@ -0,0 +1,4 @@
++shared.library.name=libjpam.so
++native.pam.library.path=/lib
++native.java.library.path=${java.home}/lib/i386/client
++make.target=libjpam.s390x
+
+--- jpam-0.4/src/c/makefile.orig
++++ jpam-0.4/src/c/makefile
+@@ -57,3 +57,13 @@
+ libjpam.mac_os_x: Pam.c
+ gcc -fPIC -Wall -g -c -I$(JAVA_HOME)/include Pam.c
+ gcc -g -export-dynamic -dynamiclib -Wl -o libjpam.jnilib Pam.o -lpam -lpam_misc -ldl -framework JavaVM
++
++# Linux s390
++libjpam.s390: Pam.c
++ gcc -fPIC -Wall -g -c -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux Pam.c
++ gcc -g -shared -fPIC -o libjpam.so Pam.o -lpam -lpam_misc -ldl
++
++# Linux s390x
++libjpam.s390x: Pam.c
++ gcc -fPIC -Wall -g -c -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux Pam.c
++ gcc -g -shared -fPIC -o libjpam.so Pam.o -lpam -lpam_misc -ldl
diff --git a/spec-tree/jpam/jpam.spec b/spec-tree/jpam/jpam.spec
new file mode 100644
index 0000000..297efad
--- /dev/null
+++ b/spec-tree/jpam/jpam.spec
@@ -0,0 +1,131 @@
+%define jpackage_run_jars antlr jakarta-commons-beanutils jakarta-commons-collections jakarta-commons-logging regexp
+%define jpackage_build_jars checkstyle junit
+%define jpackage_jars %jpackage_run_jars %jpackage_build_jars
+
+Summary: A JNI Wrapper for the Unix pam(8) subsystem and a JAAS bridge
+Name: jpam
+License: Apache Software License, v. 1.1
+Group: Application/Development
+URL: http://jpam.sourceforge.net/
+Source0: %{name}-%{version}-src.zip
+Patch0: bug219916_expired_password_hang.patch
+Patch1: %{name}-%{version}-s390x.patch
+Patch2: jpam-0.4-ppc.patch
+Patch3: jpam-0.4-no_checkstyle.patch
+Version: 0.4
+Release: 20%{?dist}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+Requires: %jpackage_run_jars
+BuildRequires: %jpackage_jars
+BuildRequires: gcc make
+BuildRequires: pam-devel
+BuildRequires: ant-nodeps
+BuildRequires: java-devel >= 1.6.0
+
+# ia64 doesnt have a new enough java.
+ExcludeArch: ia64
+
+%description
+JPam provides a class to access the Unix pam(8) subsystem from
+Java, and wraps it in a JAAS LoginModule
+
+%package javadoc
+Summary: Javadoc for %{name}
+Group: Development/Documentation
+
+%description javadoc
+Javadoc for %{name}.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
+rm -Rfv tools/*.jar
+build-jar-repository -p tools/ %jpackage_jars
+
+%build
+export JAVA_HOME=%{java_home}
+%ant shared-object dist-jar javadoc
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+# jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -m 644 build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+
+install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+install -m 644 src/dist/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+# FIXME: Sun's JDK does not search for libraries in /usr/lib, though
+# IBM's does. This specfile will work for users with the IBM JRE, but not
+# for users of Sun's JRE. Unfortunately, the two JRE's don't have a single
+# directory in java.library.path in common.
+install -D -m 755 build/gen-src/c/libjpam.so $RPM_BUILD_ROOT/usr/lib/libjpam.so
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr site/documentation/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+ rm -f %{_javadocdir}/%{name}
+fi
+
+%files
+%defattr(-,root,root,-)
+%{_javadir}/*
+/usr/lib/libjpam.so
+
+%doc
+%{_docdir}/*
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-%{version}
+
+%changelog
+* Fri Dec 17 2010 Tomas Lestach <tlestach(a)redhat.com> 0.4-20
+- disable checkstyle, since there's a problem with jpackage checkstyle
+
+* Thu May 07 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.4-19
+- package rebuild
+
+* Sat Feb 28 2009 Dennis Gilmore <dgilmore(a)redhat.com> - 0.4-18
+- rebuild to pick up all rhel arches exclude ia64
+- patch in ppc support
+
+* Wed Jan 28 2009 <dennis(a)ausil.us> 0.4-17
+- BR java-devel >= 1.6.0
+- remove version file
+
+* Sun Aug 26 2007 <bperkins(a)redhat.com> 0.4-11
+- Applying patch to allow building on Linux s390 and s390x.
+ Originally found by Brad Hinson <bhinson(a)redhat.com>
+
+* Wed Dec 20 2006 <jesusr(a)redhat.com> 0.4-9
+- Applying patch to fix a hang when pam password has expired.
+ Bugzilla: 219916
+
+* Mon Apr 18 2005 <dlutter(a)redhat.com> 0.4-1
+- Simplified packaging for version 0.4. libjpam.so is now
+ installed into /usr/lib. Set JAVA_HOME
+
+* Mon Apr 11 2005 <jesusr(a)redhat.com>
+- Changed the jvm location to /usr/lib/jvm/java-ibm/ since
+ using %{_libdir} causes libjpam to be placed in /usr/lib64
+ which doesn't work with the ibm java
+
+* Fri Apr 1 2005 <dlutter(a)redhat.com>
+- Initial build.
13 years, 5 months
Changes to 'refs/tags/spacewalk-branding-1.3.2-1'
by Michael Mraka
Tag 'spacewalk-branding-1.3.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2010-12-17 13:57 +0000
Tagging package [spacewalk-branding] version [1.3.2-1] in directory [branding/].
Changes since spacewalk-backend-1.3.29-1:
Michael Mraka (3):
fixed prototype-*.js reference
let import PXT modules on fly
Automatic commit of package [spacewalk-branding] release [1.3.2-1].
---
branding/spacewalk-branding.spec | 5 ++++-
branding/zz-spacewalk-branding.conf | 3 ---
rel-eng/packages/spacewalk-branding | 2 +-
web/html/errors/403.html | 2 +-
web/html/errors/404.html | 2 +-
web/html/errors/413.html | 2 +-
web/html/errors/500.html | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
---
13 years, 5 months
branding/spacewalk-branding.spec rel-eng/packages
by Michael Mraka
branding/spacewalk-branding.spec | 5 ++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit e84bcaefa0f6e36c389c6a1dc9165ecdd4c9271d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 17 14:57:42 2010 +0100
Automatic commit of package [spacewalk-branding] release [1.3.2-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index 6d8026b..b10f107 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -1,5 +1,5 @@
Name: spacewalk-branding
-Version: 1.3.1
+Version: 1.3.2
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Fri Dec 17 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.2-1
+- let import PXT modules on fly
+
* Thu Nov 25 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.1-1
- add GPLv2 license (msuchy(a)redhat.com)
- cleanup spec (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index ab8df36..ef0b113 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-1.3.1-1 branding/
+1.3.2-1 branding/
13 years, 5 months