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 23:56:48
Branch: HEAD Handle: 2008040221564601
Modified files:
rpm CHANGES VENDOR
rpm/lib poptALL.c
rpm/rpmio poptIO.c rpmlua.c
Log:
- jbj: merge "support-rpmlua-option" patch from OpenPKG.
- jbj: merge "support-rpmpopt-option" patch from OpenPKG.
Summary:
Revision Changes Path
1.2284 +2 -0 rpm/CHANGES
2.47 +0 -18 rpm/VENDOR
2.90 +0 -14 rpm/lib/poptALL.c
1.24 +0 -14 rpm/rpmio/poptIO.c
2.52 +0 -6 rpm/rpmio/rpmlua.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2283 -r1.2284 CHANGES
--- rpm/CHANGES 2 Apr 2008 21:10:52 -0000 1.2283
+++ rpm/CHANGES 2 Apr 2008 21:56:46 -0000 1.2284
@@ -1,4 +1,6 @@
5.0.0 -> 5.1a1:
+ - jbj: merge "support-rpmlua-option" patch from OpenPKG.
+ - jbj: merge "support-rpmpopt-option" patch from OpenPKG.
- jbj: merge "security-sanity-check-rpmpopt-and-rpmmacros" patch from
OpenPKG.
- jbj: merge "no-extra-terminating-newline-on-eval" patch from OpenPKG.
- jbj: merge "explicit-source-fetch-cli-option" patch from OpenPKG.
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.46 -r2.47 VENDOR
--- rpm/VENDOR 2 Apr 2008 21:10:52 -0000 2.46
+++ rpm/VENDOR 2 Apr 2008 21:56:46 -0000 2.47
@@ -330,24 +330,6 @@
Reason: [see scripts/integrity.txt for detailed documentation]
________________________________________________________________________
- Change: support-rpmpopt-option
- Purpose: Support the special CLI option --rpmpopt to
- on-the-fly override hard-coded path of the Autoconf
option
- --path-rpmpopt.
- Reason: OpenPKG requires this in its bootstrapping procedure in
- order to let RPM load its standard rpmpopt file(s)
- from a temporary location (under $RPM_BUILD_ROOT).
- ________________________________________________________________________
-
- Change: support-rpmlua-option
- Purpose: Support the regular CLI option --rpmlua to
- on-the-fly override hard-coded path of the Autoconf
option
- --path-rpmlua.
- Reason: OpenPKG uses a rather complex --with-path-rpmlua option
- during built-time and hence one also needs to be able
- to override this on the command line.
- ________________________________________________________________________
-
Change: support-wildcards-in-EVR-comparison
Purpose: Support asterisk ("*") as a wildcard in EVR comparison.
Reason: In OpenPKG we sometimes wish to specify dependencies on
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptALL.c
============================================================================
$ cvs diff -u -r2.89 -r2.90 poptALL.c
--- rpm/lib/poptALL.c 2 Apr 2008 21:10:52 -0000 2.89
+++ rpm/lib/poptALL.c 2 Apr 2008 21:56:47 -0000 2.90
@@ -112,17 +112,13 @@
/[EMAIL PROTECTED]@*/
static int rpmcliInitialized = -1;
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
#ifdef WITH_LUA
/[EMAIL PROTECTED]@*/
extern const char *rpmluaFiles;
#endif
-#endif
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
/[EMAIL PROTECTED]@*/
static char *rpmpoptfiles = RPMPOPTFILES;
-#endif
/**
* Display rpm version.
@@ -335,18 +331,14 @@
{ "macros", '\0', POPT_ARG_STRING, &rpmMacrofiles, 0,
N_("read <FILE:...> instead of default file(s)"),
N_("<FILE:...>") },
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
#ifdef WITH_LUA
{ "rpmlua", '\0', POPT_ARG_STRING, &rpmluaFiles, 0,
N_("read <FILE:...> instead of default RPM Lua file(s)"),
N_("<FILE:...>") },
#endif
-#endif
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
{ "rpmpopt", '\0', POPT_ARG_STRING, NULL, 0,
N_("read <FILE:...> instead of default POPT file(s)"),
N_("<FILE:...>") },
-#endif
{ "target", '\0', POPT_ARG_STRING, NULL, RPMCLI_POPT_TARGETPLATFORM,
N_("specify target platform"), N_("CPU-VENDOR-OS") },
@@ -469,9 +461,7 @@
poptContext optCon;
char *path_buf, *path, *path_next;
int rc;
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
int i;
-#endif
#if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
/[EMAIL PROTECTED]@*/
@@ -520,7 +510,6 @@
/[EMAIL PROTECTED] [EMAIL PROTECTED]/
/* read all RPM POPT configuration files */
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "--rpmpopt") == 0 && i+1 < argc) {
rpmpoptfiles = argv[i+1];
@@ -532,9 +521,6 @@
}
}
path_buf = xstrdup(rpmpoptfiles);
-#else
- path_buf = xstrdup(RPMPOPTFILES);
-#endif
for (path = path_buf; path != NULL && *path != '\0'; path = path_next) {
const char **av;
int ac, i;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/poptIO.c
============================================================================
$ cvs diff -u -r1.23 -r1.24 poptIO.c
--- rpm/rpmio/poptIO.c 2 Apr 2008 21:06:32 -0000 1.23
+++ rpm/rpmio/poptIO.c 2 Apr 2008 21:56:47 -0000 1.24
@@ -78,18 +78,14 @@
static int rpmioInitialized = -1;
#ifdef NOTYET
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
#ifdef WITH_LUA
/[EMAIL PROTECTED]@*/
extern const char *rpmluaFiles;
#endif
-#endif
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
/[EMAIL PROTECTED]@*/
static char *rpmpoptfiles = RPMPOPTFILES;
#endif
-#endif
pgpHashAlgo rpmioDigestHashAlgo = -1;
@@ -321,18 +317,14 @@
{ "macros", '\0', POPT_ARG_STRING, &rpmMacrofiles, 0,
N_("read <FILE:...> instead of default file(s)"),
N_("<FILE:...>") },
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
#ifdef WITH_LUA
{ "rpmlua", '\0', POPT_ARG_STRING, &rpmluaFiles, 0,
N_("read <FILE:...> instead of default RPM Lua file(s)"),
N_("<FILE:...>") },
#endif
-#endif
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
{ "rpmpopt", '\0', POPT_ARG_STRING, NULL, 0,
N_("read <FILE:...> instead of default POPT file(s)"),
N_("<FILE:...>") },
-#endif
#endif /* NOTYET */
#if defined(HAVE_LIBIO_H) && defined(_G_IO_IO_FILE_VERSION)
@@ -439,10 +431,8 @@
#endif
int rc;
#ifdef NOTYET
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
int i;
#endif
-#endif
#if defined(HAVE_MCHECK_H) && defined(HAVE_MTRACE)
/[EMAIL PROTECTED]@*/
@@ -492,7 +482,6 @@
#ifdef NOTYET
/* read all RPM POPT configuration files */
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmpopt-option */
for (i = 1; i < argc; i++) {
if (strcmp(argv[i], "--rpmpopt") == 0 && i+1 < argc) {
rpmpoptfiles = argv[i+1];
@@ -504,9 +493,6 @@
}
}
path_buf = xstrdup(rpmpoptfiles);
-#else
- path_buf = xstrdup(RPMPOPTFILES);
-#endif
for (path = path_buf; path != NULL && *path != '\0'; path = path_next) {
const char **av;
int ac, i;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlua.c
============================================================================
$ cvs diff -u -r2.51 -r2.52 rpmlua.c
--- rpm/rpmio/rpmlua.c 2 Apr 2008 21:10:52 -0000 2.51
+++ rpm/rpmio/rpmlua.c 2 Apr 2008 21:56:47 -0000 2.52
@@ -54,10 +54,8 @@
/[EMAIL PROTECTED] fileSystem @*/
/[EMAIL PROTECTED] L, fileSystem @*/;
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
/[EMAIL PROTECTED]@*/
const char *rpmluaFiles = RPMLUAFILES;
-#endif
rpmlua rpmluaGetGlobalState(void)
{
@@ -123,11 +121,7 @@
rpmluaSetData(lua, "lua", lua);
/* load all standard RPM Lua script files */
-#if defined(RPM_VENDOR_OPENPKG) /* support-rpmlua-option */
path_buf = xstrdup(rpmluaFiles);
-#else
- path_buf = xstrdup(RPMLUAFILES);
-#endif
for (path = path_buf; path != NULL && *path != '\0'; path = path_next) {
const char **av;
struct stat st;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository [email protected]
