[csw-devel] SF.net SVN: gar:[20542] csw/mgar/pkg/mailx/trunk
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Sat Mar 30 18:07:42 CET 2013
Revision: 20542
http://gar.svn.sourceforge.net/gar/?rev=20542&view=rev
Author: chninkel
Date: 2013-03-30 17:07:42 +0000 (Sat, 30 Mar 2013)
Log Message:
-----------
mailx/trunk: updated recipe to build against libssl1.0.0
Modified Paths:
--------------
csw/mgar/pkg/mailx/trunk/Makefile
csw/mgar/pkg/mailx/trunk/files/changelog.CSW
Added Paths:
-----------
csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch
Modified: csw/mgar/pkg/mailx/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mailx/trunk/Makefile 2013-03-30 15:41:03 UTC (rev 20541)
+++ csw/mgar/pkg/mailx/trunk/Makefile 2013-03-30 17:07:42 UTC (rev 20542)
@@ -17,13 +17,14 @@
SF_PROJECT = heirloom
DISTFILES = $(NAME)-$(VERSION).tar.bz2
-SPKG_CLASSES = none cswcpsampleconf
+RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibiconv2
-RUNTIME_DEP_PKGS = CSWcswclassutils CSWosslrt CSWiconv
-
# nail _is_ mailx now
INCOMPATIBLE_PKGS = CSWnail
+# Taken from upstream CVS to be able to build with libssl1.0.0
+PATCHFILES = build_with_openssl1.0.0.patch
+
# We define upstream file regex so we can be notifed of new upstream software release
UPSTREAM_MASTER_SITES = $(SF_PROJECT_SHOWFILE)=106236
UPSTREAM_USE_SF = 1
@@ -32,9 +33,7 @@
CONFIGURE_SCRIPTS =
TEST_SCRIPTS =
-PROTOTYPE_FILTER = awk '\
- $$$$3 ~ /nail.rc.CSW$$$$/ { $$$$2 = "cswcpsampleconf" } \
- { print }'
+SAMPLECONF = /etc/opt/csw/mailx/nail.rc
include gar/category.mk
@@ -56,7 +55,5 @@
@ginstall -d $(DOCDEST)
@$(foreach DOC,$(DOCS),cp $(WORKSRC)/$(DOC) $(DOCDEST);)
@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
- @mv $(DESTDIR)$(sysconfdir)/$(NAME)/nail.rc \
- $(DESTDIR)$(sysconfdir)/$(NAME)/nail.rc.CSW
@cd $(DESTDIR)$(bindir) && ln -s mailx nail
@$(MAKECOOKIE)
Added: csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch
===================================================================
--- csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch (rev 0)
+++ csw/mgar/pkg/mailx/trunk/files/build_with_openssl1.0.0.patch 2013-03-30 17:07:42 UTC (rev 20542)
@@ -0,0 +1,167 @@
+--- mailx/makeconfig 2007/04/14 15:26:00 1.14
++++ mailx.new/makeconfig 2009/05/26 21:04:15 1.15
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+
+ #
+-# Sccsid @(#)makeconfig 1.43 (gritter) 4/14/07
++# Sccsid @(#)makeconfig 1.44 (gritter) 5/26/09
+ #
+
+ tmp=___build$$
+@@ -393,6 +393,25 @@
+ !
+ fi
+
++if test x$have_openssl = xyes
++then
++ compile_check stack_of 'for STACK_OF()' '#define HAVE_STACK_OF' <<\!
++#include <openssl/ssl.h>
++#include <openssl/err.h>
++#include <openssl/x509v3.h>
++#include <openssl/x509.h>
++#include <openssl/rand.h>
++
++int main(void)
++{
++ STACK_OF(GENERAL_NAME) *gens = NULL;
++ printf("%p", gens); /* to make it used */
++ SSLv23_client_method();
++ PEM_read_PrivateKey(0, 0, 0, 0);
++ return 0;
++}
++!
++fi
+
+ cat >$tmp2.c <<\!
+ #include <gssapi/gssapi.h>
+--- mailx/openssl.c 2007/08/04 11:41:36 1.12
++++ mailx.new/openssl.c 2009/05/26 21:04:15 1.13
+@@ -38,7 +38,7 @@
+
+ #ifndef lint
+ #ifdef DOSCCS
+-static char sccsid[] = "@(#)openssl.c 1.25 (gritter) 8/4/07";
++static char sccsid[] = "@(#)openssl.c 1.26 (gritter) 5/26/09";
+ #endif
+ #endif /* not lint */
+
+@@ -101,12 +101,17 @@
+ static int ssl_rand_init(void);
+ static void ssl_init(void);
+ static int ssl_verify_cb(int success, X509_STORE_CTX *store);
+-static SSL_METHOD *ssl_select_method(const char *uhp);
++static const SSL_METHOD *ssl_select_method(const char *uhp);
+ static void ssl_load_verifications(struct sock *sp);
+ static void ssl_certificate(struct sock *sp, const char *uhp);
+ static enum okay ssl_check_host(const char *server, struct sock *sp);
++#ifdef HAVE_STACK_OF
++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
++ X509_STORE *store);
++#else
+ static int smime_verify(struct message *m, int n, STACK *chain,
+ X509_STORE *store);
++#endif
+ static EVP_CIPHER *smime_cipher(const char *name);
+ static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
+ static FILE *smime_sign_cert(const char *xname, const char *xname2, int warn);
+@@ -203,10 +208,10 @@
+ return 1;
+ }
+
+-static SSL_METHOD *
++static const SSL_METHOD *
+ ssl_select_method(const char *uhp)
+ {
+- SSL_METHOD *method;
++ const SSL_METHOD *method;
+ char *cp;
+
+ cp = ssl_method_string(uhp);
+@@ -308,7 +313,11 @@
+ X509 *cert;
+ X509_NAME *subj;
+ char data[256];
++#ifdef HAVE_STACK_OF
++ STACK_OF(GENERAL_NAME) *gens;
++#else
+ /*GENERAL_NAMES*/STACK *gens;
++#endif
+ GENERAL_NAME *gen;
+ int i;
+
+@@ -357,7 +366,8 @@
+
+ ssl_init();
+ ssl_set_vrfy_level(uhp);
+- if ((sp->s_ctx = SSL_CTX_new(ssl_select_method(uhp))) == NULL) {
++ if ((sp->s_ctx =
++ SSL_CTX_new((SSL_METHOD *)ssl_select_method(uhp))) == NULL) {
+ ssl_gen_err(catgets(catd, CATSET, 261, "SSL_CTX_new() failed"));
+ return STOP;
+ }
+@@ -496,7 +506,11 @@
+ }
+
+ static int
++#ifdef HAVE_STACK_OF
++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE *store)
++#else
+ smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
++#endif
+ {
+ struct message *x;
+ char *cp, *sender, *to, *cc, *cnttype;
+@@ -505,7 +519,12 @@
+ off_t size;
+ BIO *fb, *pb;
+ PKCS7 *pkcs7;
++#ifdef HAVE_STACK_OF
++ STACK_OF(X509) *certs;
++ STACK_OF(GENERAL_NAME) *gens;
++#else
+ STACK *certs, *gens;
++#endif
+ X509 *cert;
+ X509_NAME *subj;
+ char data[LINESIZE];
+@@ -614,7 +633,11 @@
+ {
+ int *msgvec = vp, *ip;
+ int ec = 0;
++#ifdef HAVE_STACK_OF
++ STACK_OF(X509) *chain = NULL;
++#else
+ STACK *chain = NULL;
++#endif
+ X509_STORE *store;
+ char *ca_dir, *ca_file;
+
+@@ -687,7 +710,11 @@
+ X509 *cert;
+ PKCS7 *pkcs7;
+ BIO *bb, *yb;
++#ifdef HAVE_STACK_OF
++ STACK_OF(X509) *certs;
++#else
+ STACK *certs;
++#endif
+ EVP_CIPHER *cipher;
+
+ certfile = expand((char *)certfile);
+@@ -950,9 +977,14 @@
+ off_t size;
+ BIO *fb, *pb;
+ PKCS7 *pkcs7;
++#ifdef HAVE_STACK_OF
++ STACK_OF(X509) *certs;
++ STACK_OF(X509) *chain = NULL;
++#else
+ STACK *certs;
+- X509 *cert;
+ STACK *chain = NULL;
++#endif
++ X509 *cert;
+ enum okay ok = OKAY;
+
+ message_number = n;
Modified: csw/mgar/pkg/mailx/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/mailx/trunk/files/changelog.CSW 2013-03-30 15:41:03 UTC (rev 20541)
+++ csw/mgar/pkg/mailx/trunk/files/changelog.CSW 2013-03-30 17:07:42 UTC (rev 20542)
@@ -1,3 +1,10 @@
+mailx (12.4,REV=2013.03.30)
+
+ * Non maintainer upload.
+ * Rebuilt again libssl 1.0.0.
+
+ -- Yann Rouillard <yann at opencsw.org> Sat, 30 Mar 2013 17:10:56 +0100
+
mailx (12.4,REV=2009.05.21)
* Package name change, was formerly known as nail.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list