Skip to content

Import win32/resolv.rb that is required on Windows #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 27 commits into from
May 29, 2024
Merged

Import win32/resolv.rb that is required on Windows #54

merged 27 commits into from
May 29, 2024

Conversation

nobu
Copy link
Member

@nobu nobu commented May 3, 2024 •
edited
Loading

Fix #53.

Memo of Procedure

  1. Cloned a new repository and filtered following files using git-filter-repo.

    ext/win32/resolv/extconf.rb
ext/win32/resolv/resolv.c
glob:ext/*/lib/win32/resolv*.rb
.git-blame-ignore-revs
ext/win32/lib/==>ext/win32/resolv/lib/

  2. Reset .git-blame-ignore-revs to truncate unrelated commits in the filtered repository.

  3. Cherry-picked from the filtered repository into ruby/resolv clone.

  4. Rewrite the last hash in .git-blame-ignore-revs.

unak and others added 27 commits May 6, 2024 21:45
@unak @nobu
* ext/Win32API/lib/win32/resolv.rb: added.
c9eb198 
* lib/resolv.rb: support Win32 platforms.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4135 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@unak @nobu
* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
d7a1036 
  fixed: [ruby-list:40058], [ruby-dev:27479]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9455 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@unak @nobu
* ext/Win32API/*: removed or moved to ext/dl/win32.
10ab1ff 
* ext/dl/win32/*: new. [ruby-dev:32387]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
a915fe7 
  [ruby-dev:29945], [ruby-dev:34095]

* lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
  name too for cygwin.  [ruby-dev:29945]

* lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
* lib/resolv.rb (Resolv::Config.default_config_hash): requires
31fb6a4 
  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@unak @nobu
* ext/dl/win32/lib/win32/{registry,resolv}.rb: use dl/import instead
cda2cfa 
  of Win32API.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@unak @nobu
* ext/dl/win32/lib/win32/resolv.rb: get rid of warning.
07f166a 
* ext/dl/lib/dl/func.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
* {ext,lib,test}/**/*.rb: removed trailing spaces.
a476972 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@unak @nobu
* ext/dl/win32/lib/win32/resolv.rb (get_info): get rid of a warning.
82dcffe 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@unak @nobu
* ext/fiddle/win32/*: library ports from DL to Fiddle.
ed102c6 
* ext/dl/win32/extconf.rb: check fiddle.  often case dl compiled prior
  to fiddle, so this change is no meaning.  in most cases, simply
  fiddle/win32 overwrite dl/win32.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
ext/win32: move
1fd3c77 
* ext/win32: move from ext/dl and ext/fiddle.  since ext/extmk.rb
  builds extensions in alphabetical order, compiled?('fiddle') under
  ext/dl makes no sense.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nurse @nobu
handle ext/ as r53141
dd4b434 
g -L frozen_string_literal ext/**/*.rb|xargs ruby -Ka -e'ARGV.each{|fn|puts
fn;open(fn,"r+"){|f|s=f.read.sub(/\A(#!.*\n)?(#.*coding.*\n)?/,"\\&#
frozen_string_literal: false\n");f.rewind;f.write s}}'

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
split win32/resolv9x.rb
364713a 
* ext/win32/lib/win32/resolv9x.rb: split code for Windows 9x from
  resolv.rb.  now it is rarely used.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
avoid ruby-mode.el bug
a12319e 
* ext/win32/lib/win32/{resolv,resolv9x}.rb: get rid of
  ruby-mode.el of Emacs 24.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53828 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
win32/resolv.rb: check pointer size
9dec211 
* ext/win32/lib/win32/resolv.rb: check pointer size first, NT if
  it is larger than 4 as Windows 9X are 32-bit mode only.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53829 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
win32/resolv.rb: invert the condition
5ced302 
* ext/win32/lib/win32/resolv.rb: invert the condition to return
  immediately in the future.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
Explicit ".dll" suffix
82f4441 
* ext/win32/lib/Win32API.rb (Win32API#initialize): Cygwin
  2.5.2-1 (perhaps) seems to no longer append ".dll" suffix
  implicitly.
* ext/win32/lib/win32/resolv.rb (Win32::Resolv): ditto.  Fix the
  error reported by yamataka AT u08.itscom.net in
  [ruby-list:50339], and pointed out and patched by cerberus AT
  m3.kcn.ne.jp in [ruby-list:50341].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
win32/resolv: get_dns_server_list
514bef0 
* ext/win32/resolv/resolv.c (get_dns_server_list): [Win32] get DNS
  servers only for connected network devices by GetNetworkParams
  API.  [Bug #12604]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
resolv.c: fix commit miss
290d0d1 
* ext/win32/resolv/resolv.c (Init_resolv): remove dead code.
  [Bug #12604]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55783 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
win32/resolv: fix for cygwin
13761dd 
* ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on
  cygwin.  [ruby-core:76791] [Bug #12663]
* ext/win32/resolv/resolv.c (w32error_make_error): use
  Win32::Resolv::Error, an alias of Win32::Registry::Error.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
win32/resolv: fix for cygwin
65d55eb 
* ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on
  cygwin.  [ruby-core:76791] [Bug #12663]

* ext/win32/resolv/resolv.c (w32error_make_error): use
  Win32::Resolv::Error, an alias of Win32::Registry::Error.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
win32/resolv.rb: ad hoc workaround
46d4055 
* ext/win32/lib/win32/resolv.rb (Win32::Resolv::SZ): an ad hoc
  workaround for broken registry.  SearchList and other registry
  values must be REG_SZ, or Windows ignores anything in those
  values otherwise.  [ruby-dev:49924] [Bug #13081]
  rubygems/rubygems#1700

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57265 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
resolv9x.rb: fix typo
02f8c5d 
* ext/win32/lib/win32/resolv9x.rb (WsControl): fix missing close
  parenthesis at r22724.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@nobu
win32/resolv.rb: call rb_w32_osid
3805f76 
* ext/win32/lib/win32/resolv.rb: call rb_w32_osid instead of
  direct GetVersionExA API.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
@hsbt @nobu
Removed win32/resolv.rb for 32bit env
b2f8683
@k0kubun @nobu
Expand tabs [ci skip]
9ae2106 
[Misc #18891]
@k0kubun @nobu
Add .git-blame-ignore-revs [ci skip]
48e427b 
for [Misc #18891]

It is a file that could be used with `git config blame.ignoreRevsFile`.
The file name `.git-blame-ignore-revs` is natively supported by GitHub,
so you don't need anything else to make it work on GitHub.
https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view

However, for your local git repository use, if you configure `blame.ignoreRevsFile`
globally, git expects you to have the file in every git repository you
use, which is nearly impossible.

So, for your local development, you're supposed to use this file with:

```
git config --local blame.ignoreRevsFile .git-blame-ignore-revs
```
@hsbt
Copy link
Member

hsbt commented May 7, 2024

👍

@nobu We need to update resolv.gemspec with spec.extensions for mswin platform.

@hsbt hsbt merged commit b25c63c into master May 29, 2024
@hsbt hsbt deleted the win32-resolv branch May 29, 2024 04:15
matzbot pushed a commit to ruby/ruby that referenced this pull request Jul 16, 2024
@hsbt
Follow-up resolv and win32 integration
7a0e6f1 
ruby/resolv#54
@nobu nobu mentioned this pull request Jul 16, 2024
Merged
@headius headius mentioned this pull request Aug 12, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Should win32/resolv be included here?
5 participants
@nobu @hsbt @unak @nurse @k0kubun