Browse Source

[rpm] Updated (4.1 -> 5.0.2)

early
Aldas Nabazas 17 years ago
parent
commit
c74f235c8e
  1. 27
      archiver/rpm/configdir-fix.patch
  2. 37
      archiver/rpm/gcc34.patch
  3. 38
      archiver/rpm/no_install_beecrypt.patch
  4. 28
      archiver/rpm/no_install_libelf.patch
  5. 29
      archiver/rpm/no_install_popt.patch
  6. 54
      archiver/rpm/no_src_redhat.patch
  7. 221
      archiver/rpm/python24.patch
  8. 8
      archiver/rpm/rpm.desc

27
archiver/rpm/configdir-fix.patch

@ -1,27 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rpm/configdir-fix.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Naur rpm-4.1.orig/configure.ac rpm-4.1/configure.ac
--- rpm-4.1.orig/configure.ac 2002-08-22 20:01:34.000000000 +0300
+++ rpm-4.1/configure.ac 2005-03-25 09:49:24.617917216 +0200
@@ -1138,7 +1138,7 @@
AC_SUBST(LOCALEDIR)
LIBDIR="`echo $libdir | sed 's-/lib$-/%{_lib}-'`"
AC_SUBST(LIBDIR)
-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
+RPMCONFIGDIR="`echo ${libdir}/rpm`"
AC_DEFINE_UNQUOTED(RPMCONFIGDIR, "$RPMCONFIGDIR",
[Full path to rpm global configuration directory (usually /usr/lib/rpm)])
AC_SUBST(RPMCONFIGDIR)

37
archiver/rpm/gcc34.patch

@ -1,37 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rpm/gcc34.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- rpm-4.1/lib/rpminstall.c.vanilla 2004-06-28 09:43:21.867093080 +0200
+++ rpm-4.1/lib/rpminstall.c 2004-06-28 09:43:46.076412704 +0200
@@ -724,7 +724,7 @@
/*@=bounds@*/
int rpmErase(rpmts ts,
- const struct rpmInstallArguments_s * ia,
+ struct rpmInstallArguments_s * ia,
const char ** argv)
{
int count;
--- rpm-4.1/lib/rpmcli.h.vanilla 2004-06-28 09:44:37.724560992 +0200
+++ rpm-4.1/lib/rpmcli.h 2004-06-28 09:44:56.856652472 +0200
@@ -557,7 +557,7 @@
* @param argv array of package file names (NULL terminated)
* @return 0 on success
*/
-int rpmErase(rpmts ts, const struct rpmInstallArguments_s * ia,
+int rpmErase(rpmts ts, struct rpmInstallArguments_s * ia,
/*@null@*/ const char ** argv)
/*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
/*@modifies ts, ia, rpmGlobalMacroContext,

38
archiver/rpm/no_install_beecrypt.patch

@ -1,38 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rpm/no_install_beecrypt.patch
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- rpm-4.1/beecrypt/Makefile.in.orig 2006-01-30 02:52:49.000000000 +0100
+++ rpm-4.1/beecrypt/Makefile.in 2006-01-30 02:53:50.000000000 +0100
@@ -532,14 +532,14 @@
check-am: all-am
check: check-recursive
all-am: Makefile $(LTLIBRARIES) $(HEADERS) config.h
-installdirs: installdirs-recursive
+installdirs:
installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(pkgincludedir)
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
+install:
+install-exec:
+install-data:
+uninstall:
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

28
archiver/rpm/no_install_libelf.patch

@ -1,28 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rpm/no_install_libelf.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./libelf/Makefile.in.orig 2003-01-06 22:08:11.000000000 +0100
+++ ./libelf/Makefile.in 2003-01-06 22:08:13.000000000 +0100
@@ -379,7 +379,7 @@
installdirs: installdirs-recursive
installdirs-am:
-install: install-recursive
+install: # install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive

29
archiver/rpm/no_install_popt.patch

@ -1,29 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rpm/no_install_popt.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./popt/Makefile.in.orig 2003-01-07 12:51:56.000000000 +0100
+++ ./popt/Makefile.in 2003-01-07 12:52:18.000000000 +0100
@@ -680,7 +680,8 @@
installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(man3dir) $(DESTDIR)$(includedir)
-install: install-recursive
+install:
+# install: install-recursive
install-exec: install-exec-recursive
install-data: install-data-recursive
uninstall: uninstall-recursive

54
archiver/rpm/no_src_redhat.patch

@ -1,54 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rpm/no_src_redhat.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
--- ./Makefile.in.orig Fri Feb 15 00:58:07 2002
+++ ./Makefile.in Sun Mar 24 23:13:34 2002
@@ -918,34 +918,6 @@
rm -f $(DESTDIR)$(bindir)/rpm$$bf ; \
@LN_S@ ../lib/rpm/rpm$$bf $(DESTDIR)$(bindir)/rpm$$bf ; \
done
- @for dir in BUILD RPMS SOURCES SPECS SRPMS ; do\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/$$dir;\
- done
- @case "@host_cpu@" in \
- *86) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i386 ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i486 ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i586 ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/i686 ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/athlon ;;\
- alpha*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alpha ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/alphaev6 ;;\
- sparc*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/sparcv9 ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/sparc64 ;;\
- ia64*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ia64 ;;\
- s390*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/s390 ;;\
- mipsel*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/mipsel ;;\
- mips*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/mips ;;\
- powerpc*) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc ;\
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/ppc64 ;;\
- *) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/@host_cpu@ ;;\
- esac
- $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/noarch
- @case "@host_os@" in \
- mint) $(mkinstalldirs) $(DESTDIR)$(pkgsrcdir)/RPMS/m68kmint ;;\
- solaris*|linux*) \
- chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ;; \
- esac
@$(mkinstalldirs) $(DESTDIR)/var/tmp
.PHONY: setperms

221
archiver/rpm/python24.patch

@ -1,221 +0,0 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../rpm/python24.patch
# Copyright (C) 2004 - 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -Nur rpm-4.1.orig/lib/rpmts.h rpm-4.1/lib/rpmts.h
--- rpm-4.1.orig/lib/rpmts.h 2002-08-23 21:35:49.000000000 +0200
+++ rpm-4.1/lib/rpmts.h 2005-10-09 14:40:22.000000000 +0300
@@ -10,7 +10,7 @@
/*@-exportlocal@*/
/*@unchecked@*/
-extern int _rpmts_debug;
+/*extern int _rpmts_debug;
/*@unchecked@*/
extern int _fps_debug;
/*@=exportlocal@*/
diff -Nur rpm-4.1.orig/python/header-py.c rpm-4.1/python/header-py.c
--- rpm-4.1.orig/python/header-py.c 2002-08-08 01:19:10.000000000 +0200
+++ rpm-4.1/python/header-py.c 2005-10-09 13:33:35.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/header-py.c
*/
-#include "system.h"
-
#include "Python.h"
+
+#undef _POSIX_C_SOURCE
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
@@ -429,7 +430,7 @@
while (extensions->name) {
if (extensions->type == HEADER_EXT_TAG
&& !xstrcasecmp(extensions->name + 7, str)) {
- (const struct headerSprintfExtension *) ext = extensions;
+ ext = extensions;
}
extensions++;
}
diff -Nur rpm-4.1.orig/python/rpmal-py.c rpm-4.1/python/rpmal-py.c
--- rpm-4.1.orig/python/rpmal-py.c 2002-07-14 23:24:28.000000000 +0200
+++ rpm-4.1/python/rpmal-py.c 2005-10-09 12:38:39.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmal-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmdb-py.c rpm-4.1/python/rpmdb-py.c
--- rpm-4.1.orig/python/rpmdb-py.c 2002-07-25 19:03:12.000000000 +0200
+++ rpm-4.1/python/rpmdb-py.c 2005-10-09 13:49:23.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmdb-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmds-py.c rpm-4.1/python/rpmds-py.c
--- rpm-4.1.orig/python/rpmds-py.c 2002-07-19 22:26:39.000000000 +0200
+++ rpm-4.1/python/rpmds-py.c 2005-10-09 13:49:52.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmds-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmfd-py.c rpm-4.1/python/rpmfd-py.c
--- rpm-4.1.orig/python/rpmfd-py.c 2002-07-14 23:24:28.000000000 +0200
+++ rpm-4.1/python/rpmfd-py.c 2005-10-09 13:50:21.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmfd-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmfi-py.c rpm-4.1/python/rpmfi-py.c
--- rpm-4.1.orig/python/rpmfi-py.c 2002-08-19 20:51:24.000000000 +0200
+++ rpm-4.1/python/rpmfi-py.c 2005-10-09 13:50:44.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmfi-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmmi-py.c rpm-4.1/python/rpmmi-py.c
--- rpm-4.1.orig/python/rpmmi-py.c 2002-08-10 01:14:10.000000000 +0200
+++ rpm-4.1/python/rpmmi-py.c 2005-10-09 13:51:07.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmmi-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmmodule.c rpm-4.1/python/rpmmodule.c
--- rpm-4.1.orig/python/rpmmodule.c 2002-08-13 18:37:52.000000000 +0200
+++ rpm-4.1/python/rpmmodule.c 2005-10-09 13:21:01.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmmodule.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
@@ -422,7 +423,7 @@
while (extensions->name) {
if (extensions->type == HEADER_EXT_TAG) {
- (const struct headerSprintfExtension *) ext = extensions;
+ ext = extensions;
PyDict_SetItemString(d, (char *) extensions->name, o=PyCObject_FromVoidPtr(ext, NULL));
Py_DECREF(o);
PyDict_SetItem(dict, tag, o=PyString_FromString(ext->name + 7));
diff -Nur rpm-4.1.orig/python/rpmrc-py.c rpm-4.1/python/rpmrc-py.c
--- rpm-4.1.orig/python/rpmrc-py.c 2002-08-05 23:46:52.000000000 +0200
+++ rpm-4.1/python/rpmrc-py.c 2005-10-09 13:41:44.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmrc-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmte-py.c rpm-4.1/python/rpmte-py.c
--- rpm-4.1.orig/python/rpmte-py.c 2002-07-14 23:24:29.000000000 +0200
+++ rpm-4.1/python/rpmte-py.c 2005-10-09 13:48:27.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmte-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;
diff -Nur rpm-4.1.orig/python/rpmts-py.c rpm-4.1/python/rpmts-py.c
--- rpm-4.1.orig/python/rpmts-py.c 2002-09-03 14:26:09.000000000 +0200
+++ rpm-4.1/python/rpmts-py.c 2005-10-09 14:39:57.000000000 +0300
@@ -2,9 +2,10 @@
* \file python/rpmts-py.c
*/
-#include "system.h"
-
#include "Python.h"
+#undef _POSIX_C_SOURCE
+
+#include "system.h"
#ifdef __LCLINT__
#undef PyObject_HEAD
#define PyObject_HEAD int _PyObjectHead;

8
archiver/rpm/rpm.desc

@ -1,9 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../rpm/rpm.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -29,8 +28,7 @@
[L] GPL
[S] Stable
[V] 4.1
[V] 5.0.2
[P] X -----5---9 138.600
[D] 4089338970 rpm-4.1.tar.gz ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
[D] 3204493626 rpm-5.0.2.tar.gz http://rpm5.org/files/rpm/rpm-5.0/

Loading…
Cancel
Save