1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/openpkg/rpm.patch Tue Jul 31 12:23:42 2012 +0200
1.3 @@ -0,0 +1,338 @@
1.4 +Index: Makefile.in
1.5 +--- Makefile.in.orig 2009-04-13 17:50:53 +0200
1.6 ++++ Makefile.in 2009-04-13 17:55:37 +0200
1.7 +@@ -502,7 +502,7 @@
1.8 + @WITH_PCRE_SUBDIR@ @WITH_LUA_SUBDIR@ @WITH_FILE_SUBDIR@ \
1.9 + @WITH_SYCK_SUBDIR@ @WITH_XAR_SUBDIR@ @WITH_XZ_SUBDIR@ misc \
1.10 + rpmio rpmdb lib build rpmconstant @WITH_PYTHON_SUBDIR@ \
1.11 +- @WITH_PERL_SUBDIR@ tools scripts tests doc .
1.12 ++ @WITH_PERL_SUBDIR@ tools scripts doc .
1.13 + AM_CPPFLAGS = \
1.14 + -I$(srcdir) \
1.15 + -I$(top_srcdir) \
1.16 +Index: configure
1.17 +--- configure.orig 2009-04-13 17:50:56 +0200
1.18 ++++ configure 2009-04-13 17:55:37 +0200
1.19 +@@ -45970,7 +45970,7 @@
1.20 + fi
1.21 +
1.22 + case "$host" in
1.23 +- *-*-linux* ) USE_LUA_SHADOW=yes; USE_LUA_CHKCONFIG=yes; ;;
1.24 ++ *-*-linux* ) USE_LUA_SHADOW=no; USE_LUA_CHKCONFIG=no; ;;
1.25 + esac
1.26 +
1.27 + cat >>confdefs.h <<\_ACEOF
1.28 +Index: macros.in
1.29 +--- macros.in.orig 2009-04-12 21:46:09 +0200
1.30 ++++ macros.in 2009-04-13 17:55:37 +0200
1.31 +@@ -692,8 +692,8 @@
1.32 +
1.33 + # database tag configuration
1.34 + %_dbi_tags %{expand:%%{_dbi_tags_%{_dbapi_used}}}
1.35 +-%_dbi_tags_3 Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
1.36 +-%_dbi_tags_4 Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
1.37 ++%_dbi_tags_3 Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:BuildEnvironment
1.38 ++%_dbi_tags_4 Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths:BuildEnvironment
1.39 +
1.40 + # database configuration: Berkeley-DB [dbapi 3 hooks]
1.41 + %_dbi_config_3 %{_dbi_btconfig}
1.42 +@@ -720,6 +720,7 @@
1.43 + %_dbi_config_3_Triggername %{_dbi_btconfig}
1.44 + %_dbi_config_3_Packages %{_dbi_btconfig} lockdbfd
1.45 + %_dbi_config_3_Depends %{_dbi_btconfig} temporary private
1.46 ++%_dbi_config_3_BuildEnvironment %{_dbi_btconfig}
1.47 +
1.48 + # database configuration: SQLite [dbapi 4 hooks]
1.49 + %_dbi_config_4 %{_dbi_sqlconfig}
1.50 +@@ -746,6 +747,7 @@
1.51 + %_dbi_config_4_Triggername %{_dbi_sqlconfig}
1.52 + %_dbi_config_4_Packages %{_dbi_sqlconfig}
1.53 + %_dbi_config_4_Depends %{_dbi_sqlconfig} temporary private
1.54 ++%_dbi_config_4_BuildEnvironment %{_dbi_sqlconfig}
1.55 +
1.56 + # database configuration [code entry hooks]
1.57 + %_dbi_config %{expand:%%{_dbi_config_%{_dbapi_used}}}
1.58 +@@ -772,6 +774,7 @@
1.59 + %_dbi_config_Nvra %{expand:%%{_dbi_config_%{_dbapi_used}_Nvra}}
1.60 + %_dbi_config_Sourcepkgid %{expand:%%{_dbi_config_%{_dbapi_used}_Sourcepkgid}}
1.61 + %_dbi_config_Filepaths %{expand:%%{_dbi_config_%{_dbapi_used}_Filepaths}}
1.62 ++%_dbi_config_BuildEnvironment %{expand:%%{_dbi_config_%{_dbapi_used}_BuildEnvironment}}
1.63 +
1.64 + # Database API configuration:
1.65 + #
1.66 +@@ -1404,11 +1407,11 @@
1.67 + %_build_cpu %{_host_cpu}
1.68 + %_build_vendor %{_host_vendor}
1.69 + %_build_os %{_host_os}
1.70 +-%_host @host@
1.71 +-%_host_alias @host_alias@%{nil}
1.72 +-%_host_cpu @host_cpu@
1.73 +-%_host_vendor @host_vendor@
1.74 +-%_host_os @host_os@
1.75 ++#%_host @host@
1.76 ++#%_host_alias @host_alias@%{nil}
1.77 ++#%_host_cpu @host_cpu@
1.78 ++#%_host_vendor @host_vendor@
1.79 ++#%_host_os @host_os@
1.80 + %_target %{_host}
1.81 + %_target_alias %{_host_alias}
1.82 + %_target_cpu %{_host_cpu}
1.83 +Index: rpmqv.c
1.84 +--- rpmqv.c.orig 2009-04-12 21:46:09 +0200
1.85 ++++ rpmqv.c 2009-04-13 17:55:37 +0200
1.86 +@@ -1,6 +1,9 @@
1.87 + #include "system.h"
1.88 + extern const char *__progname;
1.89 +
1.90 ++#define RPM_INTEGRITY_FP "0000000000000000000000000000000000000000"
1.91 ++#define RPM_INTEGRITY_MV "0.0.0"
1.92 ++
1.93 + /* Copyright (C) 1998-2002 - Red Hat, Inc. */
1.94 +
1.95 + #define _AUTOHELP
1.96 +Index: tools/Makefile.in
1.97 +--- tools/Makefile.in.orig 2009-04-13 17:50:53 +0200
1.98 ++++ tools/Makefile.in 2009-04-13 17:55:37 +0200
1.99 +@@ -35,9 +35,8 @@
1.100 + host_triplet = @host@
1.101 + target_triplet = @target@
1.102 + EXTRA_PROGRAMS = debugedit$(EXEEXT) rpmkey$(EXEEXT) txar$(EXEEXT)
1.103 +-bin_PROGRAMS = rpm2cpio$(EXEEXT) rpmcache$(EXEEXT) rpmdigest$(EXEEXT) \
1.104 +- rpmgrep$(EXEEXT) rpmmtree$(EXEEXT) rpmrepo$(EXEEXT) \
1.105 +- rpmspecdump$(EXEEXT) rpmwget$(EXEEXT)
1.106 ++bin_PROGRAMS = rpm2cpio$(EXEEXT) rpmcache$(EXEEXT) rpmgrep$(EXEEXT)
1.107 ++
1.108 + pkglib_PROGRAMS = rpmcmp$(EXEEXT) rpmdeps$(EXEEXT) \
1.109 + @WITH_LIBELF_DEBUGEDIT@ $(am__EXEEXT_1)
1.110 + @WITH_DB_INTERNAL_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_1 = db_tool
1.111 +Index: rpmio/rpmlua.c
1.112 +--- rpmio/rpmlua.c 18 Apr 2009 16:45:17 -0000 2.52.2.10
1.113 ++++ rpmio/rpmlua.c 6 May 2009 19:40:54 -0000
1.114 +@@ -1147,7 +1147,7 @@
1.115 + if ((hbn = gethostbyname(hostname)) != NULL)
1.116 + h = hbn->h_name;
1.117 + else
1.118 +- h = "localhost";
1.119 ++ h = hostname;
1.120 + /*@=multithreaded@*/
1.121 + lua_pushstring(L, (const char *)h);
1.122 + return 1;
1.123 +Index: lib/rpmfc.c
1.124 +--- lib/rpmfc.c 6 Apr 2009 00:21:21 -0000 1.64
1.125 ++++ lib/rpmfc.c 11 Apr 2009 14:17:58 -0000 1.65
1.126 +@@ -1836,7 +1836,7 @@
1.127 + /*@=mustmod@*/
1.128 +
1.129 + /*@unchecked@*/ /*@only@*/ /*@null@*/
1.130 +-rpmioPool _rpmfcPool;
1.131 ++rpmioPool _rpmfcPool = NULL;
1.132 +
1.133 + static rpmfc rpmfcGetPool(/*@null@*/ rpmioPool pool)
1.134 + /*@globals _rpmfcPool, fileSystem, internalState @*/
1.135 +Index: rpmio/rpmmg.c
1.136 +--- rpmio/rpmmg.c 25 Mar 2009 20:26:47 -0000 2.10
1.137 ++++ rpmio/rpmmg.c 11 Apr 2009 14:17:58 -0000 2.11
1.138 +@@ -37,7 +37,7 @@
1.139 + /*@=mustmod@*/
1.140 +
1.141 + /*@unchecked@*/ /*@only@*/ /*@null@*/
1.142 +-rpmioPool _rpmmgPool;
1.143 ++rpmioPool _rpmmgPool = NULL;
1.144 +
1.145 + static rpmmg rpmmgGetPool(/*@null@*/ rpmioPool pool)
1.146 + /*@globals _rpmmgPool, fileSystem @*/
1.147 +Index: rpmio/glob.c
1.148 +--- rpmio/glob.c.orig 2009-03-06 23:53:52 +0100
1.149 ++++ rpmio/glob.c 2009-09-19 19:46:41 +0200
1.150 +@@ -47,6 +47,18 @@
1.151 +
1.152 + # include "system.h"
1.153 +
1.154 ++#ifndef PATH_MAX
1.155 ++#ifdef _POSIX_VERSION
1.156 ++#define PATH_MAX _POSIX_PATH_MAX
1.157 ++#else
1.158 ++#ifdef MAXPATHLEN
1.159 ++#define PATH_MAX MAXPATHLEN
1.160 ++#else
1.161 ++#define PATH_MAX 1024
1.162 ++#endif
1.163 ++#endif
1.164 ++#endif
1.165 ++
1.166 + /* Needed for offsetof() */
1.167 + # include <stddef.h>
1.168 +
1.169 +@@ -1111,7 +1123,7 @@
1.170 + {
1.171 + struct dirent64 d64;
1.172 + char room [offsetof (struct dirent64, d_name[0])
1.173 +- + NAME_MAX + 1];
1.174 ++ + PATH_MAX + 1];
1.175 + }
1.176 + d64buf;
1.177 +
1.178 +Index: lua/local/lposix.c
1.179 +--- lua/local/lposix.c.orig 2009-03-06 23:52:45 +0100
1.180 ++++ lua/local/lposix.c 2009-09-20 19:57:28 +0200
1.181 +@@ -538,6 +538,7 @@
1.182 + return pushresult(L, mkdir(path, 0777), path);
1.183 + }
1.184 +
1.185 ++#if 0
1.186 + static int Pmkdtemp(lua_State *L) /** mkdtemp(template) */
1.187 + /*@globals fileSystem @*/
1.188 + /*@modifies L, fileSystem @*/
1.189 +@@ -555,6 +556,7 @@
1.190 + return 1;
1.191 + }
1.192 + }
1.193 ++#endif
1.194 +
1.195 +
1.196 + static int Pchdir(lua_State *L) /** chdir(path) */
1.197 +@@ -1196,7 +1198,9 @@
1.198 + {"kill", Pkill},
1.199 + {"link", Plink},
1.200 + {"mkdir", Pmkdir},
1.201 ++#if 0
1.202 + {"mkdtemp", Pmkdtemp},
1.203 ++#endif
1.204 + {"mkfifo", Pmkfifo},
1.205 + {"pathconf", Ppathconf},
1.206 + {"putenv", Pputenv},
1.207 +Index: db/os/os_yield.c
1.208 +--- db/os/os_yield.c.orig 2008-06-15 10:56:46.000000000 +0200
1.209 ++++ db/os/os_yield.c 2010-04-30 21:30:35.000000000 +0200
1.210 +@@ -58,7 +58,7 @@
1.211 + #elif defined(HAVE_YIELD)
1.212 + yield();
1.213 + #else
1.214 +- __os_sleep(dbenv, 0, 0);
1.215 ++ __os_sleep(env, 0, 0);
1.216 + #endif
1.217 + }
1.218 + }
1.219 +Index: lib/depends.c
1.220 +--- lib/depends.c.orig 2009-04-12 21:46:17.000000000 +0200
1.221 ++++ lib/depends.c 2011-03-08 20:33:59.000000000 +0100
1.222 +@@ -2654,7 +2654,7 @@
1.223 + #endif
1.224 + const char * dp;
1.225 + int msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
1.226 +- ? RPMLOG_WARNING : RPMLOG_ERR;
1.227 ++ ? RPMLOG_WARNING : RPMLOG_DEBUG;
1.228 + ;
1.229 +
1.230 + /* Unchain predecessor loop. */
1.231 +Index: doc/rpm.8
1.232 +--- doc/rpm.8.orig 2007-11-10 03:16:22.000000000 +0100
1.233 ++++ doc/rpm.8 2011-05-11 17:41:36.000000000 +0200
1.234 +@@ -177,16 +177,7 @@
1.235 + \fBrpm\fR {\fB-F|--freshen\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
1.236 + .PP
1.237 + This will upgrade packages, but only if an earlier version
1.238 +-currently exists. The \fIPACKAGE_FILE\fR
1.239 +-may be specified as an
1.240 +-\fBftp\fR or
1.241 +-\fBhttp\fR URL,
1.242 +-in which case the package will be downloaded before being
1.243 +-installed. See \fBFTP/HTTP OPTIONS\fR
1.244 +-for information on \fBrpm\fR's internal
1.245 +-\fBftp\fR and
1.246 +-\fBhttp\fR
1.247 +-client support.
1.248 ++currently exists.
1.249 + .PP
1.250 + .TP
1.251 + \fB--aid\fR
1.252 +@@ -496,14 +487,7 @@
1.253 + .TP
1.254 + \fB-p, --package \fIPACKAGE_FILE\fB\fR
1.255 + Query an (uninstalled) package \fIPACKAGE_FILE\fR.
1.256 +-The \fIPACKAGE_FILE\fR may be specified
1.257 +-as an \fBftp\fR or \fBhttp\fR style URL, in
1.258 +-which case the package header will be downloaded and queried.
1.259 +-See \fBFTP/HTTP OPTIONS\fR for information on
1.260 +-\fBrpm\fR's internal
1.261 +-\fBftp\fR and
1.262 +-\fBhttp\fR
1.263 +-client support. The \fIPACKAGE_FILE\fR argument(s),
1.264 ++The \fIPACKAGE_FILE\fR argument(s),
1.265 + if not a binary package, will be interpreted as an ASCII package
1.266 + manifest. Comments are permitted, starting with a '#', and each
1.267 + line of a package manifest file may include white space separated
1.268 +@@ -796,53 +780,6 @@
1.269 + \fIrpmrc\fR and
1.270 + \fImacros\fR
1.271 + configuration file(s).
1.272 +-.SS "FTP/HTTP OPTIONS"
1.273 +-.PP
1.274 +-\fBrpm\fR can act as an FTP and/or HTTP client so
1.275 +-that packages can be queried or installed from the internet.
1.276 +-Package files for install, upgrade, and query operations may be
1.277 +-specified as an
1.278 +-\fBftp\fR or
1.279 +-\fBhttp\fR
1.280 +-style URL:
1.281 +-.PP
1.282 +-ftp://USER:PASSWORD@HOST:PORT/path/to/package.rpm
1.283 +-.PP
1.284 +-If the \fB:PASSWORD\fR portion is omitted, the password will be
1.285 +-prompted for (once per user/hostname pair). If both the user and
1.286 +-password are omitted, anonymous \fBftp\fR is used.
1.287 +-In all cases, passive (PASV) \fBftp\fR transfers are
1.288 +-performed.
1.289 +-.PP
1.290 +-\fBrpm\fR allows the following options to be used with
1.291 +-ftp URLs:
1.292 +-.TP
1.293 +-\fB--ftpproxy \fIHOST\fB\fR
1.294 +-The host \fIHOST\fR will be used as a proxy server
1.295 +-for all ftp transfers, which allows users to ftp through firewall
1.296 +-machines which use proxy systems. This option may also be specified
1.297 +-by configuring the macro \fB%_ftpproxy\fR.
1.298 +-.TP
1.299 +-\fB--ftpport \fIPORT\fB\fR
1.300 +-The TCP \fIPORT\fR number to use for
1.301 +-the ftp connection on the proxy ftp server instead of the default
1.302 +-port. This option may also be specified by configuring the macro
1.303 +-\fB%_ftpport\fR.
1.304 +-.PP
1.305 +-\fBrpm\fR allows the following options to be used with
1.306 +-\fBhttp\fR URLs:
1.307 +-.TP
1.308 +-\fB--httpproxy \fIHOST\fB\fR
1.309 +-The host \fIHOST\fR will be used as
1.310 +-a proxy server for all \fBhttp\fR transfers. This
1.311 +-option may also be specified by configuring the macro
1.312 +-\fB%_httpproxy\fR.
1.313 +-.TP
1.314 +-\fB--httpport \fIPORT\fB\fR
1.315 +-The TCP \fIPORT\fR number to use for the
1.316 +-\fBhttp\fR connection on the proxy http server instead
1.317 +-of the default port. This option may also be specified by configuring
1.318 +-the macro \fB%_httpport\fR.
1.319 + .SH "LEGACY ISSUES"
1.320 + .SS "Executing rpmbuild"
1.321 + .PP
1.322 +Index: lua/local/lrexlib_lposix.c
1.323 +--- lua/local/lrexlib_lposix.c.orig 2008-06-15 10:56:54.000000000 +0200
1.324 ++++ lua/local/lrexlib_lposix.c 2012-02-06 20:51:46.000000000 +0100
1.325 +@@ -242,10 +242,16 @@
1.326 + { "ESPACE", REG_ESPACE },
1.327 + { "BADRPT", REG_BADRPT },
1.328 + #ifdef REX_POSIX_EXT
1.329 ++#ifdef REG_EMPTY
1.330 + { "EMPTY", REG_EMPTY },
1.331 ++#endif
1.332 ++#ifdef REG_ASSERT
1.333 + { "ASSERT", REG_ASSERT },
1.334 ++#endif
1.335 ++#ifdef REG_INVARG
1.336 + { "INVARG", REG_INVARG },
1.337 + #endif
1.338 ++#endif
1.339 + /*---------------------------------------------------------------------------*/
1.340 + { NULL, 0 }
1.341 + };
