RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 13-Aug-2008 19:05:26
Branch: rpm-5_1 Handle: 200807311658551123591
Modified files: (Branch: rpm-5_1)
rpm CHANGES system.h
rpm/misc Makefile.am librpmmisc.c librpmmisc.vers
rpm/rpmio Makefile.am
Removed files: (Branch: rpm-5_1)
rpm/misc fnmatch.c fnmatch.h glob.c glob.h
Log:
- jbj: move glob/fnmatch into -lrpmio from -lrpmmisc.
Summary:
Revision Changes Path
1.2288.2.76 +1 -0 rpm/CHANGES
1.32.4.1 +3 -3 rpm/misc/Makefile.am
1.12 +0 -609 rpm/misc/fnmatch.c
1.8 +0 -88 rpm/misc/fnmatch.h
1.22 +0 -1206 rpm/misc/glob.c
1.16 +0 -205 rpm/misc/glob.h
1.2.4.1 +0 -8 rpm/misc/librpmmisc.c
1.7.4.1 +28 -6 rpm/misc/librpmmisc.vers
1.162.2.6 +3 -2 rpm/rpmio/Makefile.am
2.110.2.2 +2 -2 rpm/system.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.75 -r1.2288.2.76 CHANGES
--- rpm/CHANGES 13 Aug 2008 16:43:14 -0000 1.2288.2.75
+++ rpm/CHANGES 13 Aug 2008 17:05:25 -0000 1.2288.2.76
@@ -1,4 +1,5 @@
5.1.4 -> 5.1.5:
+ - jbj: move glob/fnmatch into -lrpmio from -lrpmmisc.
- jbj: lua: don't exit chroot if already within running script.
- jbj: rescusitate "make check".
- jbj: permit building with older libtool-1.5.26 (back port from HEAD).
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/Makefile.am
============================================================================
$ cvs diff -u -r1.32 -r1.32.4.1 Makefile.am
--- rpm/misc/Makefile.am 12 Nov 2007 08:04:05 -0000 1.32
+++ rpm/misc/Makefile.am 13 Aug 2008 17:05:25 -0000 1.32.4.1
@@ -9,8 +9,8 @@
EXTRA_DIST = \
librpmmisc.vers \
alloca.c basename.c err.c error.c \
- fakefork.c fnmatch.c getcwd.c getmntent.c \
- getwd.c glob.c memcmp.c \
+ fakefork.c getcwd.c getmntent.c \
+ getwd.c memcmp.c \
mktime.c myrealloc.c putenv.c realpath.c \
setenv.c stpcpy.c stpncpy.c \
strcspn.c strdup.c strerror.c \
@@ -18,7 +18,7 @@
strtoul.c
noinst_HEADERS = \
- err.h error.h fnmatch.h glob.h
+ err.h error.h
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmmisc.la
@@ .
rm -f rpm/misc/fnmatch.c <<'@@ .'
Index: rpm/misc/fnmatch.c
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f rpm/misc/fnmatch.h <<'@@ .'
Index: rpm/misc/fnmatch.h
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f rpm/misc/glob.c <<'@@ .'
Index: rpm/misc/glob.c
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
rm -f rpm/misc/glob.h <<'@@ .'
Index: rpm/misc/glob.h
============================================================================
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/librpmmisc.c
============================================================================
$ cvs diff -u -r1.2 -r1.2.4.1 librpmmisc.c
--- rpm/misc/librpmmisc.c 14 Dec 2007 13:03:11 -0000 1.2
+++ rpm/misc/librpmmisc.c 13 Aug 2008 17:05:25 -0000 1.2.4.1
@@ -67,11 +67,3 @@
#if !defined(HAVE_STRSTR)
#include "strstr.c"
#endif
-
-#include "fnmatch.h"
-#include "fnmatch.c"
-#ifndef __CYGWIN__
-#include "glob.h"
-#include "glob.c"
-#endif
-
@@ .
patch -p0 <<'@@ .'
Index: rpm/misc/librpmmisc.vers
============================================================================
$ cvs diff -u -r1.7 -r1.7.4.1 librpmmisc.vers
--- rpm/misc/librpmmisc.vers 12 Nov 2007 23:58:27 -0000 1.7
+++ rpm/misc/librpmmisc.vers 13 Aug 2008 17:05:25 -0000 1.7.4.1
@@ -6,13 +6,35 @@
db_env_set_func_fsync_rpmdb;
db_strerror_rpmdb;
db_create_rpmdb;
- fnmatch;
- glob;
- globfree;
lua*;
- magic_*;
- rpmz_*;
- xar_*;
+ magic_buffer;
+ magic_close;
+ magic_error;
+ magic_file;
+ magic_load;
+ magic_open;
+ rpmz_gzclose;
+ rpmz_adler32;
+ rpmz_adler32_combine;
+ rpmz_crc32;
+ rpmz_crc32_combine;
+ rpmz_gzdopen;
+ rpmz_gzerror;
+ rpmz_gzflush;
+ rpmz_gzopen;
+ rpmz_gzread;
+ rpmz_gzseek;
+ rpmz_gzwrite;
+ xar_add_frombuffer;
+ xar_close;
+ xar_extract_tobuffersz;
+ xar_file_first;
+ xar_file_next;
+ xar_get_path;
+ xar_iter_free;
+ xar_iter_new;
+ xar_open;
+ xar_opt_set;
local:
file_*;
db_*;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.162.2.5 -r1.162.2.6 Makefile.am
--- rpm/rpmio/Makefile.am 8 Jun 2008 20:29:17 -0000 1.162.2.5
+++ rpm/rpmio/Makefile.am 13 Aug 2008 17:05:26 -0000 1.162.2.6
@@ -59,14 +59,15 @@
rpmnss.h rpmpgp.h rpmsq.h rpmssl.h rpmsw.h rpmurl.h rpmxar.h \
stringbuf.h ugid.h rpmuuid.h
noinst_HEADERS = \
- ar.h cpio.h iosm.h md2.h md4.h poptIO.h rmd128.h rmd160.h rmd256.h rmd320.h sha224.h \
+ ar.h cpio.h fnmatch.h glob.h iosm.h \
+ md2.h md4.h poptIO.h rmd128.h rmd160.h rmd256.h rmd320.h sha224.h \
salsa10.h salsa20.h tar.h tiger.h \
rpmhook.h rpmio_internal.h rpmlua.h
usrlibdir = $(libdir)
usrlib_LTLIBRARIES = librpmio.la
librpmio_la_SOURCES = \
- ar.c argv.c cpio.c digest.c fts.c getdate.c getpass.c \
+ ar.c argv.c cpio.c digest.c fnmatch.c fts.c glob.c getdate.c getpass.c \
iosm.c lzdio.c macro.c mire.c mount.c \
md2.c md4.c poptIO.c rmd128.c rmd160.c rmd256.c rmd320.c sha224.c \
salsa10.c salsa20.c tiger.c \
@@ .
patch -p0 <<'@@ .'
Index: rpm/system.h
============================================================================
$ cvs diff -u -r2.110.2.1 -r2.110.2.2 system.h
--- rpm/system.h 15 Jun 2008 07:01:57 -0000 2.110.2.1
+++ rpm/system.h 13 Aug 2008 17:05:25 -0000 2.110.2.2
@@ -504,8 +504,8 @@
/* ============== from misc/miscfn.h */
/*@-noparams@*/
-#include "misc/glob.h"
-#include "misc/fnmatch.h"
+#include "rpmio/glob.h"
+#include "rpmio/fnmatch.h"
/*@=noparams@*/
#if defined(__LCLINT__)
@@ .
Received on Wed Aug 13 19:05:26 2008