Current-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkgsrc and openssl on NetBSD current



On Monday 2009-08-03 15:04 -0600, Sverre Froyen output:
:It looks like the recent openssl updates to NetBSD current causes some 
:packages not to build.  Examples are php5 and apache22.  Should this be fixed 
:package by package or there some type of shim that can be added to current (or 
:did I mess up my system)?

From what little I read in the openssl changes logs, it was a 
deliberate choice by the openssl people to stuff up everyone and
force them to specify more explicit types for variables.

As long as the changes you need to make to packages work with
previous versions of openssl then the changes are rather
mechanical and elementary w.r.t. the pkgsrc system.

Regards,
Geoff

------------------------------------------------------------
e.g. for lang/php5 try this patch (www/ap-php needs something
similar (need to change the path for the patch) since it
extracts the whole php archive and does stuff with that as well).

--- ext/openssl/openssl.c       2009-04-20 20:00:41.000000000 +1000
+++ ext/openssl/openssl.c       2009-08-03 16:09:54.000000000 +1000
@@ -227,8 +227,8 @@
 static char default_ssl_conf_filename[MAXPATHLEN];
 
 struct php_x509_request { /* {{{ */
-       LHASH * global_config;  /* Global SSL config */
-       LHASH * req_config;             /* SSL config for this request */
+       LHASH_OF(CONF_VALUE) * global_config;   /* Global SSL config */
+       LHASH_OF(CONF_VALUE) * req_config;              /* SSL config for this 
request */
        const EVP_MD * md_alg;
        const EVP_MD * digest;
        char    * section_name,
@@ -410,7 +410,7 @@
                const char * section_label,
                const char * config_filename,
                const char * section,
-               LHASH * config TSRMLS_DC
+               LHASH_OF(CONF_VALUE) * config TSRMLS_DC
                ) /* {{{ */
 {
        X509V3_CTX ctx;

------------------------------------------------------------
for  mail/mutt-devel try this:

--- mutt_ssl.c  2009-06-10 15:08:29.000000000 +1000
+++ mutt_ssl.c  2009-08-03 11:26:49.000000000 +1000
@@ -652,7 +652,7 @@
   char *buf = NULL;
   int bufsize;
   /* needed to get the DNS subjectAltNames: */
-  STACK *subj_alt_names;
+  STACK_OF(GENERAL_NAME) *subj_alt_names;
   int subj_alt_names_count;
   GENERAL_NAME *subj_alt_name;
   /* did we find a name matching hostname? */


Home | Main Index | Thread Index | Old Index