Thu, 04 Oct 2012 20:30:05 +0200
Correct out of date build configuration, porting to Solaris 11 network
link infrastructure and new libpcap logic. This additionally allows for
device drivers in subdirectories of /dev. Correct packaged nmap
personalities and signatures to work out of the box. Finally, hack
arpd logic to properly close sockets and quit on TERM by repeating
signaling in the run command script. Sadly, all this fails to correct
the run time behaviour of honeyd which fails to bind to the IP layer.
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
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
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 @@
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
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}
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}
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}}
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;
87 +#define RPM_INTEGRITY_FP "0000000000000000000000000000000000000000"
88 +#define RPM_INTEGRITY_MV "0.0.0"
89 +
90 /* Copyright (C) 1998-2002 - Red Hat, Inc. */
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 @@ -1834,7 +1834,7 @@
124 /*@=mustmod@*/
126 /*@unchecked@*/ /*@only@*/ /*@null@*/
127 -rpmioPool _rpmfcPool;
128 +rpmioPool _rpmfcPool = NULL;
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 @@ -36,7 +36,7 @@
136 /*@=mustmod@*/
138 /*@unchecked@*/ /*@only@*/ /*@null@*/
139 -rpmioPool _rpmmgPool;
140 +rpmioPool _rpmmgPool = NULL;
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 @@
149 # include "system.h"
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>
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;
175 Index: rpmio/fnmatch.c
176 --- rpmio/fnmatch.c 2012-08-01 21:24:05.278487112 +0200
177 +++ rpmio/fnmatch.c.orig 2008-10-12 12:38:58.000000000 +0200
178 @@ -24,6 +24,9 @@
180 #include "system.h"
182 +/* Provide nonstandard constructs */
183 +#include "nonstandard.h"
184 +
185 #include <string.h>
187 #include "debug.h"
188 Index: lua/local/lposix.c
189 --- lua/local/lposix.c.orig 2009-03-06 23:52:45 +0100
190 +++ lua/local/lposix.c 2009-09-20 19:57:28 +0200
191 @@ -538,6 +538,7 @@
192 return pushresult(L, mkdir(path, 0777), path);
193 }
195 +#if 0
196 static int Pmkdtemp(lua_State *L) /** mkdtemp(template) */
197 /*@globals fileSystem @*/
198 /*@modifies L, fileSystem @*/
199 @@ -555,6 +556,7 @@
200 return 1;
201 }
202 }
203 +#endif
206 static int Pchdir(lua_State *L) /** chdir(path) */
207 @@ -1196,7 +1198,9 @@
208 {"kill", Pkill},
209 {"link", Plink},
210 {"mkdir", Pmkdir},
211 +#if 0
212 {"mkdtemp", Pmkdtemp},
213 +#endif
214 {"mkfifo", Pmkfifo},
215 {"pathconf", Ppathconf},
216 {"putenv", Pputenv},
217 Index: db/os/os_yield.c
218 --- db/os/os_yield.c.orig 2008-06-15 10:56:46.000000000 +0200
219 +++ db/os/os_yield.c 2010-04-30 21:30:35.000000000 +0200
220 @@ -58,7 +58,7 @@
221 #elif defined(HAVE_YIELD)
222 yield();
223 #else
224 - __os_sleep(dbenv, 0, 0);
225 + __os_sleep(env, 0, 0);
226 #endif
227 }
228 }
229 Index: lib/depends.c
230 --- lib/depends.c.orig 2009-04-12 21:46:17.000000000 +0200
231 +++ lib/depends.c 2011-03-08 20:33:59.000000000 +0100
232 @@ -2654,7 +2654,7 @@
233 #endif
234 const char * dp;
235 int msglvl = (anaconda || (rpmtsDFlags(ts) & RPMDEPS_FLAG_DEPLOOPS))
236 - ? RPMLOG_WARNING : RPMLOG_ERR;
237 + ? RPMLOG_WARNING : RPMLOG_DEBUG;
238 ;
240 /* Unchain predecessor loop. */
241 Index: doc/rpm.8
242 --- doc/rpm.8.orig 2007-11-10 03:16:22.000000000 +0100
243 +++ doc/rpm.8 2011-05-11 17:41:36.000000000 +0200
244 @@ -177,16 +177,7 @@
245 \fBrpm\fR {\fB-F|--freshen\fR} [\fBinstall-options\fR] \fB\fIPACKAGE_FILE\fB\fR\fI ...\fR
246 .PP
247 This will upgrade packages, but only if an earlier version
248 -currently exists. The \fIPACKAGE_FILE\fR
249 -may be specified as an
250 -\fBftp\fR or
251 -\fBhttp\fR URL,
252 -in which case the package will be downloaded before being
253 -installed. See \fBFTP/HTTP OPTIONS\fR
254 -for information on \fBrpm\fR's internal
255 -\fBftp\fR and
256 -\fBhttp\fR
257 -client support.
258 +currently exists.
259 .PP
260 .TP
261 \fB--aid\fR
262 @@ -496,14 +487,7 @@
263 .TP
264 \fB-p, --package \fIPACKAGE_FILE\fB\fR
265 Query an (uninstalled) package \fIPACKAGE_FILE\fR.
266 -The \fIPACKAGE_FILE\fR may be specified
267 -as an \fBftp\fR or \fBhttp\fR style URL, in
268 -which case the package header will be downloaded and queried.
269 -See \fBFTP/HTTP OPTIONS\fR for information on
270 -\fBrpm\fR's internal
271 -\fBftp\fR and
272 -\fBhttp\fR
273 -client support. The \fIPACKAGE_FILE\fR argument(s),
274 +The \fIPACKAGE_FILE\fR argument(s),
275 if not a binary package, will be interpreted as an ASCII package
276 manifest. Comments are permitted, starting with a '#', and each
277 line of a package manifest file may include white space separated
278 @@ -796,53 +780,6 @@
279 \fIrpmrc\fR and
280 \fImacros\fR
281 configuration file(s).
282 -.SS "FTP/HTTP OPTIONS"
283 -.PP
284 -\fBrpm\fR can act as an FTP and/or HTTP client so
285 -that packages can be queried or installed from the internet.
286 -Package files for install, upgrade, and query operations may be
287 -specified as an
288 -\fBftp\fR or
289 -\fBhttp\fR
290 -style URL:
291 -.PP
292 -ftp://USER:PASSWORD@HOST:PORT/path/to/package.rpm
293 -.PP
294 -If the \fB:PASSWORD\fR portion is omitted, the password will be
295 -prompted for (once per user/hostname pair). If both the user and
296 -password are omitted, anonymous \fBftp\fR is used.
297 -In all cases, passive (PASV) \fBftp\fR transfers are
298 -performed.
299 -.PP
300 -\fBrpm\fR allows the following options to be used with
301 -ftp URLs:
302 -.TP
303 -\fB--ftpproxy \fIHOST\fB\fR
304 -The host \fIHOST\fR will be used as a proxy server
305 -for all ftp transfers, which allows users to ftp through firewall
306 -machines which use proxy systems. This option may also be specified
307 -by configuring the macro \fB%_ftpproxy\fR.
308 -.TP
309 -\fB--ftpport \fIPORT\fB\fR
310 -The TCP \fIPORT\fR number to use for
311 -the ftp connection on the proxy ftp server instead of the default
312 -port. This option may also be specified by configuring the macro
313 -\fB%_ftpport\fR.
314 -.PP
315 -\fBrpm\fR allows the following options to be used with
316 -\fBhttp\fR URLs:
317 -.TP
318 -\fB--httpproxy \fIHOST\fB\fR
319 -The host \fIHOST\fR will be used as
320 -a proxy server for all \fBhttp\fR transfers. This
321 -option may also be specified by configuring the macro
322 -\fB%_httpproxy\fR.
323 -.TP
324 -\fB--httpport \fIPORT\fB\fR
325 -The TCP \fIPORT\fR number to use for the
326 -\fBhttp\fR connection on the proxy http server instead
327 -of the default port. This option may also be specified by configuring
328 -the macro \fB%_httpport\fR.
329 .SH "LEGACY ISSUES"
330 .SS "Executing rpmbuild"
331 .PP
332 Index: lua/local/lrexlib_lposix.c
333 --- lua/local/lrexlib_lposix.c.orig 2008-06-15 10:56:54.000000000 +0200
334 +++ lua/local/lrexlib_lposix.c 2012-02-06 20:51:46.000000000 +0100
335 @@ -242,10 +242,16 @@
336 { "ESPACE", REG_ESPACE },
337 { "BADRPT", REG_BADRPT },
338 #ifdef REX_POSIX_EXT
339 +#ifdef REG_EMPTY
340 { "EMPTY", REG_EMPTY },
341 +#endif
342 +#ifdef REG_ASSERT
343 { "ASSERT", REG_ASSERT },
344 +#endif
345 +#ifdef REG_INVARG
346 { "INVARG", REG_INVARG },
347 #endif
348 +#endif
349 /*---------------------------------------------------------------------------*/
350 { NULL, 0 }
351 };