From d97402733dcb1f0019d84cf12325a625265b0ea1 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sat, 17 Oct 2015 22:20:52 +0200 Subject: [PATCH] Removed all patches, all applied upstream. Thanks Steve. --- debian/changelog | 1 + debian/patches/correct-linking | 43 --------- debian/patches/example-shebang | 26 ----- debian/patches/man-hyphen-as-minus | 95 ------------------ debian/patches/man-section | 67 ------------- debian/patches/man-spelling | 148 ----------------------------- debian/patches/reformat-tclcurl3 | 73 -------------- debian/patches/series | 7 +- 8 files changed, 2 insertions(+), 458 deletions(-) delete mode 100644 debian/patches/correct-linking delete mode 100644 debian/patches/example-shebang delete mode 100644 debian/patches/man-hyphen-as-minus delete mode 100644 debian/patches/man-section delete mode 100644 debian/patches/man-spelling delete mode 100644 debian/patches/reformat-tclcurl3 diff --git a/debian/changelog b/debian/changelog index 9ebeedb..19ed71f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ tclcurl (7.22.0+hg20151017-1) UNRELEASED; urgency=low * Import a mercurial snapshot based on b5bc0662447d. + + Removed all patches, all applied upstream. Thanks Steve. * Remove d/watch. The old download location is no longer available. * Update d/copyright and add the link to Steve Havelkas bitbuck repository. diff --git a/debian/patches/correct-linking b/debian/patches/correct-linking deleted file mode 100644 index 11fcaae..0000000 --- a/debian/patches/correct-linking +++ /dev/null @@ -1,43 +0,0 @@ -Strip out a few libs from the linker to lower the amount of direct depedencies -for this package. -See: http://lists.debian.org/debian-devel-announce/2006/09/msg00018.html ---- a/configure -+++ b/configure -@@ -4939,7 +4939,16 @@ fi - $as_echo "yes" >&6; } - - -- vars="`$curlpath/curl-config --libs`" -+# We need to modify this original line to strip a few things -+# See: http://lists.debian.org/debian-devel-announce/2006/09/msg00018.html -+ -+ vars="`$curlpath/curl-config --libs|sed \ -+ -e 's/\-lkrb5\>//g' \ -+ -e 's/\-lgssapi_krb5//g' \ -+ -e 's/\-lk5crypto//g' \ -+ -e 's/\-lkrb5support//g' \ -+ `" -+ - for i in $vars; do - if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then - # Convert foo.lib to -lfoo for GCC. No-op if not *.lib ---- a/configure.in -+++ b/configure.in -@@ -134,7 +134,16 @@ if test "${CURL_VERSION}" != "" ; then - fi - AC_MSG_RESULT(yes) - --TEA_ADD_LIBS([`$curlpath/curl-config --libs`]) -+# We need to modify this original line to strip a few things -+# See: http://lists.debian.org/debian-devel-announce/2006/09/msg00018.html -+ -+TEA_ADD_LIBS([`$curlpath/curl-config --libs|sed \ -+ -e 's/\-lkrb5\>//g' \ -+ -e 's/\-lgssapi_krb5//g' \ -+ -e 's/\-lk5crypto//g' \ -+ -e 's/\-lkrb5support//g' \ -+ `]) -+ - - #-------------------------------------------------------------------- - # __CHANGE__ diff --git a/debian/patches/example-shebang b/debian/patches/example-shebang deleted file mode 100644 index 39f22da..0000000 --- a/debian/patches/example-shebang +++ /dev/null @@ -1,26 +0,0 @@ -Set the shebang to '/usr/bin/wish' for those example files -that carry a shebang line. ---- a/tests/multi/auto.tcl -+++ b/tests/multi/auto.tcl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/wish8.4 -+#!/usr/bin/wish - - package require TclCurl - ---- a/tests/multi/autoGUI.tcl -+++ b/tests/multi/autoGUI.tcl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/wish8.4 -+#!/usr/bin/wish - - package require TclCurl - ---- a/tests/multi/cancelTrans.tcl -+++ b/tests/multi/cancelTrans.tcl -@@ -1,4 +1,4 @@ --#!/usr/local/bin/wish8.4 -+#!/usr/bin/wish - - package require TclCurl - diff --git a/debian/patches/man-hyphen-as-minus b/debian/patches/man-hyphen-as-minus deleted file mode 100644 index 0a355c1..0000000 --- a/debian/patches/man-hyphen-as-minus +++ /dev/null @@ -1,95 +0,0 @@ -Fix several hyphen-as-minus problems flagged by lintian. ---- a/doc/tclcurl.n -+++ b/doc/tclcurl.n -@@ -397,7 +397,7 @@ HTTP proxies. - .B -proxyport - Use this option to set the proxy port to use unless it is specified in - the proxy string by \fB-proxy\fP. If not specified, TclCurl will default ---to using port 1080 for proxies. -+to using port 1080 for proxies. - - .TP - .B -proxytype -@@ -460,7 +460,7 @@ too low might cause unnecessary connecti - .TP - .B -dnscachetimeout - Pass the timeout in seconds. Name resolves will be kept in memory for this number --of seconds. Set to '0' to completely disable caching, or '-1' to make the -+of seconds. Set to '0' to completely disable caching, or '\-1' to make the - cached entries remain forever. By default, TclCurl caches this info for 60 seconds. - - The name resolve functions of various libc implementations don't re-read name -@@ -762,7 +762,7 @@ is meaningful only when setting \fB-f - Sets the redirection limit. If that many redirections have been followed, - the next redirect will cause an error. This option only makes sense if the - \fB-followlocation\fP option is used at the same time. Setting the limit --to 0 will make libcurl refuse any redirect. Set it to -1 for an infinite -+to 0 will make libcurl refuse any redirect. Set it to \-1 for an infinite - number of redirects (which is the default) - - .TP -@@ -1342,7 +1342,7 @@ Pass the offset in number of bytes that - Set this option to 0 to make the transfer start from the beginning - (effectively disabling resume). - --For FTP, set this option to -1 to make the transfer start from the end of the -+For FTP, set this option to \-1 to make the transfer start from the end of the - target file (useful to continue an interrupted upload). - - When doing uploads with FTP, the resume position is where in the local/source -@@ -1537,7 +1537,7 @@ HOST+PORT will instead use your provided - - You can remove names from the DNS cache again, to stop providing these fake - resolves, by including a string in the linked list that uses the format --"-HOST:PORT". The host name must be prefixed with a dash, and the host name -+"\-HOST:PORT". The host name must be prefixed with a dash, and the host name - and port number must exactly match what was already added previously. - - .TP -@@ -2078,7 +2078,7 @@ Internal error. A function was called wi - Interface error. A specified outgoing interface could not be used. - .IP 47 - Too many redirects. When following redirects, TclCurl hit the maximum amount, set --your limit with --maxredirs -+your limit with \-\-maxredirs - .IP 48 - An option passed to TclCurl is not recognized/known. Refer to the appropriate - documentation. This is most likely a problem in the program that uses -@@ -2187,7 +2187,7 @@ Returns the last received proxy response - .TP - .B filetime - Returns the remote time of the retrieved document (in number of seconds --since 1 jan 1970 in the GMT/UTC time zone). If you get -1, -+since 1 jan 1970 in the GMT/UTC time zone). If you get \-1, - it can be because of many reasons (unknown, the server hides it or the - server doesn't support the command that tells document time etc) and the time - of the document is unknown. -@@ -2304,7 +2304,7 @@ requests. Note that this may be more tha - .TP - .B sslverifyresult - Returns the result of the certification verification that was requested --(using the -sslverifypeer option to configure). -+(using the \-sslverifypeer option to configure). - - .TP - .B sslengines -@@ -2316,7 +2316,7 @@ engines may be available at run-time. - .B contentlengthdownload - Returns the content-length of the download. This is the value read from the - .B Content-Length: --field. If the size isn't known, it returns -1. -+field. If the size isn't known, it returns \-1. - - .TP - .B contentlengthupload ---- a/doc/tclcurl_multi.n -+++ b/doc/tclcurl_multi.n -@@ -186,7 +186,7 @@ you can use the - command, it will return the number of transfers currently active. - .sp - .B RETURN VALUE --The number of active transfers or '-1' in case of error. -+The number of active transfers or '\-1' in case of error. - - .SH multiHandle getinfo - This procedure returns very simple information about the transfers, you diff --git a/debian/patches/man-section b/debian/patches/man-section deleted file mode 100644 index 2b2b96a..0000000 --- a/debian/patches/man-section +++ /dev/null @@ -1,67 +0,0 @@ -Add a section number to the manpages. ---- a/doc/tclcurl.html -+++ b/doc/tclcurl.html -@@ -1,7 +1,7 @@ - Manpage of TclCurl - -

TclCurl

--Section: Easy inteface (n)
Updated: 03 October 2011
-+Section: Easy inteface (3)
Updated: 03 October 2011
-   -
-

NAME

---- a/doc/tclcurl.n -+++ b/doc/tclcurl.n -@@ -1,7 +1,7 @@ - .\" You can view this file with: - .\" nroff -man [file] - .\" Adapted from libcurl docs by fandom@telefonica.net --.TH TclCurl n "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" -+.TH TclCurl 3 "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" - .SH NAME - TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE, LDAP, - LDAPS, IMAP, IMAPS, POP, POP3, SMTP, SMTPS and gopher syntax. ---- a/doc/tclcurl_multi.html -+++ b/doc/tclcurl_multi.html -@@ -1,7 +1,7 @@ - Manpage of TclCurl - -

TclCurl

--Section: TclCurl Multi Interface (n)
Updated: 03 September 2011
-+Section: TclCurl Multi Interface (3)
Updated: 03 September 2011
- -   -

NAME

---- a/doc/tclcurl_multi.n -+++ b/doc/tclcurl_multi.n -@@ -1,7 +1,7 @@ - .\" You can view this file with: - .\" nroff -man [file] - .\" Adapted from libcurl docs by fandom@telefonica.net --.TH TclCurl n "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" -+.TH TclCurl 3 "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" - .SH NAME - TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE, LDAP, - LDAPS, IMAP, IMAPS, POP, POP3, SMTP, SMTPS and gopher syntax. ---- a/doc/tclcurl_share.html -+++ b/doc/tclcurl_share.html -@@ -1,7 +1,7 @@ - Manpage of TclCurl - -

TclCurl

--Section: TclCurl share data api (n)
Updated: 03 October 2011
-+Section: TclCurl share data api (3)
Updated: 03 October 2011
- -   -

NAME

---- a/doc/tclcurl_share.n -+++ b/doc/tclcurl_share.n -@@ -1,7 +1,7 @@ - .\" You can view this file with: - .\" nroff -man [file] - .\" Adapted from libcurl docs by fandom@telefonica.net --.TH TclCurl n "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" -+.TH TclCurl 3 "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" - .SH NAME - TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE, LDAP, - LDAPS, IMAP, IMAPS, POP, POP3, SMTP, SMTPS and gopher syntax. diff --git a/debian/patches/man-spelling b/debian/patches/man-spelling deleted file mode 100644 index 4bf59ac..0000000 --- a/debian/patches/man-spelling +++ /dev/null @@ -1,148 +0,0 @@ -Fix a few spelling issue flagged by lintian. -Index: tclcurl/doc/tclcurl.n -=================================================================== ---- tclcurl.orig/doc/tclcurl.n -+++ tclcurl/doc/tclcurl.n -@@ -52,7 +52,7 @@ curl and this call MUST have a correspon - .I cleanup - when the operation is completed. - You should perform all your sequential file transfers using the same --curlHandle. This enables TclCurl to use persistant connections when -+curlHandle. This enables TclCurl to use persistent connections when - possible. - .sp - .B RETURN VALUE -@@ -192,7 +192,7 @@ empty or it may be thousands of bytes. - - .TP - .B -file --File in which the transfered data will be saved. -+File in which the transferred data will be saved. - - .TP - .B -readproc -@@ -213,13 +213,13 @@ server end and the transfer will end the - - .TP - .B -infile --File from which the data will be transfered. -+File from which the data will be transferred. - - .TP - .B -progressproc - Name of the Tcl procedure that will invoked by TclCurl with a frequent - interval during operation (roughly once per second or sooner), no matter if data --is being transfered or not. Unknown/unused -+is being transferred or not. Unknown/unused - argument values passed to the callback will be set to zero (like if you - only download data, the upload size will remain 0), the prototype of the - procedure must be: -@@ -260,20 +260,20 @@ where \fBinfoType\fP specifies what kind - - .TP - .B -chunkbgnproc --Name of the procedure that will be called before a file will be transfered by -+Name of the procedure that will be called before a file will be transferred by - ftp, it should match the following prototype: - .sp - .B ChunkBgnProc {remains} - .sp - --Where remains is the number of files left to be transfered (or skipped) -+Where remains is the number of files left to be transferred (or skipped) - - This callback makes sense only when using the \fB-wildcard\fP option. - - .TP - .B -chunkbgnvar - Name of the variable in the global scope that will contain the data of the file about --to be transfered. If you don't use this option '::fileData' will be used. -+to be transferred. If you don't use this option '::fileData' will be used. - - The available data is: filename, filetype (file, directory, symlink, device block, device char, - named pipe, socket, door or error if it couldn't be identified), time, perm, uid, gid, -@@ -281,7 +281,7 @@ size, hardlinks and flags. - - .TP - .B -chunkendproc --Name of the procedure that will be called after a file is transfered (or skipped) -+Name of the procedure that will be called after a file is transferred (or skipped) - by ftp, it should match the following prototype: - .sp - .B ChunkEndProc {} -@@ -479,7 +479,7 @@ to using the share interface instead! Se - - .TP - .B -buffersize --Pass your prefered size for the receive buffer in TclCurl. The main point of this -+Pass your preferred size for the receive buffer in TclCurl. The main point of this - would be that the write callback gets called more often and with smaller chunks. - This is just treated as a request, not an order. You cannot be guaranteed to - actually get the given size. -@@ -657,7 +657,7 @@ TclCurl will automatically select the on - - .TP - .B anysafe --It may use anything but basic, TclCurl will automaticly select the -+It may use anything but basic, TclCurl will automatically select the - one it finds most secure. - .RE - -@@ -972,7 +972,7 @@ a single option and thus you need to con - Set multiple cookies in one string like this: "name1=content1; name2=content2;" - etc. - --This option sets the cookie header explictly in the outgoing request(s). -+This option sets the cookie header explicitly in the outgoing request(s). - If multiple requests are done due to authentication, followed redirections or similar, - they will all get this cookie passed on. - -@@ -1468,7 +1468,7 @@ than or equal to the parameter value. De - - .TP - .B -maxconnects --Sets the persistant connection cache size in all the protocols that support -+Sets the persistent connection cache size in all the protocols that support - persistent conecctions. The set amount will be the maximum amount of simultaneous - connections that TclCurl may cache in this easy handle. Default is 5, and there - isn't much point in changing this value unless you are perfectly aware of how this -@@ -2020,7 +2020,7 @@ FTP can't get host. Couldn't resolve the - FTP couldn't set type. Couldn't change transfer method to either binary or - ascii. - .IP 18 --Partial file. Only a part of the file was transfered, this happens when -+Partial file. Only a part of the file was transferred, this happens when - the server first reports an expected transfer size and then delivers data - that doesn't match the given size. - .IP 19 -@@ -2221,7 +2221,7 @@ negotiations that are specific to the pa - .TP - .B starttransfertime - Returns the time, in seconds, it took from the start until the first byte --is just about to be transfered. This includes the \fBpretransfertime\fP, -+is just about to be transferred. This includes the \fBpretransfertime\fP, - and also the time the server needs to calculate the result. - - .TP -@@ -2413,7 +2413,7 @@ to pause the transfer. - Resumes a transfer paused with \fBcurlhandle pause\fP - - .SH curl::transfer --In case you do not want to use persistant connections you can use this -+In case you do not want to use persistent connections you can use this - command, it takes the same arguments as the \fIcurlHandle\fP \fBconfigure\fP - and will init, configure, perform and cleanup a connection for you. - -Index: tclcurl/doc/tclcurl_multi.n -=================================================================== ---- tclcurl.orig/doc/tclcurl_multi.n -+++ tclcurl/doc/tclcurl_multi.n -@@ -223,7 +223,7 @@ the multi handle. - - The \fBcommand\fP option allows you to specify a command to invoke after all the easy - handles have finished their transfers, even though I say it is an option, the truth is --you must use this command to cleanup all the handles, otherwise the transfered files -+you must use this command to cleanup all the handles, otherwise the transferred files - may not be complete. - - This support is still in a very experimental state, it may still change without warning. diff --git a/debian/patches/reformat-tclcurl3 b/debian/patches/reformat-tclcurl3 deleted file mode 100644 index 887d70d..0000000 --- a/debian/patches/reformat-tclcurl3 +++ /dev/null @@ -1,73 +0,0 @@ -Fix some formating errors in the manpages. ---- a/doc/tclcurl.n -+++ b/doc/tclcurl.n -@@ -347,7 +347,7 @@ allows you to have a TclCurl built to su - specific transfers to only be allowed to use a subset of them. - - Accepted protocols are 'http', 'https', 'ftp', 'ftps', 'scp', 'sftp', 'telnet', 'ldap', --'ldaps','dict', 'file','tftp', 'imap', 'imaps', 'pop', 'pop3', 'smtp', 'smtps', 'gopher' -+\&'ldaps', 'dict', 'file','tftp', 'imap', 'imaps', 'pop', 'pop3', 'smtp', 'smtps', 'gopher' - and 'all'. - - .TP -@@ -402,7 +402,7 @@ the proxy string by \fB-proxy\fP. If not - .TP - .B -proxytype - Pass the type of the proxy. Available options are 'http', 'http1.0', 'socks4', 'socks4a', --'socks5' and 'socks5h', with the HTTP one being the default. -+\&'socks5' and 'socks5h', with the HTTP one being the default. - - If you set it to \fIhttp1.0\fP, it will only affect how libcurl speaks to a proxy - when CONNECT is used. The HTTP version used for "regular" HTTP requests is instead -@@ -661,7 +661,8 @@ It may use anything but basic, TclCurl w - one it finds most secure. - .RE - --.TP -tlsauthtype -+.TP -+.B -tlsauthtype - Use it to tell TclCurl which authentication method(s) you want it to use for TLS authentication. - .RS - .TP 5 -@@ -961,10 +962,10 @@ response will be treated as a valid HTTP - - .TP - .B -cookie --Pass a string as parameter. It will be used to --set a cookie in the http request. The format of the string should be --'[NAME]=[CONTENTS];'. Where NAME is the cookie name and CONTENTS is --what the cookie should contain. -+Pass a string as parameter. -+It will be used to set a cookie in the http request. The format of -+the string should be '[NAME]=[CONTENTS];'. Where NAME is the cookie -+name and CONTENTS is what the cookie should contain. - - If you need to set mulitple cookies, you need to set them all using - a single option and thus you need to concatenate them all in one single string. -@@ -1771,7 +1772,7 @@ are also acceptable separators but colon - used as operators. - - For OpenSSL and GnuTLS valid examples of cipher lists include 'RC4-SHA', 'SHA1+DES', --'TLSv1' and 'DEFAULT'. The default list is normally set when you compile OpenSSL. -+\&'TLSv1' and 'DEFAULT'. The default list is normally set when you compile OpenSSL. - - You will find more details about cipher lists on this URL: - http://www.openssl.org/docs/apps/ciphers.html -@@ -1781,7 +1782,7 @@ etc. With NSS you don't add/remove ciphe - ciphers are disabled and only those passed in are enabled. - - You'll find more details about the NSS cipher lists on this URL: -- http://directory.fedora.redhat.com/docs/mod_nss.html -+ - - .TP - .B -sslsessionidcache -@@ -1976,7 +1977,7 @@ same handle. Let it return first before - you want parallel transfers, you must use several curl handles. - .TP - .B RETURN VALUE --'0' if all went well, non-zero if it didn't. In case of error, if the -+\&'0' if all went well, non-zero if it didn't. In case of error, if the - .I errorbuffer - was set with - .I configure diff --git a/debian/patches/series b/debian/patches/series index d37947f..8b13789 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1 @@ -example-shebang -man-section -reformat-tclcurl3 -man-spelling -man-hyphen-as-minus -correct-linking + -- 2.39.5