OpenPKG Specs / file comparison

comparison: openpkg/rpm.patch

openpkg/rpm.patch

changeset 428
f880f219c566
child 431
127559aa0c5e
equal deleted inserted replaced
-1:000000000000 0:52dd57b1246d
1 Index: Makefile.in
2 --- Makefile.in.orig 2009-04-13 17:50:53 +0200
3 +++ Makefile.in 2009-04-13 17:55:37 +0200
4 @@ -502,7 +502,7 @@
5 @WITH_PCRE_SUBDIR@ @WITH_LUA_SUBDIR@ @WITH_FILE_SUBDIR@ \
6 @WITH_SYCK_SUBDIR@ @WITH_XAR_SUBDIR@ @WITH_XZ_SUBDIR@ misc \
7 rpmio rpmdb lib build rpmconstant @WITH_PYTHON_SUBDIR@ \
8 - @WITH_PERL_SUBDIR@ tools scripts tests doc .
9 + @WITH_PERL_SUBDIR@ tools scripts doc .
10 AM_CPPFLAGS = \
11 -I$(srcdir) \
12 -I$(top_srcdir) \
13 Index: configure
14 --- configure.orig 2009-04-13 17:50:56 +0200
15 +++ configure 2009-04-13 17:55:37 +0200
16 @@ -45970,7 +45970,7 @@
17 fi
18
19 case "$host" in
20 - *-*-linux* ) USE_LUA_SHADOW=yes; USE_LUA_CHKCONFIG=yes; ;;
21 + *-*-linux* ) USE_LUA_SHADOW=no; USE_LUA_CHKCONFIG=no; ;;
22 esac
23
24 cat >>confdefs.h <<\_ACEOF
25 Index: macros.in
26 --- macros.in.orig 2009-04-12 21:46:09 +0200
27 +++ macros.in 2009-04-13 17:55:37 +0200
28 @@ -692,8 +692,8 @@
29
30 # database tag configuration
31 %_dbi_tags %{expand:%%{_dbi_tags_%{_dbapi_used}}}
32 -%_dbi_tags_3 Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
33 -%_dbi_tags_4 Packages:Name:Basenames:Group:Providename:Requirename:Conflictname:Obsoletename:Triggername:Dirnames:Requireversion:Provideversion:Installtid:Sigmd5:Sha1header:Filedigests:Pubkeys:Packagecolor:Nvra:Sourcepkgid:Filepaths
34 +%_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
35 +%_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
36
37 # database configuration: Berkeley-DB [dbapi 3 hooks]
38 %_dbi_config_3 %{_dbi_btconfig}
39 @@ -720,6 +720,7 @@
40 %_dbi_config_3_Triggername %{_dbi_btconfig}
41 %_dbi_config_3_Packages %{_dbi_btconfig} lockdbfd
42 %_dbi_config_3_Depends %{_dbi_btconfig} temporary private
43 +%_dbi_config_3_BuildEnvironment %{_dbi_btconfig}
44
45 # database configuration: SQLite [dbapi 4 hooks]
46 %_dbi_config_4 %{_dbi_sqlconfig}
47 @@ -746,6 +747,7 @@
48 %_dbi_config_4_Triggername %{_dbi_sqlconfig}
49 %_dbi_config_4_Packages %{_dbi_sqlconfig}
50 %_dbi_config_4_Depends %{_dbi_sqlconfig} temporary private
51 +%_dbi_config_4_BuildEnvironment %{_dbi_sqlconfig}
52
53 # database configuration [code entry hooks]
54 %_dbi_config %{expand:%%{_dbi_config_%{_dbapi_used}}}
55 @@ -772,6 +774,7 @@
56 %_dbi_config_Nvra %{expand:%%{_dbi_config_%{_dbapi_used}_Nvra}}
57 %_dbi_config_Sourcepkgid %{expand:%%{_dbi_config_%{_dbapi_used}_Sourcepkgid}}
58 %_dbi_config_Filepaths %{expand:%%{_dbi_config_%{_dbapi_used}_Filepaths}}
59 +%_dbi_config_BuildEnvironment %{expand:%%{_dbi_config_%{_dbapi_used}_BuildEnvironment}}
60
61 # Database API configuration:
62 #
63 @@ -1404,11 +1407,11 @@
64 %_build_cpu %{_host_cpu}
65 %_build_vendor %{_host_vendor}
66 %_build_os %{_host_os}
67 -%_host @host@
68 -%_host_alias @host_alias@%{nil}
69 -%_host_cpu @host_cpu@
70 -%_host_vendor @host_vendor@
71 -%_host_os @host_os@
72 +#%_host @host@
73 +#%_host_alias @host_alias@%{nil}
74 +#%_host_cpu @host_cpu@
75 +#%_host_vendor @host_vendor@
76 +#%_host_os @host_os@
77 %_target %{_host}
78 %_target_alias %{_host_alias}
79 %_target_cpu %{_host_cpu}
80 Index: rpmqv.c
81 --- rpmqv.c.orig 2009-04-12 21:46:09 +0200
82 +++ rpmqv.c 2009-04-13 17:55:37 +0200
83 @@ -1,6 +1,9 @@
84 #include "system.h"
85 extern const char *__progname;
86
87 +#define RPM_INTEGRITY_FP "0000000000000000000000000000000000000000"
88 +#define RPM_INTEGRITY_MV "0.0.0"
89 +
90 /* Copyright (C) 1998-2002 - Red Hat, Inc. */
91
92 #define _AUTOHELP
93 Index: tools/Makefile.in
94 --- tools/Makefile.in.orig 2009-04-13 17:50:53 +0200
95 +++ tools/Makefile.in 2009-04-13 17:55:37 +0200
96 @@ -35,9 +35,8 @@
97 host_triplet = @host@
98 target_triplet = @target@
99 EXTRA_PROGRAMS = debugedit$(EXEEXT) rpmkey$(EXEEXT) txar$(EXEEXT)
100 -bin_PROGRAMS = rpm2cpio$(EXEEXT) rpmcache$(EXEEXT) rpmdigest$(EXEEXT) \
101 - rpmgrep$(EXEEXT) rpmmtree$(EXEEXT) rpmrepo$(EXEEXT) \
102 - rpmspecdump$(EXEEXT) rpmwget$(EXEEXT)
103 +bin_PROGRAMS = rpm2cpio$(EXEEXT) rpmcache$(EXEEXT) rpmgrep$(EXEEXT)
104 +
105 pkglib_PROGRAMS = rpmcmp$(EXEEXT) rpmdeps$(EXEEXT) \
106 @WITH_LIBELF_DEBUGEDIT@ $(am__EXEEXT_1)
107 @WITH_DB_INTERNAL_TRUE@@WITH_DB_TOOLS_INTEGRATED_TRUE@am__append_1 = db_tool
108 Index: rpmio/rpmlua.c
109 --- rpmio/rpmlua.c 18 Apr 2009 16:45:17 -0000 2.52.2.10
110 +++ rpmio/rpmlua.c 6 May 2009 19:40:54 -0000
111 @@ -1147,7 +1147,7 @@
112 if ((hbn = gethostbyname(hostname)) != NULL)
113 h = hbn->h_name;
114 else
115 - h = "localhost";
116 + h = hostname;
117 /*@=multithreaded@*/
118 lua_pushstring(L, (const char *)h);
119 return 1;
120 Index: lib/rpmfc.c
121 --- lib/rpmfc.c 6 Apr 2009 00:21:21 -0000 1.64
122 +++ lib/rpmfc.c 11 Apr 2009 14:17:58 -0000 1.65
123 @@ -1836,7 +1836,7 @@
124 /*@=mustmod@*/
125
126 /*@unchecked@*/ /*@only@*/ /*@null@*/
127 -rpmioPool _rpmfcPool;
128 +rpmioPool _rpmfcPool = NULL;
129
130 static rpmfc rpmfcGetPool(/*@null@*/ rpmioPool pool)
131 /*@globals _rpmfcPool, fileSystem, internalState @*/
132 Index: rpmio/rpmmg.c
133 --- rpmio/rpmmg.c 25 Mar 2009 20:26:47 -0000 2.10
134 +++ rpmio/rpmmg.c 11 Apr 2009 14:17:58 -0000 2.11
135 @@ -37,7 +37,7 @@
136 /*@=mustmod@*/
137
138 /*@unchecked@*/ /*@only@*/ /*@null@*/
139 -rpmioPool _rpmmgPool;
140 +rpmioPool _rpmmgPool = NULL;
141
142 static rpmmg rpmmgGetPool(/*@null@*/ rpmioPool pool)
143 /*@globals _rpmmgPool, fileSystem @*/
144 Index: rpmio/glob.c
145 --- rpmio/glob.c.orig 2009-03-06 23:53:52 +0100
146 +++ rpmio/glob.c 2009-09-19 19:46:41 +0200
147 @@ -47,6 +47,18 @@
148
149 # include "system.h"
150
151 +#ifndef PATH_MAX
152 +#ifdef _POSIX_VERSION
153 +#define PATH_MAX _POSIX_PATH_MAX
154 +#else
155 +#ifdef MAXPATHLEN
156 +#define PATH_MAX MAXPATHLEN
157 +#else
158 +#define PATH_MAX 1024
159 +#endif
160 +#endif
161 +#endif
162 +
163 /* Needed for offsetof() */
164 # include <stddef.h>
165
166 @@ -1111,7 +1123,7 @@
167 {
168 struct dirent64 d64;
169 char room [offsetof (struct dirent64, d_name[0])
170 - + NAME_MAX + 1];
171 + + PATH_MAX + 1];
172 }
173 d64buf;
174
175 Index: lua/local/lposix.c
176 --- lua/local/lposix.c.orig 2009-03-06 23:52:45 +0100
177 +++ lua/local/lposix.c 2009-09-20 19:57:28 +0200
178 @@ -538,6 +538,7 @@
179 return pushresult(L, mkdir(path, 0777), path);
180 }
181
182 +#if 0
183 static int Pmkdtemp(lua_State *L) /** mkdtemp(template) */
184 /*@globals fileSystem @*/
185 /*@modifies L, fileSystem @*/
186 @@ -555,6 +556,7 @@
187 return 1;
188 }
189 }
190 +#endif
191
192
193 static int Pchdir(lua_State *L) /** chdir(path) */
194 @@ -1196,7 +1198,9 @@
195 {"kill", Pkill},
196 {"link", Plink},
197 {"mkdir", Pmkdir},
198 +#if 0
199 {"mkdtemp", Pmkdtemp},
200 +#endif
201 {"mkfifo", Pmkfifo},
202 {"pathconf", Ppathconf},
203 {"putenv", Pputenv},
204 Index: db/os/os_yield.c
205 --- db/os/os_yield.c.orig 2008-06-15 10:56:46.000000000 +0200
206 +++ db/os/os_yield.c 2010-04-30 21:30:35.000000000 +0200
207 @@ -58,7 +58,7 @@
208 #elif defined(HAVE_YIELD)
209 yield();
210 #else
211 - __os_sleep(dbenv, 0, 0);
212 + __os_sleep(env, 0, 0);
213 #endif
214 }
215 }
216 Index: lib/depends.c
217 --- lib/depends.c.orig 2009-04-12 21:46:17.000000000 +0200
218 +++ lib/depends.c 2011-03-08 20:33:59.000000000 +0100
219 @@ -2654,7 +2654,7 @@
220 #endif
221 const char * dp;
222 int msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
223 - ? RPMLOG_WARNING : RPMLOG_ERR;
224 + ? RPMLOG_WARNING : RPMLOG_DEBUG;
225 ;
226
227 /* Unchain predecessor loop. */
228 Index: doc/rpm.8
229 --- doc/rpm.8.orig 2007-11-10 03:16:22.000000000 +0100
230 +++ doc/rpm.8 2011-05-11 17:41:36.000000000 +0200
231 @@ -177,16 +177,7 @@
232 \fBrpm\fR {\fB-F|--freshen\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
233 .PP
234 This will upgrade packages, but only if an earlier version
235 -currently exists. The \fIPACKAGE_FILE\fR
236 -may be specified as an
237 -\fBftp\fR or
238 -\fBhttp\fR URL,
239 -in which case the package will be downloaded before being
240 -installed. See \fBFTP/HTTP OPTIONS\fR
241 -for information on \fBrpm\fR's internal
242 -\fBftp\fR and
243 -\fBhttp\fR
244 -client support.
245 +currently exists.
246 .PP
247 .TP
248 \fB--aid\fR
249 @@ -496,14 +487,7 @@
250 .TP
251 \fB-p, --package \fIPACKAGE_FILE\fB\fR
252 Query an (uninstalled) package \fIPACKAGE_FILE\fR.
253 -The \fIPACKAGE_FILE\fR may be specified
254 -as an \fBftp\fR or \fBhttp\fR style URL, in
255 -which case the package header will be downloaded and queried.
256 -See \fBFTP/HTTP OPTIONS\fR for information on
257 -\fBrpm\fR's internal
258 -\fBftp\fR and
259 -\fBhttp\fR
260 -client support. The \fIPACKAGE_FILE\fR argument(s),
261 +The \fIPACKAGE_FILE\fR argument(s),
262 if not a binary package, will be interpreted as an ASCII package
263 manifest. Comments are permitted, starting with a '#', and each
264 line of a package manifest file may include white space separated
265 @@ -796,53 +780,6 @@
266 \fIrpmrc\fR and
267 \fImacros\fR
268 configuration file(s).
269 -.SS "FTP/HTTP OPTIONS"
270 -.PP
271 -\fBrpm\fR can act as an FTP and/or HTTP client so
272 -that packages can be queried or installed from the internet.
273 -Package files for install, upgrade, and query operations may be
274 -specified as an
275 -\fBftp\fR or
276 -\fBhttp\fR
277 -style URL:
278 -.PP
279 -ftp://USER:PASSWORD@HOST:PORT/path/to/package.rpm
280 -.PP
281 -If the \fB:PASSWORD\fR portion is omitted, the password will be
282 -prompted for (once per user/hostname pair). If both the user and
283 -password are omitted, anonymous \fBftp\fR is used.
284 -In all cases, passive (PASV) \fBftp\fR transfers are
285 -performed.
286 -.PP
287 -\fBrpm\fR allows the following options to be used with
288 -ftp URLs:
289 -.TP
290 -\fB--ftpproxy \fIHOST\fB\fR
291 -The host \fIHOST\fR will be used as a proxy server
292 -for all ftp transfers, which allows users to ftp through firewall
293 -machines which use proxy systems. This option may also be specified
294 -by configuring the macro \fB%_ftpproxy\fR.
295 -.TP
296 -\fB--ftpport \fIPORT\fB\fR
297 -The TCP \fIPORT\fR number to use for
298 -the ftp connection on the proxy ftp server instead of the default
299 -port. This option may also be specified by configuring the macro
300 -\fB%_ftpport\fR.
301 -.PP
302 -\fBrpm\fR allows the following options to be used with
303 -\fBhttp\fR URLs:
304 -.TP
305 -\fB--httpproxy \fIHOST\fB\fR
306 -The host \fIHOST\fR will be used as
307 -a proxy server for all \fBhttp\fR transfers. This
308 -option may also be specified by configuring the macro
309 -\fB%_httpproxy\fR.
310 -.TP
311 -\fB--httpport \fIPORT\fB\fR
312 -The TCP \fIPORT\fR number to use for the
313 -\fBhttp\fR connection on the proxy http server instead
314 -of the default port. This option may also be specified by configuring
315 -the macro \fB%_httpport\fR.
316 .SH "LEGACY ISSUES"
317 .SS "Executing rpmbuild"
318 .PP
319 Index: lua/local/lrexlib_lposix.c
320 --- lua/local/lrexlib_lposix.c.orig 2008-06-15 10:56:54.000000000 +0200
321 +++ lua/local/lrexlib_lposix.c 2012-02-06 20:51:46.000000000 +0100
322 @@ -242,10 +242,16 @@
323 { "ESPACE", REG_ESPACE },
324 { "BADRPT", REG_BADRPT },
325 #ifdef REX_POSIX_EXT
326 +#ifdef REG_EMPTY
327 { "EMPTY", REG_EMPTY },
328 +#endif
329 +#ifdef REG_ASSERT
330 { "ASSERT", REG_ASSERT },
331 +#endif
332 +#ifdef REG_INVARG
333 { "INVARG", REG_INVARG },
334 #endif
335 +#endif
336 /*---------------------------------------------------------------------------*/
337 { NULL, 0 }
338 };

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial