| 1 |
commit: 6e0c6326444d7fac05d56996e923b9f4fdbfa6c8 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 19:54:15 2017 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 7 19:59:05 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e0c6326 |
| 7 |
|
| 8 |
sys-auth/otpcalc: Remove unused patches from FILESDIR. |
| 9 |
|
| 10 |
These have been moved to a patchset in SRC_URI some time ago. |
| 11 |
Thanks to Michael Mair-Keimberger for pointing this out. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 14 |
|
| 15 |
sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff | 13 - |
| 16 |
.../files/otpcalc-0.97-gtk-deprecated.patch | 261 --------------------- |
| 17 |
.../otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch | 72 ------ |
| 18 |
.../files/otpcalc-0.97-sha1-byteorder.patch | 53 ----- |
| 19 |
sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch | 24 -- |
| 20 |
sys-auth/otpcalc/files/otpcalc-crypto-proto.diff | 13 - |
| 21 |
.../otpcalc/files/otpcalc-man-table-format.diff | 35 --- |
| 22 |
7 files changed, 471 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff b/sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff |
| 25 |
deleted file mode 100644 |
| 26 |
index 53a32c4..00000000 |
| 27 |
--- a/sys-auth/otpcalc/files/otpcalc-0.97-badindex.diff |
| 28 |
+++ /dev/null |
| 29 |
@@ -1,13 +0,0 @@ |
| 30 |
-Allocate enough elements for array of func ptrs, bug 123976. |
| 31 |
- |
| 32 |
---- otpCalc-0.97.orig/callbacks.c |
| 33 |
-+++ otpCalc-0.97/callbacks.c |
| 34 |
-@@ -81,7 +81,7 @@ |
| 35 |
- void calculate(void) |
| 36 |
- { |
| 37 |
- |
| 38 |
-- void (*hashes[4])(); |
| 39 |
-+ void (*hashes[5])(); |
| 40 |
- |
| 41 |
- gchar *challenge, *passwd, *message, *response; |
| 42 |
- struct tokens *set; |
| 43 |
|
| 44 |
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-gtk-deprecated.patch b/sys-auth/otpcalc/files/otpcalc-0.97-gtk-deprecated.patch |
| 45 |
deleted file mode 100644 |
| 46 |
index 8366177..00000000 |
| 47 |
--- a/sys-auth/otpcalc/files/otpcalc-0.97-gtk-deprecated.patch |
| 48 |
+++ /dev/null |
| 49 |
@@ -1,261 +0,0 @@ |
| 50 |
-Do not use deprecated GTK symbols. |
| 51 |
-Use accessor functions for GTK struct members. |
| 52 |
- |
| 53 |
---- otpCalc-0.97-orig/callbacks.c |
| 54 |
-+++ otpCalc-0.97/callbacks.c |
| 55 |
-@@ -65,14 +65,16 @@ |
| 56 |
- |
| 57 |
- bu_about_close = gtk_button_new_with_label("Close"); |
| 58 |
- |
| 59 |
-- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(di_about)->vbox), |
| 60 |
-+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area( |
| 61 |
-+ GTK_DIALOG(di_about))), |
| 62 |
- la_about); |
| 63 |
-- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(di_about)->action_area), |
| 64 |
-+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_action_area( |
| 65 |
-+ GTK_DIALOG(di_about))), |
| 66 |
- bu_about_close); |
| 67 |
- |
| 68 |
-- gtk_signal_connect_object(GTK_OBJECT(bu_about_close), "clicked", |
| 69 |
-- GTK_SIGNAL_FUNC(gtk_widget_destroy), |
| 70 |
-- (gpointer)di_about); |
| 71 |
-+ g_signal_connect_swapped(G_OBJECT(bu_about_close), "clicked", |
| 72 |
-+ G_CALLBACK(gtk_widget_destroy), |
| 73 |
-+ (gpointer)di_about); |
| 74 |
- |
| 75 |
- gtk_widget_show_all(di_about); |
| 76 |
- |
| 77 |
-@@ -176,10 +178,11 @@ |
| 78 |
- ); |
| 79 |
- gtk_misc_set_padding(GTK_MISC(la_netwarn), 10, 10); |
| 80 |
- gtk_label_set_line_wrap(GTK_LABEL(la_netwarn), TRUE); |
| 81 |
-- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(di_netwarn)->vbox), |
| 82 |
-+ gtk_container_add(GTK_CONTAINER(gtk_dialog_get_content_area( |
| 83 |
-+ GTK_DIALOG(di_netwarn))), |
| 84 |
- la_netwarn); |
| 85 |
- |
| 86 |
-- aa_netwarn = GTK_DIALOG(di_netwarn)->action_area; |
| 87 |
-+ aa_netwarn = gtk_dialog_get_action_area(GTK_DIALOG(di_netwarn)); |
| 88 |
- |
| 89 |
- bu_netwarn_ok = gtk_button_new_with_label("Yes"); |
| 90 |
- gtk_container_add(GTK_CONTAINER(aa_netwarn), bu_netwarn_ok); |
| 91 |
-@@ -187,12 +190,12 @@ |
| 92 |
- bu_netwarn_canc = gtk_button_new_with_label("No"); |
| 93 |
- gtk_container_add(GTK_CONTAINER(aa_netwarn), bu_netwarn_canc); |
| 94 |
- |
| 95 |
-- gtk_signal_connect_object(GTK_OBJECT(bu_netwarn_ok), "clicked", |
| 96 |
-- GTK_SIGNAL_FUNC(gtk_widget_destroy), |
| 97 |
-- (gpointer)di_netwarn); |
| 98 |
-+ g_signal_connect_swapped(G_OBJECT(bu_netwarn_ok), "clicked", |
| 99 |
-+ G_CALLBACK(gtk_widget_destroy), |
| 100 |
-+ (gpointer)di_netwarn); |
| 101 |
- |
| 102 |
-- gtk_signal_connect_object(GTK_OBJECT(bu_netwarn_canc), "clicked", |
| 103 |
-- GTK_SIGNAL_FUNC(gtk_main_quit), NULL); |
| 104 |
-+ g_signal_connect_swapped(G_OBJECT(bu_netwarn_canc), "clicked", |
| 105 |
-+ G_CALLBACK(gtk_main_quit), NULL); |
| 106 |
- |
| 107 |
- gtk_widget_show_all(di_netwarn); |
| 108 |
- |
| 109 |
-@@ -207,13 +210,13 @@ |
| 110 |
- unsigned short parsed; |
| 111 |
- |
| 112 |
- |
| 113 |
-- if (selection->length < 1) |
| 114 |
-+ if (gtk_selection_data_get_length(selection) < 1) |
| 115 |
- return; |
| 116 |
- |
| 117 |
- set = g_malloc(sizeof(struct tokens)); |
| 118 |
-- set->seed = g_malloc(selection->length); |
| 119 |
-+ set->seed = g_malloc(gtk_selection_data_get_length(selection)); |
| 120 |
- |
| 121 |
-- parsed = parse(selection->data, set); |
| 122 |
-+ parsed = parse(gtk_selection_data_get_data(selection), set); |
| 123 |
- |
| 124 |
- g_free(set->seed); |
| 125 |
- g_free(set); |
| 126 |
-@@ -221,7 +224,8 @@ |
| 127 |
- if (!parsed) |
| 128 |
- return; |
| 129 |
- |
| 130 |
-- gtk_entry_set_text(GTK_ENTRY(te_challenge), selection->data); |
| 131 |
-+ gtk_entry_set_text(GTK_ENTRY(te_challenge), |
| 132 |
-+ gtk_selection_data_get_data(selection)); |
| 133 |
- |
| 134 |
- } |
| 135 |
- |
| 136 |
---- otpCalc-0.97-orig/gui.c |
| 137 |
-+++ otpCalc-0.97/gui.c |
| 138 |
-@@ -51,17 +51,17 @@ |
| 139 |
- /* Setup the main window... */ |
| 140 |
- wi_top = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
| 141 |
- gtk_window_set_title(GTK_WINDOW(wi_top), "otpCalc"); |
| 142 |
-- gtk_window_set_policy(GTK_WINDOW(wi_top), FALSE, FALSE, TRUE); |
| 143 |
-+ gtk_window_set_resizable(GTK_WINDOW(wi_top), FALSE); |
| 144 |
- gtk_window_set_wmclass(GTK_WINDOW(wi_top), "otpCalc", "Calc"); |
| 145 |
- |
| 146 |
-- gtk_signal_connect(GTK_OBJECT(wi_top), "delete_event", |
| 147 |
-- GTK_SIGNAL_FUNC(gtk_main_quit), NULL); |
| 148 |
-+ g_signal_connect(G_OBJECT(wi_top), "delete_event", |
| 149 |
-+ G_CALLBACK(gtk_main_quit), NULL); |
| 150 |
- |
| 151 |
-- gtk_signal_connect(GTK_OBJECT(wi_top), "focus_in_event", |
| 152 |
-- GTK_SIGNAL_FUNC(focus), NULL); |
| 153 |
-+ g_signal_connect(G_OBJECT(wi_top), "focus_in_event", |
| 154 |
-+ G_CALLBACK(focus), NULL); |
| 155 |
- |
| 156 |
-- gtk_signal_connect(GTK_OBJECT(wi_top), "selection_received", |
| 157 |
-- GTK_SIGNAL_FUNC(selector), NULL); |
| 158 |
-+ g_signal_connect(G_OBJECT(wi_top), "selection_received", |
| 159 |
-+ G_CALLBACK(selector), NULL); |
| 160 |
- /* Done. */ |
| 161 |
- |
| 162 |
- |
| 163 |
-@@ -82,9 +82,9 @@ |
| 164 |
- /* Setup the file menu... */ |
| 165 |
- me_file = gtk_menu_new(); |
| 166 |
- mi_file_quit = gtk_menu_item_new_with_label("Quit"); |
| 167 |
-- gtk_menu_append(GTK_MENU(me_file), mi_file_quit); |
| 168 |
-- gtk_signal_connect_object(GTK_OBJECT(mi_file_quit), "activate", |
| 169 |
-- GTK_SIGNAL_FUNC(gtk_main_quit), NULL); |
| 170 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(me_file), mi_file_quit); |
| 171 |
-+ g_signal_connect_swapped(G_OBJECT(mi_file_quit), "activate", |
| 172 |
-+ G_CALLBACK(gtk_main_quit), NULL); |
| 173 |
- |
| 174 |
- gtk_widget_add_accelerator(mi_file_quit, "activate", accel_group, 0x071, |
| 175 |
- GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); |
| 176 |
-@@ -97,40 +97,45 @@ |
| 177 |
- me_sett = gtk_menu_new(); |
| 178 |
- |
| 179 |
- mi_sett_sha1 = gtk_radio_menu_item_new_with_label(hashes, "sha1"); |
| 180 |
-- gtk_menu_append(GTK_MENU(me_sett), mi_sett_sha1); |
| 181 |
-- gtk_signal_connect_object(GTK_OBJECT(mi_sett_sha1), "activate", |
| 182 |
-- GTK_SIGNAL_FUNC(sethash), (void *)SHA1); |
| 183 |
-- hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_sha1)); |
| 184 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_sha1); |
| 185 |
-+ g_signal_connect_swapped(G_OBJECT(mi_sett_sha1), "activate", |
| 186 |
-+ G_CALLBACK(sethash), (void *)SHA1); |
| 187 |
-+ hashes = gtk_radio_menu_item_get_group( |
| 188 |
-+ GTK_RADIO_MENU_ITEM(mi_sett_sha1)); |
| 189 |
- gtk_widget_show(mi_sett_sha1); |
| 190 |
- |
| 191 |
- mi_sett_rmd160 = gtk_radio_menu_item_new_with_label(hashes, "rmd160"); |
| 192 |
-- gtk_menu_append(GTK_MENU(me_sett), mi_sett_rmd160); |
| 193 |
-- gtk_signal_connect_object(GTK_OBJECT(mi_sett_rmd160), "activate", |
| 194 |
-- GTK_SIGNAL_FUNC(sethash), (void *)RMD160); |
| 195 |
-- hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_rmd160)); |
| 196 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_rmd160); |
| 197 |
-+ g_signal_connect_swapped(G_OBJECT(mi_sett_rmd160), "activate", |
| 198 |
-+ G_CALLBACK(sethash), (void *)RMD160); |
| 199 |
-+ hashes = gtk_radio_menu_item_get_group( |
| 200 |
-+ GTK_RADIO_MENU_ITEM(mi_sett_rmd160)); |
| 201 |
- gtk_widget_show(mi_sett_rmd160); |
| 202 |
- |
| 203 |
- mi_sett_md5 = gtk_radio_menu_item_new_with_label(hashes, "md5"); |
| 204 |
-- gtk_menu_append(GTK_MENU(me_sett), mi_sett_md5); |
| 205 |
-- gtk_signal_connect_object(GTK_OBJECT(mi_sett_md5), "activate", |
| 206 |
-- GTK_SIGNAL_FUNC(sethash), (void *)MD5); |
| 207 |
-- hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_md5)); |
| 208 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_md5); |
| 209 |
-+ g_signal_connect_swapped(G_OBJECT(mi_sett_md5), "activate", |
| 210 |
-+ G_CALLBACK(sethash), (void *)MD5); |
| 211 |
-+ hashes = gtk_radio_menu_item_get_group( |
| 212 |
-+ GTK_RADIO_MENU_ITEM(mi_sett_md5)); |
| 213 |
- gtk_widget_show(mi_sett_md5); |
| 214 |
- |
| 215 |
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_sett_md5), TRUE); |
| 216 |
- |
| 217 |
- mi_sett_md4 = gtk_radio_menu_item_new_with_label(hashes, "md4"); |
| 218 |
-- gtk_menu_append(GTK_MENU(me_sett), mi_sett_md4); |
| 219 |
-- gtk_signal_connect_object(GTK_OBJECT(mi_sett_md4), "activate", |
| 220 |
-- GTK_SIGNAL_FUNC(sethash), (void *)MD4); |
| 221 |
-- hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_md4)); |
| 222 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_md4); |
| 223 |
-+ g_signal_connect_swapped(G_OBJECT(mi_sett_md4), "activate", |
| 224 |
-+ G_CALLBACK(sethash), (void *)MD4); |
| 225 |
-+ hashes = gtk_radio_menu_item_get_group( |
| 226 |
-+ GTK_RADIO_MENU_ITEM(mi_sett_md4)); |
| 227 |
- gtk_widget_show(mi_sett_md4); |
| 228 |
- |
| 229 |
- mi_sett_skey = gtk_radio_menu_item_new_with_label(hashes, "s/key"); |
| 230 |
-- gtk_menu_append(GTK_MENU(me_sett), mi_sett_skey); |
| 231 |
-- gtk_signal_connect_object(GTK_OBJECT(mi_sett_skey), "activate", |
| 232 |
-- GTK_SIGNAL_FUNC(sethash), (void *)SKEY); |
| 233 |
-- hashes = gtk_radio_menu_item_group(GTK_RADIO_MENU_ITEM(mi_sett_skey)); |
| 234 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(me_sett), mi_sett_skey); |
| 235 |
-+ g_signal_connect_swapped(G_OBJECT(mi_sett_skey), "activate", |
| 236 |
-+ G_CALLBACK(sethash), (void *)SKEY); |
| 237 |
-+ hashes = gtk_radio_menu_item_get_group( |
| 238 |
-+ GTK_RADIO_MENU_ITEM(mi_sett_skey)); |
| 239 |
- gtk_widget_show(mi_sett_skey); |
| 240 |
- /* Done. */ |
| 241 |
- |
| 242 |
-@@ -138,9 +143,9 @@ |
| 243 |
- /* Setup the help menu... */ |
| 244 |
- me_help = gtk_menu_new(); |
| 245 |
- mi_help_about = gtk_menu_item_new_with_label("About..."); |
| 246 |
-- gtk_menu_append(GTK_MENU(me_help), mi_help_about); |
| 247 |
-- gtk_signal_connect_object(GTK_OBJECT(mi_help_about), "activate", |
| 248 |
-- GTK_SIGNAL_FUNC(about), NULL); |
| 249 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(me_help), mi_help_about); |
| 250 |
-+ g_signal_connect_swapped(G_OBJECT(mi_help_about), "activate", |
| 251 |
-+ G_CALLBACK(about), NULL); |
| 252 |
- gtk_widget_show(mi_help_about); |
| 253 |
- /* Done. */ |
| 254 |
- |
| 255 |
-@@ -156,18 +161,18 @@ |
| 256 |
- mi_file = gtk_menu_item_new_with_label("File"); |
| 257 |
- gtk_widget_show(mi_file); |
| 258 |
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi_file), me_file); |
| 259 |
-- gtk_menu_bar_append(GTK_MENU_BAR(mb_top), mi_file); |
| 260 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(mb_top), mi_file); |
| 261 |
- |
| 262 |
- mi_sett = gtk_menu_item_new_with_label("Settings"); |
| 263 |
- gtk_widget_show(mi_sett); |
| 264 |
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi_sett), me_sett); |
| 265 |
-- gtk_menu_bar_append(GTK_MENU_BAR(mb_top), mi_sett); |
| 266 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(mb_top), mi_sett); |
| 267 |
- |
| 268 |
- mi_help = gtk_menu_item_new_with_label("Help"); |
| 269 |
- gtk_widget_show(mi_help); |
| 270 |
- gtk_menu_item_set_submenu(GTK_MENU_ITEM(mi_help), me_help); |
| 271 |
-- gtk_menu_bar_append(GTK_MENU_BAR(mb_top), mi_help); |
| 272 |
-- gtk_menu_item_right_justify(GTK_MENU_ITEM(mi_help)); |
| 273 |
-+ gtk_menu_shell_append(GTK_MENU_SHELL(mb_top), mi_help); |
| 274 |
-+ gtk_menu_item_set_right_justified(GTK_MENU_ITEM(mi_help), TRUE); |
| 275 |
- /* Done. */ |
| 276 |
- |
| 277 |
- |
| 278 |
-@@ -208,8 +213,8 @@ |
| 279 |
- (GtkAttachOptions)(0), 5, 0); |
| 280 |
- gtk_widget_show(bu_calc); |
| 281 |
- |
| 282 |
-- gtk_signal_connect_object(GTK_OBJECT(bu_calc), "clicked", |
| 283 |
-- GTK_SIGNAL_FUNC(calculate), NULL); |
| 284 |
-+ g_signal_connect_swapped(G_OBJECT(bu_calc), "clicked", |
| 285 |
-+ G_CALLBACK(calculate), NULL); |
| 286 |
- /* Done. */ |
| 287 |
- |
| 288 |
- |
| 289 |
-@@ -221,8 +226,8 @@ |
| 290 |
- gtk_entry_set_visibility(GTK_ENTRY(te_passwd), FALSE); |
| 291 |
- gtk_widget_show(te_passwd); |
| 292 |
- |
| 293 |
-- gtk_signal_connect(GTK_OBJECT(te_passwd), "activate", |
| 294 |
-- GTK_SIGNAL_FUNC(click), bu_calc); |
| 295 |
-+ g_signal_connect(G_OBJECT(te_passwd), "activate", |
| 296 |
-+ G_CALLBACK(click), bu_calc); |
| 297 |
- /* Done. */ |
| 298 |
- |
| 299 |
- |
| 300 |
-@@ -234,8 +239,8 @@ |
| 301 |
- (GtkAttachOptions)(0), 5, 0); |
| 302 |
- gtk_widget_show(bu_clear); |
| 303 |
- |
| 304 |
-- gtk_signal_connect(GTK_OBJECT(bu_clear), "clicked", |
| 305 |
-- GTK_SIGNAL_FUNC(clear), NULL); |
| 306 |
-+ g_signal_connect(G_OBJECT(bu_clear), "clicked", |
| 307 |
-+ G_CALLBACK(clear), NULL); |
| 308 |
- /* Done. */ |
| 309 |
- |
| 310 |
- |
| 311 |
|
| 312 |
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch b/sys-auth/otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch |
| 313 |
deleted file mode 100644 |
| 314 |
index f781b73..00000000 |
| 315 |
--- a/sys-auth/otpcalc/files/otpcalc-0.97-gtk2-gentoo.patch |
| 316 |
+++ /dev/null |
| 317 |
@@ -1,72 +0,0 @@ |
| 318 |
-Make it work with GTK+ 2. |
| 319 |
- |
| 320 |
---- otpCalc-0.97-orig/Makefile.in |
| 321 |
-+++ otpCalc-0.97/Makefile.in |
| 322 |
-@@ -3,8 +3,8 @@ |
| 323 |
- |
| 324 |
- CC = @CC@ |
| 325 |
- DEFS = -DVERSION=\"$(VER)\" @DEFS@ |
| 326 |
--CFLAGS = -s -O3 -Wall -pipe `gtk-config --cflags` |
| 327 |
--LIBS = `gtk-config --libs` @LIBS@ |
| 328 |
-+CFLAGS = -s -O3 -Wall -pipe `pkg-config --cflags gtk+-2.0` |
| 329 |
-+LIBS = `pkg-config --libs gtk+-2.0` @LIBS@ |
| 330 |
- |
| 331 |
- prefix = @prefix@ |
| 332 |
- exec_prefix = @exec_prefix@ |
| 333 |
---- otpCalc-0.97-orig/callbacks.c |
| 334 |
-+++ otpCalc-0.97/callbacks.c |
| 335 |
-@@ -236,7 +236,7 @@ |
| 336 |
- } |
| 337 |
- |
| 338 |
- |
| 339 |
--void focus(GtkWidget *widget, gpointer data) |
| 340 |
-+gboolean focus(GtkWidget *widget, GdkEvent *event, gpointer data) |
| 341 |
- { |
| 342 |
- |
| 343 |
- static GdkAtom targets; |
| 344 |
-@@ -244,12 +244,12 @@ |
| 345 |
- |
| 346 |
- |
| 347 |
- if (!autopaste) |
| 348 |
-- return; |
| 349 |
-+ return FALSE; |
| 350 |
- |
| 351 |
- targets = gdk_atom_intern("STRING", FALSE); |
| 352 |
- |
| 353 |
- gtk_selection_convert(widget, GDK_SELECTION_PRIMARY, targets, |
| 354 |
- GDK_CURRENT_TIME); |
| 355 |
- |
| 356 |
-- |
| 357 |
-+ return FALSE; |
| 358 |
- } |
| 359 |
---- otpCalc-0.97-orig/gui.c |
| 360 |
-+++ otpCalc-0.97/gui.c |
| 361 |
-@@ -29,7 +29,7 @@ |
| 362 |
- GtkWidget *te_response; |
| 363 |
- |
| 364 |
- unsigned short hash; |
| 365 |
--unsigned short newline = 1; |
| 366 |
-+unsigned short newline = 0; |
| 367 |
- unsigned short autopaste = 1; |
| 368 |
- |
| 369 |
- int main(int argc, char *argv[]) |
| 370 |
-@@ -147,7 +147,7 @@ |
| 371 |
- |
| 372 |
- /* Setup the menu bar... */ |
| 373 |
- mb_top = gtk_menu_bar_new(); |
| 374 |
-- gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE); |
| 375 |
-+ /*gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE);*/ |
| 376 |
- gtk_table_attach(GTK_TABLE(ta_top), mb_top, 0, 3, 0, 1, |
| 377 |
- (GtkAttachOptions)(GTK_FILL), |
| 378 |
- (GtkAttachOptions)(0), 0, 0); |
| 379 |
---- otpCalc-0.97-orig/utility.c |
| 380 |
-+++ otpCalc-0.97/utility.c |
| 381 |
-@@ -422,7 +422,7 @@ |
| 382 |
- words[extract(message, 33, 11)], |
| 383 |
- words[extract(message, 44, 11)], |
| 384 |
- words[extract(message, 55, 11)], |
| 385 |
-- (newline == 1) ? "\n" : NULL); |
| 386 |
-+ (newline == 1) ? "\n" : ""); |
| 387 |
- |
| 388 |
- return response; |
| 389 |
- |
| 390 |
|
| 391 |
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch b/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch |
| 392 |
deleted file mode 100644 |
| 393 |
index 79f869a..00000000 |
| 394 |
--- a/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch |
| 395 |
+++ /dev/null |
| 396 |
@@ -1,53 +0,0 @@ |
| 397 |
-Fix SHA1 byte-order issue for conformance with RFC 2289. |
| 398 |
- |
| 399 |
---- otpCalc-0.97-orig/crypto.c |
| 400 |
-+++ otpCalc-0.97/crypto.c |
| 401 |
-@@ -199,6 +199,8 @@ |
| 402 |
- for (i = 0; i < 4; i++) |
| 403 |
- digest[i] ^= digest[i+16]; |
| 404 |
- |
| 405 |
-- memcpy(message, digest, 8); |
| 406 |
-+ /* Fix byte order, as required by RFC 2289 Appendix A */ |
| 407 |
-+ for (i = 0; i < 8; i++) |
| 408 |
-+ message[i] = digest[i^3]; |
| 409 |
- |
| 410 |
- } |
| 411 |
---- otpCalc-0.97-orig/sha1.h |
| 412 |
-+++ otpCalc-0.97/sha1.h |
| 413 |
-@@ -1,3 +1,5 @@ |
| 414 |
-+#include "config.h" |
| 415 |
-+ |
| 416 |
- #ifndef i386 |
| 417 |
- typedef long int int64; |
| 418 |
- typedef unsigned long int uint64; |
| 419 |
-@@ -28,7 +30,7 @@ |
| 420 |
- |
| 421 |
- #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) |
| 422 |
- |
| 423 |
--#ifdef WORDS_BIGENDIAN |
| 424 |
-+#ifndef WORDS_BIGENDIAN |
| 425 |
- #define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ |
| 426 |
- |(rol(block->l[i],8)&0x00FF00FF)) |
| 427 |
- #else |
| 428 |
---- otpCalc-0.97-orig/otpCalc.man |
| 429 |
-+++ otpCalc-0.97/otpCalc.man |
| 430 |
-@@ -47,9 +47,6 @@ |
| 431 |
- RFC 2289, RFC 1740 |
| 432 |
- .SH "AUTHOR" |
| 433 |
- Anthony D. Urso <anthonyu@×××××.net>. |
| 434 |
--.SH "BUGS" |
| 435 |
--SHA1 output differs from RFC2289; however, the output is consistant with |
| 436 |
--other implementations. |
| 437 |
- .SH "COPYRIGHT" |
| 438 |
- Copyright \(co 2001 Anthony D. Urso. |
| 439 |
- .br |
| 440 |
---- otpCalc-0.97-orig/BUGS |
| 441 |
-+++ otpCalc-0.97/BUGS |
| 442 |
-@@ -16,3 +16,7 @@ |
| 443 |
- |
| 444 |
- Thanks, |
| 445 |
- Anthony |
| 446 |
-+ |
| 447 |
-+Note: Above-mentioned SHA1 issue is fixed in the Gentoo version. |
| 448 |
-+The output now agrees with RFC 2289 and with S/Key. |
| 449 |
-+ - Ulrich Mueller <ulm@g.o> |
| 450 |
|
| 451 |
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch b/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch |
| 452 |
deleted file mode 100644 |
| 453 |
index 39ab267..00000000 |
| 454 |
--- a/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch |
| 455 |
+++ /dev/null |
| 456 |
@@ -1,24 +0,0 @@ |
| 457 |
-Change default s/key hash to MD5 (same as sys-auth/skey). |
| 458 |
- |
| 459 |
---- otpCalc-0.97-orig/callbacks.c |
| 460 |
-+++ otpCalc-0.97/callbacks.c |
| 461 |
-@@ -90,7 +90,7 @@ |
| 462 |
- unsigned char results[9]; |
| 463 |
- |
| 464 |
- |
| 465 |
-- hashes[SKEY] = md4lite; |
| 466 |
-+ hashes[SKEY] = md5lite; |
| 467 |
- hashes[MD4] = md4lite; |
| 468 |
- hashes[MD5] = md5lite; |
| 469 |
- hashes[RMD160] = rmd160lite; |
| 470 |
---- otpCalc-0.97-orig/otpCalc.man |
| 471 |
-+++ otpCalc-0.97/otpCalc.man |
| 472 |
-@@ -30,7 +30,7 @@ |
| 473 |
- cb l |
| 474 |
- cb l |
| 475 |
- cb l. |
| 476 |
--s/key#MD4 |
| 477 |
-+s/key#MD5 |
| 478 |
- otp-md4#MD4 |
| 479 |
- otp-md5#MD5 |
| 480 |
- otp-rmd160#RIPEMD-160 |
| 481 |
|
| 482 |
diff --git a/sys-auth/otpcalc/files/otpcalc-crypto-proto.diff b/sys-auth/otpcalc/files/otpcalc-crypto-proto.diff |
| 483 |
deleted file mode 100644 |
| 484 |
index 05ba89f..00000000 |
| 485 |
--- a/sys-auth/otpcalc/files/otpcalc-crypto-proto.diff |
| 486 |
+++ /dev/null |
| 487 |
@@ -1,13 +0,0 @@ |
| 488 |
-Correct crypto prototypes, bug 123993. |
| 489 |
- |
| 490 |
---- otpCalc-0.97.orig/crypto.h |
| 491 |
-+++ otpCalc-0.97/crypto.h |
| 492 |
-@@ -1,4 +1,4 @@ |
| 493 |
--void md4lite(char *, size_t); |
| 494 |
--void md5lite(char *, size_t); |
| 495 |
--void rmd160lite(char *, size_t); |
| 496 |
--void sha1lite(char *, size_t); |
| 497 |
-+void md4lite(char *message, unsigned int len); |
| 498 |
-+void md5lite(char *message, unsigned int len); |
| 499 |
-+void rmd160lite(char *message, unsigned int len); |
| 500 |
-+void sha1lite(char *message, unsigned int len); |
| 501 |
|
| 502 |
diff --git a/sys-auth/otpcalc/files/otpcalc-man-table-format.diff b/sys-auth/otpcalc/files/otpcalc-man-table-format.diff |
| 503 |
deleted file mode 100644 |
| 504 |
index bbd767e..00000000 |
| 505 |
--- a/sys-auth/otpcalc/files/otpcalc-man-table-format.diff |
| 506 |
+++ /dev/null |
| 507 |
@@ -1,35 +0,0 @@ |
| 508 |
-Make missing list appear in man page, bug 90900. |
| 509 |
- |
| 510 |
---- otpCalc.man.orig |
| 511 |
-+++ otpCalc.man |
| 512 |
-@@ -24,18 +24,20 @@ |
| 513 |
- the Challenge input: |
| 514 |
- .IP |
| 515 |
- .TS |
| 516 |
--s/key MD4 |
| 517 |
--.br |
| 518 |
--otp-md4 MD4 |
| 519 |
--.br |
| 520 |
--otp-md5 MD5 |
| 521 |
--.br |
| 522 |
--otp-rmd160 RIPEMD-160 |
| 523 |
--.br |
| 524 |
--otp-sha1 SHA1 |
| 525 |
--.br |
| 526 |
-+allbox tab(#); |
| 527 |
-+cb l |
| 528 |
-+cb l |
| 529 |
-+cb l |
| 530 |
-+cb l |
| 531 |
-+cb l. |
| 532 |
-+s/key#MD4 |
| 533 |
-+otp-md4#MD4 |
| 534 |
-+otp-md5#MD5 |
| 535 |
-+otp-rmd160#RIPEMD-160 |
| 536 |
-+otp-sha1#SHA1 |
| 537 |
- .TE |
| 538 |
- .LP |
| 539 |
-+.LP |
| 540 |
- In the absence of a prefix, the default hash, specified in the Settings menu, |
| 541 |
- is used. |
| 542 |
- .SH "SEE ALSO" |
Archives