Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (58207fab22e0584e46c1dcecb73e31b653aae6f0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (58207fab22e0584e46c1dcecb73e31b653aae6f0)
  • Date: Fri, 16 Apr 2010 12:57:57 -0500

GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz
<v.merkatz AT gmx.net>:

dev/null |binary
editors/nano/DETAILS | 3 +
editors/nano/HISTORY | 3 +
editors/nano/nano-2.2.3.tar.gz.sig | 0
editors/nano/nano-2.2.4.tar.gz.sig |binary
mail/mailx/HISTORY | 4 ++
mail/mailx/PRE_BUILD | 6 +++
mail/mailx/openssl-1.patch | 69
+++++++++++++++++++++++++++++++++++++
utils/sudo/DETAILS | 4 +-
utils/sudo/HISTORY | 3 +
10 files changed, 89 insertions(+), 3 deletions(-)

New commits:
commit 58207fab22e0584e46c1dcecb73e31b653aae6f0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

mailx: fixed compilation with the newest openssl
(cherry picked from commit 0b1ffed60c61e0248b57eeda7f8ea386d1cefafe)

commit 6119d995f5d1e36faf31d9c69ba972a9635cf9cb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

nano 2.2.4, SECURITY_PATCH=1, #15674
(cherry picked from commit ce39a13dda54d3b1ecc5ddd8cd18a27d817d63a6)

commit ea1d6abfb8e3ac6f09bc8b598e03c29f3c71b40d
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

sudo 1.7.2p6, SECURITY_PATCH=3, #15674

diff --git a/editors/nano/DETAILS b/editors/nano/DETAILS
index 83659be..1f804c9 100755
--- a/editors/nano/DETAILS
+++ b/editors/nano/DETAILS
@@ -1,5 +1,6 @@
SPELL=nano
- VERSION=2.2.3
+ VERSION=2.2.4
+ SECURITY_PATCH=1
BRANCH=`echo $VERSION | cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_GPG=gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME
diff --git a/editors/nano/HISTORY b/editors/nano/HISTORY
index f1d30da..1cc6469 100644
--- a/editors/nano/HISTORY
+++ b/editors/nano/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.2.4, SECURITY_PATCH=1, #15674
+
2010-02-14 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.2.3
* PRE_BUILD, nowrap.patch: removed
diff --git a/editors/nano/nano-2.2.3.tar.gz.sig
b/editors/nano/nano-2.2.3.tar.gz.sig
deleted file mode 100644
index a1e220a..0000000
Binary files a/editors/nano/nano-2.2.3.tar.gz.sig and /dev/null differ
diff --git a/editors/nano/nano-2.2.4.tar.gz.sig
b/editors/nano/nano-2.2.4.tar.gz.sig
new file mode 100644
index 0000000..708623d
Binary files /dev/null and b/editors/nano/nano-2.2.4.tar.gz.sig differ
diff --git a/mail/mailx/HISTORY b/mail/mailx/HISTORY
index 4ecb6c2..dbe5962 100644
--- a/mail/mailx/HISTORY
+++ b/mail/mailx/HISTORY
@@ -1,3 +1,7 @@
+2010-04-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * openssl-1.patch: added, to fix compilation with openssl 1
+
2009-01-15 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 12.4; quoting paths; fixed short desc
* INSTALL: quoting paths
diff --git a/mail/mailx/PRE_BUILD b/mail/mailx/PRE_BUILD
new file mode 100755
index 0000000..bd753af
--- /dev/null
+++ b/mail/mailx/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+if spell_ok openssl && [[ $(installed_version openssl) > 1.0 ]]; then
+ patch -p0 < "$SPELL_DIRECTORY/openssl-1.patch"
+fi
diff --git a/mail/mailx/openssl-1.patch b/mail/mailx/openssl-1.patch
new file mode 100644
index 0000000..5820dee
--- /dev/null
+++ b/mail/mailx/openssl-1.patch
@@ -0,0 +1,69 @@
+--- openssl.c.orig 2007-08-04 11:38:03.000000000 +0000
++++ openssl.c 2010-04-04 20:37:40.000000000 +0000
+@@ -105,7 +105,7 @@
+ 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);
+-static int smime_verify(struct message *m, int n, STACK *chain,
++static int smime_verify(struct message *m, int n, STACK_OF(X509) *chain,
+ X509_STORE *store);
+ static EVP_CIPHER *smime_cipher(const char *name);
+ static int ssl_password_cb(char *buf, int size, int rwflag, void *userdata);
+@@ -308,7 +308,7 @@
+ X509 *cert;
+ X509_NAME *subj;
+ char data[256];
+- /*GENERAL_NAMES*/STACK *gens;
++ /*GENERAL_NAMES*/STACK_OF(GENERAL_NAMES) *gens;
+ GENERAL_NAME *gen;
+ int i;
+
+@@ -496,7 +496,7 @@
+ }
+
+ static int
+-smime_verify(struct message *m, int n, STACK *chain, X509_STORE *store)
++smime_verify(struct message *m, int n, STACK_OF(X509) *chain, X509_STORE
*store)
+ {
+ struct message *x;
+ char *cp, *sender, *to, *cc, *cnttype;
+@@ -505,7 +505,8 @@
+ off_t size;
+ BIO *fb, *pb;
+ PKCS7 *pkcs7;
+- STACK *certs, *gens;
++ STACK_OF(X509) *certs;
++ STACK_OF(GENERAL_NAMES) *gens;
+ X509 *cert;
+ X509_NAME *subj;
+ char data[LINESIZE];
+@@ -614,7 +615,7 @@
+ {
+ int *msgvec = vp, *ip;
+ int ec = 0;
+- STACK *chain = NULL;
++ STACK_OF(X509) *chain = NULL;
+ X509_STORE *store;
+ char *ca_dir, *ca_file;
+
+@@ -687,7 +688,7 @@
+ X509 *cert;
+ PKCS7 *pkcs7;
+ BIO *bb, *yb;
+- STACK *certs;
++ STACK_OF(X509) *certs;
+ EVP_CIPHER *cipher;
+
+ certfile = expand((char *)certfile);
+@@ -950,9 +951,9 @@
+ off_t size;
+ BIO *fb, *pb;
+ PKCS7 *pkcs7;
+- STACK *certs;
++ STACK_OF(X509) *certs;
+ X509 *cert;
+- STACK *chain = NULL;
++ STACK_OF(X509) *chain = NULL;
+ enum okay ok = OKAY;
+
+ message_number = n;
diff --git a/utils/sudo/DETAILS b/utils/sudo/DETAILS
index e5479c7..0a23156 100755
--- a/utils/sudo/DETAILS
+++ b/utils/sudo/DETAILS
@@ -1,5 +1,5 @@
SPELL=sudo
- VERSION=1.7.2p5
+ VERSION=1.7.2p6
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=ftp://ftp.sudo.ws/pub/$SPELL/$SOURCE
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
SOURCE2_IGNORE=signature
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE_GPG=sudo.gpg:$SOURCE.sig:UPSTREAM_KEY
WEB_SITE=http://www.courtesan.com/sudo
KEYWORDS="utils"
diff --git a/utils/sudo/HISTORY b/utils/sudo/HISTORY
index c36764c..9604feb 100644
--- a/utils/sudo/HISTORY
+++ b/utils/sudo/HISTORY
@@ -1,3 +1,6 @@
+2010-04-15 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 1.7.2p6, SECURITY_PATCH=3, #15674
+
2010-03-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 1.7.2p5




  • [SM-Commit] GIT changes to stable-rc-0.43 grimoire by Arwed von Merkatz (58207fab22e0584e46c1dcecb73e31b653aae6f0), Arwed von Merkatz, 04/16/2010

Archive powered by MHonArc 2.6.24.

Top of Page