RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 02-Apr-2008 22:57:21
Branch: HEAD Handle: 2008040220572100
Modified files:
rpm CHANGES VENDOR
rpm/rpmio url.c
Log:
- jbj: merge "support-external-download-command" patch from OpenPKG.
Summary:
Revision Changes Path
1.2279 +1 -0 rpm/CHANGES
2.43 +0 -16 rpm/VENDOR
1.51 +0 -4 rpm/rpmio/url.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2278 -r1.2279 CHANGES
--- rpm/CHANGES 2 Apr 2008 20:52:51 -0000 1.2278
+++ rpm/CHANGES 2 Apr 2008 20:57:21 -0000 1.2279
@@ -1,4 +1,5 @@
5.0.0 -> 5.1a1:
+ - jbj: merge "support-external-download-command" patch from OpenPKG.
- jbj: merge "support-srcdefattr" patch from OpenPKG.
- jbj: fix: RPMTAG_NVRA w .src/.pubkey in error msg is bogus.
- jbj: permit noarch sub-packages. Pattern match guaranteee next ...
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.42 -r2.43 VENDOR
--- rpm/VENDOR 2 Apr 2008 20:52:51 -0000 2.42
+++ rpm/VENDOR 2 Apr 2008 20:57:21 -0000 2.43
@@ -285,22 +285,6 @@
should be able to control verbosity manually.
________________________________________________________________________
- Change: support-external-download-command
- Purpose: Allow one to use macro %{__urlgetfile} for downloading
- still missing source files via an external command
- Reason: The internal URL fetching functionality was discovered
- to be not sufficient in practice when it comes to
- HTTP redirects, FTP passive/active modes, etc. To
- easily workaround this and at the same time be
- consistent in the used downloading tool, we want
- to use an external download tool. In OpenPKG cURL
- is part of the OpenPKG bootstrap (and used for all
- other downloads outside of RPM anyway), so we will
- use '%__urlgetfile() %{l_curl} "-#" -L -R -o "%2"
- "%1"' in the global "rpmmacros" file. Other tools
- can be used similarily.
- ________________________________________________________________________
-
Change: download-source-files-from-original-location
Purpose: Allow RPM to download missing source files also
from the original location (in addition to the
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/url.c
============================================================================
$ cvs diff -u -r1.50 -r1.51 url.c
--- rpm/rpmio/url.c 16 Feb 2008 01:54:53 -0000 1.50
+++ rpm/rpmio/url.c 2 Apr 2008 20:57:21 -0000 1.51
@@ -535,9 +535,7 @@
FD_t tfd = NULL;
const char * sfuPath = NULL;
int urlType = urlPath(url, &sfuPath);
-#if defined(RPM_VENDOR_OPENPKG) /* support-external-download-command */
char *result;
-#endif
if (*sfuPath == '\0')
return FTPERR_UNKNOWN;
@@ -551,7 +549,6 @@
if (dest == NULL)
return FTPERR_UNKNOWN;
-#if defined(RPM_VENDOR_OPENPKG) /* support-external-download-command */
if (rpmExpandNumeric("%{?__urlgetfile:1}%{!?__urlgetfile:0}")) {
result = rpmExpand("%{__urlgetfile ", url, " ", dest, "}", NULL);
if (result != NULL && strcmp(result, "OK") == 0)
@@ -563,7 +560,6 @@
result = _free(result);
goto exit;
}
-#endif
sfd = Fopen(url, "r");
if (sfd == NULL || Ferror(sfd)) {
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
