Merge branch 'master' into aac

Conflicts:

	Makefile.in

Makefile.in looks fine. WTF is git complaining about?

diff --git a/NEWS b/NEWS
index 6bbb7ba59ad886bbf6b77af42e8ccde62bcfb111..4444f9e0123516d2a02db1872e1b1a05dc2e26e4 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,11 @@
 NEWS
 ====
 
-0.?.? (to be announced) "oriented abstraction"
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+0.?.? (to be announced) "sonic convolution"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+0.2.12 (2006-05-12) "oriented abstraction"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Many user-visible changes in this release and lots of new
 features:
 
@@ -11,7 +14,7 @@ features:
        congestion control protocol. You'll need a fairly new kernel
        for this.
 
-       o paraslash compiles under MacOs (thanks to Gerd Becker)
+       o paraslash works on Mac OS X (thanks to Gerd Becker)
 
        o para_play renamed to para_write
 
@@ -23,7 +26,7 @@ features:
 
        o update to libortp-0.9.1
 
-       o update to gengetopt-2.17
+       o update to gengetopt-2.17rc
 
        o para_client no longer depends on libreadline (as the
        code for the interactive mode was removed).
@@ -37,8 +40,6 @@ features:
        o configure: new command line options: --enable-mysql-headers
        and --enable-mysql-libs
 
-
-
 0.2.11 (2006-03-11) "atomic duality"
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/command.c b/command.c
index e625990213b295b9be3577db3670dbc6d80f3427..f5b39731f94224f81c954949e7fbf41d8aa1e066 100644 (file)
--- a/command.c
+++ b/command.c
@@ -1175,7 +1175,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
        if (use_rc4) {
                crypt_function_recv = rc4_recv;
                crypt_function_send = rc4_send;
-               PARA_INFO_LOG("%s", "rc4 encrytion activated\n");
+               PARA_INFO_LOG("%s", "rc4 encryption activated\n");
        }
        /* read command */
        while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {

diff --git a/scripts/demo-script b/scripts/demo-script
index 6a51ec1651c3cbc4aeaeb6bc688898682f32d12e..1e394499fa2a357e3adc2ef4ba715443694b6278 100755 (executable)
--- a/scripts/demo-script
+++ b/scripts/demo-script
@@ -6,7 +6,7 @@ dir="$HOME/.paraslash"
 client_conf="$dir/client.conf"
 audioc_conf="$dir/audioc.conf"
 server=www.paraslash.org
-proj=paraslash-0.2.11
+proj=paraslash-0.2.12
 df=$proj.tar.bz2 # download file
 url=http://$server/versions/$df
 kf="$dir/key.anonymous" # key file

diff --git a/versions/paraslash-0.2.12.tar.bz2 b/versions/paraslash-0.2.12.tar.bz2
new file mode 100644 (file)
index 0000000..b515657
Binary files /dev/null and b/versions/paraslash-0.2.12.tar.bz2 differ

diff --git a/versions/paraslash-0.2.12.tar.bz2.asc b/versions/paraslash-0.2.12.tar.bz2.asc
new file mode 100644 (file)
index 0000000..21a7f01
--- /dev/null
+++ b/versions/paraslash-0.2.12.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQBEZJtQWto1QDEAkw8RAjLCAJ4odLb1C537Vb8PqWgBIQ7j1LPZ6gCgoTH5
+SnumLYk+AvSQ5id6/nRsI9U=
+=9pnj
+-----END PGP SIGNATURE-----

diff --git a/web/index.in.html b/web/index.in.html
index 211562f0be88b5bca9dc52ffed8405edf77a21e0..29ce9d67dbb54d97d6b8cde22d7a3fa80e960af0 100644 (file)
--- a/web/index.in.html
+++ b/web/index.in.html
@@ -1,8 +1,12 @@
 <h3>Events</h3>
 <ul>
+       <li>2006-05-12: <a href="versions/paraslash-0.2.12.tar.bz2">paraslash-0.2.12</a>
+               <a href="versions/paraslash-0.2.12.tar.bz2.asc">(sig)</a>
+               "oriented abstraction"
+       </li>
        <li>2006-03-11: <a href="versions/paraslash-0.2.11.tar.bz2">paraslash-0.2.11</a>
                <a href="versions/paraslash-0.2.11.tar.bz2.asc">(sig)</a>
-               atomic duality"
+               "atomic duality"
        </li>
        <li>2006-02-22: <a href="/cgi-bin/gitweb.cgi?p=.git;a=shortlog">browsable changelog</a> (gitweb)</li>
        <li>2006-02-17: <a href="versions/paraslash-0.2.10.tar.bz2">paraslash-0.2.10</a>