This is the mail archive of the cygwin-apps mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: setup64.exe from CVS doesn't seem to append "64bit" to base URL


On Apr 24 23:11, Shaddy Baddah wrote:
> Hi Corinna,
> 
> On Apr 24 22:52, Corinna Vinschen wrote:
> >>It doesn't seem to want to download anything. And the URL it is failing
> >>on seems to me to be missing the "64bit" appendage, ahead of
> >>setup64.ini:
> >
> >Yes, that's a patch I applied only locally to provide a setup64
> >during the test phase.
> 
> I know it's pretty easy to code locally. But any chance I could get that
> patch to apply, so that my build is consistent?

Index: ini.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/ini.cc,v
retrieving revision 2.55
diff -u -p -r2.55 ini.cc
--- ini.cc	19 Nov 2010 15:49:54 -0000	2.55
+++ ini.cc	24 Apr 2013 13:51:57 -0000
@@ -60,7 +60,7 @@ unsigned int setup_timestamp = 0;
 std::string ini_setup_version;
 std::string current_ini_sig_name;
 
-static BoolOption NoVerifyOption (false, 'X', "no-verify", "Don't verify setup.ini signatures");
+static BoolOption NoVerifyOption (true, 'X', "no-verify", "Don't verify setup.ini signatures");
 
 extern int yyparse ();
 /*extern int yydebug;*/
@@ -150,8 +150,8 @@ do_remote_ini (HWND owner)
     {
       bool sig_fail = false;
       /* First try to fetch the .bz2 compressed ini file.  */
-      current_ini_name = n->url + "/" + SETUP_BZ2_FILENAME;
-      current_ini_sig_name = n->url + "/" + SETUP_BZ2_FILENAME + ".sig";
+      current_ini_name = n->url + "/64bit/" + SETUP_BZ2_FILENAME;
+      current_ini_sig_name = n->url + "/64bit/" + SETUP_BZ2_FILENAME + ".sig";
       ini_file = get_url_to_membuf (current_ini_name, owner);
       if (!NoVerifyOption)
 	ini_sig_file = get_url_to_membuf (current_ini_sig_name, owner);
@@ -220,8 +220,8 @@ do_remote_ini (HWND owner)
 	       - there was no .bz2 file found on the mirror.
 	       - the .bz2 file didn't look like a valid bzip2 file.
 	       - there was an error during bzip2 decompression.  */
-	  current_ini_name = n->url + "/" + SETUP_INI_FILENAME;
-	  current_ini_sig_name = n->url + "/" + SETUP_INI_FILENAME + ".sig";
+	  current_ini_name = n->url + "/64bit/" + SETUP_INI_FILENAME;
+	  current_ini_sig_name = n->url + "/64bit/" + SETUP_INI_FILENAME + ".sig";
 	  ini_file = get_url_to_membuf (current_ini_name, owner);
 	  if (!NoVerifyOption)
 	    ini_sig_file = get_url_to_membuf (current_ini_sig_name, owner);


Corinna

-- 
Corinna Vinschen                  Please, send mails regarding Cygwin to
Cygwin Maintainer                 cygwin AT cygwin DOT com
Red Hat


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]