Cleaning up INSTALL before 1.5.6

Cleaning up INSTALL before 1.5.6

[Johan Herland]

AFAICS, there's a couple of things that should be changed in the list of 
system requirements:

- cpio is no longer needed due to git-clone now being a builtin

- According to some other thread on this list, curl might no longer be 
needed, as all its users are now builtin, and uses libcurl instead.


Have fun! :)

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net

[PATCH 1/3] cpio is no longer used by git-clone

[Johan Herland]

Signed-off-by: Johan Herland <johan@herland.net>
---
 INSTALL |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/INSTALL b/INSTALL
index d9b425f..9888f25 100644
--- a/INSTALL
+++ b/INSTALL
@@ -83,9 +83,6 @@ Issues of note:
 	- "perl" and POSIX-compliant shells are needed to use most of
 	  the barebone Porcelainish scripts.
 
-	- "cpio" is used by git-clone when doing a local (possibly
-	  hardlinked) clone.
-
  - Some platform specific issues are dealt with Makefile rules,
    but depending on your specific installation, you may not
    have all the libraries/tools needed, or you may have
-- 
1.5.6.rc2.128.gf64ae

[PATCH 2/3] Consistency: Use "libcurl" instead of "cURL library" and "curl"

[Johan Herland]

Signed-off-by: Johan Herland <johan@herland.net>
---
 Documentation/git-http-push.txt                    |    4 ++--
 Documentation/howto/setup-git-server-over-http.txt |    2 +-
 Makefile                                           |    2 +-
 configure.ac                                       |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-http-push.txt b/Documentation/git-http-push.txt
index 8d32a92..d69b205 100644
--- a/Documentation/git-http-push.txt
+++ b/Documentation/git-http-push.txt
@@ -15,8 +15,8 @@ DESCRIPTION
 Sends missing objects to remote repository, and updates the
 remote branch.
 
-*NOTE*: This command is temporarily disabled if your cURL
-library is older than 7.16, as the combination has been reported
+*NOTE*: This command is temporarily disabled if your libcurl
+is older than 7.16, as the combination has been reported
 not to work and sometimes corrupts repository.
 
 OPTIONS
diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt
index b7d09c1..4032748 100644
--- a/Documentation/howto/setup-git-server-over-http.txt
+++ b/Documentation/howto/setup-git-server-over-http.txt
@@ -186,7 +186,7 @@ Step 3: setup the client
 ------------------------
 
 Make sure that you have HTTP support, i.e. your git was built with
-curl (version more recent than 7.10). The command 'git http-push' with
+libcurl (version more recent than 7.10). The command 'git http-push' with
 no argument should display a usage message.
 
 Then, add the following to your $HOME/.netrc (you can do without, but will be
diff --git a/Makefile b/Makefile
index 1937507..06ebebe 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ all::
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
 # This also implies MOZILLA_SHA1.
 #
-# Define NO_CURL if you do not have curl installed.  git-http-pull and
+# Define NO_CURL if you do not have libcurl installed.  git-http-pull and
 # git-http-push are not built, and you cannot use http:// and https://
 # transports.
 #
diff --git a/configure.ac b/configure.ac
index 82584e9..7c2856e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,7 @@ AC_CHECK_LIB([crypto], [SHA1_Init],
 AC_SUBST(NEEDS_SSL_WITH_CRYPTO)
 AC_SUBST(NO_OPENSSL)
 #
-# Define NO_CURL if you do not have curl installed.  git-http-pull and
+# Define NO_CURL if you do not have libcurl installed.  git-http-pull and
 # git-http-push are not built, and you cannot use http:// and https://
 # transports.
 AC_CHECK_LIB([curl], [curl_global_init],
-- 
1.5.6.rc2.128.gf64ae

[PATCH 3/3] The "curl" executable is no longer required

[Johan Herland]

git-clone.sh was the last user of the "curl" executable. Relevant git
commands now use libcurl instead. This should be reflected in the
install requirements.

Signed-off-by: Johan Herland <johan@herland.net>
---

I haven't tested the RPM spec change, but it seems fairly straightforward...

 INSTALL     |    8 ++++----
 git.spec.in |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index 9888f25..4a4e13f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -67,10 +67,10 @@ Issues of note:
 	  that come with git (git includes the one from Mozilla, and has
 	  its own PowerPC and ARM optimized ones too - see the Makefile).
 
-	- "libcurl" and "curl" executable.  git-http-fetch and
-	  git-fetch use them.  If you do not use http
-	  transfer, you are probably OK if you do not have
-	  them.
+	- libcurl library; git-http-fetch and git-fetch use them.  You
+	  might also want the "curl" executable for debugging purposes.
+	  If you do not use http transfer, you are probably OK if you
+	  do not have them.
 
 	- expat library; git-http-push uses it for remote lock
 	  management over DAV.  Similar to "curl" above, this is optional.
diff --git a/git.spec.in b/git.spec.in
index 97a26be..d946bb1 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -12,7 +12,7 @@ BuildRequires:	zlib-devel >= 1.2, openssl-devel, 
curl-devel, expat-devel, gettex
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	perl-Git = %{version}-%{release}
-Requires:	zlib >= 1.2, rsync, curl, less, openssh-clients, expat
+Requires:	zlib >= 1.2, rsync, less, openssh-clients, expat
 Provides:	git-core = %{version}-%{release}
 Obsoletes:	git-core <= 1.5.4.2
 Obsoletes:	git-p4
-- 
1.5.6.rc2.128.gf64ae

Re: [PATCH 3/3] The "curl" executable is no longer required

[David Symonds]

On Sun, Jun 15, 2008 at 8:16 PM, Johan Herland <johan@herland.net> wrote:

> diff --git a/git.spec.in b/git.spec.in
> index 97a26be..d946bb1 100644
> --- a/git.spec.in
> +++ b/git.spec.in
> @@ -12,7 +12,7 @@ BuildRequires:        zlib-devel >= 1.2, openssl-devel,
> curl-devel, expat-devel, gettex
>  BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>
>  Requires:      perl-Git = %{version}-%{release}
> -Requires:      zlib >= 1.2, rsync, curl, less, openssh-clients, expat
> +Requires:      zlib >= 1.2, rsync, less, openssh-clients, expat
>  Provides:      git-core = %{version}-%{release}
>  Obsoletes:     git-core <= 1.5.4.2
>  Obsoletes:     git-p4

Shouldn't libcurl still be listed as a requirement? Or is it statically linked?


Dave.

Re: [PATCH 3/3] The "curl" executable is no longer required

[Johan Herland]

On Sunday 15 June 2008, David Symonds wrote:
> On Sun, Jun 15, 2008 at 8:16 PM, Johan Herland <johan@herland.net> wrote:
> > diff --git a/git.spec.in b/git.spec.in
> > index 97a26be..d946bb1 100644
> > --- a/git.spec.in
> > +++ b/git.spec.in
> > @@ -12,7 +12,7 @@ BuildRequires:        zlib-devel >= 1.2,
> > openssl-devel, curl-devel, expat-devel, gettex
> >  BuildRoot:    
> > %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> >
> >  Requires:      perl-Git = %{version}-%{release}
> > -Requires:      zlib >= 1.2, rsync, curl, less, openssh-clients, expat
> > +Requires:      zlib >= 1.2, rsync, less, openssh-clients, expat
> >  Provides:      git-core = %{version}-%{release}
> >  Obsoletes:     git-core <= 1.5.4.2
> >  Obsoletes:     git-p4
>
> Shouldn't libcurl still be listed as a requirement? Or is it statically
> linked?

4 lines further up in git.spec.in:

BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, 
gettext  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}


Have fun!

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net

Re: [PATCH 3/3] The "curl" executable is no longer required

[David Symonds]

On Sun, Jun 15, 2008 at 8:55 PM, Johan Herland <johan@herland.net> wrote:

> On Sunday 15 June 2008, David Symonds wrote:

>> Shouldn't libcurl still be listed as a requirement? Or is it statically
>> linked?
>
> 4 lines further up in git.spec.in:
>
> BuildRequires:  zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel,
> gettext  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}

So does a built RPM inherit that as a requirement? Just curious, since
I haven't touched RPMs for the better part of a decade.


Dave.

Re: [PATCH 3/3] The "curl" executable is no longer required

[Matthieu Moy]

Johan Herland <johan@herland.net> writes:

> On Sunday 15 June 2008, David Symonds wrote:
>> On Sun, Jun 15, 2008 at 8:16 PM, Johan Herland <johan@herland.net> wrote:
>> > diff --git a/git.spec.in b/git.spec.in
>> > index 97a26be..d946bb1 100644
>> > --- a/git.spec.in
>> > +++ b/git.spec.in
>> > @@ -12,7 +12,7 @@ BuildRequires:        zlib-devel >= 1.2,
>> > openssl-devel, curl-devel, expat-devel, gettex
>> >  BuildRoot:    
>> > %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>> >
>> >  Requires:      perl-Git = %{version}-%{release}
>> > -Requires:      zlib >= 1.2, rsync, curl, less, openssh-clients, expat
>> > +Requires:      zlib >= 1.2, rsync, less, openssh-clients, expat
>> >  Provides:      git-core = %{version}-%{release}
>> >  Obsoletes:     git-core <= 1.5.4.2
>> >  Obsoletes:     git-p4
>>
>> Shouldn't libcurl still be listed as a requirement? Or is it statically
>> linked?
>
> 4 lines further up in git.spec.in:
>
> BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, 
> gettext  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}

I don't understand how that answers the question. Unless curl is
statically linked, you need the library both at build time and at run
time. For example, zlib-devel is needed here at build time, and zlib
(without devel) is still in "Requires:". So, what's the difference
between zlib and libcurl here?

-- 
Matthieu

[PATCH 3/3 v2] The "curl" executable is no longer required

[Johan Herland]

git-clone.sh was the last user of the "curl" executable. Relevant git
commands now use libcurl instead. This should be reflected in the
install requirements.

Signed-off-by: Johan Herland <johan@herland.net>
---

On Sunday 15 June 2008, Matthieu Moy wrote:
> I don't understand how that answers the question. Unless curl is
> statically linked, you need the library both at build time and at run
> time. For example, zlib-devel is needed here at build time, and zlib
> (without devel) is still in "Requires:". So, what's the difference
> between zlib and libcurl here?

You're probably right. What about this?

 INSTALL     |    8 ++++----
 git.spec.in |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/INSTALL b/INSTALL
index 9888f25..4a4e13f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -67,10 +67,10 @@ Issues of note:
 	  that come with git (git includes the one from Mozilla, and has
 	  its own PowerPC and ARM optimized ones too - see the Makefile).
 
-	- "libcurl" and "curl" executable.  git-http-fetch and
-	  git-fetch use them.  If you do not use http
-	  transfer, you are probably OK if you do not have
-	  them.
+	- libcurl library; git-http-fetch and git-fetch use them.  You
+	  might also want the "curl" executable for debugging purposes.
+	  If you do not use http transfer, you are probably OK if you
+	  do not have them.
 
 	- expat library; git-http-push uses it for remote lock
 	  management over DAV.  Similar to "curl" above, this is optional.
diff --git a/git.spec.in b/git.spec.in
index 97a26be..fb8da85 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -12,7 +12,7 @@ BuildRequires:	zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel, gettex
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	perl-Git = %{version}-%{release}
-Requires:	zlib >= 1.2, rsync, curl, less, openssh-clients, expat
+Requires:	zlib >= 1.2, rsync, libcurl, less, openssh-clients, expat
 Provides:	git-core = %{version}-%{release}
 Obsoletes:	git-core <= 1.5.4.2
 Obsoletes:	git-p4
-- 
1.5.6.rc2.128.gf64ae

Re: [PATCH 3/3] The "curl" executable is no longer required

[Jakub Narebski]

"David Symonds" <dsymonds@gmail.com> writes:

> On Sun, Jun 15, 2008 at 8:16 PM, Johan Herland <johan@herland.net> wrote:
> 
> > diff --git a/git.spec.in b/git.spec.in
> > index 97a26be..d946bb1 100644
> > --- a/git.spec.in
> > +++ b/git.spec.in
> > @@ -12,7 +12,7 @@ BuildRequires:        zlib-devel >= 1.2, openssl-devel,
> > curl-devel, expat-devel, gettex
> >  BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> >
> >  Requires:      perl-Git = %{version}-%{release}
> > -Requires:      zlib >= 1.2, rsync, curl, less, openssh-clients, expat
> > +Requires:      zlib >= 1.2, rsync, less, openssh-clients, expat
> >  Provides:      git-core = %{version}-%{release}
> >  Obsoletes:     git-core <= 1.5.4.2
> >  Obsoletes:     git-p4
> 
> Shouldn't libcurl still be listed as a requirement? Or is it
> statically linked?

It is not necessary to enumerate simple library dependencies, as
rpmbuild _detects_ those dependencies during building binary RPMS.
Only unusual requirements (on programs (tools) or on specific version
of library) are needed to be added in Requires header.

This has nothing to do with BuildRequires.  Besides it worked without
libcurl in Requires, so it should continue to work without it,
isn't it?

-- 
Jakub Narebski
Poland
ShadeHawk on #git

Re: [PATCH 3/3] The "curl" executable is no longer required

[Johan Herland]

On Sunday 15 June 2008, Jakub Narebski wrote:
> "David Symonds" <dsymonds@gmail.com> writes:
> > On Sun, Jun 15, 2008 at 8:16 PM, Johan Herland <johan@herland.net> 
wrote:
> > > diff --git a/git.spec.in b/git.spec.in
> > > index 97a26be..d946bb1 100644
> > > --- a/git.spec.in
> > > +++ b/git.spec.in
> > > @@ -12,7 +12,7 @@ BuildRequires:        zlib-devel >= 1.2,
> > > openssl-devel, curl-devel, expat-devel, gettex
> > >  BuildRoot:    
> > > %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> > >
> > >  Requires:      perl-Git = %{version}-%{release}
> > > -Requires:      zlib >= 1.2, rsync, curl, less, openssh-clients,
> > > expat +Requires:      zlib >= 1.2, rsync, less, openssh-clients,
> > > expat Provides:      git-core = %{version}-%{release}
> > >  Obsoletes:     git-core <= 1.5.4.2
> > >  Obsoletes:     git-p4
> >
> > Shouldn't libcurl still be listed as a requirement? Or is it
> > statically linked?
>
> It is not necessary to enumerate simple library dependencies, as
> rpmbuild _detects_ those dependencies during building binary RPMS.
> Only unusual requirements (on programs (tools) or on specific version
> of library) are needed to be added in Requires header.
>
> This has nothing to do with BuildRequires.  Besides it worked without
> libcurl in Requires, so it should continue to work without it,
> isn't it?

Unfortunately I don't know this format at all. There are now two versions of 
the patch, one without "Requires: curl", and one where it's replaced 
by "Requires: libcurl". Someone with more RPM knowledge will have to 
determine which is right.

...Johan

-- 
Johan Herland, <johan@herland.net>
www.herland.net

Re: [PATCH 3/3] The "curl" executable is no longer required

[Matthieu Moy]

Johan Herland <johan@herland.net> writes:

> On Sunday 15 June 2008, Jakub Narebski wrote:
>> It is not necessary to enumerate simple library dependencies, as
>> rpmbuild _detects_ those dependencies during building binary RPMS.

Good to know, and that seems to be a valid argument ("seems to"
because of my lack of knowledge of rpm, not lack of trust ;-) ).

>> Besides it worked without libcurl in Requires, so it should
>> continue to work without it, isn't it?

It used to have a dependency on curl, which itself requires libcurl,
so the dependency was implicit.

> Someone with more RPM knowledge will have to determine which is
> right.

+1

-- 
Matthieu

Re: [PATCH 3/3] The "curl" executable is no longer required

[Jakub Narebski]

Matthieu Moy wrote:
> Johan Herland <johan@herland.net> writes:
>> On Sunday 15 June 2008, Jakub Narebski wrote:
>>
>>> It is not necessary to enumerate simple library dependencies, as
>>> rpmbuild _detects_ those dependencies during building binary RPMS.
> 
> Good to know, and that seems to be a valid argument ("seems to"
> because of my lack of knowledge of rpm, not lack of trust ;-) ).
> 
>>> Besides it worked without libcurl in Requires, so it should
>>> continue to work without it, isn't it?
> 
> It used to have a dependency on curl, which itself requires libcurl,
> so the dependency was implicit.
> 
>> Someone with more RPM knowledge will have to determine which is
>> right.
> 
> +1

Or simply remove 'curl' from 'Requires:' header, and check if rpmbuild
would pick up libcurl dependency, and if resulting RPM has libcurl as
requirement.

Fragment of "make rpm" output (word wrapped for better readibility):
[...]
Provides: git-core = 1.5.6.rc3.198.g368e0.dirty-1
Requires(rpmlib): rpmlib(CompressedFileNames) <= 3.0.4-1 
 rpmlib(PartialHardlinkSets) <= 4.0.4-1 
 rpmlib(PayloadFilesHavePrefix) <= 4.0-1 
 rpmlib(VersionedDependencies) <= 3.0.3-1
Requires: /bin/sh /usr/bin/perl expat less 
 libc.so.6 libc.so.6(GLIBC_2.0) libc.so.6(GLIBC_2.1) libc.so.6(GLIBC_2.1.1) libc.so.6(GLIBC_2.1.3) 
 libc.so.6(GLIBC_2.2) libc.so.6(GLIBC_2.2.3) libc.so.6(GLIBC_2.3) libc.so.6(GLIBC_2.3.4) 
 libcrypto.so.5 libcurl.so.3 libexpat.so.0 libz.so.1
 openssh-clients 
 perl >= 0:5.006 perl(Getopt::Long) perl(Git) perl(lib)
 perl(strict) perl(warnings) 
 perl-Git = 1.5.6.rc3.198.g368e0.dirty-1
 rsync zlib >= 1.2
Obsoletes: git-core <= 1.5.4.2 git-p4
[...]

$ rpm -q --requires -p git-1.5.6.rc3.198.g368e0.dirty-1.i386.rpm
/bin/sh  
/usr/bin/perl  
expat  
less  
libc.so.6
[...]
libcrypto.so.5  
libcurl.so.3  
libexpat.so.0  
libz.so.1
[...]

As you can see rpmbuild picks up dependency on libcurl.


>From what I remember using automatically picked depndencies is
preferred solution, even if I cannot find it in "Maximum RPM" book.

HTH
-- 
Jakub Narebski
Poland

Re: [PATCH 3/3] The "curl" executable is no longer required

[Johan Herland]

On Sunday 15 June 2008, Jakub Narebski wrote:
> Or simply remove 'curl' from 'Requires:' header, and check if rpmbuild
> would pick up libcurl dependency, and if resulting RPM has libcurl as
> requirement.
>
> [...]
>
> As you can see rpmbuild picks up dependency on libcurl.
>
>
> From what I remember using automatically picked depndencies is
> preferred solution, even if I cannot find it in "Maximum RPM" book.

So the conclusion is that v1 of the patch is ok, IIUC.


Thanks,

...Johan


-- 
Johan Herland, <johan@herland.net>
www.herland.net