Opened 16 years ago

Closed 16 years ago

Last modified 15 years ago

#13956 closed update (fixed)

git-core should be updated to 1.5.4.3 (PATCH)

Reported by: maccheck@… Owned by: macports-tickets@…
Priority: Normal Milestone:
Component: ports Version: 1.6.0
Keywords: git-core Cc: bryan@…, ryandesign (Ryan Carsten Schmidt), stephen.bannasch@…
Port:

Description

I'm providing a patch for the git-core Portfile that updates version no. and SHA1 checksums for upstream version 1.5.3.8

Attachments (1)

Portfile-git-core.diff (2.0 KB) - added by maccheck@… 16 years ago.
New diff 1.5.3.7 -> 1.5.4.3 (with perllocal.pod removal)

Download all attachments as: .zip

Change History (32)

comment:1 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Cc: ryandesign@… added

Bryan, have you had a chance to try out this update? Should it be committed?

comment:2 Changed 16 years ago by maccheck@…

Since this weekend there is a git-core 1.5.4 out. I already have a Portfile patch for 1.5.4 locally. Should I attach this patch here or should I create a new ticket and provide the according ticket id here, so that this ticket can be closed?

comment:3 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Summary: git-core 1.5.3.8: new version of sources available (1.5.3.8)git-core should be updated to 1.5.4 (PATCH)

Sure, you can attach it here.

comment:4 Changed 16 years ago by maccheck@…

git-core 1.5.4.1 is out. Therefore I replaced the patch with the current diff.

comment:5 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Summary: git-core should be updated to 1.5.4 (PATCH)git-core should be updated to 1.5.4.1 (PATCH)

comment:6 Changed 16 years ago by maccheck@…

Mmh, it seems to me that we lost a maintainer here, isn't it?

comment:7 Changed 16 years ago by raimue (Rainer Müller)

Start the Port Abandoned protocol, as described in http://guide.macports.org/#project.update-policies.abandonment.

comment:8 Changed 16 years ago by bryan@…

At this time I neither have regular access to a Macintosh, nor do I have commit access to the macports. The other maintainer (mgrimes@…) has generally handled the trivial updates. Please add him to the CC list, you should get more response from him.

I would welcome other trustworthy people being added to the maintainer list. I would like to stay on it myself, but at this time am forced to take a secondary role.

comment:9 Changed 16 years ago by raimue (Rainer Müller)

mgrimes retired and is no longer maintaining any ports. Therefore at the moment you are the only maintainer. I could commit this update, but it would be better if we find someone who uses git regularly for maintainership.

comment:10 Changed 16 years ago by maccheck@…

As I submitted current patches I can confirm that I'm using git regularly -- at least currently. But I have to admit that I didn't dig too much into the development of Portfiles until now. If it's only updating the SHA1 keys for upcoming versions in the beginning, I'm happy to help out.

comment:11 Changed 16 years ago by bryan@…

If you want it, add yourself to the maintainership list. Do the tests pass? Do they pass on a clean install of MacPorts? That's the kicker there. Most major upgrades break the test on a clean install (and this is a major upgrade). I've tried to keep reliance on standard gnu tools to a minimum: keeping git working with the BSD tools has been the largest part of the effort I put in. Most real developers have all the gnu tools installed, but it seems rude to force everybody to install them all.

I'd especially like to get a Perl guru on the maintainers list. Most of our current issues are perl issues.

comment:12 in reply to:  11 Changed 16 years ago by maccheck@…

Okay, I will try to generate this new port on a fresh install of MacPorts this weekend.

Bryan, can you conduct a way how I get the git tests to execute while building git-core with MacPorts? I have the git repository clone as well, but when I run "make" in the test directory, it bitches that git isn't compiled/installed.

Unfortunately, I second that we need a Perl guru here. I'm much more familiar with Python. My Perl days are way way back... :-(

comment:13 Changed 16 years ago by bryan@…

There is a test target, so you can just type "port test".

Please check the variants as well.

comment:14 Changed 16 years ago by skymoo (Adam Mercer)

All the tests pass for me on Intel Leopard, for both the vanilla and +svn versions

comment:15 Changed 16 years ago by maccheck@…

Once again I attached the diff for the current upstream git-core in version 1.5.4.2. I tested it with "sudo port test git-core" and got no errors on an Intel Mac with 10.5.2.

Additionally I included the patch from #14374 into this one.

comment:16 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

Summary: git-core should be updated to 1.5.4.1 (PATCH)git-core should be updated to 1.5.4.2 (PATCH)

I get:

$ sudo port install git-core
--->  Fetching git-core
--->  Attempting to fetch git-1.5.4.2.tar.bz2 from http://www.kernel.org/pub/software/scm/git/
--->  Attempting to fetch git-manpages-1.5.4.2.tar.bz2 from http://www.kernel.org/pub/software/scm/git/
--->  Attempting to fetch git-htmldocs-1.5.4.2.tar.bz2 from http://www.kernel.org/pub/software/scm/git/
--->  Verifying checksum(s) for git-core
--->  Extracting git-core
--->  Applying patches to git-core
--->  Configuring git-core
--->  Building git-core with target all
--->  Staging git-core into destroot
--->  Installing git-core 1.5.4.2_0+doc
--->  Activating git-core 1.5.4.2_0+doc
Error: Target org.macports.activate returned: Image error: /opt/local/lib/perl5/5.8.8/darwin-2level/perllocal.pod already exists and does not belong to a registered port.  Unable to activate port git-core.
Error: Status 1 encountered during processing.
$

I have seen this problem with other ports as well. It seems to me that no port should attempt to install perllocal.pod, but I'm no Perl expert and I don't know what the file is for.

comment:17 Changed 16 years ago by maccheck@…

I have to check that with a clean install of MacPorts 1.6.0 in the next days. I don't get this error message with my working environment (neither "git-core +doc" nor "git-core +doc+svn").

comment:18 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

You won't see the problem on a clean install of MacPorts. You'll only see the problem if you already have the file /opt/local/lib/perl5/5.8.8/darwin-2level/perllocal.pod, either from another port or for some other reason. I don't think git-core or any port should own that file.

comment:19 Changed 16 years ago by maccheck@…

I'm totally with you here. Unfortunately, as mentioned before, I'm not a Perl genius at all. So I don't know what this file is for and how to "patch it out" of the distribution. :-(

comment:20 Changed 16 years ago by ryandesign (Ryan Carsten Schmidt)

clearsilver, p5-libapreq2, rpm, rpm45, rpm50, rpm-devel and silc-client all seem to just delete the file after destroot.

comment:21 Changed 16 years ago by stephen.bannasch@…

Tried latest patch on my system -- seem to work fine. Also ran sudo port test git-core -- no errors reported. MacOS 10.5.2

comment:22 Changed 16 years ago by stephen.bannasch@…

Then tried

$ sudo port install git-core +svn

and got this error:

--->  Configuring sqlite3
--->  Building sqlite3 with target all
Error: Target org.macports.build returned: shell command " cd "/opt/local/var/macports/build/_opt_local_var_macports_sources_rsync.macports.org_release_ports_databases_sqlite3/work/sqlite-3.5.6" && gnumake all " returned error 2
Command output: sed -e s/--VERS--/3.5.6/ ./src/sqlite.h.in | \
	sed -e s/--VERSION-NUMBER--/3005006/ >sqlite3.h
/usr/bin/gcc-4.0 -O2 -o lemon ./tool/lemon.c
cp ./tool/lempar.c .
cp ./src/parse.y .
./lemon  parse.y
mv parse.h parse.h.temp
f ./addopcodes.awk parse.h.temp >parse.h
/bin/sh: f: command not found
gnumake: [parse.c] Error 127 (ignored)
cat parse.h ./src/vdbe.c |  -f ./mkopcodeh.awk >opcodes.h
/bin/sh: -f: command not found
cat: stdout: Broken pipe
gnumake: *** [opcodes.h] Error 127

Error: The following dependencies failed to build: p5-svn-simple subversion-perlbindings apr-util sqlite3 neon subversion p5-term-readkey
Error: Status 1 encountered during processing.

comment:23 Changed 16 years ago by stephen.bannasch@…

CC: stephen.bannasch@…

comment:24 Changed 16 years ago by stephen.bannasch@…

Obviously that didn't work -- it's not clear how to add myself to the cc list.

comment:25 Changed 16 years ago by skymoo (Adam Mercer)

Cc: stephen.bannasch@… added

comment:26 Changed 16 years ago by maccheck@…

That's weird. I deinstalled the complete subversion stack (including sqlite3 port) and did a sudo port install git-core +svn as well. sqlite3 was installed and activated without any problems. Maybe there is a missing dependency here?

I cannot imagine this is related to the git-core portfile patch.

comment:27 Changed 16 years ago by stephen.bannasch@…

The problem seems to be that the f command can't be found. I don't know what f is or who what it;s does.

This was on a new ports install. I did not have svn installed yet with ports. I had:

(I'm trying to use wiki formatting below to display a list and failing ... am I missing something or is list formattig not working?)

+ installed git-core + applied patch + tried installing again and got error + uninstalled both versions of git-core + ran install again -- now 1.5.4.2 of git was installed and working + tried doing a get import from a subversion repository + realized that this functionality wasn't installed + then got to the error above after $ sudo port install git-core +svn

Changed 16 years ago by maccheck@…

Attachment: Portfile-git-core.diff added

New diff 1.5.3.7 -> 1.5.4.3 (with perllocal.pod removal)

comment:28 Changed 16 years ago by raimue (Rainer Müller)

I will add openmaintainer to the port as an immediate solution until Bryan gets access to a Mac again. So also others can commit patches.

comment:29 Changed 16 years ago by raimue (Rainer Müller)

Resolution: fixed
Status: newclosed
Summary: git-core should be updated to 1.5.4.2 (PATCH)git-core should be updated to 1.5.4.3 (PATCH)

Committed in r34462.

comment:30 Changed 15 years ago by jmroot (Joshua Root)

Type: enhancementupdate

comment:31 Changed 15 years ago by (none)

Milestone: Port Updates

Milestone Port Updates deleted

Note: See TracTickets for help on using tickets.