pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/cue Overhaul mail/cue pacakge.
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a9c2740d282
branches: trunk
changeset: 568529:6a9c2740d282
user: taca <taca%pkgsrc.org@localhost>
date: Tue Dec 15 13:11:18 2009 +0000
description:
Overhaul mail/cue pacakge.
* Add patches to fix build problem with OpenSSL 1.0.0 beta and later.
* Generase "-DUSE_SSL" instead of "-DSSL". Similar changes are CANNA
and ZLIB. (In the case of ZLIB, it could be change to use HAVE_ZLIB_H.)
* Split Makefile to use hacks.mk and options.mk.
* And miscellaneous pkglint clean up.
There should be no functional change and fix PR pkg/42452.
diffstat:
mail/cue/Makefile | 47 ++--------------
mail/cue/distinfo | 9 ++-
mail/cue/hacks.mk | 7 ++
mail/cue/options.mk | 23 ++++++++
mail/cue/patches/patch-aa | 53 +++++++++++++++++--
mail/cue/patches/patch-ae | 127 ++++++++++++++++++++++++++++++++++++++++++++++
mail/cue/patches/patch-af | 81 +++++++++++++++++++++++++++++
mail/cue/patches/patch-ag | 120 +++++++++++++++++++++++++++++++++++++++++++
mail/cue/patches/patch-ah | 15 +++++
mail/cue/patches/patch-ai | 20 +++++++
10 files changed, 455 insertions(+), 47 deletions(-)
diffs (truncated from 591 to 300 lines):
diff -r 2a20e1e5d9cb -r 6a9c2740d282 mail/cue/Makefile
--- a/mail/cue/Makefile Tue Dec 15 13:07:52 2009 +0000
+++ b/mail/cue/Makefile Tue Dec 15 13:11:18 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2009/12/15 07:22:59 obache Exp $
+# $NetBSD: Makefile,v 1.59 2009/12/15 13:11:18 taca Exp $
DISTNAME= cue-snap-20090209
PKGNAME= ${DISTNAME:S/snap-//}
@@ -6,55 +6,24 @@
MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/free-ware/cue/snap/
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-COMMENT= mh-e like mail user agent
+HOMEPAGE= # not available
+COMMENT= Mh-e like mail user agent
LICENSE= modified-bsd
PKG_DESTDIR_SUPPORT= user-destdir
-GNU_CONFIGURE= yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${PKGSRC_COMPILER} == "ido"
-CPPFLAGS+= -DNO_ATTRIBUTE
-.endif
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.cue
-PKG_SUPPORTED_OPTIONS= canna idea inet6
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6) && (${OPSYS} != "SunOS")
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mcanna)
-. include "../../inputmethod/canna-lib/buildlink3.mk"
-CONFIGURE_ARGS+= --with-canna=${BUILDLINK_PREFIX.canna}
-.else
-CONFIGURE_ARGS+= --without-canna
-.endif
-
-.if !empty(PKG_OPTIONS:Midea)
-CONFIGURE_ARGS+= --enable-idea
-.endif
-
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
-
-INSTALLATION_DIRS= bin
-
-.include "../../security/openssl/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
+INSTALLATION_DIRS+= bin share/doc/cue share/examples/cue
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/cue ${DESTDIR}${PREFIX}/bin
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/cue
${INSTALL_DATA} ${WRKSRC}/sample.cuerc \
${DESTDIR}${PREFIX}/share/examples/cue
- ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/cue
${INSTALL_DATA} ${WRKSRC}/cue.hlp ${DESTDIR}${PREFIX}/share/doc/cue
+.include "options.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 2a20e1e5d9cb -r 6a9c2740d282 mail/cue/distinfo
--- a/mail/cue/distinfo Tue Dec 15 13:07:52 2009 +0000
+++ b/mail/cue/distinfo Tue Dec 15 13:11:18 2009 +0000
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.31 2009/02/15 07:07:23 obache Exp $
+$NetBSD: distinfo,v 1.32 2009/12/15 13:11:18 taca Exp $
SHA1 (cue-snap-20090209.tar.gz) = 8f0a6269855c7fd19f298d18613422f71ce8761e
RMD160 (cue-snap-20090209.tar.gz) = 94d0a6d5820c9c8ba71230ab5212196b0f0121c6
Size (cue-snap-20090209.tar.gz) = 229115 bytes
-SHA1 (patch-aa) = c1ed53b1333b58dd8f794b2f028ed4c71a294c04
+SHA1 (patch-aa) = f771f37323d81d15e85e357b85cd45c17ada1c2c
SHA1 (patch-ac) = 105da5dc78a6a493d3863de74ba91891653cc936
SHA1 (patch-ad) = 0d3ce51529e2b0d7fcc051719bbd4ad008bd1b65
+SHA1 (patch-ae) = 96342438871f296c51f6f8e91fe2956f1ed05d33
+SHA1 (patch-af) = 1941315f7349aab62c3e1f58598518d446af1c24
+SHA1 (patch-ag) = 46e7f66117b020555e59e1d3ed9262cbcf66a689
+SHA1 (patch-ah) = 1e75fd0441dda53f02cceea9b09c0c7a02f80e50
+SHA1 (patch-ai) = 65a9651bf46517846910d6094a7c957d2ca91711
diff -r 2a20e1e5d9cb -r 6a9c2740d282 mail/cue/hacks.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cue/hacks.mk Tue Dec 15 13:11:18 2009 +0000
@@ -0,0 +1,7 @@
+# $NetBSD: hacks.mk,v 1.1 2009/12/15 13:11:18 taca Exp $
+
+.include "../../mk/compiler.mk"
+
+.if ${PKGSRC_COMPILER} == "ido"
+CPPFLAGS+= -DNO_ATTRIBUTE
+.endif
diff -r 2a20e1e5d9cb -r 6a9c2740d282 mail/cue/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cue/options.mk Tue Dec 15 13:11:18 2009 +0000
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2009/12/15 13:11:18 taca Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.cue
+PKG_SUPPORTED_OPTIONS= canna idea inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6) && (${OPSYS} != "SunOS")
+CONFIGURE_ARGS+= --enable-ipv6
+.else
+CONFIGURE_ARGS+= --disable-ipv6
+.endif
+
+.if !empty(PKG_OPTIONS:Mcanna)
+. include "../../inputmethod/canna-lib/buildlink3.mk"
+CONFIGURE_ARGS+= --with-canna=${BUILDLINK_PREFIX.canna}
+.else
+CONFIGURE_ARGS+= --without-canna
+.endif
+
+.if !empty(PKG_OPTIONS:Midea)
+CONFIGURE_ARGS+= --enable-idea
+.endif
diff -r 2a20e1e5d9cb -r 6a9c2740d282 mail/cue/patches/patch-aa
--- a/mail/cue/patches/patch-aa Tue Dec 15 13:07:52 2009 +0000
+++ b/mail/cue/patches/patch-aa Tue Dec 15 13:11:18 2009 +0000
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2006/10/22 20:59:01 schwarz Exp $
+$NetBSD: patch-aa,v 1.6 2009/12/15 13:11:18 taca Exp $
---- configure.orig 2005-04-27 13:54:13.000000000 +0200
-+++ configure 2006-10-22 22:53:47.000000000 +0200
-@@ -675,7 +675,7 @@
+* Prevent extra -O from being added to optimizer flags.
+* Assume that DragonFly's getaddrinfo works.
+* Add "USE_" before cpp definition for CANNA, SSL and ZLIB. It was generated
+ by fixed AC_PREFIX_PKG in configure.in.
+
+--- configure.orig 2005-04-27 20:54:13.000000000 +0900
++++ configure
+@@ -675,7 +675,7 @@ netbsd*)
;;
esac
@@ -11,7 +16,7 @@
-@@ -1127,7 +1127,7 @@
+@@ -1127,7 +1127,7 @@ fi
rm -fr conftest*
fi
@@ -20,7 +25,7 @@
if test "$buggygetaddrinfo" = "yes"; then
if test "$ipv6" = "yes"; then
echo 'Fatal: You must get working getaddrinfo() function.'
-@@ -1135,6 +1135,7 @@
+@@ -1135,6 +1135,7 @@ if test "$buggygetaddrinfo" = "yes"; the
exit 1
fi
fi
@@ -28,3 +33,39 @@
echo $ac_n "checking if --enable-idea option is specified""... $ac_c" 1>&6
echo "configure:1141: checking if --enable-idea option is specified" >&5
+@@ -1216,7 +1217,7 @@ echo "configure:1201: checking for zlib
+
+ zlib=$ac_cv_prefix_zlib
+ cat >> confdefs.h <<EOF
+-#define `echo zlib | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
++#define `echo use_zlib | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
+ EOF
+
+ if test -n "$ac_lib"; then
+@@ -1268,7 +1269,7 @@ echo "configure:1253: checking for canna
+
+ canna=$ac_cv_prefix_canna
+ cat >> confdefs.h <<EOF
+-#define `echo canna | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
++#define `echo use_canna | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
+ EOF
+
+ if test -n "$ac_lib"; then
+@@ -1321,7 +1322,7 @@ echo "configure:1306: checking for ssl d
+
+ ssl=$ac_cv_prefix_ssl
+ cat >> confdefs.h <<EOF
+-#define `echo ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
++#define `echo use_ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
+ EOF
+
+ if test -n "$ac_lib"; then
+@@ -1362,7 +1363,7 @@ echo "configure:1347: checking for ssl d
+
+ ssl=$ac_cv_prefix_ssl
+ cat >> confdefs.h <<EOF
+-#define `echo ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
++#define `echo use_ssl | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` 1
+ EOF
+
+ if test -n "$ac_lib"; then
diff -r 2a20e1e5d9cb -r 6a9c2740d282 mail/cue/patches/patch-ae
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/cue/patches/patch-ae Tue Dec 15 13:11:18 2009 +0000
@@ -0,0 +1,127 @@
+$NetBSD: patch-ae,v 1.3 2009/12/15 13:11:18 taca Exp $
+
+* Fix for OpenSSL 1.0.0 beta. (STACK has gone.)
+* Use proper sk_TYPE_num, sk_TYPE_value for each TYPE.
+
+--- smime.c.orig 2008-06-03 10:58:57.000000000 +0900
++++ smime.c
+@@ -108,7 +108,7 @@ smime_decrypt(struct state *state)
+ struct header *hdr;
+ char buf[BUFSIZ];
+ #ifndef OPENSSL_BUG_FIXED
+- STACK *sk;
++ STACK_OF(PKCS7_RECIP_INFO) *sk;
+ PKCS7_RECIP_INFO *ri;
+ #endif
+
+@@ -174,10 +174,10 @@ smime_decrypt(struct state *state)
+ sk = NULL;
+ break;
+ case NID_pkcs7_signedAndEnveloped:
+- sk = (STACK *)p7->d.signed_and_enveloped->recipientinfo;
++ sk = p7->d.signed_and_enveloped->recipientinfo;
+ break;
+ case NID_pkcs7_enveloped:
+- sk = (STACK *)p7->d.enveloped->recipientinfo;
++ sk = p7->d.enveloped->recipientinfo;
+ break;
+ default:
+ sk = NULL;
+@@ -185,7 +185,7 @@ smime_decrypt(struct state *state)
+ }
+ if (sk) {
+ for (;;) {
+- if (sk_num(sk) == 0) {
++ if (sk_PKCS7_RECIP_INFO_num(sk) == 0) {
+ strlcpy(state->status,
+ "Cannot find recipient info for me\n",
+ sizeof(state->status));
+@@ -194,11 +194,11 @@ smime_decrypt(struct state *state)
+ PKCS7_free(p7);
+ return -1;
+ }
+- ri=(PKCS7_RECIP_INFO *)sk_value(sk,0);
++ ri=sk_PKCS7_RECIP_INFO_value(sk,0);
+ if (X509_name_cmp(ri->issuer_and_serial->issuer, X509_get_issuer_name(x509)) == 0
+ && ASN1_INTEGER_cmp(ri->issuer_and_serial->serial, X509_get_serialNumber(x509)) == 0)
+ break;
+- sk_shift(sk);
++ sk_PKCS7_RECIP_INFO_shift(sk);
+ PKCS7_RECIP_INFO_free(ri);
+ }
+ }
+@@ -401,7 +401,7 @@ smime_verify(struct state *state)
+ cbuf_t *cb, cbuf, sproto, from;
+ int i, ret;
+ PKCS7 *p7;
+- STACK *sk;
++ STACK_OF(PKCS7_SIGNER_INFO) *sk;
+ char *p, *ep;
+ BIO *detached, *p7bio;
+ PKCS7_SIGNER_INFO *si;
+@@ -496,11 +496,11 @@ BIO_read_filename(detached, "/tmp/smime.
+ getenv("SSL_CERT_DIR"));
+ ERR_clear_error();
+
+- sk = (STACK *)PKCS7_get_signer_info(p7);
++ sk = PKCS7_get_signer_info(p7);
+ strlcpy(state->status, "S/MIME verify OK", sizeof(state->status));
+ ret = 1;
+- for (i = 0; i < sk_num(sk); i++) {
+- si = (PKCS7_SIGNER_INFO *)sk_value(sk, i);
++ for (i = 0; i < sk_PKCS7_SIGNER_INFO_num(sk); i++) {
++ si = sk_PKCS7_SIGNER_INFO_value(sk, i);
+ if (PKCS7_dataVerify(cert_store, &cert_ctx, p7bio, p7, si) <= 0) {
+ ret = -1;
+ snprintf(state->status, sizeof(state->status),
+@@ -560,7 +560,7 @@ smime_sign(struct state *state)
+ {
+ int i;
+ PKCS7 *p7;
+- STACK *sk;
++ STACK_OF(X509) *sk;
+ char *p;
+ BIO *in, *p7bio;
+ PKCS7_SIGNER_INFO *si;
+@@ -675,9 +675,9 @@ smime_sign(struct state *state)
+ PKCS7_free(p7);
+ return 0;
Home |
Main Index |
Thread Index |
Old Index