[MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

classic Classic list List threaded Threaded
8 messages Options
Reply | Threaded
Open this post in threaded view
|

[MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
----------------------------+----------------------------
 Reporter:  raimue          |      Owner:  (none)
     Type:  enhancement     |     Status:  new
 Priority:  Normal          |  Milestone:  MacPorts 2.4.4
Component:  base            |    Version:
 Keywords:  needs-backport  |       Port:
----------------------------+----------------------------
 From https://lists.macports.org/pipermail/macports-
 dev/2018-April/038199.html:
 >
 > Do you want to merge this performance enhancement too:
 >
 >
 > macports_util: Optimize lshift and lunshift
 >
 > https://github.com/macports/macports-
 base/commit/cf998981c078c9804f1f8e0ce245796278876474
 >
 >
 > And these bugfixes:
 >
 >
 > port: Add missing -N flag to usage
 >
 > https://github.com/macports/macports-
 base/commit/80d65609e11fc0b32f0f5f86e0696d9e244f7707
 >
 >
 > port: Remove misleading [privopts] from usage
 >
 > https://github.com/macports/macports-
 base/commit/f166b4809f88ddbb7fe77a495d5159fc87f764a4
 >
 >
 > reclaim: Split distfile into filename and disttag
 >
 > https://github.com/macports/macports-
 base/commit/3ad97625cc57d26e333dcdf06dc0d932f002056a
 >
 >
 > Update copyright year
 >
 > https://github.com/macports/macports-
 base/commit/fa20ccb51e64fb2773125a1e5bd392a2fe322c90
 >
 >
 > Update Apple developer site URL in readme
 >
 > https://github.com/macports/macports-
 base/commit/9f7ffde631117650b96641595f626512409a3cbb
 >
 >
 > Add link to Guide to readme
 >
 > https://github.com/macports/macports-
 base/commit/a3e250224da7667b4970f381878d5cd9c7fc6df2
 >
 >
 > HACKING: Add links to the MacPorts Guide
 >
 > https://github.com/macports/macports-
 base/commit/d7fd81a85065c29092e71743716004ba0eb578b2
 >
 >
 > reclaim.tcl: don't ask for partial removal
 >
 > https://github.com/macports/macports-
 base/commit/3578400bf5f593c92b1bc412a45776fe55c0db78
 >
 >
 > port mirror: Respect special license NoMirror
 >
 > https://github.com/macports/macports-
 base/commit/fae17c2c7b97f2c6b8d9ab527ef6776b93353a00
 >
 >
 > tests: Avoid bogus error message during test runs
 >
 > https://github.com/macports/macports-
 base/commit/4c11f3bea113e305776751e98d5236e34175a972
 >
 >
 > tests: Fix test failure due to missing SVN command
 >
 > https://github.com/macports/macports-
 base/commit/ea77eb50b06f009629afb95321f0d5cd932c070b
 >
 >
 > tests: Remove non-existing constraint from test
 >
 > https://github.com/macports/macports-
 base/commit/0745d2d4efcbe082e13828f31c2c594c2be0a0a4
 >
 >
 > tests: Avoid using network in port1.0 unit tests
 >
 > https://github.com/macports/macports-
 base/commit/521e0143893f89c35f084205f9230fbd24e30165
 >
 >
 > The three commits for using MacPorts svn on newer macOS versions to fix
 fetch failures:
 >
 > https://trac.macports.org/ticket/55933
 >
 >
 > The two commits for using MacPorts git on newer macOS versions to fix
 fetch failures:
 >
 > https://trac.macports.org/ticket/55989
 >
 >
 > Fix trace mode when using ccache-devel:
 >
 > https://trac.macports.org/ticket/55680
 >
 >
 > Add size to default checksums:
 >
 > https://github.com/macports/macports-
 base/commit/95a153e6a4bff8b99502806960c916a2b5d20504
 >
 >
 > Correct default value of distpath in docs
 >
 > https://github.com/macports/macports-
 base/commit/b7e7fe52d7e6450181232ee635597fff56722c69
 >
 >
 > Don't allow non-integer epoch or revision
 >
 > https://github.com/macports/macports-
 base/commit/387cd8ca7c7a54a38ea24fc1d698444720dfa8eb
 >
 >
 > Remove lint check for non-integer revision, epoch
 >
 > https://github.com/macports/macports-
 base/commit/dcf6a81c69556b0c03b508122f176f01f9d8da1e
 >
 >

--
Ticket URL: <https://trac.macports.org/ticket/56267>
MacPorts <https://www.macports.org/>
Ports system for macOS
Reply | Threaded
Open this post in threaded view
|

Re: [MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
--------------------------+----------------------------
  Reporter:  raimue       |      Owner:  (none)
      Type:  enhancement  |     Status:  new
  Priority:  Normal       |  Milestone:  MacPorts 2.4.4
 Component:  base         |    Version:
Resolution:               |   Keywords:  needs-backport
      Port:               |
--------------------------+----------------------------

Comment (by raimue):

 Replying to [ticket:56267 raimue]:
 > > macports_util: Optimize lshift and lunshift
 > >
 > > https://github.com/macports/macports-
 base/commit/cf998981c078c9804f1f8e0ce245796278876474

 Applied as [26fd9b60bd0e742eef37ed87ae3f23a260a71ae0/macports-ports].

 > > port: Add missing -N flag to usage
 > >
 > > https://github.com/macports/macports-
 base/commit/80d65609e11fc0b32f0f5f86e0696d9e244f7707

 Applied as [361eca49fc497415c80244c9504d89fa768e35d0/macports-ports].

 > > port: Remove misleading [privopts] from usage
 > >
 > > https://github.com/macports/macports-
 base/commit/f166b4809f88ddbb7fe77a495d5159fc87f764a4

 Applied as [26324b4bdba87bca50319dcc07c5c8a5d51c76b9/macports-ports].

 > > reclaim: Split distfile into filename and disttag
 > >
 > > https://github.com/macports/macports-
 base/commit/3ad97625cc57d26e333dcdf06dc0d932f002056a

 Applied as [22dd6dd58c7440886a681514cb866ef4e3b5db01/macports-ports].

 > > Update copyright year
 > >
 > > https://github.com/macports/macports-
 base/commit/fa20ccb51e64fb2773125a1e5bd392a2fe322c90

 Applied as [17ba93da370d583d835ac807eb9992c36835057a/macports-ports].

 > > Update Apple developer site URL in readme
 > >
 > > https://github.com/macports/macports-
 base/commit/9f7ffde631117650b96641595f626512409a3cbb

 Merge conflict, not applied.

 > > Add link to Guide to readme
 > >
 > > https://github.com/macports/macports-
 base/commit/a3e250224da7667b4970f381878d5cd9c7fc6df2

 Applied as [c4bd71ebcff60d3076d6335cbf7d1f72fa01ffc1/macports-ports].

 > > HACKING: Add links to the MacPorts Guide
 > >
 > > https://github.com/macports/macports-
 base/commit/d7fd81a85065c29092e71743716004ba0eb578b2

 (All development should happen on master. We should not care too much
 about updating development documentation on the release branches.)

 Applied as [164a317815a4998e583153489d217aa2be28b482/macports-ports].

 > > reclaim.tcl: don't ask for partial removal
 > >
 > > https://github.com/macports/macports-
 base/commit/3578400bf5f593c92b1bc412a45776fe55c0db78

 Should we consider this a bug fix or a change in behavior? Isn't this
 something for 2.5.0?

 > > port mirror: Respect special license NoMirror
 > >
 > > https://github.com/macports/macports-
 base/commit/fae17c2c7b97f2c6b8d9ab527ef6776b93353a00

 Applied as [7a87293ad9ff60ff93fa9c110ced1e7a9761e12e/macports-ports].

 > > tests: Avoid bogus error message during test runs
 > >
 > > https://github.com/macports/macports-
 base/commit/4c11f3bea113e305776751e98d5236e34175a972

 Merge conflict, not applied.

 > > tests: Fix test failure due to missing SVN command
 > >
 > > https://github.com/macports/macports-
 base/commit/ea77eb50b06f009629afb95321f0d5cd932c070b

 Applied as [4a9604b66827e8c6cf08cef941fe9b44d424c6c8/macports-ports].

 > > tests: Remove non-existing constraint from test
 > >
 > > https://github.com/macports/macports-
 base/commit/0745d2d4efcbe082e13828f31c2c594c2be0a0a4

 Applied as [0b66b003688fc80c3a5d6738880d540eb3dd9d5c/macports-ports].

 > > tests: Avoid using network in port1.0 unit tests
 > >
 > > https://github.com/macports/macports-
 base/commit/521e0143893f89c35f084205f9230fbd24e30165

 Applied as [b6d72434ed46414aa1e3bd59f7166b46434ceb36/macports-ports].

 > > The three commits for using MacPorts svn on newer macOS versions to
 fix fetch failures:
 > >
 > > https://trac.macports.org/ticket/55933

 Applied as [5233e5d6ddf725232ed0a5380be2dbce0a41861c/macports-ports],
 [5233e5d6ddf725232ed0a5380be2dbce0a41861c/macports-ports],
 [5233e5d6ddf725232ed0a5380be2dbce0a41861c/macports-ports].

 > > The two commits for using MacPorts git on newer macOS versions to fix
 fetch failures:
 > >
 > > https://trac.macports.org/ticket/55989

 Applied as [7faf782506a0d1f51ddda19e5f68c5edeacafe18/macports-ports],
 [7faf782506a0d1f51ddda19e5f68c5edeacafe18/macports-ports].

 > > Fix trace mode when using ccache-devel:
 > >
 > > https://trac.macports.org/ticket/55680

 Applied as [217e1441e601573eb3e25656cdaf3c1ea2daa30f/macports-ports].

 > > Add size to default checksums:
 > >
 > > https://github.com/macports/macports-
 base/commit/95a153e6a4bff8b99502806960c916a2b5d20504

 Applied as [4a9b547bc9d45d92c2cea4d8d061f9a0263c055e/macports-ports].

 > > Correct default value of distpath in docs
 > >
 > > https://github.com/macports/macports-
 base/commit/b7e7fe52d7e6450181232ee635597fff56722c69

 Applied as [bfa4694d9c405c977546d46a34dd3e47b2ac8700/macports-ports].

 > > Don't allow non-integer epoch or revision
 > >
 > > https://github.com/macports/macports-
 base/commit/387cd8ca7c7a54a38ea24fc1d698444720dfa8eb

 Applied as [20c76156ab6bae19c24e6fe94b2c5d6b43ce5086/macports-ports].

 > > Remove lint check for non-integer revision, epoch
 > >
 > > https://github.com/macports/macports-
 base/commit/dcf6a81c69556b0c03b508122f176f01f9d8da1e

 Applied as [3e841f5778c3fc9d3d09cc1f595e19b5cedb707d/macports-ports].

--
Ticket URL: <https://trac.macports.org/ticket/56267#comment:1>
MacPorts <https://www.macports.org/>
Ports system for macOS
Reply | Threaded
Open this post in threaded view
|

Re: [MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
In reply to this post by MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
--------------------------+----------------------------
  Reporter:  raimue       |      Owner:  (none)
      Type:  enhancement  |     Status:  new
  Priority:  Normal       |  Milestone:  MacPorts 2.4.4
 Component:  base         |    Version:
Resolution:               |   Keywords:  needs-backport
      Port:               |
--------------------------+----------------------------

Comment (by raimue):

 I should have sorted the list before to make it clearer what was not yet
 merged. Here are the outstanding commits from the original list:

 ----

 > reclaim.tcl: don't ask for partial removal
 >
 > https://github.com/macports/macports-
 base/commit/3578400bf5f593c92b1bc412a45776fe55c0db78

 Should we consider this a bug fix or a change in behavior? Isn't this
 something for 2.5.0?

 > Update Apple developer site URL in readme
 >
 > https://github.com/macports/macports-
 base/commit/9f7ffde631117650b96641595f626512409a3cbb

 Merge conflict, not applied.

 > tests: Avoid bogus error message during test runs
 >
 > https://github.com/macports/macports-
 base/commit/4c11f3bea113e305776751e98d5236e34175a972

 Merge conflict, not applied.

--
Ticket URL: <https://trac.macports.org/ticket/56267#comment:2>
MacPorts <https://www.macports.org/>
Ports system for macOS
Reply | Threaded
Open this post in threaded view
|

Re: [MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
In reply to this post by MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
--------------------------+----------------------------
  Reporter:  raimue       |      Owner:  (none)
      Type:  enhancement  |     Status:  new
  Priority:  Normal       |  Milestone:  MacPorts 2.4.4
 Component:  base         |    Version:
Resolution:               |   Keywords:  needs-backport
      Port:               |
--------------------------+----------------------------

Comment (by raimue):

 Also backported to release-2.4:

 > system: Get rid of unused circbuf\\
 > https://github.com/macports/macports-
 base/commit/fcd8c218cf94951112803e1998d80b42bc693370

 Applied as [3e668ccc520940e2ece1e40533a6cbf361dc2b97/macports-ports].

--
Ticket URL: <https://trac.macports.org/ticket/56267#comment:3>
MacPorts <https://www.macports.org/>
Ports system for macOS
Reply | Threaded
Open this post in threaded view
|

Re: [MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
In reply to this post by MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
--------------------------+----------------------------
  Reporter:  raimue       |      Owner:  (none)
      Type:  enhancement  |     Status:  new
  Priority:  Normal       |  Milestone:  MacPorts 2.4.4
 Component:  base         |    Version:
Resolution:               |   Keywords:  needs-backport
      Port:               |
--------------------------+----------------------------

Comment (by raimue):

 Replying to [comment:2 raimue]:
 > > tests: Avoid bogus error message during test runs
 > >
 > > https://github.com/macports/macports-
 base/commit/4c11f3bea113e305776751e98d5236e34175a972
 >
 > Merge conflict, not applied.

 Correction: not a merge conflict, this was already applied in
 [1f63790f2535049f03d0732156c7efc5fe1f568c/macports-ports].

--
Ticket URL: <https://trac.macports.org/ticket/56267#comment:4>
MacPorts <https://www.macports.org/>
Ports system for macOS
Reply | Threaded
Open this post in threaded view
|

Re: [MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
In reply to this post by MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
--------------------------+----------------------------
  Reporter:  raimue       |      Owner:  (none)
      Type:  enhancement  |     Status:  new
  Priority:  Normal       |  Milestone:  MacPorts 2.4.4
 Component:  base         |    Version:
Resolution:               |   Keywords:  needs-backport
      Port:               |
--------------------------+----------------------------

Comment (by raimue):

 In [changeset:"b200459e83cab1924130ef78628bde16b0e5503e/macports-base"
 b200459e83cab1924130ef78628bde16b0e5503e/macports-base]:
 {{{
 #!ConfigurableCommitTicketReference repository="macports-base"
 revision="b200459e83cab1924130ef78628bde16b0e5503e"
 ChangeLog: Update for backports to release-2.4

 See: https://trac.macports.org/ticket/56267
 }}}

--
Ticket URL: <https://trac.macports.org/ticket/56267#comment:5>
MacPorts <https://www.macports.org/>
Ports system for macOS
Reply | Threaded
Open this post in threaded view
|

Re: [MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
In reply to this post by MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
--------------------------+----------------------------
  Reporter:  raimue       |      Owner:  (none)
      Type:  enhancement  |     Status:  closed
  Priority:  Normal       |  Milestone:  MacPorts 2.4.4
 Component:  base         |    Version:
Resolution:  fixed        |   Keywords:  needs-backport
      Port:               |
--------------------------+----------------------------
Changes (by raimue):

 * status:  new => closed
 * resolution:   => fixed


Comment:

 In the [wiki:Meetings/2018-04-21 online meeting] we discussed not to
 bother about backporting [9f7ffde631117650b96641595f626512409a3cbb
 /macports-base] with the conflict as it is only in the ReadMe.rtf file and
 the old URL still works.

 Everything else suggested here has been backported to release-2.4.

--
Ticket URL: <https://trac.macports.org/ticket/56267#comment:6>
MacPorts <https://www.macports.org/>
Ports system for macOS
Reply | Threaded
Open this post in threaded view
|

Re: [MacPorts] #56267: Backport changes to release-2.4 for 2.4.4

MacPorts
In reply to this post by MacPorts
#56267: Backport changes to release-2.4 for 2.4.4
--------------------------+----------------------------
  Reporter:  raimue       |      Owner:  (none)
      Type:  enhancement  |     Status:  closed
  Priority:  Normal       |  Milestone:  MacPorts 2.4.4
 Component:  base         |    Version:
Resolution:  fixed        |   Keywords:  needs-backport
      Port:               |
--------------------------+----------------------------

Comment (by raimue):

 In [changeset:"861e949e21b29f12c759965e613f11563a419675/macports-base"
 861e949e21b29f12c759965e613f11563a419675/macports-base] (release-2.4):
 {{{
 #!ConfigurableCommitTicketReference repository="macports-base"
 revision="861e949e21b29f12c759965e613f11563a419675"
 ChangeLog: Update for backports to release-2.4

 See: https://trac.macports.org/ticket/56267
 (cherry picked from commit b200459e83cab1924130ef78628bde16b0e5503e)
 }}}

--
Ticket URL: <https://trac.macports.org/ticket/56267#comment:7>
MacPorts <https://www.macports.org/>
Ports system for macOS