Changeset 8b0d793
- Timestamp:
- Nov 17, 2013, 4:00:27 AM (10 years ago)
- 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. - Files:
-
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
.gitignore
r81691e8 r935eb10 4 4 .deps 5 5 META.yml 6 MYMETA.yml 6 7 Makefile 7 8 Makefile.in -
AUTHORS
r1d2c4c3 ra634103 3 3 4 4 The following people have provided patches or other contributions: 5 Alex Vandiver 6 Kevin Chen 7 Arun Tharuvai 5 8 Sam Hartman 6 Alex Vandiver7 Geoffrey Thomas8 9 Derrick Brashear 9 10 David Glasser 11 Eric Price 10 12 Matthew Goldstein 11 Arun Tharuvai 12 Kevin Chen 13 Eric Price 13 Geoffrey Thomas 14 Anders Kaseorg 15 Greg Price 16 Chris Lesniewski-Laas 17 Alex Dehnert 18 Edward Z. Yang 19 Karl Ramm 20 Evan Broder 21 David Benjamin 22 Cathy Zhang 23 Joshua Oreman 24 Leonid Grinberg 25 Kevin Riggle 26 Brian Sniffen 27 William Throwe 28 Jason Gross 29 Adam Glasgall 30 Tim Hill 31 DD Liu 32 Betsy Riley 33 Robert Jacobs 14 34 15 BarnOwl is based on code from Owl, which was originally primar ly35 BarnOwl is based on code from Owl, which was originally primarily 16 36 written by James Kretchmar. Erik Nygren also made substantial 17 contributions and improvem nts to the program.37 contributions and improvements to the program. 18 38 19 The following people provided patches and other tech incal support for39 The following people provided patches and other technical support for 20 40 Owl: 21 41 … … 30 50 Mark Eichin 31 51 32 Mark Eichin is also maintaining the debian package of Owl.52 Mark Eichin is also maintaining the Debian package of Owl. 33 53 34 54 The following people helped with beta testing the earliest versions of -
ChangeLog
r489df88 rb783311 1 1 1.9 2 * Update Jabber module for Net::DNS changes -james2vegas@aim.com 3 * Update and make configurable the Zephyr default format -adehnert@mit.edu 4 * Fix a crash when zcrypt fails -andersk@mit.edu 5 * Fix building with OpenSSL before 0.9.8 -andersk@mit.edu 6 * Make :loadsubs reload instanced personals too -davidben@mit.edu 7 * Make Perl zephyr_zwrite call die() when it fails -jgross@mit.edu 8 * Tell gpg calls from zcrypt to ignore ~/.gnupg -andersk@mit.edu 9 * Replace outgoing zephyr default format with a small URL -geofft@mit.edu 2 10 * Add getnumlines() to perl interface -asedeno@mit.edu 3 11 * Include names of invalid filters on filter errors -adehnert@mit.edu -
configure.ac
r489df88 rb783311 1 1 dnl Process this file with autoconf to produce a configure script. 2 AC_INIT([BarnOwl],[1.9rc 1],[bug-barnowl@mit.edu])2 AC_INIT([BarnOwl],[1.9rc2],[bug-barnowl@mit.edu]) 3 3 AM_INIT_AUTOMAKE([1.7.0 -Wall -Wno-portability foreign]) 4 4 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) … … 9 9 AC_PROG_CC 10 10 AC_PROG_CC_C99 11 12 AC_ARG_WITH([zephyr-default-format], 13 [AS_HELP_STRING([--with-zephyr-default-format], 14 [value for the default format zephyrgram field])], 15 [ 16 case $withval in 17 yes) withval='Config error: see http://mit.edu/df';; 18 no) withval='';; 19 esac 20 zephyr_default_format=$withval 21 ], 22 [zephyr_default_format='Config error: see http://mit.edu/df']) 23 AC_DEFINE_UNQUOTED( 24 [ZEPHYR_DEFAULT_FORMAT], ["$zephyr_default_format"], 25 [Value for the default format zephyrgram field] 26 ) 11 27 12 28 AC_ARG_WITH([stack-protector], … … 41 57 42 58 AS_IF([test "x$with_zephyr" != xno], 43 [AS_IF([test "x$with_krb4" != "xno"], 59 [have_krb4=no 60 61 AS_IF([test "x$with_krb4" != "xno"], 44 62 [AC_MSG_CHECKING([for Kerberos IV]) 45 63 AS_IF([krb5-config krb4 --libs >/dev/null 2>&1], 46 64 [AC_MSG_RESULT([yes]) 65 have_krb4=yes 47 66 AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV]) 48 67 AM_CFLAGS="${AM_CFLAGS} `krb5-config krb4 --cflags`" … … 51 70 [AC_MSG_RESULT([no]) 52 71 AS_IF([test "x$with_krb4" = "xyes"], 53 [AC_MSG_ERROR([Kerberos IV requested but not found])]) 54 PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto]) 55 AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}" 56 LIBS="${LIBS} ${LIBCRYPTO_LIBS}" 57 ])]) 72 [AC_MSG_ERROR([Kerberos IV requested but not found])])])]) 73 74 AS_IF([test "x$have_krb4" != xyes], 75 [PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto], 76 [AM_CFLAGS="${AM_CFLAGS} ${LIBCRYPTO_CFLAGS}" 77 LIBS="${LIBS} ${LIBCRYPTO_LIBS}" 78 ], 79 [PKG_CHECK_MODULES([OPENSSL], [openssl], 80 [AM_CFLAGS="${AM_CFLAGS} ${OPENSSL_CFLAGS}" 81 LIBS="${LIBS} ${OPENSSL_LIBS}" 82 ])])]) 83 58 84 AC_CHECK_LIB([zephyr], [ZGetSender], 59 85 [LIBS="$LIBS -lzephyr" … … 150 176 dnl Define __EXTENSIONS__ for strcasecmp on Solaris. 151 177 AM_CFLAGS="$AM_CFLAGS -D__EXTENSIONS__" 178 dnl Define _XOPEN_SOURCE_EXTENDED for some features in ncurses, 179 dnl including cchar_t. This should not be necessary with 180 dnl _XOPEN_SOURCE=600, but some versions of ncurses 181 dnl apparently still need it. 182 AM_CFLAGS="$AM_CFLAGS -D_XOPEN_SOURCE_EXTENDED" 152 183 153 184 AC_SUBST([AM_CFLAGS]) -
filter.c
r30781f6 r1cefe5f 124 124 125 125 op1 = owl_filter_parse_primitive_expression(argc-i, argv+i, &skip); 126 if(!op1) goto err; 126 127 i += skip; 127 if(!op1) goto err;128 128 129 129 while(i < argc) { -
filterproc.c
r97cdbaf5 rb70556f 81 81 &child_pid, &child_stdin, &child_stdout, NULL, 82 82 NULL)) { 83 *out = NULL; 83 84 return 1; 84 85 } -
functions.c
r06470d7 r990772c 871 871 void owl_function_loadsubs(const char *file) 872 872 { 873 int ret, ret2; 874 const char *foo; 873 int ret, ret2, ret3; 875 874 char *path; 876 875 … … 884 883 885 884 /* for backwards compatibility for now */ 886 ret2=owl_zephyr_loaddefaultsubs(); 885 ret2 = owl_zephyr_loaddefaultsubs(); 886 ret3 = owl_zephyr_loadbarnowldefaultsubs(); 887 887 888 888 if (!owl_context_is_interactive(owl_global_get_context(&g))) return; 889 889 890 foo=file?file:"file"; 891 if (ret==0 && ret2==0) { 890 if (ret == 0 && ret2 == 0 && ret3 == 0) { 892 891 if (!file) { 893 892 owl_function_makemsg("Subscribed to messages."); … … 895 894 owl_function_makemsg("Subscribed to messages from %s", file); 896 895 } 897 } else if (ret ==-1) {898 owl_function_error("Could not read %s", f oo);899 } else {896 } else if (ret == -1) { 897 owl_function_error("Could not read %s", file ? file : "file"); 898 } else if (ret2 == -1) { 900 899 owl_function_error("Error subscribing to messages"); 900 } else { 901 owl_function_error("Error subscribing to instanced personals"); 901 902 } 902 903 } -
perl/lib/BarnOwl.pm
rb303ba2 r7975229 93 93 command line, and C<MESSAGE> is the zephyr body to send. 94 94 95 =cut 96 97 sub zephyr_zwrite { 98 my ($command, $message) = @_; 99 my $ret = BarnOwl::Internal::zephyr_zwrite($command, $message); 100 die "Error sending zephyr" unless $ret == 0; 101 } 102 95 103 =head2 ztext_stylestrip STRING 96 104 -
perl/lib/BarnOwl/Message/Zephyr.pm
rbf70350 r1e2fab5 51 51 my ($m) = @_; 52 52 return undef if (!$m->is_loginout); 53 return undef if (!defined($m->fields)); 53 54 return $m->fields->[2]; 54 55 } … … 57 58 my ($m) = @_; 58 59 return undef if (!$m->is_loginout); 60 return undef if (!defined($m->fields)); 59 61 return $m->fields->[0]; 60 62 } -
perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm
r678f607 r384b2fa 1313 1313 { 1314 1314 my @answer = $packet->answer; 1315 return $answer[0] {target}, $answer[0]{port};1315 return $answer[0]->target, $answer[0]->port if @answer; 1316 1316 } 1317 1317 -
perlconfig.c
rd199207 r1e2fab5 92 92 owl_new_sv(owl_message_get_##field(m)), 0) 93 93 94 if (owl_message_ get_notice(m)) {94 if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) { 95 95 /* Handle zephyr-specific fields... */ 96 AV *av_zfields; 97 98 av_zfields = newAV(); 99 for (f = owl_zephyr_first_raw_field(owl_message_get_notice(m)); f != NULL; 100 f = owl_zephyr_next_raw_field(owl_message_get_notice(m), f)) { 101 ptr=owl_zephyr_field_as_utf8(owl_message_get_notice(m), f); 102 av_push(av_zfields, owl_new_sv(ptr)); 103 g_free(ptr); 96 AV *av_zfields = newAV(); 97 if (owl_message_get_notice(m)) { 98 for (f = owl_zephyr_first_raw_field(owl_message_get_notice(m)); f != NULL; 99 f = owl_zephyr_next_raw_field(owl_message_get_notice(m), f)) { 100 ptr = owl_zephyr_field_as_utf8(owl_message_get_notice(m), f); 101 av_push(av_zfields, owl_new_sv(ptr)); 102 g_free(ptr); 103 } 104 (void)hv_store(h, "auth", strlen("auth"), 105 owl_new_sv(owl_zephyr_get_authstr(owl_message_get_notice(m))), 0); 106 } else { 107 /* Incoming zephyrs without a ZNotice_t are pseudo-logins. To appease 108 * existing styles, put in bogus 'auth' and 'fields' keys. */ 109 (void)hv_store(h, "auth", strlen("auth"), owl_new_sv("NO"), 0); 104 110 } 105 111 (void)hv_store(h, "fields", strlen("fields"), newRV_noinc((SV*)av_zfields), 0); 106 107 (void)hv_store(h, "auth", strlen("auth"),108 owl_new_sv(owl_zephyr_get_authstr(owl_message_get_notice(m))),0);109 112 } 110 113 -
perlglue.xs
rb303ba2 r7975229 96 96 RETVAL 97 97 98 void99 zephyr_zwrite(cmd,msg)100 const char *cmd101 const char *msg102 PREINIT:103 int i;104 CODE:105 i = owl_zwrite_create_and_send_from_line(cmd, msg);106 107 98 const utf8 * 108 99 ztext_stylestrip(ztext) … … 475 466 } 476 467 468 int 469 zephyr_zwrite(cmd,msg) 470 const char *cmd 471 const char *msg 472 CODE: 473 RETVAL = owl_zwrite_create_and_send_from_line(cmd, msg); 474 OUTPUT: 475 RETVAL 476 477 477 MODULE = BarnOwl PACKAGE = BarnOwl::Editwin 478 478 -
zcrypt.c
r97cdbaf5 r017bf98 766 766 "gpg", 767 767 "--symmetric", 768 "--no-options", 769 "--no-default-keyring", 770 "--keyring", "/dev/null", 771 "--secret-keyring", "/dev/null", 768 772 "--batch", 769 773 "--quiet", … … 846 850 "gpg", 847 851 "--decrypt", 852 "--no-options", 853 "--no-default-keyring", 854 "--keyring", "/dev/null", 855 "--secret-keyring", "/dev/null", 848 856 "--batch", 849 857 "--no-use-agent", … … 858 866 859 867 err = call_filter(argv, in, &out, &status); 868 free(in); 860 869 if(err || status) { 861 870 g_free(out); -
zephyr.c
r80bea5b rff25de6 29 29 #define HM_SVC_FALLBACK htons((unsigned short) 2104) 30 30 31 static char *owl_zephyr_dotfile(const char *name, const char *input)31 static CALLER_OWN char *owl_zephyr_dotfile(const char *name, const char *input) 32 32 { 33 33 if (input != NULL) … … 291 291 struct stat statbuff; 292 292 293 subs = g_new(ZSubscription_t, subSize);294 293 subsfile = owl_zephyr_dotfile(".zephyr.subs", filename); 295 294 … … 307 306 if (!file) 308 307 return -1; 308 309 subs = g_new(ZSubscription_t, subSize); 309 310 while (owl_getline(&buffer, file)) { 310 311 if (buffer[0] == '#' || buffer[0] == '\n') … … 728 729 if (!owl_zwrite_recip_is_personal(recipient) && *owl_global_get_zsender(&g)) 729 730 notice.z_sender = zsender = long_zuser(owl_global_get_zsender(&g)); 730 notice.z_default_format=zstr( "Class $class, Instance $instance:\nTo: @bold($recipient) at $time $date\nFrom: @bold{$1 <$sender>}\n\n$2");731 notice.z_default_format=zstr(ZEPHYR_DEFAULT_FORMAT); 731 732 if (opcode) notice.z_opcode=zstr(opcode); 732 733 … … 1023 1024 } 1024 1025 1026 g_free(subsfile); 1025 1027 g_free(line); 1026 1028 #endif
Note: See TracChangeset
for help on using the changeset viewer.