[packages/links2] - updated to 2.12 - updated cookies-save,pl-update patches - removed outdated segv patch
qboosh
qboosh at pld-linux.org
Sat Jan 9 21:13:09 CET 2016
commit 2d41662488e16f2e50084a0619600fa66cc02ce5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jan 9 21:15:12 2016 +0100
- updated to 2.12
- updated cookies-save,pl-update patches
- removed outdated segv patch
links2-cookies-save.patch | 76 ++++++------
links2-pl-update.patch | 307 +++++++++++++++++++++++++++++++---------------
links2-segv.patch | 19 ---
links2.spec | 24 ++--
4 files changed, 258 insertions(+), 168 deletions(-)
---
diff --git a/links2.spec b/links2.spec
index dddb3c8..2c7b835 100644
--- a/links2.spec
+++ b/links2.spec
@@ -13,13 +13,13 @@ Summary(pt_BR.UTF-8): O links é um browser para modo texto, similar ao lynx
Summary(ru.UTF-8): Текстовый WWW броузер типа Lynx
Summary(uk.UTF-8): Текстовий WWW броузер типу Lynx
Name: links2
-Version: 2.11
+Version: 2.12
Release: 1
Epoch: 1
License: GPL v2
Group: Applications/Networking
Source0: http://links.twibright.com/download/links-%{version}.tar.bz2
-# Source0-md5: d122879f2870dfec2fec1a07517c1458
+# Source0-md5: 5d763ab72dc57bbc310feb95679c9d14
Source1: %{name}.desktop
Source2: %{name}.1.pl
Source3: %{name}.png
@@ -30,7 +30,6 @@ Patch3: %{name}-convert-old-bookmarks.patch
Patch4: %{name}-cookies-save.patch
Patch5: %{name}-config-dirs.patch
Patch6: %{name}-gzip_fallback.patch
-Patch9: %{name}-segv.patch
Patch10: %{name}-pl-update.patch
Patch17: ac_config_headers.patch
Patch18: ac_prog_cxx.patch
@@ -43,10 +42,12 @@ BuildRequires: libevent-devel
BuildRequires: ncurses-devel >= 5.1
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pkgconfig
+BuildRequires: xz-devel
BuildRequires: zlib-devel
%if %{with graphics}
%{?with_fb:BuildRequires: DirectFB-devel >= 0.9.17}
%{?with_sdl:BuildRequires: SDL-devel >= 1.2.0}
+BuildRequires: cairo-devel
BuildRequires: libgomp-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
@@ -116,8 +117,7 @@ трохи відмінний від нього:
%patch4 -p1
%patch5 -p1
%patch6 -p1
-#%%patch9 -p1
-#%%patch10 -p1
+%patch10 -p1
%patch17 -p1
%patch18 -p1
@@ -165,8 +165,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog README SITES
-%attr(755,root,root) %{_bindir}/*
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*
-%{_mandir}/man*/*
-%lang(pl) %{_mandir}/pl/man*/*
+%attr(755,root,root) %{_bindir}/glinks
+%attr(755,root,root) %{_bindir}/links2
+%{_desktopdir}/glinks.desktop
+%{_desktopdir}/links2.desktop
+%{_pixmapsdir}/links2.png
+%{_mandir}/man1/glinks.1*
+%{_mandir}/man1/links2.1*
+%lang(pl) %{_mandir}/pl/man1/glinks.1*
+%lang(pl) %{_mandir}/pl/man1/links2.1*
diff --git a/links2-cookies-save.patch b/links2-cookies-save.patch
index f90aaea..296c877 100644
--- a/links2-cookies-save.patch
+++ b/links2-cookies-save.patch
@@ -1,11 +1,41 @@
---- links-2.8/cookies.c 2013-07-22 04:05:21.000000000 +0200
-+++ links-2.8/cookies.c.new 2013-10-07 19:31:08.217264646 +0200
-@@ -249,15 +249,98 @@
+--- links-2.12/cookies.c.orig 2016-01-09 16:48:22.619433626 +0100
++++ links-2.12/cookies.c 2016-01-09 16:52:06.066090917 +0100
+@@ -250,15 +250,99 @@
+ void free_cookies(void)
+ {
+ struct cookie *c;
++ unsigned char *cookfile;
++ FILE *fp;
++
+ free_list(c_domains);
+- /* !!! FIXME: save cookies */
+- foreach (c, all_cookies) free_cookie(c);
++
++ cookfile = stracpy(links_home);
++ if (! cookfile) return;
++ add_to_strn(&cookfile, "cookies");
++
++ fp = fopen(cookfile, "w");
++ mem_free(cookfile);
++ if (fp == NULL) return;
++
++ foreach (c, all_cookies) {
++ if (c->expires && ! cookie_expired(c))
++ fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value,
++ c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
++ c->domain?c->domain:(unsigned char *)"", (int)c->expires, c->secure);
++
++ free_cookie(c);
++ }
++
++ fclose(fp);
++
+ free_list(all_cookies);
+ }
void init_cookies(void)
{
- /* !!! FIXME: read cookies */
--}
+ unsigned char in_buffer[MAX_STR_LEN];
+ unsigned char *cookfile, *p, *q;
+ FILE *fp;
@@ -56,7 +86,7 @@
+ if (p == NULL) goto inv;
+ *p++ = '\0';
+ cookie->expires = atoi(q);
-
++
+ cookie->secure = atoi(p);
+
+ /*cookie->id = cookie_id++;*/
@@ -70,38 +100,6 @@
+ free(cookie);
+ }
+ fclose(fp);
-+}
-+
- void cleanup_cookies(void)
- {
- struct cookie *c;
-+ unsigned char *cookfile;
-+ FILE *fp;
-+
- free_list(c_domains);
-- /* !!! FIXME: save cookies */
-- foreach (c, all_cookies) free_cookie(c);
-- free_list(all_cookies);
--}
+ }
-+ cookfile = stracpy(links_home);
-+ if (! cookfile) return;
-+ add_to_strn(&cookfile, "cookies");
-+
-+ fp = fopen(cookfile, "w");
-+ mem_free(cookfile);
-+ if (fp == NULL) return;
-+
-+ foreach (c, all_cookies) {
-+ if (c->expires && ! cookie_expired(c))
-+ fprintf(fp, "%s %s %s %s %s %d %d\n", c->name, c->value,
-+ c->server?c->server:(unsigned char *)"", c->path?c->path:(unsigned char *)"",
-+ c->domain?c->domain:(unsigned char *)"", (int)c->expires, c->secure);
-+
-+ free_cookie(c);
-+ }
-+
-+ fclose(fp);
-+
-+ free_list(all_cookies);
-+}
+ void cleanup_cookies(void)
diff --git a/links2-pl-update.patch b/links2-pl-update.patch
index 2499d7b..a6a4e8b 100644
--- a/links2-pl-update.patch
+++ b/links2-pl-update.patch
@@ -1,102 +1,209 @@
---- links-2.10/intl/polish.lng.orig 2015-05-28 19:24:55.000000000 +0200
-+++ links-2.10/intl/polish.lng 2015-07-16 21:29:26.033756135 +0200
-@@ -28,9 +28,9 @@
- T_MEMORY, "Pami��",
- T_FILE_SIZE, "rozmiar pliku",
- T_DEBUGGING_LEVEL, "Poziom diagnostyki",
--T_EVENT_HANDLER, NULL,
--T_SELECT_SYSCALL, NULL,
--T_dISABLED, NULL,
-+T_EVENT_HANDLER, "Obs�uga zdarze�",
-+T_SELECT_SYSCALL, "Wywo�anie systemowe select",
-+T_dISABLED, "wy��czone",
- T_IPV6, "IPv6",
- T_NOT_ENABLED_IN_SYSTEM, "Nie w��czone w systemie",
- T_LOCAL_NETWORK_ONLY, "Tylko sie� lokalna",
-@@ -41,11 +41,11 @@
+--- links-2.12/intl/polish.lng.orig 2015-09-10 00:37:40.000000000 +0200
++++ links-2.12/intl/polish.lng 2016-01-09 18:39:01.949154994 +0100
+@@ -37,7 +37,7 @@
+ T_UTF8_TERMINAL, "Terminal UTF-8",
+ T_COMPRESSION_METHODS, "Metody kompresji",
+ T_ENCRYPTION, "Szyfrowanie",
+-T_NO_CERTIFICATE_VERIFICATION, NULL,
++T_NO_CERTIFICATE_VERIFICATION, "Bez weryfikacji certyfikat�w",
+ T_GPM_MOUSE_DRIVER, "Sterownik myszy GPM",
T_XTERM_FOR_OS2, "Xterm dla OS/2",
T_GRAPHICS_MODE, "Tryb graficzny",
- T_IMAGE_LIBRARIES, "Biblioteki obraz�w",
--T_OPENMP, NULL,
--T_DISABLED, NULL,
--T_THREAD, NULL,
--T_THREADS, NULL,
--T_THREADS5, NULL,
-+T_OPENMP, "OpenMP",
-+T_DISABLED, "Wy��czone",
-+T_THREAD, "w�tek",
-+T_THREADS, "w�tki",
-+T_THREADS5, "w�tk�w",
- T_KEYS, "Klawiszologia",
- T_KEYS_DESC, "ESC poka� menu\n^C, q wyj�cie\n^P, ^N przewi� g�ra,d�\n[, ] przewi� lewo,prawo\ng�ra, d� zaznacz link\n-> wybierz link\n<- powr�t\ng przejd� do URL-a\nG przejd� do URL-a bazuj�cego na aktualnym\n/ szukaj\nn znajd� nast�pny\nd pobierz\n* prze��cz wy�wietlanie obrazk�w\n^W dope�nij URL lub szukany �a�cuch\n^B, ^X, ^V skopiuj, wytnij, wklej do/ze schowka\nAlt-1 .. Alt-9 prze��cz ekran wirtualny (svgalib lub framebuffer)",
- T_KEYS_BRAILLE_DESC, "a, t kursor do linii stanu lub tytu�u\n{, } kursor do pocz�tku/ko�ca linii\n^T, ^Y nast�pny lub poprzedni odno�nik",
-@@ -91,13 +91,13 @@
- T_COLOR, "Kolor",
- T_BRAILLE_TERMINAL, "Terminal Braille'a",
- T_TERMINAL_OPTIONS, "Opcje terminala",
--T_SCREEN_MARGINS, NULL,
--T_LEFT_MARGIN, NULL,
--T_RIGHT_MARGIN, NULL,
--T_TOP_MARGIN, NULL,
--T_BOTTOM_MARGIN, NULL,
--T_MARGINS_TOO_LARGE, NULL,
--T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN, NULL,
-+T_SCREEN_MARGINS, "Marginesy ekranu",
-+T_LEFT_MARGIN, "Lewy margines",
-+T_RIGHT_MARGIN, "Prawy margines",
-+T_TOP_MARGIN, "G�rny margines",
-+T_BOTTOM_MARGIN, "Dolny margines",
-+T_MARGINS_TOO_LARGE, "Marginesy zbyt du�e",
-+T_THE_ENTERED_VALUES_ARE_TOO_LARGE_FOR_THE_CURRENT_SCREEN, "Wprowadzone warto�ci s� zbyt du�e dla obecnego ekranu",
- T_NETWORK_OPTIONS, "Ustawienia sieci",
- T_IPV6_OPTIONS, "Opcje IPv6",
- T_IPV6_DEFAULT, "Domy�lne preferencje systemu",
-@@ -132,7 +132,7 @@
- T_HTML_OPTIONS, "Ustawienia HTML",
- T_DISPLAY_TABLES, "Wy�wietlaj tabele",
- T_DISPLAY_FRAMES, "Wy�wietlaj ramki",
--T_BREAK_LONG_LINES, NULL,
-+T_BREAK_LONG_LINES, "�am d�ugie linie",
- T_DISPLAY_IMAGES, "Wy�wietlaj obrazy",
- T_DISPLAY_IMAGE_FILENAMES, "Wy�wietlaj nazwy plik�w obraz�w",
- T_DISPLAY_LINKS_TO_IMAGES, "Pokazuj linki do obrazk�w",
-@@ -255,8 +255,8 @@
- T_SOCKS_UNKNOWN_ERROR, "Nieznany b��d Socks",
- T_NO_SMB_CLIENT, "Brak zainstalowanego klienta smb (obs�ugiwane s� smbclient i smbc)",
- T_BLOCKED_URL, "Ten URL jest na li�cie zablokowanych",
--T_SMB_NOT_ALLOWED, NULL,
--T_FILE_NOT_ALLOWED, NULL,
-+T_SMB_NOT_ALLOWED, "Odno�niki do protoko�u SMB nie s� dozwolone",
-+T_FILE_NOT_ALLOWED, "Odno�niki do plik�w lokalnych nie s� dozwolone",
- T_NO_PROXY, "Brak proxy dla tego po��czenia, a po��czenia bez proxy s� wy��czone",
- T_UNKNOWN_ERROR, "Nieznany b��d",
- T_RECEIVED, "Pobrano",
-@@ -437,8 +437,8 @@
- T_RETRY_ON_INTERNAL_ERRORS, "Ponawiaj pr�by przy wewn�trznych b��dach serwera (50x)",
- T_HEADER_OPTIONS, "Opcje nag��wka",
- T_HTTP_HEADER_OPTIONS, "Opcje nag��wka HTTP",
--T_FAKE_FIREFOX, NULL,
--T_DO_NOT_TRACK, NULL,
-+T_FAKE_FIREFOX, "Udawanie Firefoksa (poprawia prywatno��)",
-+T_DO_NOT_TRACK, "Wysy�anie ��dania \"do not track\"",
- T_REFERER_NONE, "Bez nag��wka Referer",
- T_REFERER_SAME_URL, "Wysy�aj ��dany URL jako Referer",
- T_REFERER_FAKE, "Sta�y nag��wek Referer",
-@@ -452,7 +452,7 @@
- T_USE_EPRT_EPSV, "U�ywaj polece� EPRT/EPSV po IPv4",
- T_USE_FAST_FTP, "U�ywaj szybkiego FTP",
- T_SET_TYPE_OF_SERVICE, "Ustaw typ us�ugi IP (ToS)",
--T_ALLOW_HYPERLINKS_TO_SMB, NULL,
-+T_ALLOW_HYPERLINKS_TO_SMB, "Zezwolenie na odno�niki do protoko�u SMB. Wy��czenie zwi�ksza bezpiecze�stwo, poniewa� strony internetowe nie mog� wykorzysta� ewentualnych b��d�w w kliencie SMB.",
- T_MANUAL, "Podr�cznik u�ytkownika",
- T_HOMEPAGE, "Strona domowa",
- T_CALIBRATION, "Kalibracja",
-@@ -540,7 +540,7 @@
- T_SCROLL_BAR_AREA_COLOR, "Kolor obszaru paska przewijania",
- T_SCROLL_BAR_FRAME_COLOR, "Kolor ramki paska przewijania",
- T_BOOKMARKS_FILE, "Plik zak�adek",
--T_SAVE_URL_HISTORY_ON_EXIT, NULL,
-+T_SAVE_URL_HISTORY_ON_EXIT, "Zapis historii URL-i przy wy��czaniu",
- T_ENTER_COLORS_AS_RGB_TRIPLETS, "Wpisz kolory jako tr�jki RGB",
- T_JS_MEMORY_LIMIT_KB, "Pami�� dla Javascriptu",
- T_SCALE_ALL_IMAGES_BY, "Skalowanie wszystkich obraz�w",
+@@ -114,16 +114,16 @@
+ T_APPEND_TEXT_TO_SOCKS_LOOKUPS, "Do��czanie tekstu do nazwy hosta (wyb�r w�z�a tora)",
+ T_ONLY_PROXIES, "��czenie si� tylko przez proxy lub Socks (przydatne z torem)",
+ T_NOPROXY_LIST, "Lista domen dost�pnych bez proxy",
+-T_SSL_OPTIONS, NULL,
+-T_ACCEPT_INVALID_CERTIFICATES, NULL,
+-T_WARN_ON_INVALID_CERTIFICATES, NULL,
+-T_REJECT_INVALID_CERTIFICATES, NULL,
+-T_CLIENT_CERTIFICATE_KEY_FILE, NULL,
+-T_CLIENT_CERTIFICATE_FILE, NULL,
+-T_CLIENT_CERTIFICATE_KEY_PASSWORD, NULL,
+-T_BAD_FILE, NULL,
+-T_THE_FILE_DOES_NOT_EXIST, NULL,
+-T_THE_FILE_HAS_INVALID_FORMAT, NULL,
++T_SSL_OPTIONS, "Opcje SSL",
++T_ACCEPT_INVALID_CERTIFICATES, "Akceptowanie b��dnych certyfikat�w i s�abych szyfr�w",
++T_WARN_ON_INVALID_CERTIFICATES, "Ostrzeganie o b��dnych certyfikatach i s�abych szyfrach",
++T_REJECT_INVALID_CERTIFICATES, "Odrzucanie b��dnych certyfikat�w i s�abych szyfr�w",
++T_CLIENT_CERTIFICATE_KEY_FILE, "Plik klucza certyfikatu klienta",
++T_CLIENT_CERTIFICATE_FILE, "Plik certyfikatu klienta",
++T_CLIENT_CERTIFICATE_KEY_PASSWORD, "Has�o certyfikatu klienta (nie b�dzie zapisane w pliku konfiguracyjnym)",
++T_BAD_FILE, "B��dny plik",
++T_THE_FILE_DOES_NOT_EXIST, "Plik nie istnieje",
++T_THE_FILE_HAS_INVALID_FORMAT, "Plik ma b��dny format",
+ T_CONNECTIONS, "Po��czenia",
+ T_MAX_CONNECTIONS, "Maksymalna liczba po��cze�",
+ T_MAX_CONNECTIONS_TO_ONE_HOST, "Maksymalna liczba po��cze� z jednym serwerem",
+@@ -199,7 +199,7 @@
+ T_FRAME_AT_FULL_SCREEN, "Ramka na ca�ym ekranie",
+ T_SAVE_HTML_OPTIONS, "Zapisz ustawienia HTML",
+ T_CHARACTER_SET, "Zestaw znak�w",
+-T_DEFAULT_CHARSET, NULL,
++T_DEFAULT_CHARSET, "Domy�lny",
+ T_CACHE, "Pami�� podr�czna",
+ T_MAIL_AND_TELNEL, "Poczta i telnet",
+ T_MAIL_TELNET_AND_SHELL, "Poczta, telnet i pow�oka",
+@@ -250,8 +250,8 @@
+ T_HTTP_100, NULL,
+ T_NO_CONTENT, "Plik pusty",
+ T_HTTPS_FWD_ERROR, "Przekierowanie HTTPS nie powiod�o si�",
+-T_INVALID_CERTIFICATE, NULL,
+-T_INSECURE_CIPHER, NULL,
++T_INVALID_CERTIFICATE, "B��dny certyfikat",
++T_INSECURE_CIPHER, "Niebezpieczny szyfr",
+ T_UNKNOWN_FILE_TYPE, "Nieznany typ pliku",
+ T_ERROR_OPENING_FILE, "B��d przy otwieraniu pliku",
+ T_BAD_FTP_RESPONSE, "Nieprawid�owa odpowied� FTP",
+@@ -400,9 +400,9 @@
+ T_LAST_MODIFIED, "Ostatnia zmiana",
+ T_SSL_CIPHER, "Szyfr SSL",
+ T_LANGUAGE, "J�zyk",
+-T_DEFAULT_LANG, NULL,
+-T_GO_TO_LINK, "Przejd� do linka",
+-T_ENTER_LINK_NUMBER, "Wprowad� numer linka",
++T_DEFAULT_LANG, "Domy�lny",
++T_GO_TO_LINK, "Przejd� do odno�nika",
++T_ENTER_LINK_NUMBER, "Wprowad� numer odno�nika",
+ T_RESIZE_TERMINAL, "Zmie� rozmiar terminala",
+ T_COLUMNS, "Kolumny",
+ T_ROWS, "Wiersze",
+@@ -496,9 +496,9 @@
+ T_PASSWORD, "Has�o",
+ T_ENTER_USERNAME, "Nazwa u�ytkownika dla ",
+ T_AT, "na ",
+-T_THE_SERVER_, NULL,
+-T_DOESNT_HAVE_A_VALID_CERTIFICATE, NULL,
+-T_USES_INSECURE_CIPHER, NULL,
++T_THE_SERVER_, "Serwer ",
++T_DOESNT_HAVE_A_VALID_CERTIFICATE, " nie posiada poprawnego certyfikatu. Czy mimo to po��czy� si� z nim?",
++T_USES_INSECURE_CIPHER, " u�ywa niebezpiecznego szyfru. Czy mimo to po��czy� si� z nim?",
+ T_WAITING_FOR_REDIRECT_CONFIRMATION, "Oczekiwanie na potwierdzenie przekierowania",
+ T_DECOMPRESSION_ERROR, "B��d dekompresji",
+ T_ERROR_DECOMPRESSING_, "B��d podczas dekompresji ",
+@@ -578,49 +578,49 @@
+ T_BLOCK_DELETE, "Usu�",
+ T_HK_GOTO_URL, "U",
+ T_HK_GO_BACK, "W",
+-T_HK_GO_FORWARD, NULL,
+-T_HK_HISTORY, NULL,
+-T_HK_RELOAD, NULL,
++T_HK_GO_FORWARD, "R",
++T_HK_HISTORY, "H",
++T_HK_RELOAD, "E",
+ T_HK_BOOKMARKS, "Z",
+-T_HK_NEW_WINDOW, NULL,
++T_HK_NEW_WINDOW, "N",
+ T_HK_SAVE_AS, "Z",
+ T_HK_SAVE_URL_AS, "A",
+ T_HK_SAVE_FORMATTED_DOCUMENT, "F",
+-T_HK_COPY_URL_LOCATION, NULL,
++T_HK_COPY_URL_LOCATION, "K",
+ T_HK_KILL_BACKGROUND_CONNECTIONS, "P",
+-T_HK_KILL_ALL_CONNECTIONS, NULL,
++T_HK_KILL_ALL_CONNECTIONS, "T",
+ T_HK_FLUSH_ALL_CACHES, "C",
+-T_HK_RESOURCE_INFO, NULL,
++T_HK_RESOURCE_INFO, "I",
+ T_HK_MEMORY_INFO, "N",
+-T_HK_OS_SHELL, NULL,
+-T_HK_RESIZE_TERMINAL, NULL,
++T_HK_OS_SHELL, "O",
++T_HK_RESIZE_TERMINAL, "M",
+ T_HK_EXIT, "Y",
+ T_HK_SEARCH, "S",
+ T_HK_SEARCH_BACK, "W",
+-T_HK_FIND_NEXT, NULL,
+-T_HK_FIND_PREVIOUS, NULL,
+-T_HK_TOGGLE_HTML_PLAIN, NULL,
+-T_HK_DOCUMENT_INFO, NULL,
+-T_HK_HEADER_INFO, NULL,
++T_HK_FIND_NEXT, "N",
++T_HK_FIND_PREVIOUS, "O",
++T_HK_TOGGLE_HTML_PLAIN, "H",
++T_HK_DOCUMENT_INFO, "I",
++T_HK_HEADER_INFO, "F",
+ T_HK_FRAME_AT_FULL_SCREEN, "Y",
+ T_HK_HTML_OPTIONS, "U",
+-T_HK_COLOR, NULL,
++T_HK_COLOR, "K",
+ T_HK_SAVE_HTML_OPTIONS, "Z",
+ T_HK_LANGUAGE, "J",
+ T_HK_CHARACTER_SET, "Z",
+-T_HK_TERMINAL_OPTIONS, NULL,
+-T_HK_SCREEN_MARGINS, NULL,
+-T_HK_VIDEO_OPTIONS, NULL,
++T_HK_TERMINAL_OPTIONS, "T",
++T_HK_SCREEN_MARGINS, "M",
++T_HK_VIDEO_OPTIONS, "O",
+ T_HK_NETWORK_OPTIONS, "U",
+-T_HK_CONNECTIONS, NULL,
+-T_HK_IPV6_OPTIONS, NULL,
+-T_HK_PROXIES, NULL,
+-T_HK_SSL_OPTIONS, NULL,
+-T_HK_HTTP_OPTIONS, NULL,
+-T_HK_FTP_OPTIONS, NULL,
+-T_HK_SMB_OPTIONS, NULL,
+-T_HK_JAVASCRIPT_OPTIONS, NULL,
+-T_HK_MISCELANEOUS_OPTIONS, NULL,
++T_HK_CONNECTIONS, "C",
++T_HK_IPV6_OPTIONS, "I",
++T_HK_PROXIES, "P",
++T_HK_SSL_OPTIONS, "L",
++T_HK_HTTP_OPTIONS, "H",
++T_HK_FTP_OPTIONS, "F",
++T_HK_SMB_OPTIONS, "S",
++T_HK_JAVASCRIPT_OPTIONS, "J",
++T_HK_MISCELANEOUS_OPTIONS, "N",
+ T_HK_CACHE, "P",
+ T_HK_MAIL_AND_TELNEL, "C",
+ T_HK_ASSOCIATIONS, "S",
+@@ -628,11 +628,11 @@
+ T_HK_BLOCK_LIST, NULL,
+ T_HK_SAVE_OPTIONS, "O",
+ T_HK_ABOUT, "O",
+-T_HK_KEYS, NULL,
++T_HK_KEYS, "K",
+ T_HK_COPYING, "P",
+-T_HK_MANUAL, NULL,
+-T_HK_HOMEPAGE, NULL,
+-T_HK_CALIBRATION, NULL,
++T_HK_MANUAL, "U",
++T_HK_HOMEPAGE, "D",
++T_HK_CALIBRATION, "K",
+ T_HK_FILE, "P",
+ T_HK_VIEW, "W",
+ T_HK_LINK, "L",
+@@ -641,20 +641,20 @@
+ T_HK_HELP, "M",
+ T_HK_DISPLAY_USEMAP, "M",
+ T_HK_FOLLOW_LINK, "L",
+-T_HK_OPEN_IN_NEW_WINDOW, NULL,
++T_HK_OPEN_IN_NEW_WINDOW, "N",
+ T_HK_DOWNLOAD_LINK, "P",
+-T_HK_RESET_FORM, NULL,
++T_HK_RESET_FORM, "R",
+ T_HK_SUBMIT_FORM, "P",
+ T_HK_SUBMIT_FORM_AND_OPEN_IN_NEW_WINDOW, "F",
+ T_HK_SUBMIT_FORM_AND_DOWNLOAD, "O",
+ T_HK_VIEW_IMAGE, "B",
+ T_HK_DOWNLOAD_IMAGE, "O",
+-T_HK_SCALE_IMAGE_TO_FULL_SCREEN, NULL,
+-T_HK_COPY_LINK_LOCATION, NULL,
+-T_HK_BLOCK_URL, NULL,
+-T_HK_XTERM, NULL,
+-T_HK_TWTERM, NULL,
+-T_HK_SCREEN, NULL,
+-T_HK_WINDOW, NULL,
+-T_HK_FULL_SCREEN, NULL,
+-T_HK_BEOS_TERMINAL, NULL,
++T_HK_SCALE_IMAGE_TO_FULL_SCREEN, "E",
++T_HK_COPY_LINK_LOCATION, "K",
++T_HK_BLOCK_URL, "B",
++T_HK_XTERM, "X",
++T_HK_TWTERM, "T",
++T_HK_SCREEN, "S",
++T_HK_WINDOW, "O",
++T_HK_FULL_SCREEN, "P",
++T_HK_BEOS_TERMINAL, "B",
diff --git a/links2-segv.patch b/links2-segv.patch
deleted file mode 100644
index 566ac25..0000000
--- a/links2-segv.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- links-2.7/default.c.orig 2013-06-23 19:40:46.132079076 +0200
-+++ links-2.7/default.c 2013-06-23 19:42:18.822075186 +0200
-@@ -1216,14 +1216,14 @@
- {
- struct driver_param *dp;
- foreachback(dp, driver_params) {
-- if ((!dp->param || !*dp->param) && !dp->codepage && !*dp->shell) continue;
-+ if ((!dp->param || !*dp->param) && !dp->codepage && (!dp->shell || !*dp->shell)) continue;
- if (dp->nosave) continue;
- add_nm(o, s, l);
- add_quoted_to_str(s, l, dp->name);
- add_to_str(s, l, cast_uchar " ");
- add_quoted_to_str(s, l, dp->param ? dp->param : (unsigned char*)"");
- add_to_str(s, l, cast_uchar " ");
-- add_quoted_to_str(s, l, dp->shell);
-+ add_quoted_to_str(s, l, dp->shell ? dp->shell : (unsigned char*)"");
- add_to_str(s, l, cast_uchar " ");
- add_to_str(s, l, get_cp_mime_name(dp->codepage));
- }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/links2.git/commitdiff/2d41662488e16f2e50084a0619600fa66cc02ce5
More information about the pld-cvs-commit
mailing list