aboutsummaryrefslogtreecommitdiffstats
path: root/misc/rpm/files
diff options
context:
space:
mode:
Diffstat (limited to 'misc/rpm/files')
-rw-r--r--misc/rpm/files/patch-av11
-rw-r--r--misc/rpm/files/patch-aw11
-rw-r--r--misc/rpm/files/patch-ax20
-rw-r--r--misc/rpm/files/patch-ay49
-rw-r--r--misc/rpm/files/patch-ba11
-rw-r--r--misc/rpm/files/patch-bb20
-rw-r--r--misc/rpm/files/patch-bc57
-rw-r--r--misc/rpm/files/patch-bd26
-rw-r--r--misc/rpm/files/patch-be11
-rw-r--r--misc/rpm/files/patch-bf20
-rw-r--r--misc/rpm/files/patch-bg24
-rw-r--r--misc/rpm/files/patch-bh11
-rw-r--r--misc/rpm/files/patch-bi25
-rw-r--r--misc/rpm/files/patch-bj14
14 files changed, 0 insertions, 310 deletions
diff --git a/misc/rpm/files/patch-av b/misc/rpm/files/patch-av
deleted file mode 100644
index 6b13ae1ad123..000000000000
--- a/misc/rpm/files/patch-av
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.orig Thu Sep 14 04:41:44 2000
-+++ aclocal.m4 Wed Oct 4 04:45:55 2000
-@@ -738,7 +738,7 @@
- [CATOBJEXT=.gmo
- DATADIRNAME=share],
- [CATOBJEXT=.mo
-- DATADIRNAME=lib])
-+ DATADIRNAME=share])
- INSTOBJEXT=.mo
- fi
- fi
diff --git a/misc/rpm/files/patch-aw b/misc/rpm/files/patch-aw
deleted file mode 100644
index b85c48e92d53..000000000000
--- a/misc/rpm/files/patch-aw
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpm.c.orig Thu Sep 14 02:15:44 2000
-+++ rpm.c Thu Oct 5 00:37:37 2000
-@@ -313,7 +313,7 @@
- _("print the version of rpm being used"));
- puts( _(" all modes support the following arguments:"));
- printHelpLine(_(" --rcfile <file> "),
-- _("use <file> instead of /etc/rpmrc and $HOME/.rpmrc"));
-+ _("use <file> instead of %%PREFIX%%/etc/rpmrc and $HOME/.rpmrc"));
- printHelpLine( " -v ",
- _("be a little more verbose"));
- printHelpLine( " -vv ",
diff --git a/misc/rpm/files/patch-ax b/misc/rpm/files/patch-ax
deleted file mode 100644
index d9ffff14843c..000000000000
--- a/misc/rpm/files/patch-ax
+++ /dev/null
@@ -1,20 +0,0 @@
---- macros.in.orig Thu Oct 5 13:31:06 2000
-+++ macros.in Thu Oct 5 13:31:25 2000
-@@ -104,7 +104,7 @@
- # will be used if the per-platform macro file does not exist..
- #
- %_arch @RPMCANONARCH@
--%_vendor @RPMCANONVENDOR@
-+%_vendor freebsd
- %_os @RPMCANONOS@
- %_target_platform %{_target_cpu}-%{_vendor}-%{_target_os}
- #
-@@ -145,7 +145,7 @@
- %_host @host@
- %_host_alias @host_alias@
- %_host_cpu @host_cpu@
--%_host_vendor @host_vendor@
-+%_host_vendor unknown
- %_host_os @host_os@
- %_target %{_host}
- %_target_alias %{_host_alias}
diff --git a/misc/rpm/files/patch-ay b/misc/rpm/files/patch-ay
deleted file mode 100644
index 307bb3fff8db..000000000000
--- a/misc/rpm/files/patch-ay
+++ /dev/null
@@ -1,49 +0,0 @@
---- doc/rpm.8.orig Wed Aug 30 05:27:18 2000
-+++ doc/rpm.8 Wed Oct 4 22:46:12 2000
-@@ -86,7 +86,7 @@
- .IP "\fB\-\-rcfile \fI<filelist>\fP"
- Each of the files in the colon separated \fI<filelist>\fP is read
- sequentially by \fBrpm\fP for configuration information.
--The default \fI<filelist>\fP is \fB/usr/lib/rpm/rpmrc:/etc/rpmrc:~/.rpmrc\fP.
-+The default \fI<filelist>\fP is \fB%%PREFIX%%/lib/rpm/rpmrc:%%PREFIX%%/etc/rpmrc:~/.rpmrc\fP.
- Only the first file in the list must exist, and tildes will be expanded to
- the value of \fB$HOME\fP.
- .IP "\fB\-\-root \fI<dir>\fP"
-@@ -493,17 +493,17 @@
-
- For example, to be able to use PGP to sign packages as the user
- \fB"John Doe <jdoe@foo.com>"\fP from the key rings located in
--\fB/etc/rpm/.pgp\fP using the executable \fB/usr/bin/pgp\fP you would include
-+\fB%%PREFIX%%/etc/rpm/.pgp\fP using the executable \fB%%PREFIX%%/bin/pgp\fP you would include
-
- .I "\fB%_signature pgp\fP"
-
--.I "\fB%_pgp_path /etc/rpm/.pgp\fP"
-+.I "\fB%_pgp_path %%PREFIX%%/etc/rpm/.pgp\fP"
-
- .I "\fB%_pgp_name John Doe <jdoe@foo.com>\fP"
-
--.I "\fB%_pgpbin /usr/bin/pgp\fP"
-+.I "\fB%_pgpbin %%PREFIX%%/bin/pgp\fP"
-
--in a macro configuration file. Use \fB/etc/rpm/macros\fP for per-system
-+in a macro configuration file. Use \fB%%PREIFX%%/etc/rpm/macros\fP for per-system
- configuration and \fB~/.rpmmacros\fP for per-user configuration.
-
- .SH REBUILD DATABASE OPTIONS
-@@ -575,11 +575,11 @@
-
- .SH FILES
- .nf
--/usr/lib/rpm/rpmrc
--/etc/rpmrc
-+%%PREFIX%%/lib/rpm/rpmrc
-+%%PREIFX%%/etc/rpmrc
- ~/.rpmrc
--/usr/lib/rpm/macros
--/etc/rpm/macros
-+%%PREFIX%%/lib/rpm/macros
-+%%PREFIX%%/etc/rpm/macros
- ~/.rpmmacros
- /var/lib/rpm/conflictsindex.rpm
- /var/lib/rpm/fileindex.rpm
diff --git a/misc/rpm/files/patch-ba b/misc/rpm/files/patch-ba
deleted file mode 100644
index a41025f75309..000000000000
--- a/misc/rpm/files/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/macro.c.orig Mon Jul 10 00:35:57 2000
-+++ lib/macro.c Wed Oct 4 23:04:43 2000
-@@ -1608,7 +1608,7 @@
-
- #if defined(EVAL_MACROS)
-
--char *macrofiles = "/usr/lib/rpm/macros:/etc/rpm/macros:~/.rpmmacros";
-+char *macrofiles = "%%PREFIX%%/lib/rpm/macros:%%PREFIX%%/etc/rpm/macros:~/.rpmmacros";
-
- int
- main(int argc, char *argv[])
diff --git a/misc/rpm/files/patch-bb b/misc/rpm/files/patch-bb
deleted file mode 100644
index f94da33da1c3..000000000000
--- a/misc/rpm/files/patch-bb
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/rpmrc.c.orig Thu Sep 14 02:29:18 2000
-+++ lib/rpmrc.c Wed Oct 4 23:03:36 2000
-@@ -13,7 +13,7 @@
-
- #include "misc.h"
-
--static const char *defrcfiles = LIBRPMRC_FILENAME ":/etc/rpmrc:~/.rpmrc";
-+static const char *defrcfiles = LIBRPMRC_FILENAME ":%%PREFIX%%/etc/rpmrc:~/.rpmrc";
-
- struct machCacheEntry {
- const char * name;
-@@ -858,7 +858,7 @@
- /* we are on ncr-sysv4 */
- char *prelid = NULL;
- FD_t fd;
-- fd = Fopen("/etc/.relid", "r.fdio");
-+ fd = Fopen("%%PREFIX%%/etc/.relid", "r.fdio");
- if (!Ferror(fd)) {
- chptr = (char *) xcalloc(1, 256);
- if (chptr != NULL) {
diff --git a/misc/rpm/files/patch-bc b/misc/rpm/files/patch-bc
deleted file mode 100644
index f081ede2c5a1..000000000000
--- a/misc/rpm/files/patch-bc
+++ /dev/null
@@ -1,57 +0,0 @@
---- configure.in.orig Thu Sep 14 04:39:40 2000
-+++ configure.in Wed Oct 4 23:13:46 2000
-@@ -369,7 +369,7 @@
- AC_CHECK_HEADERS(netinet/in_systm.h)
- AC_CHECK_HEADERS(machine/types.h)
- AC_CHECK_HEADERS(mntent.h sys/mnttab.h sys/systemcfg.h)
--AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/vmount.h)
-+AC_CHECK_HEADERS(sys/mount.h sys/mntctl.h sys/param.h sys/vmount.h)
- AC_CHECK_HEADERS(bzlib.h libio.h zlib.h)
- AC_CHECK_HEADERS(err.h mcheck.h)
-
-@@ -431,6 +431,9 @@
- #ifdef HAVE_SYS_TYPES_H
- #include <sys/types.h>
- #endif
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #include <sys/mount.h> ],
- [struct statfs sfs;],
- [AC_MSG_RESULT(in sys/mount.h)
-@@ -744,7 +747,7 @@
- AC_SUBST(ROOT_GROUP)
-
- if test "x$varprefix" = "x"; then
-- varprefix=`echo $prefix | sed 's/usr/var/'`
-+ varprefix=`echo /var`
- test "x$prefix" = xNONE && varprefix=`echo $ac_default_prefix | sed 's/usr/var/'`
- fi
- AC_SUBST(varprefix)
-@@ -872,7 +875,7 @@
- RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
- AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR")
- AC_SUBST(RPMCONFIGDIR)
--SYSCONFIGDIR="`echo /etc/rpm`"
-+SYSCONFIGDIR="`echo ${usrprefix}/etc/rpm`"
- AC_DEFINE_UNQUOTED(SYSCONFIGDIR, "$SYSCONFIGDIR")
- AC_SUBST(SYSCONFIGDIR)
- LIBRPMRC_FILENAME="${RPMCONFIGDIR}/rpmrc"
-@@ -911,7 +914,6 @@
- dnl # XXX Propagate -lucb to popt ...
- dnl export LIBS INCPATH CONFIG_SITE
-
--AC_CONFIG_SUBDIRS(popt)
- AC_OUTPUT([Doxyfile Makefile rpmrc macros platform rpmpopt scripts/brp-redhat
- lib/Makefile build/Makefile tools/Makefile scripts/Makefile
- tests/Makefile tests/rpmrc tests/macros tests/hello-test/Makefile
-@@ -919,8 +921,7 @@
- doc/Makefile doc/manual/Makefile
- doc/ja/Makefile doc/pl/Makefile doc/ru/Makefile doc/sk/Makefile
- python/Makefile perl/Makefile perl/Makefile.PL],
-- [echo timestamp > popt/stamp-h.in
-- echo timestamp > stamp-h.in])
-+ [echo timestamp > stamp-h.in])
- dnl touch Makefile.in
- dnl sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
-
diff --git a/misc/rpm/files/patch-bd b/misc/rpm/files/patch-bd
deleted file mode 100644
index 5d3992602259..000000000000
--- a/misc/rpm/files/patch-bd
+++ /dev/null
@@ -1,26 +0,0 @@
---- Makefile.am.orig Thu Sep 14 02:36:40 2000
-+++ Makefile.am Wed Oct 4 06:08:38 2000
-@@ -11,19 +11,19 @@
- rpm.magic rpmpopt rpm.spec installplatform
-
- # XXX TODO: python perl
--SUBDIRS = intl po popt lib build misc tools scripts tests doc .
-+SUBDIRS = intl po lib build misc tools scripts tests .
-
--INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
-+INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib \
- @INCPATH@
-
--myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
-+myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib
-
- # XXX libtool can/should generate dependent libs.
- # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
- myldadd= \
- $(top_builddir)/build/.libs/librpmbuild.a \
- $(top_builddir)/lib/.libs/librpm.a \
-- $(top_builddir)/popt/.libs/libpopt.a \
-+ -lpopt \
- @INTLLIBS@ @LIBMISC@
-
- LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
diff --git a/misc/rpm/files/patch-be b/misc/rpm/files/patch-be
deleted file mode 100644
index 5c34517e9088..000000000000
--- a/misc/rpm/files/patch-be
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/Makefile.am.orig Wed Jun 14 21:34:28 2000
-+++ build/Makefile.am Wed Oct 4 05:02:45 2000
-@@ -2,7 +2,7 @@
-
- AUTOMAKE_OPTIONS = 1.4 foreign
-
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib \
- @INCPATH@
-
- pkgincdir = $(pkgincludedir)
diff --git a/misc/rpm/files/patch-bf b/misc/rpm/files/patch-bf
deleted file mode 100644
index e7fa9954a817..000000000000
--- a/misc/rpm/files/patch-bf
+++ /dev/null
@@ -1,20 +0,0 @@
---- lib/Makefile.am.orig Mon Jul 17 03:49:43 2000
-+++ lib/Makefile.am Wed Oct 4 05:32:09 2000
-@@ -2,7 +2,7 @@
-
- AUTOMAKE_OPTIONS = 1.4 foreign
-
--INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@
-+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@
-
- pkgincdir = $(pkgincludedir)
- pkginc_HEADERS = \
-@@ -12,7 +12,7 @@
- lookup.h md5.h rpm_malloc.h \
- rpmdb.h rpmlead.h signature.h
-
--mylibpaths= -L$(top_builddir)/lib -L$(top_builddir)/popt
-+mylibpaths= -L$(top_builddir)/lib
- mylibs= -lrpm -lpopt @INTLLIBS@ @LIBMISC@
-
- lib_LTLIBRARIES = librpm.la
diff --git a/misc/rpm/files/patch-bg b/misc/rpm/files/patch-bg
deleted file mode 100644
index c3968cf1ce7f..000000000000
--- a/misc/rpm/files/patch-bg
+++ /dev/null
@@ -1,24 +0,0 @@
---- tools/Makefile.am.orig Wed Jun 14 21:34:51 2000
-+++ tools/Makefile.am Wed Oct 4 05:34:26 2000
-@@ -3,18 +3,18 @@
- AUTOMAKE_OPTIONS = 1.4 foreign
-
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build \
-- -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
-+ -I$(top_srcdir)/lib \
- @INCPATH@ -I$(top_srcdir)/misc
-
- EXTRA_DIST = fstrcmp.c message.c str-list.c rpmchecksig.c
-
- EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject
-
--myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
-+myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib
- # XXX should libtool generate dependent libs?
- myldadd= $(top_builddir)/build/librpmbuild.la \
- $(top_builddir)/lib/librpm.la \
-- $(top_builddir)/popt/libpopt.la \
-+ -lpopt \
- @INTLLIBS@ @LIBMISC@
-
- LDFLAGS = $(myldflags)
diff --git a/misc/rpm/files/patch-bh b/misc/rpm/files/patch-bh
deleted file mode 100644
index 527ef4c3f99d..000000000000
--- a/misc/rpm/files/patch-bh
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpm2cpio.c.orig Wed Oct 25 19:26:40 2000
-+++ rpm2cpio.c Wed Oct 25 19:26:59 2000
-@@ -55,7 +55,7 @@
- }
-
- gzdi = Fdopen(fdi, rpmio_flags); /* XXX gzdi == fdi */
-- if (gzdi == NULL || Ferror(gzdi)) {
-+ if (gzdi == NULL) {
- fprintf(stderr, _("cannot re-open payload: %s\n"), Fstrerror(gzdi));
- exit(EXIT_FAILURE);
- }
diff --git a/misc/rpm/files/patch-bi b/misc/rpm/files/patch-bi
deleted file mode 100644
index 2f4b57a890a3..000000000000
--- a/misc/rpm/files/patch-bi
+++ /dev/null
@@ -1,25 +0,0 @@
---- lib/fs.c.orig Wed Jun 14 21:34:30 2000
-+++ lib/fs.c Tue Mar 20 22:24:58 2001
-@@ -12,6 +12,11 @@
- /*@only@*/ /*@null@*/ static const char ** fsnames = NULL;
- static int numFilesystems = 0;
-
-+/* dummy getmntent() for FreeBSD */
-+our_mntent *getmntent(FILE *filep) {
-+ return NULL;
-+}
-+
- void freeFilesystems(void)
- {
- if (filesystems) {
-@@ -129,8 +134,10 @@
- # if GETMNTENT_ONE || GETMNTENT_TWO
- mtab = fopen(MOUNTED, "r");
- if (!mtab) {
-+/*
- rpmError(RPMERR_MTAB, _("failed to open %s: %s"), MOUNTED,
- strerror(errno));
-+*/
- return 1;
- }
- # elif HAVE_GETMNTINFO_R
diff --git a/misc/rpm/files/patch-bj b/misc/rpm/files/patch-bj
deleted file mode 100644
index b48019f66759..000000000000
--- a/misc/rpm/files/patch-bj
+++ /dev/null
@@ -1,14 +0,0 @@
---- system.h.orig Tue Mar 20 22:24:05 2001
-+++ system.h Tue Mar 20 22:24:30 2001
-@@ -351,9 +351,9 @@
- # elif HAVE_STRUCT_MNTTAB
- # include <stdio.h>
- # include <mnttab.h>
-- struct our_mntent {
-+ typedef struct our_mntent {
- char * our_mntdir;
-- };
-+ } our_mntent;
- struct our_mntent *getmntent(FILE *filep);
- # define our_mntent struct our_mntent
- # else