Wed Sep 7 15:14:45 UTC 2011

3 files changed, 0 insertions, 145 deletions

diff --git a/extra/ettercap/01_pointers_and_ints_dont_mix.diff b/extra/ettercap/01_pointers_and_ints_dont_mix.diff
deleted file mode 100644
index 65571309c..000000000
--- a/extra/ettercap/01_pointers_and_ints_dont_mix.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-See debian bug #521857, patch from Timothy Redaelli <timothy@redaelli.eu>
-Revised by Robert Edmonds <edmonds@debian.org>
-
---- a/src/protocols/ec_tcp.c
-+++ b/src/protocols/ec_tcp.c
-@@ -116,7 +116,7 @@
-    tcp = (struct tcp_header *)DECODE_DATA;
-    
-    opt_start = (u_char *)(tcp + 1);
--   opt_end = (u_char *)((int)tcp + tcp->off * 4);
-+   opt_end = (u_char *)(((u_char *)tcp) + tcp->off * 4);
- 
-    DECODED_LEN = (u_int32)(tcp->off * 4);
diff --git a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch b/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
deleted file mode 100644
index 1754f2e3d..000000000
--- a/extra/ettercap/ettercap-NG-0.7.3_dns_support_on_x86_64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/configure	2011-08-06 12:50:26.000000000 +0200
-+++ b/configure	2011-08-06 13:01:56.000000000 +0200
-@@ -15732,7 +15732,7 @@
- if ${ac_cv_search_dn_expand+:} false; then :
- 
- else
--  ac_cv_search_dn_expand=no
-+  ac_cv_search_dn_expand='-lresolv'
- fi
- rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
-@@ -15790,14 +15790,14 @@
-  ac_ec_dns=yes
- 
- else
--   if false; then
-+   if true; then
-   HAVE_DN_EXPAND_TRUE=
-   HAVE_DN_EXPAND_FALSE='#'
- else
-   HAVE_DN_EXPAND_TRUE='#'
-   HAVE_DN_EXPAND_FALSE=
- fi
-- ac_ec_dns=no
-+ ac_ec_dns=yes
- fi
- 
- 
---- a/src/ec_log.c	2004-09-30 18:01:45.000000000 +0200
-+++ b/src/ec_log.c	2011-08-06 13:04:30.000000000 +0200
-@@ -190,7 +190,7 @@
-       if (fd->cfd == NULL)
-          SEMIFATAL_ERROR("%s", gzerror(fd->cfd, &zerr));
-    } else {
--      fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY);
-+      fd->fd = open(filename, O_CREAT | O_TRUNC | O_RDWR | O_BINARY, 0666);
-       if (fd->fd == -1)
-          SEMIFATAL_ERROR("Can't create %s: %s", filename, strerror(errno));
-    }
diff --git a/extra/scim/wtf.patch b/extra/scim/wtf.patch
deleted file mode 100644
index c0e5ab078..000000000
--- a/extra/scim/wtf.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -aur old/extras/panel/scim_panel_gtk.cpp new/extras/panel/scim_panel_gtk.cpp
---- old/extras/panel/scim_panel_gtk.cpp	2011-08-04 13:21:29.000000000 -0700
-+++ new/extras/panel/scim_panel_gtk.cpp	2011-08-07 16:11:12.977663776 -0700
-@@ -479,12 +479,12 @@
- 
- static bool               _should_exit                 = false;
- 
-+static bool               _panel_is_on                 = false;
- 
--static struct timeval     _last_menu_deactivate_time = {0, 0};
-+static GThread           *_panel_agent_thread          = 0;
-+
-+static PanelAgent        *_panel_agent                 = 0;
- 
--// client repository
--static PropertyRepository            _frontend_property_repository;
--static HelperPropertyRepository      _helper_property_repository;
- static std::vector<String> _factory_menu_uuids;
- 
- static std::list<String>  _recent_factory_uuids;
-@@ -1187,16 +1187,16 @@
- 
-     GtkRequisition ws;
-     gint pos_x, pos_y;
-+
-+    gtk_widget_size_request (_toolbar_window, &ws);
-+
-+    pos_x = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X),
-                            workarea_x + workarea_width - ws.width);
-     pos_y = _config->read (String (SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_Y),
-                            workarea_y + workarea_height - ws.height);
-     if (pos_x == -1 && pos_y == -1) {
-         pos_x = workarea_x + workarea_width  - ws.width;
-         pos_y = workarea_y + workarea_height - ws.height;
--                           workarea_y + workarea_height - ws.height);
--    if (pos_x == -1 && pos_y == -1) {
--        pos_x = workarea_x + workarea_width  - ws.width;
--        pos_y = workarea_y + workarea_height - ws.height;
-     }
- 
-     if (_toolbar_auto_snap) {
-@@ -1215,6 +1215,10 @@
-     else if (pos_y < 0)
-         pos_y = 0;
- 
-+    if (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y || force) {
-+        gtk_window_move (GTK_WINDOW (_toolbar_window), pos_x, pos_y);
-+        _toolbar_window_x = pos_x;
-+        _toolbar_window_y = pos_y;
-     }
- }
- 
-@@ -1227,9 +1231,9 @@
- #endif
-     return gdk_screen_width ();
- }
--        return gdk_screen_get_width (_current_screen);
--#endif
--    return gdk_screen_width ();
-+
-+static int
-+ui_screen_height (void)
- {
- #if GDK_MULTIHEAD_SAFE
-     if (_current_screen)
-@@ -1237,10 +1241,6 @@
- #endif
-     return gdk_screen_height ();
- }
--        return gdk_screen_get_height (_current_screen);
--#endif
--    return gdk_screen_height ();
--}
- 
- static void
- ui_get_workarea (int &x, int &y, int &width, int &height)
-@@ -1929,11 +1929,11 @@
-     static gulong motion_handler;
-     GdkCursor *cursor;
- 
--        if (!_config.null () &&
--            (_toolbar_window_x != pos_x || _toolbar_window_y != pos_y)) {
--            _config->write (
--                SCIM_CONFIG_PANEL_GTK_TOOLBAR_POS_X, pos_x);
--            _config->write (
-+    if (click_type == 0 && event->button <= 1) {
-+        if (_toolbar_window_draging)
-+            return FALSE;
-+
-+        // Connection pointer motion handler to this window.
-         motion_handler = g_signal_connect (G_OBJECT (window), "motion-notify-event",
-                                            G_CALLBACK (ui_toolbar_window_motion_cb),
-                                            NULL);