[Pkg-openssl-changes] (no subject)
kroeckx at alioth.debian.org
kroeckx at alioth.debian.org
Sun May 13 17:59:11 UTC 2007
Subject: r220 - openssl/trunk/debian
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: kroeckx
Date: 2007-05-13 17:59:11 +0000 (Sun, 13 May 2007)
New Revision: 220
Removed:
openssl/trunk/debian/header.diff
Modified:
openssl/trunk/debian/changelog
openssl/trunk/debian/control
openssl/trunk/debian/rules
Log:
Do the header changes, changing those defines into real functions,
and bump the shlibs to match.
Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog 2007-05-13 17:43:26 UTC (rev 219)
+++ openssl/trunk/debian/changelog 2007-05-13 17:59:11 UTC (rev 220)
@@ -25,10 +25,12 @@
- Romanian. Closes: #421708
[ Kurt Roeckx ]
- * Remove the Provides for -udeb. Patch from Frans Pop. (Closes: #419608)
+ * Remove the Provides for the udeb. Patch from Frans Pop. (Closes: #419608)
* Updated Spanish debconf template. (Closes: #421336)
+ * Do the header changes, changing those defines into real functions,
+ and bump the shlibs to match.
- -- Kurt Roeckx <kurt at roeckx.be> Sun, 13 May 2007 19:42:24 +0200
+ -- Kurt Roeckx <kurt at roeckx.be> Sun, 13 May 2007 19:56:29 +0200
openssl (0.9.8e-4) unstable; urgency=low
Modified: openssl/trunk/debian/control
===================================================================
--- openssl/trunk/debian/control 2007-05-13 17:43:26 UTC (rev 219)
+++ openssl/trunk/debian/control 2007-05-13 17:59:11 UTC (rev 220)
@@ -9,7 +9,7 @@
Package: openssl
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}, libssl0.9.8 (>= 0.9.8e-1)
+Depends: ${shlibs:Depends}, ${perl:Depends}
Conflicts: ssleay (<< 0.9.2b)
Suggests: ca-certificates
Description: Secure Socket Layer (SSL) binary and related cryptographic tools
Deleted: openssl/trunk/debian/header.diff
===================================================================
--- openssl/trunk/debian/header.diff 2007-05-13 17:43:26 UTC (rev 219)
+++ openssl/trunk/debian/header.diff 2007-05-13 17:59:11 UTC (rev 220)
@@ -1,196 +0,0 @@
---- debian/tmp/usr/include/openssl/bio.h
-+++ debian/tmp/usr/include/openssl/bio.h
-@@ -196,28 +196,32 @@
- */
- #define BIO_FLAGS_MEM_RDONLY 0x200
-
--#define BIO_set_flags(b,f) ((b)->flags|=(f))
--#define BIO_get_flags(b) ((b)->flags)
-+typedef struct bio_st BIO;
-+
-+void BIO_set_flags(BIO *b, int flags);
-+int BIO_test_flags(const BIO *b, int flags);
-+void BIO_clear_flags(BIO *b, int flags);
-+
-+#define BIO_get_flags(b) BIO_test_flags(b, ~(0x0))
- #define BIO_set_retry_special(b) \
-- ((b)->flags|=(BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
-+ BIO_set_flags(b, (BIO_FLAGS_IO_SPECIAL|BIO_FLAGS_SHOULD_RETRY))
- #define BIO_set_retry_read(b) \
-- ((b)->flags|=(BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
-+ BIO_set_flags(b, (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY))
- #define BIO_set_retry_write(b) \
-- ((b)->flags|=(BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
-+ BIO_set_flags(b, (BIO_FLAGS_WRITE|BIO_FLAGS_SHOULD_RETRY))
-
- /* These are normally used internally in BIOs */
--#define BIO_clear_flags(b,f) ((b)->flags&= ~(f))
- #define BIO_clear_retry_flags(b) \
-- ((b)->flags&= ~(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-+ BIO_clear_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
- #define BIO_get_retry_flags(b) \
-- ((b)->flags&(BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-+ BIO_test_flags(b, (BIO_FLAGS_RWS|BIO_FLAGS_SHOULD_RETRY))
-
- /* These should be used by the application to tell why we should retry */
--#define BIO_should_read(a) ((a)->flags & BIO_FLAGS_READ)
--#define BIO_should_write(a) ((a)->flags & BIO_FLAGS_WRITE)
--#define BIO_should_io_special(a) ((a)->flags & BIO_FLAGS_IO_SPECIAL)
--#define BIO_retry_type(a) ((a)->flags & BIO_FLAGS_RWS)
--#define BIO_should_retry(a) ((a)->flags & BIO_FLAGS_SHOULD_RETRY)
-+#define BIO_should_read(a) BIO_test_flags(a, BIO_FLAGS_READ)
-+#define BIO_should_write(a) BIO_test_flags(a, BIO_FLAGS_WRITE)
-+#define BIO_should_io_special(a) BIO_test_flags(a, BIO_FLAGS_IO_SPECIAL)
-+#define BIO_retry_type(a) BIO_test_flags(a, BIO_FLAGS_RWS)
-+#define BIO_should_retry(a) BIO_test_flags(a, BIO_FLAGS_SHOULD_RETRY)
-
- /* The next three are used in conjunction with the
- * BIO_should_io_special() condition. After this returns true,
-@@ -246,14 +250,14 @@
- #define BIO_cb_pre(a) (!((a)&BIO_CB_RETURN))
- #define BIO_cb_post(a) ((a)&BIO_CB_RETURN)
-
--#define BIO_set_callback(b,cb) ((b)->callback=(cb))
--#define BIO_set_callback_arg(b,arg) ((b)->cb_arg=(char *)(arg))
--#define BIO_get_callback_arg(b) ((b)->cb_arg)
--#define BIO_get_callback(b) ((b)->callback)
--#define BIO_method_name(b) ((b)->method->name)
--#define BIO_method_type(b) ((b)->method->type)
-+long (*BIO_get_callback(const BIO *b)) (struct bio_st *,int,const char *,int, long,long);
-+void BIO_set_callback(BIO *b,
-+ long (*callback)(struct bio_st *,int,const char *,int, long,long));
-+char *BIO_get_callback_arg(const BIO *b);
-+void BIO_set_callback_arg(BIO *b, char *arg);
-
--typedef struct bio_st BIO;
-+const char * BIO_method_name(const BIO *b);
-+int BIO_method_type(const BIO *b);
-
- typedef void bio_info_cb(struct bio_st *, int, const char *, int, long, long);
-
---- debian/tmp/usr/include/openssl/evp.h
-+++ debian/tmp/usr/include/openssl/evp.h
-@@ -429,36 +429,36 @@
- #define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
- #define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
-
--#define EVP_MD_type(e) ((e)->type)
-+int EVP_MD_type(const EVP_MD *md);
- #define EVP_MD_nid(e) EVP_MD_type(e)
- #define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_nid(e))
--#define EVP_MD_pkey_type(e) ((e)->pkey_type)
--#define EVP_MD_size(e) ((e)->md_size)
--#define EVP_MD_block_size(e) ((e)->block_size)
--
--#define EVP_MD_CTX_md(e) ((e)->digest)
--#define EVP_MD_CTX_size(e) EVP_MD_size((e)->digest)
--#define EVP_MD_CTX_block_size(e) EVP_MD_block_size((e)->digest)
--#define EVP_MD_CTX_type(e) EVP_MD_type((e)->digest)
-+int EVP_MD_pkey_type(const EVP_MD *md);
-+int EVP_MD_size(const EVP_MD *md);
-+int EVP_MD_block_size(const EVP_MD *md);
-+
-+const EVP_MD * EVP_MD_CTX_md(const EVP_MD_CTX *ctx);
-+#define EVP_MD_CTX_size(e) EVP_MD_size(EVP_MD_CTX_md(e))
-+#define EVP_MD_CTX_block_size(e) EVP_MD_block_size(EVP_MD_CTX_md(e))
-+#define EVP_MD_CTX_type(e) EVP_MD_type(EVP_MD_CTX_md(e))
-
--#define EVP_CIPHER_nid(e) ((e)->nid)
-+int EVP_CIPHER_nid(const EVP_CIPHER *cipher);
- #define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
--#define EVP_CIPHER_block_size(e) ((e)->block_size)
--#define EVP_CIPHER_key_length(e) ((e)->key_len)
--#define EVP_CIPHER_iv_length(e) ((e)->iv_len)
--#define EVP_CIPHER_flags(e) ((e)->flags)
--#define EVP_CIPHER_mode(e) (((e)->flags) & EVP_CIPH_MODE)
--
--#define EVP_CIPHER_CTX_cipher(e) ((e)->cipher)
--#define EVP_CIPHER_CTX_nid(e) ((e)->cipher->nid)
--#define EVP_CIPHER_CTX_block_size(e) ((e)->cipher->block_size)
--#define EVP_CIPHER_CTX_key_length(e) ((e)->key_len)
--#define EVP_CIPHER_CTX_iv_length(e) ((e)->cipher->iv_len)
--#define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data)
--#define EVP_CIPHER_CTX_set_app_data(e,d) ((e)->app_data=(char *)(d))
-+int EVP_CIPHER_block_size(const EVP_CIPHER *cipher);
-+int EVP_CIPHER_key_length(const EVP_CIPHER *cipher);
-+int EVP_CIPHER_iv_length(const EVP_CIPHER *cipher);
-+unsigned long EVP_CIPHER_flags(const EVP_CIPHER *cipher);
-+#define EVP_CIPHER_mode(e) (EVP_CIPHER_flags(e) & EVP_CIPH_MODE)
-+
-+const EVP_CIPHER * EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
-+int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);
-+int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
-+int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
-+int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
-+void * EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
-+void EVP_CIPHER_CTX_set_app_data(EVP_CIPHER_CTX *ctx, void *data);
- #define EVP_CIPHER_CTX_type(c) EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
--#define EVP_CIPHER_CTX_flags(e) ((e)->cipher->flags)
--#define EVP_CIPHER_CTX_mode(e) ((e)->cipher->flags & EVP_CIPH_MODE)
-+unsigned long EVP_CIPHER_CTX_flags(const EVP_CIPHER_CTX *ctx);
-+#define EVP_CIPHER_CTX_mode(e) (EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)
-
- #define EVP_ENCODE_LENGTH(l) (((l+2)/3*4)+(l/48+1)*2+80)
- #define EVP_DECODE_LENGTH(l) ((l+3)/4*3+80)
-@@ -479,10 +479,14 @@
- #endif
- #define BIO_get_md(b,mdp) BIO_ctrl(b,BIO_C_GET_MD,0,(char *)mdp)
- #define BIO_get_md_ctx(b,mdcp) BIO_ctrl(b,BIO_C_GET_MD_CTX,0,(char *)mdcp)
-+#define BIO_set_md_ctx(b,mdcp) BIO_ctrl(b,BIO_C_SET_MD_CTX,0,(char *)mdcp)
- #define BIO_get_cipher_status(b) BIO_ctrl(b,BIO_C_GET_CIPHER_STATUS,0,NULL)
- #define BIO_get_cipher_ctx(b,c_pp) BIO_ctrl(b,BIO_C_GET_CIPHER_CTX,0,(char *)c_pp)
-
--#define EVP_Cipher(c,o,i,l) (c)->cipher->do_cipher((c),(o),(i),(l))
-+int EVP_Cipher(EVP_CIPHER_CTX *c,
-+ unsigned char *out,
-+ const unsigned char *in,
-+ unsigned int inl);
-
- #define EVP_add_cipher_alias(n,alias) \
- OBJ_NAME_add((alias),OBJ_NAME_TYPE_CIPHER_METH|OBJ_NAME_ALIAS,(n))
-@@ -498,9 +502,9 @@
- EVP_MD_CTX *EVP_MD_CTX_create(void);
- void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
- int EVP_MD_CTX_copy_ex(EVP_MD_CTX *out,const EVP_MD_CTX *in);
--#define EVP_MD_CTX_set_flags(ctx,flgs) ((ctx)->flags|=(flgs))
--#define EVP_MD_CTX_clear_flags(ctx,flgs) ((ctx)->flags&=~(flgs))
--#define EVP_MD_CTX_test_flags(ctx,flgs) ((ctx)->flags&(flgs))
-+void EVP_MD_CTX_set_flags(EVP_MD_CTX *ctx, int flags);
-+void EVP_MD_CTX_clear_flags(EVP_MD_CTX *ctx, int flags);
-+int EVP_MD_CTX_test_flags(const EVP_MD_CTX *ctx,int flags);
- int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl);
- int EVP_DigestUpdate(EVP_MD_CTX *ctx,const void *d,
- size_t cnt);
---- debian/tmp/usr/include/openssl/ssl.h
-+++ debian/tmp/usr/include/openssl/ssl.h
-@@ -791,18 +791,18 @@
- #define SSL_CTX_sess_cache_full(ctx) \
- SSL_CTX_ctrl(ctx,SSL_CTRL_SESS_CACHE_FULL,0,NULL)
-
--#define SSL_CTX_sess_set_new_cb(ctx,cb) ((ctx)->new_session_cb=(cb))
--#define SSL_CTX_sess_get_new_cb(ctx) ((ctx)->new_session_cb)
--#define SSL_CTX_sess_set_remove_cb(ctx,cb) ((ctx)->remove_session_cb=(cb))
--#define SSL_CTX_sess_get_remove_cb(ctx) ((ctx)->remove_session_cb)
--#define SSL_CTX_sess_set_get_cb(ctx,cb) ((ctx)->get_session_cb=(cb))
--#define SSL_CTX_sess_get_get_cb(ctx) ((ctx)->get_session_cb)
--#define SSL_CTX_set_info_callback(ctx,cb) ((ctx)->info_callback=(cb))
--#define SSL_CTX_get_info_callback(ctx) ((ctx)->info_callback)
--#define SSL_CTX_set_client_cert_cb(ctx,cb) ((ctx)->client_cert_cb=(cb))
--#define SSL_CTX_get_client_cert_cb(ctx) ((ctx)->client_cert_cb)
--#define SSL_CTX_set_cookie_generate_cb(ctx,cb) ((ctx)->app_gen_cookie_cb=(cb))
--#define SSL_CTX_set_cookie_verify_cb(ctx,cb) ((ctx)->app_verify_cookie_cb=(cb))
-+void SSL_CTX_sess_set_new_cb(SSL_CTX *ctx, int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess));
-+int (*SSL_CTX_sess_get_new_cb(SSL_CTX *ctx))(struct ssl_st *ssl, SSL_SESSION *sess);
-+void SSL_CTX_sess_set_remove_cb(SSL_CTX *ctx, void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess));
-+void (*SSL_CTX_sess_get_remove_cb(SSL_CTX *ctx))(struct ssl_ctx_st *ctx, SSL_SESSION *sess);
-+void SSL_CTX_sess_set_get_cb(SSL_CTX *ctx, SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, unsigned char *data,int len,int *copy));
-+SSL_SESSION *(*SSL_CTX_sess_get_get_cb(SSL_CTX *ctx))(struct ssl_st *ssl, unsigned char *Data, int len, int *copy);
-+void SSL_CTX_set_info_callback(SSL_CTX *ctx, void (*cb)(const SSL *ssl,int type,int val));
-+void (*SSL_CTX_get_info_callback(SSL_CTX *ctx))(const SSL *ssl,int type,int val);
-+void SSL_CTX_set_client_cert_cb(SSL_CTX *ctx, int (*client_cert_cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey));
-+int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL *ssl, X509 **x509, EVP_PKEY **pkey);
-+void SSL_CTX_set_cookie_generate_cb(SSL_CTX *ctx, int (*app_gen_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int *cookie_len));
-+void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, int (*app_verify_cookie_cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len));
-
- #define SSL_NOTHING 1
- #define SSL_WRITING 2
Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules 2007-05-13 17:43:26 UTC (rev 219)
+++ openssl/trunk/debian/rules 2007-05-13 17:59:11 UTC (rev 220)
@@ -137,9 +137,6 @@
# (cd doc; for f in *; do install "$$f" ../debian/tmp/usr/share/doc/openssl/doc/"$$(echo $$f | sed -e 's/doc/txt/')";done)
# debstd -u CHANGES* LICENSE README NEWS
-# Reverse the changes to the headers.
- patch -p0 -R < debian/header.diff
-
dh_installdocs CHANGES.SSLeay README NEWS debian/README.optimization
dh_installexamples
dh_installchangelogs CHANGES
@@ -159,7 +156,7 @@
dh_strip --dbg-package=libssl0.9.8
dh_perl -d
# dh_suidregister
- dh_makeshlibs -V "libssl0.9.8 (>= 0.9.8c-1)" --add-udeb="libcrypto0.9.8-udeb"
+ dh_makeshlibs -V "libssl0.9.8 (>= 0.9.8e-1)" --add-udeb="libcrypto0.9.8-udeb"
dh_shlibdeps -L libssl0.9.8 -l debian/libssl0.9.8/usr/lib
dh_gencontrol
dh_installdeb
More information about the Pkg-openssl-changes
mailing list