[setup - the official Cygwin setup program] branch master, updated. release_2.882-9-gb05caf6

[jturney@sourceware.org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=b05caf6f9b366b64845fd918cba6425185f64053

commit b05caf6f9b366b64845fd918cba6425185f64053
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu Nov 16 15:50:44 2017 +0000

    Make 'System Proxy Settings' the default, rather than 'Direct'
    
    Make 'System Proxy Settings' the default, rather than 'Direct', and re-order
    the network connection options so that option is first.
    
    If you don't need a proxy, the system proxy setting should be for direct
    connection, anyhow.
    
    So, at the moment, this is just a button you're supposed to know you need to
    press to make it work, when you are behind a proxy.
    
    This setting is persisted (as 'net-method'), so this change only effects new
    installations.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=6899a29febd2bd45438fd7c6b53dbde5496a9b71

commit 6899a29febd2bd45438fd7c6b53dbde5496a9b71
Author: Ken Brown <kbrown@cornell.edu>
Date:   Fri Oct 27 14:47:23 2017 -0400

    Remove the ScanFindVisitor class
    
    This class was used for local installs in which the repository contains no
    setup.ini file.
    
    This seems of questionable usefulness, since it doesn't know anything about
    dependencies
    
    It also doesn't correctly handle filenames with colons.
    
    There are now good instructions at
    https://cygwin.com/package-server.html#overlay for creating a valid
    repository, so we just remove the class instead of trying to fix it.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ef5d7aa75daca39345e34f24392cd1b08aff32f5

commit ef5d7aa75daca39345e34f24392cd1b08aff32f5
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Fri Sep 22 21:56:27 2017 +0100

    Don't fatal() on unexpected early window messages
    
    There's no good reason for this to be immediately fatal, and we have at
    least one report of this happening [1], so don't fatal(), just warn.
    
    [1] https://cygwin.com/ml/cygwin/2017-07/msg00428.html

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=71c57a357c7d7b624be28700bf514599b413b401

commit 71c57a357c7d7b624be28700bf514599b413b401
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed Jul 5 18:06:36 2017 +0100

    Add upload target to Makefile

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=4bf910ebd310782941c6bf069ccf7e2c7fe6d272

commit 4bf910ebd310782941c6bf069ccf7e2c7fe6d272
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun Oct 29 16:38:32 2017 +0000

    Remove remaining CVS keyword cruft


Diff:
---
 IniDBBuilderPackage.h    |    6 -----
 Makefile.am              |   11 +++++---
 ScanFindVisitor.cc       |   57 ----------------------------------------------
 ScanFindVisitor.h        |   36 -----------------------------
 configure.ac             |    3 --
 fromcwd.cc               |    8 +-----
 libgetopt++/configure.ac |    4 ---
 net.cc                   |    6 ++--
 res.rc                   |    7 ++---
 resource.h               |    1 -
 window.cc                |    4 ++-
 11 files changed, 17 insertions(+), 126 deletions(-)

diff --git a/IniDBBuilderPackage.h b/IniDBBuilderPackage.h
index 766a5ef..323b186 100644
--- a/IniDBBuilderPackage.h
+++ b/IniDBBuilderPackage.h
@@ -42,12 +42,6 @@ public:
   void buildPackageSource (const std::string&, const std::string&,
                            char *, hashType);
 
-  // helpers for ScanFindVisitor
-  void buildPackageInstall (const std::string& path, const std::string& size)
-  { buildPackageInstall(path, size, NULL, hashType::none); }
-  void buildPackageSource (const std::string& path, const std::string& size)
-  { buildPackageSource(path, size, NULL, hashType::none); }
-
   void buildPackageTrust (int);
   void buildPackageCategory (const std::string& );
 
diff --git a/Makefile.am b/Makefile.am
index d4c8472..b2a735c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id$
-#
 # Copyright (c) 2000, Red Hat, Inc.
 # Copyright (c) 2002, Robert Collins
 #
@@ -236,8 +234,6 @@ inilint_SOURCES = \
 	resource.h \
 	root.cc \
 	root.h \
-	ScanFindVisitor.cc \
-	ScanFindVisitor.h \
 	script.cc \
 	script.h \
 	setup_version.h \
@@ -317,5 +313,12 @@ release: upx
 	cp setup.dbg setup-${VER}.${ARCH}.dbg
 	cp setup${EXEEXT} setup-${VER}.${ARCH}${EXEEXT}
 
+UPLOAD_HOST=cygwin-admin@cygwin.com
+UPLOAD_PATH=/www/sourceware/htdocs/cygwin/setup
+
+upload: release
+	scp setup-${VER}-$(ARCH).exe setup-${VER}-$(ARCH).dbg ${UPLOAD_HOST}:${UPLOAD_PATH}
+	ssh ${UPLOAD_HOST} gpg --detach-sign ${UPLOAD_PATH}/setup-${VER}-$(ARCH).exe
+
 clean-local:
 	rm -f setup*${EXEEXT} setup*.dbg
diff --git a/ScanFindVisitor.cc b/ScanFindVisitor.cc
deleted file mode 100644
index 14c3722..0000000
--- a/ScanFindVisitor.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2002 Robert Collins.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by Robert Collins <robertc@hotmail.com>
- *
- */
-
-#include "ScanFindVisitor.h"
-#include "filemanip.h"
-#include "IniDBBuilderPackage.h"
-
-ScanFindVisitor::ScanFindVisitor(IniDBBuilderPackage &aBuilder) : _Builder (aBuilder) {}
-ScanFindVisitor::~ScanFindVisitor(){}
-
-/* look for potential packages we can add to the in-memory package
- * database
- */
-void
-ScanFindVisitor::visitFile(const std::string& basePath,
-                           const WIN32_FIND_DATA *theFile)
-{
-  // Sanity check: Does the file look like a package ?
-  fileparse f;
-  if (!parse_filename (theFile->cFileName, f))
-    return;
-
-  // Sanity check: Zero length package files get thrown out.
-  if (!(theFile->nFileSizeLow || theFile->nFileSizeHigh))
-    return;
-
-  // Build a new package called f.pkg
-  _Builder.buildPackage (f.pkg);
-
-  // Set the version we are bulding
-  _Builder.buildPackageVersion (f.ver);
-
-  // Add the file as a installable package
-  if (!f.what.size())
-    {
-      //assume binary
-      _Builder.buildPackageInstall (basePath + theFile->cFileName,
-                                    stringify(theFile->nFileSizeLow));
-    }
-  else
-    // patch or src, assume src until someone complains
-    _Builder.buildPackageSource (basePath + theFile->cFileName,
-                                 stringify(theFile->nFileSizeLow));
-
-}
diff --git a/ScanFindVisitor.h b/ScanFindVisitor.h
deleted file mode 100644
index b4c93d9..0000000
--- a/ScanFindVisitor.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2002 Robert Collins.
- *
- *     This program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     A copy of the GNU General Public License can be found at
- *     http://www.gnu.org/
- *
- * Written by Robert Collins <robertc@hotmail.com>
- *
- */
-
-#ifndef SETUP_SCANFINDVISITOR_H
-#define SETUP_SCANFINDVISITOR_H
-
-#include "FindVisitor.h"
-
-class IniDBBuilderPackage ;
-/* Scan files and create a package db when no cached .ini exists */
-class ScanFindVisitor : public FindVisitor
-{
-public:
-  ScanFindVisitor (IniDBBuilderPackage &aBuilder);
-  virtual void visitFile(const std::string& basePath, const WIN32_FIND_DATA *);
-  virtual ~ ScanFindVisitor ();
-protected:
-  ScanFindVisitor (ScanFindVisitor const &);
-  ScanFindVisitor & operator= (ScanFindVisitor const &);
-private:
-  IniDBBuilderPackage &_Builder;
-};
-
-#endif /* SETUP_SCANFINDVISITOR_H */
diff --git a/configure.ac b/configure.ac
index ab548c0..2c610ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,6 @@ dnl
 dnl Written by Christopher Faylor <cgf@redhat.com>
 dnl and Robert Collins  <rbtcollins@hotmail.com>
 dnl
-dnl $Id$
-dnl
 dnl Autoconf configure script for Cygwin utilities.
 dnl
 dnl Process this file with autoconf to produce a configure script.
@@ -24,7 +22,6 @@ AM_INIT_AUTOMAKE([1.12 subdir-objects foreign no-define -Wall -Wno-portability])
 dnl AM_CONFIG_HEADER(include/autoconf.h)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES(yes)])
 AC_CONFIG_SRCDIR([Makefile.in])
-AC_REVISION($Revision$)dnl
 
 AC_MSG_CHECKING([Whether to build inilint])
 AC_ARG_ENABLE(inilint,
diff --git a/fromcwd.cc b/fromcwd.cc
index 791744e..3e77ad3 100644
--- a/fromcwd.cc
+++ b/fromcwd.cc
@@ -30,7 +30,7 @@
 #include "find.h"
 #include "ini.h"
 
-#include "ScanFindVisitor.h"
+#include "FindVisitor.h"
 #include "IniDBBuilderPackage.h"
 #include "IniParseFeedback.h"
 
@@ -111,7 +111,6 @@ IniList found_ini_list;
 bool
 do_from_local_dir (HINSTANCE h, HWND owner, std::string &local_dir)
 {
-  // Assume we won't find the INI file.
   SetupFindVisitor found;
   // single mirror?
   Find (local_dir.c_str ()).accept (found, 1);
@@ -121,10 +120,5 @@ do_from_local_dir (HINSTANCE h, HWND owner, std::string &local_dir)
   Find (local_dir.c_str ()).accept (found, 2);
   if (found)
       return true;
-  // nope, do full scan.
-  IniParseFeedback myFeedback;
-  IniDBBuilderPackage myBuilder (myFeedback);
-  ScanFindVisitor myVisitor (myBuilder);
-  Find (local_dir.c_str ()).accept (myVisitor);
   return false;
 }
diff --git a/libgetopt++/configure.ac b/libgetopt++/configure.ac
index 41ea672..16a8944 100644
--- a/libgetopt++/configure.ac
+++ b/libgetopt++/configure.ac
@@ -3,16 +3,12 @@ dnl  Configuration input file for GetOpt++
 dnl
 dnl  Robert Collins, rbtcollins@hotmail.com
 dnl
-dnl  $Id$
-dnl
-dnl
 dnl
 AC_INIT(src/GetOption.cc, 0.0.2-DEVEL)
 AC_PREREQ(2.60)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS(include/autoconf.h)
-AC_REVISION($Revision$)dnl
 AC_PREFIX_DEFAULT(/usr/local)
 AM_MAINTAINER_MODE
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES(yes)])
diff --git a/net.cc b/net.cc
index 903f096..fa6f1e3 100644
--- a/net.cc
+++ b/net.cc
@@ -112,7 +112,7 @@ NetPage::OnInit ()
   std::string proxyString (ProxyOption);
 
   if (!NetIO::net_method)
-    NetIO::net_method = IDC_NET_DIRECT;
+    NetIO::net_method = IDC_NET_IE5;
 
   if (proxyString.size ())
   {
@@ -131,10 +131,10 @@ NetPage::OnInit ()
   CheckIfEnableNext();
 
   // Check to see if any radio buttons are selected. If not, select a default.
-  if (SendMessage (GetDlgItem (IDC_NET_IE5), BM_GETCHECK, 0, 0) != BST_CHECKED
+  if (SendMessage (GetDlgItem (IDC_NET_DIRECT), BM_GETCHECK, 0, 0) != BST_CHECKED
       && SendMessage (GetDlgItem (IDC_NET_PROXY), BM_GETCHECK, 0, 0) != BST_CHECKED
       && SendMessage (GetDlgItem (IDC_NET_DIRECT_LEGACY), BM_GETCHECK, 0, 0) != BST_CHECKED)
-    SendMessage (GetDlgItem (IDC_NET_DIRECT), BM_CLICK, 0, 0);
+    SendMessage (GetDlgItem (IDC_NET_IE5), BM_CLICK, 0, 0);
 }
 
 long
diff --git a/res.rc b/res.rc
index 80d1bf1..a4d7e70 100644
--- a/res.rc
+++ b/res.rc
@@ -157,10 +157,10 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
 CAPTION "Cygwin Setup - Select Connection Type"
 FONT 8, "MS Shell Dlg"
 BEGIN
-    CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,73,10
     CONTROL         "Use &System Proxy Settings",IDC_NET_IE5,"Button",
-                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,185,10
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,60,55,185,10
+    CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
+                    BS_AUTORADIOBUTTON | WS_TABSTOP,60,70,73,10
     CONTROL         "Use HTTP/FTP &Proxy:",IDC_NET_PROXY,"Button",
                     BS_AUTORADIOBUTTON | WS_TABSTOP,60,85,88,10
     CONTROL         "&Direct Connection (legacy)",IDC_NET_DIRECT_LEGACY,"Button",
@@ -550,7 +550,6 @@ BEGIN
     IDS_INSTALL_INCOMPLETE  "Installation incomplete.  Check %s for details"
     IDS_CORRUPT_PACKAGE     "Package file %s has a corrupt local copy, please remove and retry."
     IDS_SKIP_PACKAGE	    "%s\nDo you want to skip this package ?"
-    IDS_WINDOW_INIT_BADMSG  "Fatal Error: Unexpected windows message %u received too early in window initialization."
     IDS_UNCAUGHT_EXCEPTION  "Fatal Error: Uncaught Exception\nThread: %s\nType: %s\nMessage: %s"
     IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO  "Fatal Error: Uncaught Exception\nThread: %s\nType: %s\nMessage: %s\nAppErrNo: %d"
     IDS_TRUSTKEEP_TOOLTIP   "Sets all packages to their currently installed "
diff --git a/resource.h b/resource.h
index 0cc70ca..a2e867f 100644
--- a/resource.h
+++ b/resource.h
@@ -20,7 +20,6 @@
 #define IDS_REBOOT_REQUIRED               118
 #define IDS_CORRUPT_PACKAGE               119
 #define IDS_INSTALL_ERROR                 120
-#define IDS_WINDOW_INIT_BADMSG            121
 #define IDS_UNCAUGHT_EXCEPTION            122
 #define IDS_UNCAUGHT_EXCEPTION_WITH_ERRNO 123
 #define IDS_SKIP_PACKAGE                  124
diff --git a/window.cc b/window.cc
index d97ef6a..c4006d6 100644
--- a/window.cc
+++ b/window.cc
@@ -79,7 +79,9 @@ Window::FirstWindowProcReflector (HWND hwnd, UINT uMsg, WPARAM wParam,
   else
     {
       // Should never get here.
-      fatal(NULL, IDS_WINDOW_INIT_BADMSG, uMsg);
+      Log (LOG_PLAIN) << "Warning: Unexpected windows message " << uMsg
+                      << "received early in window initialization."
+                      << endLog;
     }
 
   return wnd->WindowProc (uMsg, wParam, lParam);