From d97402733dcb1f0019d84cf12325a625265b0ea1 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sat, 17 Oct 2015 22:20:52 +0200 Subject: [PATCH 01/16] 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.2 From 184a22eeddb724c8cb9218bf2c77fd9871ecbe7c Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sat, 17 Oct 2015 23:01:03 +0200 Subject: [PATCH 02/16] Add d/patches/bts801734.patch - thanks to Christian Werner! --- debian/changelog | 2 ++ debian/patches/bts801734.patch | 52 ++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 debian/patches/bts801734.patch diff --git a/debian/changelog b/debian/changelog index 19ed71f..66a5984 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ tclcurl (7.22.0+hg20151017-1) UNRELEASED; urgency=low + 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. + * Add d/patches/bts801734.patch - thanks to Christian Werner! + (Closes: #801734) -- Sven Hoexter Sat, 17 Oct 2015 22:16:02 +0200 diff --git a/debian/patches/bts801734.patch b/debian/patches/bts801734.patch new file mode 100644 index 0000000..321bd30 --- /dev/null +++ b/debian/patches/bts801734.patch @@ -0,0 +1,52 @@ +Description: close the file handle in time in case -file option is used +Origin: https://www.androwish.org/index.html/vpatch?from=9afc8918cdeec6d7&to=e4864fde820aac71 +Author: Christian Werner +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801734 +Forwarded: yes, email + +Index: b/generic/tclcurl.c +=================================================================== +--- a/generic/tclcurl.c ++++ b/generic/tclcurl.c +@@ -465,6 +465,12 @@ curlSetOpts(Tcl_Interp *interp, struct c + case 1: + Tcl_Free(curlData->outFile); + curlData->outFile=curlstrdup(Tcl_GetString(objv)); ++ if (curlData->outFlag) { ++ if (curlData->outHandle!=NULL) { ++ fclose(curlData->outHandle); ++ curlData->outHandle=NULL; ++ } ++ } + if ((strcmp(curlData->outFile,""))&&(strcmp(curlData->outFile,"stdout"))) { + curlData->outFlag=1; + } else { +@@ -1043,6 +1049,14 @@ curlSetOpts(Tcl_Interp *interp, struct c + case 62: + Tcl_Free(curlData->bodyVarName); + curlData->bodyVarName=curlstrdup(Tcl_GetString(objv)); ++ if (curlData->outFlag) { ++ if (curlData->outHandle!=NULL) { ++ fclose(curlData->outHandle); ++ curlData->outHandle=NULL; ++ } ++ curl_easy_setopt(curlHandle,CURLOPT_WRITEDATA,NULL); ++ } ++ curlData->outFlag=0; + if (curl_easy_setopt(curlHandle,CURLOPT_WRITEFUNCTION, + curlBodyReader)) { + return TCL_ERROR; +@@ -1080,6 +1094,13 @@ curlSetOpts(Tcl_Interp *interp, struct c + break; + case 65: + curlData->writeProc=curlstrdup(Tcl_GetString(objv)); ++ if (curlData->outFlag) { ++ if (curlData->outHandle!=NULL) { ++ fclose(curlData->outHandle); ++ curlData->outHandle=NULL; ++ } ++ curl_easy_setopt(curlHandle,CURLOPT_WRITEDATA,NULL); ++ } + curlData->outFlag=0; + if (curl_easy_setopt(curlHandle,CURLOPT_WRITEFUNCTION, + curlWriteProcInvoke)) { diff --git a/debian/patches/series b/debian/patches/series index 8b13789..0c767c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ - +bts801734.patch -- 2.39.2 From 681f13b357762e8109b693cb6ec5fc5be5ea7119 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sat, 17 Oct 2015 23:11:08 +0200 Subject: [PATCH 03/16] Add d/pattches/bts719441.patch - thanks to Christian Werner! (Closes: #719441.patch) --- debian/changelog | 2 + debian/patches/bts719441.patch | 108 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 111 insertions(+) create mode 100644 debian/patches/bts719441.patch diff --git a/debian/changelog b/debian/changelog index 66a5984..104f9ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ tclcurl (7.22.0+hg20151017-1) UNRELEASED; urgency=low * Update d/copyright and add the link to Steve Havelkas bitbuck repository. * Add d/patches/bts801734.patch - thanks to Christian Werner! (Closes: #801734) + * Add d/pattches/bts719441.patch - thanks to Christian Werner! + (Closes: #719441.patch) -- Sven Hoexter Sat, 17 Oct 2015 22:16:02 +0200 diff --git a/debian/patches/bts719441.patch b/debian/patches/bts719441.patch new file mode 100644 index 0000000..bb13b42 --- /dev/null +++ b/debian/patches/bts719441.patch @@ -0,0 +1,108 @@ +Description: close the file handle in time, increase space allocated for handleName and shandleName +Origin: https://www.androwish.org/index.html/vpatch?from=e4864fde820aac71&to=ce9a5b5886ac7381 +Author: Christian Werner +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719441 +Forwarded: yes, email + +Index: tclcurl/generic/tclcurl.c +=================================================================== +--- tclcurl.orig/generic/tclcurl.c ++++ tclcurl/generic/tclcurl.c +@@ -87,7 +87,7 @@ curlCreateObjCmd (Tcl_Interp *interp,str + Tcl_Command cmdToken; + + /* We try with curl1, if it already exists with curl2...*/ +- handleName=(char *)Tcl_Alloc(10); ++ handleName=(char *)Tcl_Alloc(32); + for (i=1;;i++) { + sprintf(handleName,"curl%d",i); + if (!Tcl_GetCommandInfo(interp,handleName,&info)) { +@@ -483,6 +483,12 @@ curlSetOpts(Tcl_Interp *interp, struct c + case 2: + Tcl_Free(curlData->inFile); + curlData->inFile=curlstrdup(Tcl_GetString(objv)); ++ if (curlData->inFlag) { ++ if (curlData->inHandle!=NULL) { ++ fclose(curlData->inHandle); ++ curlData->inHandle=NULL; ++ } ++ } + if ((strcmp(curlData->inFile,""))&&(strcmp(curlData->inFile,"stdin"))) { + curlData->inFlag=1; + } else { +@@ -914,6 +920,13 @@ curlSetOpts(Tcl_Interp *interp, struct c + case 44: + Tcl_Free(curlData->headerFile); + curlData->headerFile=curlstrdup(Tcl_GetString(objv)); ++ if (curlData->headerFlag) { ++ if (curlData->headerHandle!=NULL) { ++ fclose(curlData->headerHandle); ++ curlData->headerHandle=NULL; ++ } ++ curl_easy_setopt(curlHandle,CURLOPT_HEADERDATA,NULL); ++ } + if ((strcmp(curlData->headerFile,""))&&(strcmp(curlData->headerFile,"stdout")) + &&(strcmp(curlData->headerFile,"stderr"))) { + curlData->headerFlag=1; +@@ -1035,6 +1048,14 @@ curlSetOpts(Tcl_Interp *interp, struct c + } + break; + case 61: ++ if (curlData->headerFlag) { ++ if (curlData->headerHandle!=NULL) { ++ fclose(curlData->headerHandle); ++ curlData->headerHandle=NULL; ++ } ++ curl_easy_setopt(curlHandle,CURLOPT_HEADERDATA,NULL); ++ curlData->headerFlag=0; ++ } + if (curl_easy_setopt(curlHandle,CURLOPT_HEADERFUNCTION, + curlHeaderReader)) { + return TCL_ERROR; +@@ -1114,6 +1135,13 @@ curlSetOpts(Tcl_Interp *interp, struct c + break; + case 66: + curlData->readProc=curlstrdup(Tcl_GetString(objv)); ++ if (curlData->inFlag) { ++ if (curlData->inHandle!=NULL) { ++ fclose(curlData->inHandle); ++ curlData->inHandle=NULL; ++ } ++ curl_easy_setopt(curlHandle,CURLOPT_READDATA,NULL); ++ } + curlData->inFlag=0; + if (strcmp(curlData->readProc,"")) { + if (curl_easy_setopt(curlHandle,CURLOPT_READFUNCTION, +@@ -2439,12 +2467,14 @@ curlHeaderReader(void *ptr,size_t size,s + headerContent[charLength]=0; + /* There may be multiple 'Set-Cookie' headers, so we use a list */ + if (Tcl_StringCaseMatch(headerName,"Set-Cookie",1)) { +- Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, \ ++ Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, + headerContent,TCL_LIST_ELEMENT|TCL_APPEND_VALUE); + } else { + Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, + headerContent,0); + } ++ Tcl_Free(headerContent); ++ Tcl_Free(headerName); + } + regExp=Tcl_RegExpCompile(curlData->interp,"(^(HTTP|http)[^\r]+)(\r*)(\n)"); + match=Tcl_RegExpExec(curlData->interp,regExp,header,header); +@@ -2457,6 +2487,7 @@ curlHeaderReader(void *ptr,size_t size,s + + Tcl_SetVar2(curlData->interp,curlData->headerVar,"http", + httpStatus,0); ++ Tcl_Free(httpStatus); + } + return size*nmemb; + } +@@ -4159,7 +4190,7 @@ curlCreateShareObjCmd (Tcl_Interp *inter + Tcl_Command cmdToken; + + /* We try with scurl1, if it already exists with scurl2...*/ +- shandleName=(char *)Tcl_Alloc(10); ++ shandleName=(char *)Tcl_Alloc(32); + for (i=1;;i++) { + sprintf(shandleName,"scurl%d",i); + if (!Tcl_GetCommandInfo(interp,shandleName,&info)) { diff --git a/debian/patches/series b/debian/patches/series index 0c767c3..5821c22 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ bts801734.patch +bts719441.patch -- 2.39.2 From 4c90ce689c5b7219afd7993a7719a17a7a3b9563 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sat, 17 Oct 2015 23:27:01 +0200 Subject: [PATCH 04/16] releasing package tclcurl version 7.22.0+hg20151017-1 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 104f9ed..4a8c914 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -tclcurl (7.22.0+hg20151017-1) UNRELEASED; urgency=low +tclcurl (7.22.0+hg20151017-1) unstable; urgency=low * Import a mercurial snapshot based on b5bc0662447d. + Removed all patches, all applied upstream. Thanks Steve. @@ -6,10 +6,10 @@ tclcurl (7.22.0+hg20151017-1) UNRELEASED; urgency=low * Update d/copyright and add the link to Steve Havelkas bitbuck repository. * Add d/patches/bts801734.patch - thanks to Christian Werner! (Closes: #801734) - * Add d/pattches/bts719441.patch - thanks to Christian Werner! + * Add d/patches/bts719441.patch - thanks to Christian Werner! (Closes: #719441.patch) - -- Sven Hoexter Sat, 17 Oct 2015 22:16:02 +0200 + -- Sven Hoexter Sat, 17 Oct 2015 23:26:15 +0200 tclcurl (7.22.0-2) unstable; urgency=low -- 2.39.2 From 2599beb367b4ac1cd1c517db000be5266edb6c81 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 4 Sep 2016 16:47:19 +0200 Subject: [PATCH 05/16] New upstream version 7.22.0+hg20160822 --- .hg_archival.txt | 5 ++-- doc/tclcurl.html | 12 ++++++++++ doc/tclcurl.n | 9 ++++++++ generic/tclcurl.c | 58 ++++++++++++++++++++++++++++++++++++++++++++--- generic/tclcurl.h | 8 ++++++- 5 files changed, 86 insertions(+), 6 deletions(-) diff --git a/.hg_archival.txt b/.hg_archival.txt index 98a7ef7..f9ee621 100644 --- a/.hg_archival.txt +++ b/.hg_archival.txt @@ -1,5 +1,6 @@ repo: 11ea73a1b3c3793635669d40e602ff7f52f53e3a -node: b5bc0662447d3c92cc8d30e637e5a25457eac077 +node: 475f63137a7ecb3e8528e279ab66c0e59c16ab43 branch: default latesttag: null -latesttagdistance: 13 +latesttagdistance: 18 +changessincelatesttag: 19 diff --git a/doc/tclcurl.html b/doc/tclcurl.html index 5758241..9fe96c8 100755 --- a/doc/tclcurl.html +++ b/doc/tclcurl.html @@ -1244,6 +1244,18 @@ Enforce HTTP 1.0 requests.
Enforce HTTP 1.1 requests. +
2.0 + +
+Enforce HTTP version 2 requests. +
2TLS + +
+Enforce version 2 requests for HTTPS, version 1.1 for HTTP. +
2_PRIOR_KNOWLEDGE + +
+Enforce HTTP 2 requests without performing HTTP/1.1 Upgrade first. diff --git a/doc/tclcurl.n b/doc/tclcurl.n index 6e7227a..59fce53 100755 --- a/doc/tclcurl.n +++ b/doc/tclcurl.n @@ -1047,6 +1047,15 @@ Enforce HTTP 1.0 requests. .TP .B 1.1 Enforce HTTP 1.1 requests. +.TP +.B 2.0 +Enforce HTTP version 2 requests. +.TP +.B 2TLS +Enforce version 2 requests for HTTPS, version 1.1 for HTTP. +.TP +.B 2_PRIOR_KNOWLEDGE +Enforce HTTP 2 requests without performing HTTP/1.1 Upgrade first. .RE .TP diff --git a/generic/tclcurl.c b/generic/tclcurl.c index 21c947c..5e0a851 100755 --- a/generic/tclcurl.c +++ b/generic/tclcurl.c @@ -87,7 +87,7 @@ curlCreateObjCmd (Tcl_Interp *interp,struct curlObjData *curlData) { Tcl_Command cmdToken; /* We try with curl1, if it already exists with curl2...*/ - handleName=(char *)Tcl_Alloc(10); + handleName=(char *)Tcl_Alloc(32); for (i=1;;i++) { sprintf(handleName,"curl%d",i); if (!Tcl_GetCommandInfo(interp,handleName,&info)) { @@ -465,6 +465,12 @@ curlSetOpts(Tcl_Interp *interp, struct curlObjData *curlData, case 1: Tcl_Free(curlData->outFile); curlData->outFile=curlstrdup(Tcl_GetString(objv)); + if (curlData->outFlag) { + if (curlData->outHandle!=NULL) { + fclose(curlData->outHandle); + curlData->outHandle=NULL; + } + } if ((strcmp(curlData->outFile,""))&&(strcmp(curlData->outFile,"stdout"))) { curlData->outFlag=1; } else { @@ -477,6 +483,12 @@ curlSetOpts(Tcl_Interp *interp, struct curlObjData *curlData, case 2: Tcl_Free(curlData->inFile); curlData->inFile=curlstrdup(Tcl_GetString(objv)); + if (curlData->inFlag) { + if (curlData->inHandle!=NULL) { + fclose(curlData->inHandle); + curlData->inHandle=NULL; + } + } if ((strcmp(curlData->inFile,""))&&(strcmp(curlData->inFile,"stdin"))) { curlData->inFlag=1; } else { @@ -908,6 +920,13 @@ curlSetOpts(Tcl_Interp *interp, struct curlObjData *curlData, case 44: Tcl_Free(curlData->headerFile); curlData->headerFile=curlstrdup(Tcl_GetString(objv)); + if (curlData->headerFlag) { + if (curlData->headerHandle!=NULL) { + fclose(curlData->headerHandle); + curlData->headerHandle=NULL; + } + curl_easy_setopt(curlHandle,CURLOPT_HEADERDATA,NULL); + } if ((strcmp(curlData->headerFile,""))&&(strcmp(curlData->headerFile,"stdout")) &&(strcmp(curlData->headerFile,"stderr"))) { curlData->headerFlag=1; @@ -1029,6 +1048,14 @@ curlSetOpts(Tcl_Interp *interp, struct curlObjData *curlData, } break; case 61: + if (curlData->headerFlag) { + if (curlData->headerHandle!=NULL) { + fclose(curlData->headerHandle); + curlData->headerHandle=NULL; + } + curl_easy_setopt(curlHandle,CURLOPT_HEADERDATA,NULL); + curlData->headerFlag=0; + } if (curl_easy_setopt(curlHandle,CURLOPT_HEADERFUNCTION, curlHeaderReader)) { return TCL_ERROR; @@ -1043,6 +1070,14 @@ curlSetOpts(Tcl_Interp *interp, struct curlObjData *curlData, case 62: Tcl_Free(curlData->bodyVarName); curlData->bodyVarName=curlstrdup(Tcl_GetString(objv)); + if (curlData->outFlag) { + if (curlData->outHandle!=NULL) { + fclose(curlData->outHandle); + curlData->outHandle=NULL; + } + curl_easy_setopt(curlHandle,CURLOPT_WRITEDATA,NULL); + } + curlData->outFlag=0; if (curl_easy_setopt(curlHandle,CURLOPT_WRITEFUNCTION, curlBodyReader)) { return TCL_ERROR; @@ -1080,6 +1115,13 @@ curlSetOpts(Tcl_Interp *interp, struct curlObjData *curlData, break; case 65: curlData->writeProc=curlstrdup(Tcl_GetString(objv)); + if (curlData->outFlag) { + if (curlData->outHandle!=NULL) { + fclose(curlData->outHandle); + curlData->outHandle=NULL; + } + curl_easy_setopt(curlHandle,CURLOPT_WRITEDATA,NULL); + } curlData->outFlag=0; if (curl_easy_setopt(curlHandle,CURLOPT_WRITEFUNCTION, curlWriteProcInvoke)) { @@ -1093,6 +1135,13 @@ curlSetOpts(Tcl_Interp *interp, struct curlObjData *curlData, break; case 66: curlData->readProc=curlstrdup(Tcl_GetString(objv)); + if (curlData->inFlag) { + if (curlData->inHandle!=NULL) { + fclose(curlData->inHandle); + curlData->inHandle=NULL; + } + curl_easy_setopt(curlHandle,CURLOPT_READDATA,NULL); + } curlData->inFlag=0; if (strcmp(curlData->readProc,"")) { if (curl_easy_setopt(curlHandle,CURLOPT_READFUNCTION, @@ -2418,12 +2467,14 @@ curlHeaderReader(void *ptr,size_t size,size_t nmemb,FILE *curlDataPtr) { headerContent[charLength]=0; /* There may be multiple 'Set-Cookie' headers, so we use a list */ if (Tcl_StringCaseMatch(headerName,"Set-Cookie",1)) { - Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, \ + Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, headerContent,TCL_LIST_ELEMENT|TCL_APPEND_VALUE); } else { Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, headerContent,0); } + Tcl_Free(headerContent); + Tcl_Free(headerName); } regExp=Tcl_RegExpCompile(curlData->interp,"(^(HTTP|http)[^\r]+)(\r*)(\n)"); match=Tcl_RegExpExec(curlData->interp,regExp,header,header); @@ -2436,6 +2487,7 @@ curlHeaderReader(void *ptr,size_t size,size_t nmemb,FILE *curlDataPtr) { Tcl_SetVar2(curlData->interp,curlData->headerVar,"http", httpStatus,0); + Tcl_Free(httpStatus); } return size*nmemb; } @@ -4138,7 +4190,7 @@ curlCreateShareObjCmd (Tcl_Interp *interp,struct shcurlObjData *shcurlData) { Tcl_Command cmdToken; /* We try with scurl1, if it already exists with scurl2...*/ - shandleName=(char *)Tcl_Alloc(10); + shandleName=(char *)Tcl_Alloc(32); for (i=1;;i++) { sprintf(shandleName,"scurl%d",i); if (!Tcl_GetCommandInfo(interp,shandleName,&info)) { diff --git a/generic/tclcurl.h b/generic/tclcurl.h index acbee1f..b235d58 100755 --- a/generic/tclcurl.h +++ b/generic/tclcurl.h @@ -294,7 +294,13 @@ CONST static char *curlFormTable[]={ }; CONST static char *httpVersionTable[] = { - "none", "1.0", "1.1", (char *)NULL + "none", /* CURL_HTTP_VERSION_NONE */ + "1.0", /* CURL_HTTP_VERSION_1_0 */ + "1.1", /* CURL_HTTP_VERSION_1_1 */ + "2.0", /* CURL_HTTP_VERSION_2_0 */ + "2TLS", /* CURL_HTTP_VERSION_2TLS */ + "2_PRIOR_KNOWLEDGE", /* CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE */ + (char *)NULL }; CONST static char *netrcTable[] = { -- 2.39.2 From c2657113b807139f80f5f46de3bede1b8613e07b Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 4 Sep 2016 16:50:56 +0200 Subject: [PATCH 06/16] * Import a mercurial snapshot based on 475f63137a7e. + Removed alle patches, all appliead upstream, thanks again Steve. --- debian/changelog | 7 +++ debian/patches/bts719441.patch | 108 --------------------------------- debian/patches/bts801734.patch | 52 ---------------- debian/patches/series | 2 - 4 files changed, 7 insertions(+), 162 deletions(-) delete mode 100644 debian/patches/bts719441.patch delete mode 100644 debian/patches/bts801734.patch diff --git a/debian/changelog b/debian/changelog index 4a8c914..53fbf7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tclcurl (7.22.0+hg20160822-1) UNRELEASED; urgency=low + + * Import a mercurial snapshot based on 475f63137a7e. + + Removed alle patches, all appliead upstream, thanks again Steve. + + -- + tclcurl (7.22.0+hg20151017-1) unstable; urgency=low * Import a mercurial snapshot based on b5bc0662447d. diff --git a/debian/patches/bts719441.patch b/debian/patches/bts719441.patch deleted file mode 100644 index bb13b42..0000000 --- a/debian/patches/bts719441.patch +++ /dev/null @@ -1,108 +0,0 @@ -Description: close the file handle in time, increase space allocated for handleName and shandleName -Origin: https://www.androwish.org/index.html/vpatch?from=e4864fde820aac71&to=ce9a5b5886ac7381 -Author: Christian Werner -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=719441 -Forwarded: yes, email - -Index: tclcurl/generic/tclcurl.c -=================================================================== ---- tclcurl.orig/generic/tclcurl.c -+++ tclcurl/generic/tclcurl.c -@@ -87,7 +87,7 @@ curlCreateObjCmd (Tcl_Interp *interp,str - Tcl_Command cmdToken; - - /* We try with curl1, if it already exists with curl2...*/ -- handleName=(char *)Tcl_Alloc(10); -+ handleName=(char *)Tcl_Alloc(32); - for (i=1;;i++) { - sprintf(handleName,"curl%d",i); - if (!Tcl_GetCommandInfo(interp,handleName,&info)) { -@@ -483,6 +483,12 @@ curlSetOpts(Tcl_Interp *interp, struct c - case 2: - Tcl_Free(curlData->inFile); - curlData->inFile=curlstrdup(Tcl_GetString(objv)); -+ if (curlData->inFlag) { -+ if (curlData->inHandle!=NULL) { -+ fclose(curlData->inHandle); -+ curlData->inHandle=NULL; -+ } -+ } - if ((strcmp(curlData->inFile,""))&&(strcmp(curlData->inFile,"stdin"))) { - curlData->inFlag=1; - } else { -@@ -914,6 +920,13 @@ curlSetOpts(Tcl_Interp *interp, struct c - case 44: - Tcl_Free(curlData->headerFile); - curlData->headerFile=curlstrdup(Tcl_GetString(objv)); -+ if (curlData->headerFlag) { -+ if (curlData->headerHandle!=NULL) { -+ fclose(curlData->headerHandle); -+ curlData->headerHandle=NULL; -+ } -+ curl_easy_setopt(curlHandle,CURLOPT_HEADERDATA,NULL); -+ } - if ((strcmp(curlData->headerFile,""))&&(strcmp(curlData->headerFile,"stdout")) - &&(strcmp(curlData->headerFile,"stderr"))) { - curlData->headerFlag=1; -@@ -1035,6 +1048,14 @@ curlSetOpts(Tcl_Interp *interp, struct c - } - break; - case 61: -+ if (curlData->headerFlag) { -+ if (curlData->headerHandle!=NULL) { -+ fclose(curlData->headerHandle); -+ curlData->headerHandle=NULL; -+ } -+ curl_easy_setopt(curlHandle,CURLOPT_HEADERDATA,NULL); -+ curlData->headerFlag=0; -+ } - if (curl_easy_setopt(curlHandle,CURLOPT_HEADERFUNCTION, - curlHeaderReader)) { - return TCL_ERROR; -@@ -1114,6 +1135,13 @@ curlSetOpts(Tcl_Interp *interp, struct c - break; - case 66: - curlData->readProc=curlstrdup(Tcl_GetString(objv)); -+ if (curlData->inFlag) { -+ if (curlData->inHandle!=NULL) { -+ fclose(curlData->inHandle); -+ curlData->inHandle=NULL; -+ } -+ curl_easy_setopt(curlHandle,CURLOPT_READDATA,NULL); -+ } - curlData->inFlag=0; - if (strcmp(curlData->readProc,"")) { - if (curl_easy_setopt(curlHandle,CURLOPT_READFUNCTION, -@@ -2439,12 +2467,14 @@ curlHeaderReader(void *ptr,size_t size,s - headerContent[charLength]=0; - /* There may be multiple 'Set-Cookie' headers, so we use a list */ - if (Tcl_StringCaseMatch(headerName,"Set-Cookie",1)) { -- Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, \ -+ Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, - headerContent,TCL_LIST_ELEMENT|TCL_APPEND_VALUE); - } else { - Tcl_SetVar2(curlData->interp,curlData->headerVar,headerName, - headerContent,0); - } -+ Tcl_Free(headerContent); -+ Tcl_Free(headerName); - } - regExp=Tcl_RegExpCompile(curlData->interp,"(^(HTTP|http)[^\r]+)(\r*)(\n)"); - match=Tcl_RegExpExec(curlData->interp,regExp,header,header); -@@ -2457,6 +2487,7 @@ curlHeaderReader(void *ptr,size_t size,s - - Tcl_SetVar2(curlData->interp,curlData->headerVar,"http", - httpStatus,0); -+ Tcl_Free(httpStatus); - } - return size*nmemb; - } -@@ -4159,7 +4190,7 @@ curlCreateShareObjCmd (Tcl_Interp *inter - Tcl_Command cmdToken; - - /* We try with scurl1, if it already exists with scurl2...*/ -- shandleName=(char *)Tcl_Alloc(10); -+ shandleName=(char *)Tcl_Alloc(32); - for (i=1;;i++) { - sprintf(shandleName,"scurl%d",i); - if (!Tcl_GetCommandInfo(interp,shandleName,&info)) { diff --git a/debian/patches/bts801734.patch b/debian/patches/bts801734.patch deleted file mode 100644 index 321bd30..0000000 --- a/debian/patches/bts801734.patch +++ /dev/null @@ -1,52 +0,0 @@ -Description: close the file handle in time in case -file option is used -Origin: https://www.androwish.org/index.html/vpatch?from=9afc8918cdeec6d7&to=e4864fde820aac71 -Author: Christian Werner -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=801734 -Forwarded: yes, email - -Index: b/generic/tclcurl.c -=================================================================== ---- a/generic/tclcurl.c -+++ b/generic/tclcurl.c -@@ -465,6 +465,12 @@ curlSetOpts(Tcl_Interp *interp, struct c - case 1: - Tcl_Free(curlData->outFile); - curlData->outFile=curlstrdup(Tcl_GetString(objv)); -+ if (curlData->outFlag) { -+ if (curlData->outHandle!=NULL) { -+ fclose(curlData->outHandle); -+ curlData->outHandle=NULL; -+ } -+ } - if ((strcmp(curlData->outFile,""))&&(strcmp(curlData->outFile,"stdout"))) { - curlData->outFlag=1; - } else { -@@ -1043,6 +1049,14 @@ curlSetOpts(Tcl_Interp *interp, struct c - case 62: - Tcl_Free(curlData->bodyVarName); - curlData->bodyVarName=curlstrdup(Tcl_GetString(objv)); -+ if (curlData->outFlag) { -+ if (curlData->outHandle!=NULL) { -+ fclose(curlData->outHandle); -+ curlData->outHandle=NULL; -+ } -+ curl_easy_setopt(curlHandle,CURLOPT_WRITEDATA,NULL); -+ } -+ curlData->outFlag=0; - if (curl_easy_setopt(curlHandle,CURLOPT_WRITEFUNCTION, - curlBodyReader)) { - return TCL_ERROR; -@@ -1080,6 +1094,13 @@ curlSetOpts(Tcl_Interp *interp, struct c - break; - case 65: - curlData->writeProc=curlstrdup(Tcl_GetString(objv)); -+ if (curlData->outFlag) { -+ if (curlData->outHandle!=NULL) { -+ fclose(curlData->outHandle); -+ curlData->outHandle=NULL; -+ } -+ curl_easy_setopt(curlHandle,CURLOPT_WRITEDATA,NULL); -+ } - curlData->outFlag=0; - if (curl_easy_setopt(curlHandle,CURLOPT_WRITEFUNCTION, - curlWriteProcInvoke)) { diff --git a/debian/patches/series b/debian/patches/series index 5821c22..e69de29 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +0,0 @@ -bts801734.patch -bts719441.patch -- 2.39.2 From 53e3e60bd2ea8407cc4f3b7c37aee883a528ab1e Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 4 Sep 2016 16:52:36 +0200 Subject: [PATCH 07/16] finalise changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 53fbf7d..0f38d74 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ tclcurl (7.22.0+hg20160822-1) UNRELEASED; urgency=low * Import a mercurial snapshot based on 475f63137a7e. + Removed alle patches, all appliead upstream, thanks again Steve. - -- + -- Sven Hoexter Sun, 04 Sep 2016 16:52:08 +0200 tclcurl (7.22.0+hg20151017-1) unstable; urgency=low -- 2.39.2 From 96a1e35362a6ff1a8bf080ac515adc1999c8cb37 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 4 Sep 2016 16:56:35 +0200 Subject: [PATCH 08/16] Bump Standards-Version to 3.9.8 - no changes required. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0f38d74..100831b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ tclcurl (7.22.0+hg20160822-1) UNRELEASED; urgency=low * Import a mercurial snapshot based on 475f63137a7e. + Removed alle patches, all appliead upstream, thanks again Steve. + * Bump Standards-Version to 3.9.8 - no changes required. -- Sven Hoexter Sun, 04 Sep 2016 16:52:08 +0200 diff --git a/debian/control b/debian/control index 6da28a4..14fe303 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Sven Hoexter Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), quilt, bc Homepage: http://mirror.yellow5.com/tclcurl/ -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Vcs-Git: git://git.sven.stormbind.net/git/sven/tclcurl.git Vcs-Browser: http://git.sven.stormbind.net/?p=sven/tclcurl.git -- 2.39.2 From d0400b86b96fafc119ffbb59bfd3e10d29b6827b Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 4 Sep 2016 16:58:51 +0200 Subject: [PATCH 09/16] Do not Build-Depend on quilt, removed --with quilt from d/rules. --- debian/changelog | 3 ++- debian/control | 3 +-- debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 100831b..ab5f273 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ tclcurl (7.22.0+hg20160822-1) UNRELEASED; urgency=low * Import a mercurial snapshot based on 475f63137a7e. + Removed alle patches, all appliead upstream, thanks again Steve. - * Bump Standards-Version to 3.9.8 - no changes required. + * Do not Build-Depend on quilt, removed --with quilt from d/rules. + * Bump Standards-Version to 3.9.8 - no changes required. -- Sven Hoexter Sun, 04 Sep 2016 16:52:08 +0200 diff --git a/debian/control b/debian/control index 14fe303..f316bc7 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: tclcurl Section: interpreters Priority: extra Maintainer: Sven Hoexter -Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), - quilt, bc +Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), bc Homepage: http://mirror.yellow5.com/tclcurl/ Standards-Version: 3.9.8 Vcs-Git: git://git.sven.stormbind.net/git/sven/tclcurl.git diff --git a/debian/rules b/debian/rules index f3638f8..8b07692 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ export DEB_LDFLAGS_MAINT_PREPEND := -Wl,-z,defs -Wl,--as-needed DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: - dh $@ --with quilt + dh $@ override_dh_auto_configure: dh_auto_configure -- \ -- 2.39.2 From 73aa3372cb1ac577c52c5560b0c75732ed521663 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sun, 4 Sep 2016 17:09:53 +0200 Subject: [PATCH 10/16] releasing package tclcurl version 7.22.0+hg20160822-1 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ab5f273..dfd6d0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -tclcurl (7.22.0+hg20160822-1) UNRELEASED; urgency=low +tclcurl (7.22.0+hg20160822-1) unstable; urgency=low * Import a mercurial snapshot based on 475f63137a7e. + Removed alle patches, all appliead upstream, thanks again Steve. -- 2.39.2 From 54838f7be69b90af920870d2193697a5d3bfa7ad Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 1 Nov 2018 09:46:25 +0100 Subject: [PATCH 11/16] Remove Hompage from d/control - does no longer exist. --- debian/changelog | 7 +++++++ debian/control | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dfd6d0e..f6a9817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tclcurl (7.22.0+hg20160822-2) unstable; urgency=medium + + * Remove Hompage from d/control - does no longer exist. + + + -- + tclcurl (7.22.0+hg20160822-1) unstable; urgency=low * Import a mercurial snapshot based on 475f63137a7e. diff --git a/debian/control b/debian/control index f316bc7..d87f358 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: interpreters Priority: extra Maintainer: Sven Hoexter Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), bc -Homepage: http://mirror.yellow5.com/tclcurl/ Standards-Version: 3.9.8 Vcs-Git: git://git.sven.stormbind.net/git/sven/tclcurl.git Vcs-Browser: http://git.sven.stormbind.net/?p=sven/tclcurl.git -- 2.39.2 From 1b13edd82fbc96c5de7fb6b3b1a30f7367106cc0 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 1 Nov 2018 09:48:29 +0100 Subject: [PATCH 12/16] Adjust Vcs-* to point to https endpoints. --- debian/changelog | 2 +- debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6a9817..45f1f87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ tclcurl (7.22.0+hg20160822-2) unstable; urgency=medium * Remove Hompage from d/control - does no longer exist. - + * Adjust Vcs-* to point to https endpoints. -- diff --git a/debian/control b/debian/control index d87f358..6cda987 100644 --- a/debian/control +++ b/debian/control @@ -4,8 +4,8 @@ Priority: extra Maintainer: Sven Hoexter Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), bc Standards-Version: 3.9.8 -Vcs-Git: git://git.sven.stormbind.net/git/sven/tclcurl.git -Vcs-Browser: http://git.sven.stormbind.net/?p=sven/tclcurl.git +Vcs-Git: https://git.sven.stormbind.net/tclcurl.git +Vcs-Browser: https://git.sven.stormbind.net/?p=sven/tclcurl.git Package: tclcurl Architecture: any -- 2.39.2 From e5638bc82e74fc50903459d8ad64277ebfc2cfb5 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 1 Nov 2018 09:49:03 +0100 Subject: [PATCH 13/16] Bump Standards-Version to 4.2.1 - no changes required. --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 45f1f87..e4ee11b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ tclcurl (7.22.0+hg20160822-2) unstable; urgency=medium * Remove Hompage from d/control - does no longer exist. * Adjust Vcs-* to point to https endpoints. + * Bump Standards-Version to 4.2.1 - no changes required. -- diff --git a/debian/control b/debian/control index 6cda987..54ff6d9 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: interpreters Priority: extra Maintainer: Sven Hoexter Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), bc -Standards-Version: 3.9.8 +Standards-Version: 4.2.1 Vcs-Git: https://git.sven.stormbind.net/tclcurl.git Vcs-Browser: https://git.sven.stormbind.net/?p=sven/tclcurl.git -- 2.39.2 From 3bc145badbe097b916d2df42f21fb9c77e824110 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 1 Nov 2018 09:50:10 +0100 Subject: [PATCH 14/16] Change debhelper compat level to 11 and move the declaration to Build-Depends. --- debian/changelog | 2 ++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index e4ee11b..1ec0f4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ tclcurl (7.22.0+hg20160822-2) unstable; urgency=medium * Remove Hompage from d/control - does no longer exist. * Adjust Vcs-* to point to https endpoints. * Bump Standards-Version to 4.2.1 - no changes required. + * Change debhelper compat level to 11 and move the + declaration to Build-Depends. -- diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index 54ff6d9..2ac8aa7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tclcurl Section: interpreters Priority: extra Maintainer: Sven Hoexter -Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), bc +Build-Depends: debhelper-compat (= 11), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), bc Standards-Version: 4.2.1 Vcs-Git: https://git.sven.stormbind.net/tclcurl.git Vcs-Browser: https://git.sven.stormbind.net/?p=sven/tclcurl.git -- 2.39.2 From 74413c621a8ac074d62993bd5fa703d5412ea1be Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 1 Nov 2018 09:51:20 +0100 Subject: [PATCH 15/16] Change package priority from extra to optional. --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1ec0f4e..2037fea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,8 @@ tclcurl (7.22.0+hg20160822-2) unstable; urgency=medium * Remove Hompage from d/control - does no longer exist. * Adjust Vcs-* to point to https endpoints. - * Bump Standards-Version to 4.2.1 - no changes required. + * Bump Standards-Version to 4.2.1. + * Change package priority from extra to optional. * Change debhelper compat level to 11 and move the declaration to Build-Depends. diff --git a/debian/control b/debian/control index 2ac8aa7..db870da 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,6 @@ Source: tclcurl Section: interpreters -Priority: extra +Priority: optional Maintainer: Sven Hoexter Build-Depends: debhelper-compat (= 11), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), bc Standards-Version: 4.2.1 -- 2.39.2 From 4eb785676c083db49fdb3b2a9d06d3c881d70a5a Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Thu, 1 Nov 2018 09:53:00 +0100 Subject: [PATCH 16/16] Update d/copyright to note that the repository this package was based on is now offline. --- debian/changelog | 2 ++ debian/copyright | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2037fea..9ace7d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ tclcurl (7.22.0+hg20160822-2) unstable; urgency=medium * Change package priority from extra to optional. * Change debhelper compat level to 11 and move the declaration to Build-Depends. + * Update d/copyright to note that the repository this + package was based on is now offline. -- diff --git a/debian/copyright b/debian/copyright index 808edcc..87cc252 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,9 +3,10 @@ Wed, 26 Sep 2001 00:51:25 +0200. It is currently maintained by Sven Hoexter . -It was downloaded from +It was originally downloaded from http://personal.telefonica.terra.es/web/getleft/tclcurl/download.html -Some patches were integrated in this repository: +The current snapshot release is based on the now offline repository +formerly located at: https://bitbucket.org/smh377/tclcurl Current upstream author: Steve Havelka -- 2.39.2