michael@428: Index: Makefile.in
michael@428: --- Makefile.in.orig	2009-04-13 17:50:53 +0200
michael@428: +++ Makefile.in	2009-04-13 17:55:37 +0200
michael@428: @@ -502,7 +502,7 @@
michael@428:  	@WITH_PCRE_SUBDIR@ @WITH_LUA_SUBDIR@ @WITH_FILE_SUBDIR@ \
michael@428:  	@WITH_SYCK_SUBDIR@ @WITH_XAR_SUBDIR@ @WITH_XZ_SUBDIR@ misc \
michael@428:  	rpmio rpmdb lib build rpmconstant @WITH_PYTHON_SUBDIR@ \
michael@428: -	@WITH_PERL_SUBDIR@ tools scripts tests doc .
michael@428: +	@WITH_PERL_SUBDIR@ tools scripts doc .
michael@428:  AM_CPPFLAGS = \
michael@428:  	-I$(srcdir) \
michael@428:  	-I$(top_srcdir) \
michael@428: Index: configure
michael@428: --- configure.orig	2009-04-13 17:50:56 +0200
michael@428: +++ configure	2009-04-13 17:55:37 +0200
michael@428: @@ -45970,7 +45970,7 @@
michael@428:  fi
michael@428:  
michael@428:  	  case "$host" in
michael@428: -	    *-*-linux* ) USE_LUA_SHADOW=yes; USE_LUA_CHKCONFIG=yes; ;;
michael@428: +	    *-*-linux* ) USE_LUA_SHADOW=no; USE_LUA_CHKCONFIG=no; ;;
michael@428:  	  esac
michael@428:  
michael@428:  cat >>confdefs.h <<\_ACEOF
michael@428: Index: macros.in
michael@428: --- macros.in.orig	2009-04-12 21:46:09 +0200
michael@428: +++ macros.in	2009-04-13 17:55:37 +0200
michael@428: @@ -692,8 +692,8 @@
michael@428:  
michael@428:  # database tag configuration
michael@428:  %_dbi_tags                      %{expand:%%{_dbi_tags_%{_dbapi_used}}}
michael@428: -%_dbi_tags_3                    Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
michael@428: -%_dbi_tags_4                    Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
michael@428: +%_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
michael@428: +%_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
michael@428:  
michael@428:  # database configuration: Berkeley-DB [dbapi 3 hooks]
michael@428:  %_dbi_config_3                  %{_dbi_btconfig}
michael@428: @@ -720,6 +720,7 @@
michael@428:  %_dbi_config_3_Triggername      %{_dbi_btconfig}
michael@428:  %_dbi_config_3_Packages         %{_dbi_btconfig} lockdbfd
michael@428:  %_dbi_config_3_Depends          %{_dbi_btconfig} temporary private
michael@428: +%_dbi_config_3_BuildEnvironment %{_dbi_btconfig}
michael@428:  
michael@428:  # database configuration: SQLite [dbapi 4 hooks]
michael@428:  %_dbi_config_4                  %{_dbi_sqlconfig}
michael@428: @@ -746,6 +747,7 @@
michael@428:  %_dbi_config_4_Triggername      %{_dbi_sqlconfig}
michael@428:  %_dbi_config_4_Packages         %{_dbi_sqlconfig}
michael@428:  %_dbi_config_4_Depends          %{_dbi_sqlconfig} temporary private
michael@428: +%_dbi_config_4_BuildEnvironment %{_dbi_sqlconfig}
michael@428:  
michael@428:  # database configuration [code entry hooks]
michael@428:  %_dbi_config                    %{expand:%%{_dbi_config_%{_dbapi_used}}}
michael@428: @@ -772,6 +774,7 @@
michael@428:  %_dbi_config_Nvra               %{expand:%%{_dbi_config_%{_dbapi_used}_Nvra}}
michael@428:  %_dbi_config_Sourcepkgid        %{expand:%%{_dbi_config_%{_dbapi_used}_Sourcepkgid}}
michael@428:  %_dbi_config_Filepaths		%{expand:%%{_dbi_config_%{_dbapi_used}_Filepaths}}
michael@428: +%_dbi_config_BuildEnvironment   %{expand:%%{_dbi_config_%{_dbapi_used}_BuildEnvironment}}
michael@428:  
michael@428:  # Database API configuration:
michael@428:  #
michael@428: @@ -1404,11 +1407,11 @@
michael@428:  %_build_cpu		%{_host_cpu}
michael@428:  %_build_vendor		%{_host_vendor}
michael@428:  %_build_os		%{_host_os}
michael@428: -%_host			@host@
michael@428: -%_host_alias		@host_alias@%{nil}
michael@428: -%_host_cpu		@host_cpu@
michael@428: -%_host_vendor		@host_vendor@
michael@428: -%_host_os		@host_os@
michael@428: +#%_host			@host@
michael@428: +#%_host_alias		@host_alias@%{nil}
michael@428: +#%_host_cpu		@host_cpu@
michael@428: +#%_host_vendor		@host_vendor@
michael@428: +#%_host_os		@host_os@
michael@428:  %_target		%{_host}
michael@428:  %_target_alias		%{_host_alias}
michael@428:  %_target_cpu		%{_host_cpu}
michael@428: Index: rpmqv.c
michael@428: --- rpmqv.c.orig	2009-04-12 21:46:09 +0200
michael@428: +++ rpmqv.c	2009-04-13 17:55:37 +0200
michael@428: @@ -1,6 +1,9 @@
michael@428:  #include "system.h"
michael@428:  extern const char *__progname;
michael@428:  
michael@428: +#define RPM_INTEGRITY_FP "0000000000000000000000000000000000000000"
michael@428: +#define RPM_INTEGRITY_MV "0.0.0"
michael@428: +
michael@428:  /* Copyright (C) 1998-2002 - Red Hat, Inc. */
michael@428:  
michael@428:  #define	_AUTOHELP
michael@428: Index: tools/Makefile.in
michael@428: --- tools/Makefile.in.orig	2009-04-13 17:50:53 +0200
michael@428: +++ tools/Makefile.in	2009-04-13 17:55:37 +0200
michael@428: @@ -35,9 +35,8 @@
michael@428:  host_triplet = @host@
michael@428:  target_triplet = @target@
michael@428:  EXTRA_PROGRAMS = debugedit$(EXEEXT) rpmkey$(EXEEXT) txar$(EXEEXT)
michael@428: -bin_PROGRAMS = rpm2cpio$(EXEEXT) rpmcache$(EXEEXT) rpmdigest$(EXEEXT) \
michael@428: -	rpmgrep$(EXEEXT) rpmmtree$(EXEEXT) rpmrepo$(EXEEXT) \
michael@428: -	rpmspecdump$(EXEEXT) rpmwget$(EXEEXT)
michael@428: +bin_PROGRAMS = rpm2cpio$(EXEEXT) rpmcache$(EXEEXT) rpmgrep$(EXEEXT)
michael@428: +	
michael@428:  pkglib_PROGRAMS = rpmcmp$(EXEEXT) rpmdeps$(EXEEXT) \
michael@428:  	@WITH_LIBELF_DEBUGEDIT@ $(am__EXEEXT_1)
michael@428:  @WITH_DB_INTERNAL_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_1 = db_tool
michael@428: Index: rpmio/rpmlua.c
michael@428: --- rpmio/rpmlua.c	18 Apr 2009 16:45:17 -0000	2.52.2.10
michael@428: +++ rpmio/rpmlua.c	6 May 2009 19:40:54 -0000
michael@428: @@ -1147,7 +1147,7 @@
michael@428:      if ((hbn = gethostbyname(hostname)) != NULL)
michael@428:          h = hbn->h_name;
michael@428:      else
michael@428: -        h = "localhost";
michael@428: +        h = hostname;
michael@428:  /*@=multithreaded@*/
michael@428:      lua_pushstring(L, (const char *)h);
michael@428:      return 1;
michael@428: Index: lib/rpmfc.c
michael@428: --- lib/rpmfc.c	6 Apr 2009 00:21:21 -0000	1.64
michael@428: +++ lib/rpmfc.c	11 Apr 2009 14:17:58 -0000	1.65
michael@431: @@ -1834,7 +1834,7 @@
michael@428:  /*@=mustmod@*/
michael@428:  
michael@428:  /*@unchecked@*/ /*@only@*/ /*@null@*/
michael@428: -rpmioPool _rpmfcPool;
michael@428: +rpmioPool _rpmfcPool = NULL;
michael@428:  
michael@428:  static rpmfc rpmfcGetPool(/*@null@*/ rpmioPool pool)
michael@428:  	/*@globals _rpmfcPool, fileSystem, internalState @*/
michael@428: Index: rpmio/rpmmg.c
michael@428: --- rpmio/rpmmg.c	25 Mar 2009 20:26:47 -0000	2.10
michael@428: +++ rpmio/rpmmg.c	11 Apr 2009 14:17:58 -0000	2.11
michael@431: @@ -36,7 +36,7 @@
michael@428:  /*@=mustmod@*/
michael@428:  
michael@428:  /*@unchecked@*/ /*@only@*/ /*@null@*/
michael@428: -rpmioPool _rpmmgPool;
michael@428: +rpmioPool _rpmmgPool = NULL;
michael@428:  
michael@428:  static rpmmg rpmmgGetPool(/*@null@*/ rpmioPool pool)
michael@428:  	/*@globals _rpmmgPool, fileSystem @*/
michael@428: Index: rpmio/glob.c
michael@428: --- rpmio/glob.c.orig	2009-03-06 23:53:52 +0100
michael@428: +++ rpmio/glob.c	2009-09-19 19:46:41 +0200
michael@428: @@ -47,6 +47,18 @@
michael@428:  
michael@428:  # include "system.h"
michael@428:  
michael@428: +#ifndef PATH_MAX
michael@428: +#ifdef _POSIX_VERSION
michael@428: +#define PATH_MAX _POSIX_PATH_MAX
michael@428: +#else
michael@428: +#ifdef MAXPATHLEN
michael@428: +#define PATH_MAX MAXPATHLEN
michael@428: +#else
michael@428: +#define PATH_MAX 1024
michael@428: +#endif
michael@428: +#endif
michael@428: +#endif
michael@428: +
michael@428:  /* Needed for offsetof() */
michael@428:  # include <stddef.h>
michael@428:  
michael@428: @@ -1111,7 +1123,7 @@
michael@428:  		    {
michael@428:  	 		struct dirent64 d64;
michael@428:        			char room [offsetof (struct dirent64, d_name[0])
michael@428: -   				   + NAME_MAX + 1];
michael@428: +   				   + PATH_MAX + 1];
michael@428:      		    }
michael@428:      		  d64buf;
michael@428:  
michael@435: Index: rpmio/fnmatch.c
michael@435: --- rpmio/fnmatch.c	2012-08-01 21:24:05.278487112 +0200
michael@435: +++ rpmio/fnmatch.c.orig	2008-10-12 12:38:58.000000000 +0200
michael@435: @@ -24,6 +24,9 @@
michael@435:  
michael@435:  #include "system.h"
michael@435:  
michael@435: +/* Provide nonstandard constructs */
michael@435: +#include "nonstandard.h"
michael@435: +
michael@435:  #include <string.h>
michael@435:  
michael@435:  #include "debug.h"
michael@428: Index: lua/local/lposix.c
michael@428: --- lua/local/lposix.c.orig	2009-03-06 23:52:45 +0100
michael@428: +++ lua/local/lposix.c	2009-09-20 19:57:28 +0200
michael@428: @@ -538,6 +538,7 @@
michael@428:  	return pushresult(L, mkdir(path, 0777), path);
michael@428:  }
michael@428:  
michael@428: +#if 0
michael@428:  static int Pmkdtemp(lua_State *L)		/** mkdtemp(template) */
michael@428:  	/*@globals fileSystem @*/
michael@428:  	/*@modifies L, fileSystem @*/
michael@428: @@ -555,6 +556,7 @@
michael@428:  		return 1;
michael@428:  	}
michael@428:  }
michael@428: +#endif
michael@428:  
michael@428:  
michael@428:  static int Pchdir(lua_State *L)			/** chdir(path) */
michael@428: @@ -1196,7 +1198,9 @@
michael@428:  	{"kill",		Pkill},
michael@428:  	{"link",		Plink},
michael@428:  	{"mkdir",		Pmkdir},
michael@428: +#if 0
michael@428:  	{"mkdtemp",		Pmkdtemp},
michael@428: +#endif
michael@428:  	{"mkfifo",		Pmkfifo},
michael@428:  	{"pathconf",		Ppathconf},
michael@428:  	{"putenv",		Pputenv},
michael@428: Index: db/os/os_yield.c
michael@428: --- db/os/os_yield.c.orig	2008-06-15 10:56:46.000000000 +0200
michael@428: +++ db/os/os_yield.c	2010-04-30 21:30:35.000000000 +0200
michael@428: @@ -58,7 +58,7 @@
michael@428:  #elif defined(HAVE_YIELD)
michael@428:  		yield();
michael@428:  #else
michael@428: -		__os_sleep(dbenv, 0, 0);
michael@428: +		__os_sleep(env, 0, 0);
michael@428:  #endif
michael@428:  	}
michael@428:  }
michael@428: Index: lib/depends.c
michael@428: --- lib/depends.c.orig	2009-04-12 21:46:17.000000000 +0200
michael@428: +++ lib/depends.c	2011-03-08 20:33:59.000000000 +0100
michael@428: @@ -2654,7 +2654,7 @@
michael@428:  #endif
michael@428:  		const char * dp;
michael@428:  		int msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
michael@428: -			? RPMLOG_WARNING : RPMLOG_ERR;
michael@428: +			? RPMLOG_WARNING : RPMLOG_DEBUG;
michael@428:  ;
michael@428:  
michael@428:  		/* Unchain predecessor loop. */
michael@428: Index: doc/rpm.8
michael@428: --- doc/rpm.8.orig	2007-11-10 03:16:22.000000000 +0100
michael@428: +++ doc/rpm.8	2011-05-11 17:41:36.000000000 +0200
michael@428: @@ -177,16 +177,7 @@
michael@428:  \fBrpm\fR {\fB-F|--freshen\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
michael@428:  .PP
michael@428:  This will upgrade packages, but only if an earlier version
michael@428: -currently exists. The \fIPACKAGE_FILE\fR
michael@428: -may be specified as an
michael@428: -\fBftp\fR or
michael@428: -\fBhttp\fR URL,
michael@428: -in which case the package will be downloaded before being
michael@428: -installed. See \fBFTP/HTTP OPTIONS\fR
michael@428: -for information on \fBrpm\fR's internal
michael@428: -\fBftp\fR and
michael@428: -\fBhttp\fR
michael@428: -client support. 
michael@428: +currently exists.
michael@428:  .PP
michael@428:  .TP
michael@428:  \fB--aid\fR
michael@428: @@ -496,14 +487,7 @@
michael@428:  .TP
michael@428:  \fB-p, --package \fIPACKAGE_FILE\fB\fR
michael@428:  Query an (uninstalled) package \fIPACKAGE_FILE\fR.
michael@428: -The \fIPACKAGE_FILE\fR may be specified
michael@428: -as an \fBftp\fR or \fBhttp\fR style URL, in
michael@428: -which case the package header will be downloaded and queried.
michael@428: -See \fBFTP/HTTP OPTIONS\fR for information on
michael@428: -\fBrpm\fR's internal
michael@428: -\fBftp\fR and
michael@428: -\fBhttp\fR
michael@428: -client support. The \fIPACKAGE_FILE\fR argument(s),
michael@428: +The \fIPACKAGE_FILE\fR argument(s),
michael@428:  if not a binary package, will be interpreted as an ASCII package
michael@428:  manifest.  Comments are permitted, starting with a '#', and each
michael@428:  line of a package manifest file may include white space separated
michael@428: @@ -796,53 +780,6 @@
michael@428:  \fIrpmrc\fR and
michael@428:  \fImacros\fR
michael@428:  configuration file(s).
michael@428: -.SS "FTP/HTTP OPTIONS"
michael@428: -.PP
michael@428: -\fBrpm\fR can act as an FTP and/or HTTP client so
michael@428: -that packages can be queried or installed from the internet.
michael@428: -Package files for install, upgrade, and query operations may be
michael@428: -specified as an
michael@428: -\fBftp\fR or
michael@428: -\fBhttp\fR
michael@428: -style URL:  
michael@428: -.PP
michael@428: -ftp://USER:PASSWORD@HOST:PORT/path/to/package.rpm
michael@428: -.PP
michael@428: -If the \fB:PASSWORD\fR portion is omitted, the password will be
michael@428: -prompted for (once per user/hostname pair). If both the user and
michael@428: -password are omitted, anonymous \fBftp\fR is used.
michael@428: -In all cases, passive (PASV) \fBftp\fR transfers are
michael@428: -performed.
michael@428: -.PP
michael@428: -\fBrpm\fR allows the following options to be used with
michael@428: -ftp URLs:
michael@428: -.TP
michael@428: -\fB--ftpproxy \fIHOST\fB\fR
michael@428: -The host \fIHOST\fR will be used as a proxy server
michael@428: -for all ftp transfers, which allows users to ftp through firewall
michael@428: -machines which use proxy systems. This option may also be specified
michael@428: -by configuring the macro \fB%_ftpproxy\fR.
michael@428: -.TP
michael@428: -\fB--ftpport \fIPORT\fB\fR
michael@428: -The TCP \fIPORT\fR number to use for
michael@428: -the ftp connection on the proxy ftp server instead of the default
michael@428: -port. This option may also be specified by configuring the macro
michael@428: -\fB%_ftpport\fR.
michael@428: -.PP
michael@428: -\fBrpm\fR allows the following options to be used with
michael@428: -\fBhttp\fR URLs:
michael@428: -.TP
michael@428: -\fB--httpproxy \fIHOST\fB\fR
michael@428: -The host \fIHOST\fR will be used as
michael@428: -a proxy server for all \fBhttp\fR transfers. This
michael@428: -option may also be specified by configuring the macro
michael@428: -\fB%_httpproxy\fR.
michael@428: -.TP
michael@428: -\fB--httpport \fIPORT\fB\fR
michael@428: -The TCP \fIPORT\fR number to use for the
michael@428: -\fBhttp\fR connection on the proxy http server instead
michael@428: -of the default port. This option may also be specified by configuring
michael@428: -the macro \fB%_httpport\fR.
michael@428:  .SH "LEGACY ISSUES"
michael@428:  .SS "Executing rpmbuild"
michael@428:  .PP
michael@428: Index: lua/local/lrexlib_lposix.c
michael@428: --- lua/local/lrexlib_lposix.c.orig	2008-06-15 10:56:54.000000000 +0200
michael@428: +++ lua/local/lrexlib_lposix.c	2012-02-06 20:51:46.000000000 +0100
michael@428: @@ -242,10 +242,16 @@
michael@428:    { "ESPACE",   REG_ESPACE },
michael@428:    { "BADRPT",   REG_BADRPT },
michael@428:  #ifdef REX_POSIX_EXT
michael@428: +#ifdef REG_EMPTY
michael@428:    { "EMPTY",    REG_EMPTY },
michael@428: +#endif
michael@428: +#ifdef REG_ASSERT
michael@428:    { "ASSERT",   REG_ASSERT },
michael@428: +#endif
michael@428: +#ifdef REG_INVARG
michael@428:    { "INVARG",   REG_INVARG },
michael@428:  #endif
michael@428: +#endif
michael@428:  /*---------------------------------------------------------------------------*/
michael@428:    { NULL, 0 }
michael@428:  };