Bug 146605 - [patch] devel/git make python dep optional, make /etc/shells modification optional
Summary: [patch] devel/git make python dep optional, make /etc/shells modification opt...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Wesley Shields
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-05-15 03:40 UTC by Alex Kozlov
Modified: 2010-07-06 01:00 UTC (History)
0 users

See Also:


Attachments
file.diff (3.08 KB, patch)
2010-05-15 03:40 UTC, Alex Kozlov
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Kozlov 2010-05-15 03:40:05 UTC
-make python depemdemcy optional, it's only used in p4 and contrib scripts
-make /etc/shells modification optional.

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-05-15 03:40:15 UTC
Responsible Changed
From-To: freebsd-ports-bugs->wxs

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Wesley Shields freebsd_committer freebsd_triage 2010-05-15 03:51:37 UTC
I'm going to have to investigate this close as I recall the build
process changed to require python when I updated to 1.7.0.

I'm also not sure we should make the modification of /etc/shells
optional.

-- WXS
Comment 3 Alex Kozlov 2010-05-15 05:18:59 UTC
On Fri, May 14, 2010 at 10:51:37PM -0400, Wesley Shields wrote:
> I'm going to have to investigate this close as I recall the build
> process changed to require python when I updated to 1.7.0.
I don't have python in this vm. git compiled normally and I
also checked basic functionality. Still another check will not hurt.

> I'm also not sure we should make the modification of /etc/shells
> optional.
This is useful when you have a separate ro / and you're not going
provide ssh access to your git repository.
Nevertheless, a warning about loss of this functionality will be
a good idea.


--
Adios
Comment 4 dfilter service freebsd_committer freebsd_triage 2010-07-04 19:49:57 UTC
wxs         2010-07-04 18:49:44 UTC

  FreeBSD ports repository

  Modified files:
    devel/git            Makefile distinfo pkg-plist 
    devel/git/files      git_daemon.in 
  Removed files:
    devel/git/files      patch-gitk-git__gitk 
  Log:
  Update to 1.7.1.1
  Conditionally depend on python now. Earlier releases required python, this
  release does not. [1]
  Strip binaries before install. [2]
  Add ${PREFIX}/libexec/git-core to rc script PATH. Not having this causes
  git-daemon to be unable to exec upload-pack. Users always had to restart
  the RC script once the box was booted in order to fix this. [3]
  Properly fix bug when using gitk that "wish" is not found. [4]
  
  Changelog for 1.7.1.1:
  http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.1.1.txt
  
  PR:             [1]: ports/146605
                  [2]: ports/146961
                  [3]: ports/148337
  Submitted by:   [1]: Alex Kozlov <spam@rm-rf.kiev.ua>
                  [2]: Anonymous <swell.k@gmail.com>
                  [3]: Marin Atanasov Nikolov <dnaeon@gmail.com>
                  [4]: N.J. Thomas (private mail)
  Feature safe:   yes
  
  Revision  Changes    Path
  1.87      +16 -6     ports/devel/git/Makefile
  1.61      +18 -18    ports/devel/git/distinfo
  1.6       +3 -1      ports/devel/git/files/git_daemon.in
  1.2       +0 -10     ports/devel/git/files/patch-gitk-git__gitk (dead)
  1.57      +12 -11    ports/devel/git/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 5 Wesley Shields freebsd_committer freebsd_triage 2010-07-04 19:51:12 UTC
State Changed
From-To: open->closed

I committed the python portion of the patch (earlier versions did not 
work with this but 1.7.1.1 does). I do not like the idea of making the 
/etc/shells modification optional so I have left it out.
Comment 6 Alex Kozlov 2010-07-05 09:46:11 UTC
Hi, Wesley

Then what do You thinking about making failure to modify /etc/shells non-fatal?


--
Adios
Comment 7 Wesley Shields freebsd_committer freebsd_triage 2010-07-05 12:51:33 UTC
On Mon, Jul 05, 2010 at 11:46:11AM +0300, Alex Kozlov wrote:
> Hi, Wesley
> 
> Then what do You thinking about making failure to modify /etc/shells
> non-fatal?

I guess I'm a little unclear as to _why_ it's failing for you. I have a
patch which makes the Makefile part of it non-fatal but I have not added
support for the pkg-plist part. If you can please provide me with an
explanation of why it's failing I'd be more inclined to look into this.

-- WXS
Comment 8 Alex Kozlov 2010-07-05 20:04:41 UTC
On Mon, Jul 05, 2010 at 07:51:33AM -0400, Wesley Shields wrote:
> On Mon, Jul 05, 2010 at 11:46:11AM +0300, Alex Kozlov wrote:
> > Then what do You thinking about making failure to modify /etc/shells
> > non-fatal?
> I guess I'm a little unclear as to _why_ it's failing for you. I have a
> patch which makes the Makefile part of it non-fatal but I have not added
> support for the pkg-plist part. If you can please provide me with an
> explanation of why it's failing
It's failing because / is ro. I have a few machines with remote /usr.
Every time I update ports in this shared /usr I have to modify git's port
Makefile or remount / on host machine in rw, backup and latter restore /etc/shells.

> I'd be more inclined to look into this.
If needed I will provide a complete patch.


--
Adios
Comment 9 dfilter service freebsd_committer freebsd_triage 2010-07-06 00:51:24 UTC
wxs         2010-07-05 23:51:16 UTC

  FreeBSD ports repository

  Modified files:
    devel/git            Makefile pkg-plist 
  Log:
  Make modification of /etc/shells optional (default to on). No need to
  bump PORTREVISION for this as there is no functional change.
  
  PR:             ports/146605
  Submitted by:   Alex Kozlov <spam@rm-rf.kiev.ua>
  Feature safe:   yes
  
  Revision  Changes    Path
  1.88      +11 -3     ports/devel/git/Makefile
  1.58      +2 -2      ports/devel/git/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 10 Wesley Shields freebsd_committer freebsd_triage 2010-07-06 00:52:17 UTC
On Mon, Jul 05, 2010 at 10:04:41PM +0300, Alex Kozlov wrote:
> On Mon, Jul 05, 2010 at 07:51:33AM -0400, Wesley Shields wrote:
> > On Mon, Jul 05, 2010 at 11:46:11AM +0300, Alex Kozlov wrote:
> > > Then what do You thinking about making failure to modify /etc/shells
> > > non-fatal?
> > I guess I'm a little unclear as to _why_ it's failing for you. I have a
> > patch which makes the Makefile part of it non-fatal but I have not added
> > support for the pkg-plist part. If you can please provide me with an
> > explanation of why it's failing
> It's failing because / is ro. I have a few machines with remote /usr.
> Every time I update ports in this shared /usr I have to modify git's port
> Makefile or remount / on host machine in rw, backup and latter restore
> /etc/shells.

Thanks for the clarification.

> > I'd be more inclined to look into this.
> If needed I will provide a complete patch.

I've committed a patch for this which should be almost identical the one
you submitted in the PR.

-- WXS