diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-03-30 09:54:00 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-03-30 09:54:00 +0000 |
| commit | 38de822769246a605c24962836af633fcc960bfd (patch) | |
| tree | 28e310a32027f59ab8d6b4e8859b0405a29e5ba8 /net-im/silc-server/files | |
| parent | Version bump; bugs #211853 and #211938. (diff) | |
| download | historical-38de822769246a605c24962836af633fcc960bfd.tar.gz historical-38de822769246a605c24962836af633fcc960bfd.tar.bz2 historical-38de822769246a605c24962836af633fcc960bfd.zip | |
old
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-im/silc-server/files')
| -rw-r--r-- | net-im/silc-server/files/1.0-fPIC.patch | 11 | ||||
| -rw-r--r-- | net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch | 84 |
2 files changed, 0 insertions, 95 deletions
diff --git a/net-im/silc-server/files/1.0-fPIC.patch b/net-im/silc-server/files/1.0-fPIC.patch deleted file mode 100644 index f8faee6ec966..000000000000 --- a/net-im/silc-server/files/1.0-fPIC.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- silc-server-1.0.orig/lib/silccrypt/Makefile.am 2005-06-08 20:59:07.877340006 +0000 -+++ silc-server-1.0/lib/silccrypt/Makefile.am 2005-06-08 20:59:54.936564721 +0000 -@@ -36,7 +36,7 @@ - LTFLAGS = - endif - --CFLAGS = $(LTFLAGS) -+CFLAGS = $(LTFLAGS) -fPIC - - - EXTRA_DIST = *.h $(SILC_EXTRA_DIST) diff --git a/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch b/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch deleted file mode 100644 index b5e6061c1590..000000000000 --- a/net-im/silc-server/files/silc-server-1.0.2-join-hmac.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -ur silc-server-1.0.2.orig/apps/silcd/command.c silc-server-1.0.2/apps/silcd/command.c ---- silc-server-1.0.2.orig/apps/silcd/command.c 2007-03-06 11:21:40.000000000 +0100 -+++ silc-server-1.0.2/apps/silcd/command.c 2007-03-06 13:33:28.000000000 +0100 -@@ -2441,10 +2441,22 @@ - channel = silc_server_create_new_channel(server, server->id, cipher, - hmac, channel_name, TRUE); - if (!channel) { -- silc_server_command_send_status_data( -- cmd, SILC_COMMAND_JOIN, -- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -- 0, 2, cipher, strlen(cipher)); -+ if (cipher) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, cipher, strlen(cipher)); -+ } else if (hmac) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, hmac, strlen(hmac)); -+ } else { -+ silc_server_command_send_status_reply( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_RESOURCE_LIMIT, -+ 0); -+ } - silc_free(client_id); - goto out; - } -@@ -2505,10 +2517,22 @@ - channel = silc_server_create_new_channel(server, server->id, cipher, - hmac, channel_name, TRUE); - if (!channel) { -- silc_server_command_send_status_data( -- cmd, SILC_COMMAND_JOIN, -- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0, -- 2, cipher, strlen(cipher)); -+ if (cipher) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, cipher, strlen(cipher)); -+ } else if (hmac) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, hmac, strlen(hmac)); -+ } else { -+ silc_server_command_send_status_reply( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_RESOURCE_LIMIT, -+ 0); -+ } - silc_free(client_id); - goto out; - } -@@ -2541,10 +2565,22 @@ - channel = silc_server_create_new_channel(server, server->id, cipher, - hmac, channel_name, TRUE); - if (!channel) { -- silc_server_command_send_status_data( -- cmd, SILC_COMMAND_JOIN, -- SILC_STATUS_ERR_UNKNOWN_ALGORITHM, 0, -- 2, cipher, strlen(cipher)); -+ if (cipher) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, cipher, strlen(cipher)); -+ } else if (hmac) { -+ silc_server_command_send_status_data( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_UNKNOWN_ALGORITHM, -+ 0, 2, hmac, strlen(hmac)); -+ } else { -+ silc_server_command_send_status_reply( -+ cmd, SILC_COMMAND_JOIN, -+ SILC_STATUS_ERR_RESOURCE_LIMIT, -+ 0); -+ } - silc_free(client_id); - goto out; - } |