rpms/python-gnutls/devel python-gnutls--remove_srp.diff, NONE, 1.1 import.log, 1.1, 1.2 python-gnutls.spec, 1.1, 1.2

Peter Lemenkov peter at fedoraproject.org
Wed Jun 3 13:45:40 UTC 2009


Author: peter

Update of /cvs/pkgs/rpms/python-gnutls/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9692/devel

Modified Files:
	import.log python-gnutls.spec 
Added Files:
	python-gnutls--remove_srp.diff 
Log Message:
initial commit

python-gnutls--remove_srp.diff:

--- NEW FILE python-gnutls--remove_srp.diff ---
--- gnutls/library/functions.py~	2008-07-22 13:20:54.000000000 +0400
+++ gnutls/library/functions.py	2009-06-03 17:39:28.830344265 +0400
@@ -613,48 +613,6 @@
 gnutls_fingerprint = _libraries['libgnutls.so.26'].gnutls_fingerprint
 gnutls_fingerprint.restype = c_int
 gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)]
-gnutls_srp_free_client_credentials = _libraries['libgnutls.so.26'].gnutls_srp_free_client_credentials
-gnutls_srp_free_client_credentials.restype = None
-gnutls_srp_free_client_credentials.argtypes = [gnutls_srp_client_credentials_t]
-gnutls_srp_allocate_client_credentials = _libraries['libgnutls.so.26'].gnutls_srp_allocate_client_credentials
-gnutls_srp_allocate_client_credentials.restype = c_int
-gnutls_srp_allocate_client_credentials.argtypes = [POINTER(gnutls_srp_client_credentials_t)]
-gnutls_srp_set_client_credentials = _libraries['libgnutls.so.26'].gnutls_srp_set_client_credentials
-gnutls_srp_set_client_credentials.restype = c_int
-gnutls_srp_set_client_credentials.argtypes = [gnutls_srp_client_credentials_t, STRING, STRING]
-gnutls_srp_free_server_credentials = _libraries['libgnutls.so.26'].gnutls_srp_free_server_credentials
-gnutls_srp_free_server_credentials.restype = None
-gnutls_srp_free_server_credentials.argtypes = [gnutls_srp_server_credentials_t]
-gnutls_srp_allocate_server_credentials = _libraries['libgnutls.so.26'].gnutls_srp_allocate_server_credentials
-gnutls_srp_allocate_server_credentials.restype = c_int
-gnutls_srp_allocate_server_credentials.argtypes = [POINTER(gnutls_srp_server_credentials_t)]
-gnutls_srp_set_server_credentials_file = _libraries['libgnutls.so.26'].gnutls_srp_set_server_credentials_file
-gnutls_srp_set_server_credentials_file.restype = c_int
-gnutls_srp_set_server_credentials_file.argtypes = [gnutls_srp_server_credentials_t, STRING, STRING]
-gnutls_srp_server_get_username = _libraries['libgnutls.so.26'].gnutls_srp_server_get_username
-gnutls_srp_server_get_username.restype = STRING
-gnutls_srp_server_get_username.argtypes = [gnutls_session_t]
-gnutls_srp_verifier = _libraries['libgnutls.so.26'].gnutls_srp_verifier
-gnutls_srp_verifier.restype = c_int
-gnutls_srp_verifier.argtypes = [STRING, STRING, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t), POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
-gnutls_srp_set_server_credentials_function = _libraries['libgnutls.so.26'].gnutls_srp_set_server_credentials_function
-gnutls_srp_set_server_credentials_function.restype = None
-gnutls_srp_set_server_credentials_function.argtypes = [gnutls_srp_server_credentials_t, gnutls_srp_server_credentials_function]
-gnutls_srp_set_client_credentials_function = _libraries['libgnutls.so.26'].gnutls_srp_set_client_credentials_function
-gnutls_srp_set_client_credentials_function.restype = None
-gnutls_srp_set_client_credentials_function.argtypes = [gnutls_srp_client_credentials_t, gnutls_srp_client_credentials_function]
-gnutls_srp_base64_encode = _libraries['libgnutls.so.26'].gnutls_srp_base64_encode
-gnutls_srp_base64_encode.restype = c_int
-gnutls_srp_base64_encode.argtypes = [POINTER(gnutls_datum_t), STRING, POINTER(size_t)]
-gnutls_srp_base64_encode_alloc = _libraries['libgnutls.so.26'].gnutls_srp_base64_encode_alloc
-gnutls_srp_base64_encode_alloc.restype = c_int
-gnutls_srp_base64_encode_alloc.argtypes = [POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
-gnutls_srp_base64_decode = _libraries['libgnutls.so.26'].gnutls_srp_base64_decode
-gnutls_srp_base64_decode.restype = c_int
-gnutls_srp_base64_decode.argtypes = [POINTER(gnutls_datum_t), STRING, POINTER(size_t)]
-gnutls_srp_base64_decode_alloc = _libraries['libgnutls.so.26'].gnutls_srp_base64_decode_alloc
-gnutls_srp_base64_decode_alloc.restype = c_int
-gnutls_srp_base64_decode_alloc.argtypes = [POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
 gnutls_psk_free_client_credentials = _libraries['libgnutls.so.26'].gnutls_psk_free_client_credentials
 gnutls_psk_free_client_credentials.restype = None
 gnutls_psk_free_client_credentials.argtypes = [gnutls_psk_client_credentials_t]
@@ -1473,7 +1431,6 @@
            'gnutls_x509_crt_check_hostname',
            'gnutls_openpgp_keyring_get_crt',
            'gnutls_global_init_extra',
-           'gnutls_srp_set_client_credentials_function',
            'gnutls_x509_crl_import',
            'gnutls_certificate_set_x509_trust_file',
            'gnutls_x509_crt_get_pk_rsa_raw',
@@ -1489,7 +1446,7 @@
            'gnutls_x509_crt_get_pk_algorithm',
            'gnutls_x509_crt_set_crq',
            'gnutls_certificate_set_openpgp_key_mem2',
-           'gnutls_certificate_free_keys', 'gnutls_srp_verifier',
+           'gnutls_certificate_free_keys',
            'gnutls_x509_crl_deinit',
            'gnutls_openpgp_crt_get_pk_dsa_raw',
            'gnutls_certificate_free_ca_names', 'gnutls_cipher_list',
@@ -1527,7 +1484,6 @@
            'gnutls_cipher_set_priority',
            'gnutls_openpgp_keyring_check_id',
            'gnutls_openpgp_keyring_deinit',
-           'gnutls_srp_base64_encode_alloc',
            'gnutls_db_set_store_function',
            'gnutls_supplemental_get_name',
            'gnutls_handshake_get_last_out',
@@ -1542,14 +1498,13 @@
            'gnutls_openpgp_keyring_get_crt_count', 'gnutls_ia_recv',
            'gnutls_x509_crt_get_pk_dsa_raw', 'gnutls_x509_crt_sign',
            'gnutls_certificate_verify_peers',
-           'gnutls_srp_free_server_credentials',
            'gnutls_x509_crt_print',
            'gnutls_openpgp_privkey_export_subkey_dsa_raw',
            'gnutls_server_name_set', 'gnutls_kx_set_priority',
            'gnutls_transport_set_push_function',
            'gnutls_x509_crt_sign2',
            'gnutls_x509_crt_cpy_crl_dist_points',
-           'gnutls_pem_base64_decode', 'gnutls_srp_base64_decode',
+           'gnutls_pem_base64_decode',
            'gnutls_openpgp_privkey_get_subkey_count',
            'gnutls_global_init', 'gnutls_x509_rdn_get_by_oid',
            'gnutls_dh_params_import_raw',
@@ -1580,7 +1535,7 @@
            'gnutls_ia_generate_challenge',
            'gnutls_certificate_server_set_retrieve_function',
            'gnutls_certificate_set_openpgp_key',
-           'gnutls_srp_base64_encode', 'gnutls_db_get_ptr',
+           'gnutls_db_get_ptr',
            'gnutls_pkcs7_export', 'gnutls_mac_set_priority',
            'gnutls_x509_crt_get_basic_constraints',
            'gnutls_x509_crt_get_subject_alt_othername_oid',
@@ -1594,7 +1549,6 @@
            'gnutls_pkcs7_deinit', 'gnutls_record_check_pending',
            'gnutls_protocol_get_name',
            'gnutls_openpgp_privkey_sign_hash',
-           'gnutls_srp_set_server_credentials_file',
            'gnutls_pkcs7_delete_crl', 'gnutls_rsa_params_init',
            'gnutls_x509_crt_set_key_purpose_oid', 'gnutls_mac_get',
            'gnutls_record_get_direction',
@@ -1643,7 +1597,7 @@
            'gnutls_x509_crt_set_subject_key_id',
            'gnutls_check_version',
            'gnutls_certificate_client_get_request_status',
-           'gnutls_prf', 'gnutls_srp_server_get_username',
+           'gnutls_prf',
            'gnutls_pem_base64_encode_alloc',
            'gnutls_certificate_set_openpgp_key_file2',
            'gnutls_openpgp_privkey_export_rsa_raw',
@@ -1686,10 +1640,9 @@
            'gnutls_x509_crt_get_expiration_time', 'gnutls_pkcs7_init',
            'gnutls_transport_set_pull_function',
            'gnutls_protocol_list',
-           'gnutls_srp_set_client_credentials',
            'gnutls_x509_crt_get_key_purpose_oid',
            'gnutls_certificate_verify_peers2',
-           'gnutls_srp_base64_decode_alloc', 'gnutls_x509_crq_sign',
+           'gnutls_x509_crq_sign',
            'gnutls_x509_privkey_init', 'gnutls_global_set_log_level',
            'gnutls_sign_callback_get', 'gnutls_x509_rdn_get',
            'gnutls_openpgp_privkey_set_preferred_key_id',
@@ -1702,7 +1655,7 @@
            'gnutls_ia_extract_inner_secret',
            'gnutls_x509_crt_get_version', 'gnutls_ia_enable',
            'gnutls_x509_crt_set_key',
-           'gnutls_srp_free_client_credentials', 'gnutls_mac_list',
+           'gnutls_mac_list',
            'gnutls_dh_get_prime_bits', 'gnutls_certificate_free_cas',
            'gnutls_alert_get', 'gnutls_ia_permute_inner_secret',
            'gnutls_rehandshake',
@@ -1713,7 +1666,6 @@
            'gnutls_dh_params_export_pkcs3', 'gnutls_x509_crq_deinit',
            'gnutls_x509_crt_get_fingerprint',
            'gnutls_extra_check_version',
-           'gnutls_srp_allocate_client_credentials',
            'gnutls_x509_crl_get_issuer_dn_by_oid',
            'gnutls_pkcs7_get_crl_raw',
            'gnutls_x509_crt_set_expiration_time',
@@ -1760,7 +1712,6 @@
            'gnutls_pkcs7_get_crt_raw',
            'gnutls_openpgp_privkey_get_subkey_id',
            'gnutls_psk_set_server_credentials_function',
-           'gnutls_srp_set_server_credentials_function',
            'gnutls_ia_verify_endphase', 'gnutls_error_is_fatal',
            'gnutls_x509_crt_verify_data',
            'gnutls_psk_netconf_derive_key',
@@ -1807,7 +1758,6 @@
            'gnutls_certificate_get_openpgp_keyring',
            'gnutls_openpgp_privkey_export_dsa_raw',
            'gnutls_openpgp_crt_set_preferred_key_id',
-           'gnutls_srp_allocate_server_credentials',
            'gnutls_dh_get_peers_public_bits',
            'gnutls_certificate_set_x509_crl_mem',
            'gnutls_x509_privkey_fix', 'gnutls_kx_get_name',


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	2 Jun 2009 06:57:57 -0000	1.1
+++ import.log	3 Jun 2009 13:45:10 -0000	1.2
@@ -1 +1,2 @@
 python-gnutls-1_1_8-2_fc10:HEAD:python-gnutls-1.1.8-2.fc10.src.rpm:1243925841
+python-gnutls-1_1_8-2_fc10:HEAD:python-gnutls-1.1.8-2.fc10.src.rpm:1244036670


Index: python-gnutls.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-gnutls/devel/python-gnutls.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-gnutls.spec	2 Jun 2009 06:57:57 -0000	1.1
+++ python-gnutls.spec	3 Jun 2009 13:45:10 -0000	1.2
@@ -9,6 +9,8 @@ Group:		Development/Languages
 License:	LGPLv2+
 URL:		http://pypi.python.org/pypi/python-gnutls
 Source0:	http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
+# gnutls in Fedora has supporr for SRP removed
+Patch0:		python-gnutls--remove_srp.diff
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires:	python-devel
 BuildRequires:	gnutls-devel
@@ -38,6 +40,7 @@ extend without any need to write C code 
 %prep
 %setup -q
 chmod 644 examples/*.py
+%patch0 -p0 -b .srp
 
 
 %build




More information about the fedora-extras-commits mailing list