From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1785 invoked by alias); 18 Jun 2018 17:25:51 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 1764 invoked by uid 9078); 18 Jun 2018 17:25:50 -0000 Date: Mon, 18 Jun 2018 17:25:00 -0000 Message-ID: <20180618172550.1734.qmail@sourceware.org> From: corinna@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [setup - the official Cygwin setup program] branch master, updated. release_2.891-10-ga2046f5 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 4a6f8247d6bb71812aa564c4714fb58b5f61d46f X-Git-Newrev: a2046f55666feee636048911d6b022224a5cf89f X-SW-Source: 2018-q2/txt/msg00013.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=a2046f55666feee636048911d6b022224a5cf89f commit a2046f55666feee636048911d6b022224a5cf89f Author: Corinna Vinschen Date: Mon Jun 18 19:16:59 2018 +0200 netio.cc: fix a bug in string handling commit ed6137e5f94f45e50a12994aeae310278b2bf758 back in 2003(!) introduced a bug in creating an empty password string which, embarrassingly, only now has been catched by gcc. Signed-off-by: Corinna Vinschen https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=2a6835da5e4aa197b9cc081247d18b7469fe2e0a commit 2a6835da5e4aa197b9cc081247d18b7469fe2e0a Author: Corinna Vinschen Date: Mon Jun 18 17:36:39 2018 +0200 replace http links with official https URLs Signed-off-by: Corinna Vinschen Diff: --- IniDBBuilderPackage.cc | 4 ++-- netio.cc | 2 +- res.rc | 4 ++-- splash.cc | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/IniDBBuilderPackage.cc b/IniDBBuilderPackage.cc index d5f167d..48a5d4a 100644 --- a/IniDBBuilderPackage.cc +++ b/IniDBBuilderPackage.cc @@ -57,7 +57,7 @@ IniDBBuilderPackage::buildVersion (const std::string& aVersion) snprintf (old_vers, sizeof old_vers, "The current ini file is from a newer version of setup-%s.exe. " "If you have any trouble installing, please download a fresh " - "version from http://www.cygwin.com/setup-%s.exe", + "version from https://cygwin.com/setup-%s.exe", is_64bit ? "x86_64" : "x86", is_64bit ? "x86_64" : "x86"); _feedback.warning(old_vers); @@ -73,7 +73,7 @@ IniDBBuilderPackage::buildMinimumVersion (const std::string& minimum) char min_vers[256]; snprintf (min_vers, sizeof(min_vers), "The current ini file requires at least version %s of setup.\n" - "Please download a newer version from http://www.cygwin.com/setup-%s.exe", + "Please download a newer version from https://cygwin.com/setup-%s.exe", minimum.c_str(), is_64bit ? "x86_64" : "x86"); return min_vers; diff --git a/netio.cc b/netio.cc index 512750c..9eb1e91 100644 --- a/netio.cc +++ b/netio.cc @@ -137,7 +137,7 @@ save_dialog (HWND h) *passwd = eget (h, IDC_NET_PASSWD, *passwd); if (! *passwd) { *passwd = new char[1]; - passwd[0] = '\0'; + (*passwd)[0] = '\0'; } } diff --git a/res.rc b/res.rc index 921ef03..02b60cf 100644 --- a/res.rc +++ b/res.rc @@ -264,7 +264,7 @@ BEGIN ICON IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE LTEXT "Version (unknown)",IDC_VERSION,115,127,195,10 LTEXT "Copyright 2000-2018",IDC_SPLASH_COPYR,115,140,195,8 - LTEXT "http://www.cygwin.com/",IDC_SPLASH_URL,115,152,90,8 + LTEXT "https://cygwin.com/",IDC_SPLASH_URL,115,152,90,8 END IDD_DESKTOP DIALOG DISCARDABLE 0, 0, SETUP_STANDARD_DIALOG_DIMS @@ -549,7 +549,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_ROOT_SLASH "Warning: we recommend you do not use the root of your hard drive as the cygwin root, to prevent possible conflicts with other programs. Proceed anyway?" IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?" - IDS_MIRROR_LST "http://cygwin.com/mirrors.lst" + IDS_MIRROR_LST "https://cygwin.com/mirrors.lst" IDS_ERR_OPEN_WRITE "Can't open %s for writing: %s" IDS_SETUPINI_MISSING "Unable to get %s from <%s>" IDS_OLD_SETUPINI "This setup.ini is older than the one you used last time you installed cygwin. Proceed anyway?" diff --git a/splash.cc b/splash.cc index 8f24d2f..16a6f7b 100644 --- a/splash.cc +++ b/splash.cc @@ -49,5 +49,5 @@ SplashPage::OnInit () ver += is_64bit ? " (64 bit)" : " (32 bit)"; SetDlgItemFont(IDC_VERSION, "Arial", 10, FW_BOLD); ::SetWindowText (GetDlgItem (IDC_VERSION), ver.c_str()); - makeClickable (IDC_SPLASH_URL, "http://www.cygwin.com"); + makeClickable (IDC_SPLASH_URL, "https://cygwin.com"); }