Changeset 8b0d793

Timestamp:

Nov 17, 2013, 4:00:27 AM (11 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

489df88 (diff), b783311 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge b783311d7c91e45c1cf9690a3390f33d624dd567 into 489df88d718a4254481227e1f039326a6081b1d7

Files:

• .gitignore (modified) (1 diff)
• AUTHORS (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• configure.ac (modified) (5 diffs)
• filter.c (modified) (1 diff)
• filterproc.c (modified) (1 diff)
• functions.c (modified) (3 diffs)
• perl/lib/BarnOwl.pm (modified) (1 diff)
• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)
• perlconfig.c (modified) (1 diff)
• perlglue.xs (modified) (2 diffs)
• zcrypt.c (modified) (3 diffs)
• zephyr.c (modified) (5 diffs)

.gitignore

@@ -4 +4 @@
 .deps
 META.yml
+MYMETA.yml
 Makefile
 Makefile.in

AUTHORS

@@ -3 +3 @@
 
 The following people have provided patches or other contributions:
+  Alex Vandiver
+  Kevin Chen
+  Arun Tharuvai
   Sam Hartman
-  Alex Vandiver
-  Geoffrey Thomas
   Derrick Brashear
   David Glasser
+  Eric Price
   Matthew Goldstein
-  Arun Tharuvai
-  Kevin Chen
-  Eric Price
+  Geoffrey Thomas
+  Anders Kaseorg
+  Greg Price
+  Chris Lesniewski-Laas
+  Alex Dehnert
+  Edward Z. Yang
+  Karl Ramm
+  Evan Broder
+  David Benjamin
+  Cathy Zhang
+  Joshua Oreman
+  Leonid Grinberg
+  Kevin Riggle
+  Brian Sniffen
+  William Throwe
+  Jason Gross
+  Adam Glasgall
+  Tim Hill
+  DD Liu
+  Betsy Riley
+  Robert Jacobs
 
-BarnOwl is based on code from Owl, which was originally primarly
+BarnOwl is based on code from Owl, which was originally primarily
 written by James Kretchmar.  Erik Nygren also made substantial
-contributions and improvemnts to the program.
+contributions and improvements to the program.
 
-The following people provided patches and other techincal support for
+The following people provided patches and other technical support for
 Owl:
 
@@ -30 +50 @@
   Mark Eichin
 
-Mark Eichin is also maintaining the debian package of Owl.
+Mark Eichin is also maintaining the Debian package of Owl.
 
 The following people helped with beta testing the earliest versions of

ChangeLog

@@ -1 +1 @@
 1.9
+ * Update Jabber module for Net::DNS changes -james2vegas@aim.com
+ * Update and make configurable the Zephyr default format -adehnert@mit.edu
+ * Fix a crash when zcrypt fails -andersk@mit.edu
+ * Fix building with OpenSSL before 0.9.8 -andersk@mit.edu
+ * Make :loadsubs reload instanced personals too -davidben@mit.edu
+ * Make Perl zephyr_zwrite call die() when it fails -jgross@mit.edu
+ * Tell gpg calls from zcrypt to ignore ~/.gnupg -andersk@mit.edu
+ * Replace outgoing zephyr default format with a small URL -geofft@mit.edu
  * Add getnumlines() to perl interface -asedeno@mit.edu
  * Include names of invalid filters on filter errors -adehnert@mit.edu

configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([BarnOwl],[1.9rc1],[bug-barnowl@mit.edu])
+AC_INIT([BarnOwl],[1.9rc2],[bug-barnowl@mit.edu])
 AM_INIT_AUTOMAKE([1.7.0 -Wall -Wno-portability foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -9 +9 @@
 AC_PROG_CC
 AC_PROG_CC_C99
+
+AC_ARG_WITH([zephyr-default-format],
+    [AS_HELP_STRING([--with-zephyr-default-format],
+                    [value for the default format zephyrgram field])],
+    [
+        case $withval in
+            yes) withval='Config error: see http://mit.edu/df';;
+            no) withval='';;
+        esac
+        zephyr_default_format=$withval
+    ],
+    [zephyr_default_format='Config error: see http://mit.edu/df'])
+AC_DEFINE_UNQUOTED(
+    [ZEPHYR_DEFAULT_FORMAT], ["$zephyr_default_format"],
+    [Value for the default format zephyrgram field]
+)
 
 AC_ARG_WITH([stack-protector],
@@ -41 +57 @@
 
 AS_IF([test "x$with_zephyr" != xno],
-  [AS_IF([test "x$with_krb4" != "xno"],
+  [have_krb4=no
+
+   AS_IF([test "x$with_krb4" != "xno"],
    [AC_MSG_CHECKING([for Kerberos IV])
     AS_IF([krb5-config krb4 --libs >/dev/null 2>&1],
       [AC_MSG_RESULT([yes])
+       have_krb4=yes
        AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
        AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`"
@@ -51 +70 @@
       [AC_MSG_RESULT([no])
        AS_IF([test "x$with_krb4" = "xyes"],
-             [AC_MSG_ERROR([Kerberos IV requested but not found])])
-       PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
-       AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
-       LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
-     ])])
+             [AC_MSG_ERROR([Kerberos IV requested but not found])])])])
+
+   AS_IF([test "x$have_krb4" != xyes],
+     [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto],
+        [AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}"
+         LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
+        ],
+        [PKG_CHECK_MODULES([OPENSSL], [openssl],
+           [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}"
+            LIBS="${LIBS} ${OPENSSL_LIBS}"
+           ])])])
+
    AC_CHECK_LIB([zephyr], [ZGetSender],
    [LIBS="$LIBS -lzephyr"
@@ -150 +176 @@
 dnl Define __EXTENSIONS__ for strcasecmp on Solaris.
 AM_CFLAGS="$AM_CFLAGS -D__EXTENSIONS__"
+dnl Define _XOPEN_SOURCE_EXTENDED for some features in ncurses,
+dnl including cchar_t.  This should not be necessary with
+dnl _XOPEN_SOURCE=600, but some versions of ncurses
+dnl apparently still need it.
+AM_CFLAGS="$AM_CFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
 AC_SUBST([AM_CFLAGS])

filter.c

@@ -124 +124 @@
 
   op1 = owl_filter_parse_primitive_expression(argc-i, argv+i, &skip);
+  if(!op1) goto err;
   i += skip;
-  if(!op1) goto err;
 
   while(i < argc) {

filterproc.c

@@ -81 +81 @@
                                 &child_pid, &child_stdin, &child_stdout, NULL,
                                 NULL)) {
+    *out = NULL;
     return 1;
   }

functions.c

@@ -871 +871 @@
 void owl_function_loadsubs(const char *file)
 {
-  int ret, ret2;
-  const char *foo;
+  int ret, ret2, ret3;
   char *path;
 
@@ -884 +883 @@
 
   /* for backwards compatibility for now */
-  ret2=owl_zephyr_loaddefaultsubs();
+  ret2 = owl_zephyr_loaddefaultsubs();
+  ret3 = owl_zephyr_loadbarnowldefaultsubs();
 
   if (!owl_context_is_interactive(owl_global_get_context(&g))) return;
 
-  foo=file?file:"file";
-  if (ret==0 && ret2==0) {
+  if (ret == 0 && ret2 == 0 && ret3 == 0) {
     if (!file) {
       owl_function_makemsg("Subscribed to messages.");
@@ -895 +894 @@
       owl_function_makemsg("Subscribed to messages from %s", file);
     }
-  } else if (ret==-1) {
-    owl_function_error("Could not read %s", foo);
-  } else {
+  } else if (ret == -1) {
+    owl_function_error("Could not read %s", file ? file : "file");
+  } else if (ret2 == -1) {
     owl_function_error("Error subscribing to messages");
+  } else {
+    owl_function_error("Error subscribing to instanced personals");
   }
 }

perl/lib/BarnOwl.pm

@@ -93 +93 @@
 command line, and C<MESSAGE> is the zephyr body to send.
 
+=cut
+
+sub zephyr_zwrite {
+    my ($command, $message) = @_;
+    my $ret = BarnOwl::Internal::zephyr_zwrite($command, $message);
+    die "Error sending zephyr" unless $ret == 0;
+}
+
 =head2 ztext_stylestrip STRING
 

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -51 +51 @@
     my ($m) = @_;
     return undef if (!$m->is_loginout);
+    return undef if (!defined($m->fields));
     return $m->fields->[2];
 }
@@ -57 +58 @@
     my ($m) = @_;
     return undef if (!$m->is_loginout);
+    return undef if (!defined($m->fields));
     return $m->fields->[0];
 }

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -1313 +1313 @@
     {
         my @answer = $packet->answer;
-        return $answer[0]{target}, $answer[0]{port};
+        return $answer[0]->target, $answer[0]->port if @answer;
     }
 

perlconfig.c

@@ -92 +92 @@
                                       owl_new_sv(owl_message_get_##field(m)), 0)
 
-  if (owl_message_get_notice(m)) {
+  if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
     /* Handle zephyr-specific fields... */
-    AV *av_zfields;
-
-    av_zfields = newAV();
-    for (f = owl_zephyr_first_raw_field(owl_message_get_notice(m)); f != NULL;
-         f = owl_zephyr_next_raw_field(owl_message_get_notice(m), f)) {
-      ptr=owl_zephyr_field_as_utf8(owl_message_get_notice(m), f);
-      av_push(av_zfields, owl_new_sv(ptr));
-      g_free(ptr);
+    AV *av_zfields = newAV();
+    if (owl_message_get_notice(m)) {
+      for (f = owl_zephyr_first_raw_field(owl_message_get_notice(m)); f != NULL;
+           f = owl_zephyr_next_raw_field(owl_message_get_notice(m), f)) {
+        ptr = owl_zephyr_field_as_utf8(owl_message_get_notice(m), f);
+        av_push(av_zfields, owl_new_sv(ptr));
+        g_free(ptr);
+      }
+      (void)hv_store(h, "auth", strlen("auth"),
+                     owl_new_sv(owl_zephyr_get_authstr(owl_message_get_notice(m))), 0);
+    } else {
+      /* Incoming zephyrs without a ZNotice_t are pseudo-logins. To appease
+       * existing styles, put in bogus 'auth' and 'fields' keys. */
+      (void)hv_store(h, "auth", strlen("auth"), owl_new_sv("NO"), 0);
     }
     (void)hv_store(h, "fields", strlen("fields"), newRV_noinc((SV*)av_zfields), 0);
-
-    (void)hv_store(h, "auth", strlen("auth"), 
-                   owl_new_sv(owl_zephyr_get_authstr(owl_message_get_notice(m))),0);
   }
 

perlglue.xs

@@ -96 +96 @@
                 RETVAL
 
-void
-zephyr_zwrite(cmd,msg)
-        const char *cmd
-        const char *msg
-        PREINIT:
-                int i;
-        CODE:
-                i = owl_zwrite_create_and_send_from_line(cmd, msg);
-
 const utf8 *
 ztext_stylestrip(ztext)
@@ -475 +466 @@
         }
 
+int
+zephyr_zwrite(cmd,msg)
+        const char *cmd
+        const char *msg
+        CODE:
+                RETVAL = owl_zwrite_create_and_send_from_line(cmd, msg);
+        OUTPUT:
+                RETVAL
+
 MODULE = BarnOwl                PACKAGE = BarnOwl::Editwin
 

zcrypt.c

@@ -766 +766 @@
     "gpg",
     "--symmetric",
+    "--no-options",
+    "--no-default-keyring",
+    "--keyring", "/dev/null",
+    "--secret-keyring", "/dev/null",
     "--batch",
     "--quiet",
@@ -846 +850 @@
     "gpg",
     "--decrypt",
+    "--no-options",
+    "--no-default-keyring",
+    "--keyring", "/dev/null",
+    "--secret-keyring", "/dev/null",
     "--batch",
     "--no-use-agent",
@@ -858 +866 @@
 
   err = call_filter(argv, in, &out, &status);
+  free(in);
   if(err || status) {
     g_free(out);

zephyr.c

@@ -29 +29 @@
 #define HM_SVC_FALLBACK         htons((unsigned short) 2104)
 
-static char *owl_zephyr_dotfile(const char *name, const char *input)
+static CALLER_OWN char *owl_zephyr_dotfile(const char *name, const char *input)
 {
   if (input != NULL)
@@ -291 +291 @@
   struct stat statbuff;
 
-  subs = g_new(ZSubscription_t, subSize);
   subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
 
@@ -307 +306 @@
   if (!file)
     return -1;
+
+  subs = g_new(ZSubscription_t, subSize);
   while (owl_getline(&buffer, file)) {
     if (buffer[0] == '#' || buffer[0] == '\n')
@@ -728 +729 @@
   if (!owl_zwrite_recip_is_personal(recipient) && *owl_global_get_zsender(&g))
     notice.z_sender = zsender = long_zuser(owl_global_get_zsender(&g));
-  notice.z_default_format=zstr("Class $class, Instance $instance:\nTo: @bold($recipient) at $time $date\nFrom: @bold{$1 <$sender>}\n\n$2");
+  notice.z_default_format=zstr(ZEPHYR_DEFAULT_FORMAT);
   if (opcode) notice.z_opcode=zstr(opcode);
 
@@ -1023 +1024 @@
   }
 
+  g_free(subsfile);
   g_free(line);
 #endif