Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 18:33:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Automatic import for version 5.3.12

Browse source
This commit is contained in:
Rosa 2012-02-01 14:15:49 +04:00
commit d5d753e187
16 changed files with 2413 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.abf.yml Normal file
View file

@ -0,0 +1,3 @@
sources:
"cpu-os-macros.tar.gz": 68dbf0b8b9c625c59ad607cf0eda665087cead58
"rpm-5.3.12.tar.xz": 81cdbf2d0f432abef56444eeabf9c2eab1d25f8a

66
legacy_compat.macros Normal file
View file

@ -0,0 +1,66 @@
%_dependency_whiteout_mandriva \
coreutils>pam \
tcb>shadow-utils \
mkinitrd>plymouth \
plymouth-scripts>plymouth \
perl-base>perl-base \
libncurses.so.5>ncurses libncurses.so.5()(64bit)>ncurses \
libncurses5>ncurses lib64ncurses5>ncurses \
libopenssl1.0.0>libopenssl-engines1.0.0 lib64openssl1.0.0>lib64openssl-engines1.0.0 \
libgamin-1_0>gamin lib64gamin-1_0>gamin \
libglib-2.0.so.0>gamin libglib-2.0.so.0()(64bit)>gamin \
util-linux-ng>udev \
SysVinit>initscripts systemd>initscripts systemd>systemd-units \
rpm-mandriva-setup>rpm rpm-mandriva-setup>rpm-manbo-setup rpm-manbo-setup>rpm \
drakx-kbd-mouse-x11>drakxtools-backend drakx-kbd-mouse-x11>drakxtools-curses \
drakxtools-backend>drakxtools-curses \
hal-info>hal \
perl-base>perl \
drakxtools-backend>drakxtools-curses \
libck-connector.so.0>consolekit libck-connector.so.0()(64bit)>consolekit \
libconsolekit0>consolekit lib64consolekit0>consolekit \
manbo-files-gcc>gcc manbo-files>libstdc++-devel \
gcc-cpp>gcc gcc>libstdc++-devel \
libgvfs0>gvfs lib64gvfs0>gvfs \
nss>libnss3 nss>lib64nss3 \
libpolkit1_0-0.99>polkit lib64polkit1_0-0.99>polkit \
libpolkit2>policykit lib64polkit2>policykit \
libv4l0>v4l-utils lib64v4l0>v4l-utils \
libenchant1>enchant lib64enchant1>enchant \
libsopranoclient1>soprano lib64sopranoclient1>soprano \
soprano>soprano-plugin-virtuoso \
libsopranoindex1>soprano lib64sopranoindex1>soprano \
libsoprano4>libsopranoserver1 lib64soprano4>lib64sopranoserver1 \
soprano>libsopraoserver1 soprano>lib64sopranoserver1 \
libv4l1.so.0>libv4l-wrappers libv4l1.so.0()(64bit)>libv4l-wrappers \
libgnome-vfs2_0>gnome-vfs2 lib64gnome-vfs2_0>gnome-vfs2 \
libgphoto2.so.2>libgphoto-common libgphoto2.so.2()(64bit)>lib64gphoto-common \
libgphoto2>libgphoto-common lib64gphoto2>lib64gphoto-common \
libwnck-1_22>libwnck lib64wnck-1_22>libwnck \
libcanberra-gtk0>canberra-gtk lib64canberra-gtk0>canberra-gtk \
libgcr0>gnome-keyring lib64gcr0>gnome-keyring \
libpango1.0_0>libpango1.0_0-modules lib64pango1.0_0>lib64pango1.0_0-modules \
libgio2.0_0>glib2.0 lib64gio2.0_0>glib2.0 \
libglib2.0_0>glib2.0-common lib64glib2.0_0>glib2.0-common \
libGConf2_4-2.32.0>GConf2 lib64GConf2_4-2.32.0>GConf2 \
libORBit2_0>ORBit2 lib64ORBit2_0>ORBit2 \
libhal1>hal lib64hal1>hal \
libgdk_pixbuf2.0_0>gdk-pixbuf2.0 lib64gdk_pixbuf2.0_0>gdk-pixbuf2.0 \
libgstreamer-0.10.so.0>gstreamer0.10-tools libgstreamer-0.10.so.0()(64bit)>gstreamer0.10-tools \
libuser1>libuser lib64user1>lib64user \
libdbus-1_3>dbus lib64dbus-1_3>dbus\
libfontconfig1>fontconfig lib64fontconfig1>fontconfig \
libgtk+-x11-2.0_0>libgtk+2.0_0 lib64gtk+-x11-2.0_0>lib64gtk+2.0_0 \
libgtk+2.0_0>gtk+2.0 lib64gtk+2.0_0>gtk+2.0 \
libgtk+-x11-2.0_0>gtk+2.0 lib64gtk+-x11-2.0_0>gtk+2.0 \
libavahi-client3>avahi lib64avahi-client3>avahi \
rpm-helper>rpm
# enabling this by default is to be dropped ASAP
%_dependency_whiteout %_dependency_whiteout_mandriva
%_legacy_compat_non_pre_scripts_dont_fail 1
%_legacy_compat_all \
%global _legacy_compat_no_doc_conflicts 1 \
%global _legacy_compat_non_pre_scripts_dont_fail 1 \
%global _dependency_whiteout %_dependency_whiteout_mandriva

12
rpm-5.3.10-doxygen-1.7.4-bug.patch Normal file
View file

@ -0,0 +1,12 @@
--- rpm-5.3.10/tools/rpmdigest.c.doxygen~ 2009-10-10 15:57:00.000000000 +0200
+++ rpm-5.3.10/tools/rpmdigest.c 2011-05-16 09:28:13.242200969 +0200
@@ -898,8 +898,7 @@ The following two options are useful onl
N_("\
When checking, the input should be a former output of this program. The\n\
default mode is to print a line with digest, a character indicating type\n\
-(`*' for binary, ` ' for text), and name for each FILE.\n\
-"), NULL },
+(`*' for binary, ` ' for text), and name for each FILE.\n"), NULL },
POPT_TABLEEND
};

38
rpm-5.3.11-fix-syslog-b0rkage.patch Normal file
View file

@ -0,0 +1,38 @@
--- rpm-5.3.11/lib/psm.c.syslog~ 2011-05-25 16:21:51.465345513 +0200
+++ rpm-5.3.11/lib/psm.c 2011-05-25 16:21:54.565306757 +0200
@@ -65,6 +65,11 @@
#include "debug.h"
+#if HAVE_SYSLOG
+#include <syslog.h>
+#include <rpmlog.h>
+#endif
+
#define _PSM_DEBUG 0
/*@unchecked@*/
int _psm_debug = _PSM_DEBUG;
@@ -3070,9 +3075,9 @@ assert(psm->mi == NULL);
else
rc = rpmdbAdd(rpmtsGetRdb(ts), tid, fi->h, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBADD), 0);
-#if defined(HAVE_SYSLOG_H) && defined(RPM_VENDOR_MANDRIVA) /* log-install-remove-to-syslog */
+#if defined(HAVE_SYSLOG) && defined(RPM_VENDOR_MANDRIVA) /* log-install-remove-to-syslog */
{
- char *s, fmt;
+ char *s, *fmt;
fmt = rpmExpand("%{___NVRA}", NULL);
s = headerSprintf(fi->h, fmt,
rpmTagTable, rpmHeaderFormats, NULL);
@@ -3110,9 +3115,9 @@ assert(psm->te != NULL);
(void) rpmswEnter(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
rc = rpmdbRemove(rpmtsGetRdb(ts), rpmtsGetTid(ts), fi->record, NULL);
(void) rpmswExit(rpmtsOp(ts, RPMTS_OP_DBREMOVE), 0);
-#if defined(HAVE_SYSLOG_H) && defined(RPM_VENDOR_MANDRIVA) /* log-install-remove-to-syslog */
+#if defined(HAVE_SYSLOG) && defined(RPM_VENDOR_MANDRIVA) /* log-install-remove-to-syslog */
{
- char *s, fmt;
+ char *s, *fmt;
fmt = rpmExpand("%{___NVRA}", NULL);
s = headerSprintf(fi->h, fmt,
rpmTagTable, rpmHeaderFormats, NULL);

22
rpm-5.3.12-55810-rpmevrcmp-again-grf.patch Normal file
View file

@ -0,0 +1,22 @@
--- rpm-5.3.12/lib/rpmds.c.55810~ 2011-07-12 18:15:29.016085065 +0200
+++ rpm-5.3.12/lib/rpmds.c 2011-07-12 18:15:56.300506314 +0200
@@ -4333,7 +4333,7 @@ assert((rpmdsFlags(B) & RPMSENSE_SENSEMA
case 'D': ix = RPMEVR_D; /*@switchbreak@*/break;
}
#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
- if(ix == RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
+ if(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
&& *(b->F[ix]) == '\0')
break;
if (a->F[ix] && b->F[ix])
--- rpm-5.3.12/rpmdb/rpmevr.c.55810~ 2011-07-12 18:15:40.964269535 +0200
+++ rpm-5.3.12/rpmdb/rpmevr.c 2011-07-12 18:15:42.897299380 +0200
@@ -286,7 +286,7 @@ assert(b->F[RPMEVR_D] != NULL);
case 'D': ix = RPMEVR_D; /*@switchbreak@*/break;
}
#if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
- if(ix == RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
+ if(ix >= RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
&& *(b->F[ix]) == '\0')
break;
#endif

14
rpm-5.3.12-change-dep-loop-errors-to-warnings.patch Normal file
View file

@ -0,0 +1,14 @@
--- rpm-5.3.12/macros/mandriva.in.loop_warning~ 2011-07-12 12:35:08.465808221 +0200
+++ rpm-5.3.12/macros/mandriva.in 2011-07-12 12:35:34.313207285 +0200
@@ -75,9 +75,9 @@ end\
%__xar %{_bindir}/xar
# mdvbz#61851
-%__tar_wildcards --wildcards
+%__tar_wildcards --wildcards
-%_loop_detection_loglevel 3
+%_loop_detection_loglevel 4
# mdvbz#62741
# standard systemd directories

9
rpm-5.3.8-dependency-whiteout.patch Normal file
View file

@ -0,0 +1,9 @@
--- rpm-5.3.8/macros/mandriva.in.dep_whiteout~ 2011-01-09 07:19:01.000000000 +0100
+++ rpm-5.3.8/macros/mandriva.in 2011-01-13 21:55:16.000000000 +0100
@@ -66,4 +66,6 @@ end\
# mdvbz#61851
%__tar_wildcards --wildcards
+%_loop_detection_loglevel 3
+
%{load:/etc/rpm/macros.d/*.macros}

21
rpm-5.3.8-distepoch-pattern-hack.patch Normal file
View file

@ -0,0 +1,21 @@
--- rpm-5.3.8/rpmdb/rpmdb.c.distpatt~ 2011-01-09 07:25:35.000000000 +0100
+++ rpm-5.3.8/rpmdb/rpmdb.c 2011-02-25 08:03:31.073663026 +0100
@@ -2441,6 +2446,18 @@ assert(keylen == sizeof(hdrNum));
/* XXX Special case #4: gather primary keys with patterns. */
rpmRC rc;
+ /* ugly hack to workaround disttag/distepoch pattern matching issue */
+ const char *tmp = strstr(keyp, "-mdv2011.0");
+ if(tmp) {
+ const char *origkeyp = keyp;
+ size_t klen = strlen(keyp);
+ keyp = alloca(klen);
+ memset((void*)keyp, klen, 0);
+ klen = tmp-origkeyp+1;
+ snprintf((char*)keyp, klen, "%s", origkeyp);
+ if(strlen(tmp) > sizeof("-mdv2011.0")-1)
+ stpcpy((char*)keyp+(klen-1), &tmp[sizeof("-mdv2011.0")-1]);
+ }
rc = dbiFindMatches(dbi, keyp, &set);
if ((rc && rc != RPMRC_NOTFOUND) || set == NULL || set->count < 1) { /* error or empty set */

11
rpm-5.3.8-disttag-distsuffix-fallback.patch Normal file
View file

@ -0,0 +1,11 @@
--- rpm-5.3.8/macros/mandriva.in.distsuffix~ 2011-01-22 23:54:04.320131003 +0100
+++ rpm-5.3.8/macros/mandriva.in 2011-01-23 00:09:48.251131004 +0100
@@ -31,7 +31,7 @@
# %release with such.
%evr_tuple_select 1234
%evr_tuple_order EVRD
-%disttag mdv
+%disttag %{!?distsuffix:mdv}%{?distsuffix}
%distepoch %(sed -e 's#.*release\\ \\(\\S*\\).*#\\1#' /etc/release)
# Dynamic EVRD tags macro for use with versioned provides/requires in place of

27
rpm-5.3.8-fire-file-triggers-only-once.patch Normal file
View file

@ -0,0 +1,27 @@
--- rpm-5.3.8/lib/psm.c.trigger_once~ 2011-02-21 22:35:22.081663000 +0100
+++ rpm-5.3.8/lib/psm.c 2011-02-21 22:35:25.023663001 +0100
@@ -1482,11 +1482,23 @@ static rpmRC runTriggersLoop(rpmpsm psm,
/*@innercontinue@*/ continue;
rc |= handleOneTrigger(psm, fi->h, triggeredH, arg2);
prev = instance;
+
+ /* FIXME: 'instances' is never really used for anything later,
+ * and seems to have some bug making it eat it all memory
xx = argiAdd(&instances, -1, instance);
- xx = argiSort(instances, NULL);
+ xx = argiSort(instances, NULL);*/
+ /* As no filenames or anything is passed to the trigger script,
+ * there doesn't seem to be any reason to fire the same trigger
+ * over and over..
+ */
+ if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES)
+ break;
}
mi = rpmmiFree(mi);
+ /* again don't fire same trigger over and over.. */
+ if(tagno == RPMTAG_BASENAMES || RPMTAG_DIRNAMES)
+ break;
}
instances = argiFree(instances);

11
rpm-5.3.8-fix-russian-typo.patch Normal file
View file

@ -0,0 +1,11 @@
--- rpm-5.3.8/po/ru.po.ru_typo~ 2011-02-10 22:25:44.205491002 +0100
+++ rpm-5.3.8/po/ru.po 2011-02-10 22:25:49.050491001 +0100
@@ -3015,7 +3015,7 @@ msgstr "(ÕÓÔÁÎÏ×ÌÅÎ)"
#: lib/rpmps.c:299
#, c-format
msgid "%s conflicts with %s%s"
-msgstr "%s ËÏÎÆÌÉËÔÕÅÔ Ó%s%s"
+msgstr "%s ËÏÎÆÌÉËÔÕÅÔ Ó %s%s"
#: lib/rpmps.c:305
#, fuzzy, c-format

63
rpm-5.3.8-no-doc-conflicts.patch Normal file
View file

@ -0,0 +1,63 @@
--- rpm-5.3.8/lib/transaction.c.doc_conflicts~ 2011-01-18 23:27:15.243131004 +0100
+++ rpm-5.3.8/lib/transaction.c 2011-01-18 23:34:38.430131002 +0100
@@ -68,6 +68,24 @@
/*@access IDTX @*/
/*@access FD_t @*/
+#if defined(RPM_VENDOR_MANDRIVA)
+static int is_a_doc_conflict(rpmfi fi)
+{
+ const char *ignorelist[] = {
+ "/usr/share/man/",
+ "/usr/share/gtk-doc/html/",
+ "/usr/share/gnome/html/",
+ NULL
+ };
+ const char *fn = rpmfiFN(fi);
+ const char **dnp;
+ for (dnp = ignorelist; *dnp != NULL; dnp++)
+ if (strstr(fn, *dnp) == fn) return 1;
+
+ return 0;
+}
+#endif
+
static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
Header otherHeader, rpmfi otherFi,
int beingRemoved)
@@ -117,6 +135,17 @@ static int handleInstInstalledFile(const
}
}
+#if defined(RPM_VENDOR_MANDRIVA)
+ if(rpmExpandNumeric("%{?_legacy_compat_no_doc_conflicts}")) {
+ /* HACK: always install latest (arch-independent) man
+ pages and gtk/gnome html doc files. */
+ if (rConflicts && is_a_doc_conflict(fi)) {
+ fi->actions[fx] = FA_CREATE;
+ rConflicts = 0;
+ }
+ }
+#endif
+
if (rConflicts) {
HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
rpmps ps = rpmtsProblems(ts);
@@ -381,6 +410,17 @@ assert(otherFi != NULL);
done = 1;
}
+#if defined(RPM_VENDOR_MANDRIVA)
+ if(rpmExpandNumeric("%{?_legacy_compat_no_doc_conflicts}")) {
+ /* HACK: always install latest (arch-independent) man
+ pages and gtk/gnome html doc files. */
+ if (rConflicts && is_a_doc_conflict(fi)) {
+ fi->actions[i] = FA_CREATE;
+ rConflicts = 0;
+ }
+ }
+#endif
+
if (rConflicts) {
rpmpsAppend(ps, RPMPROB_NEW_FILE_CONFLICT,
rpmteNEVR(p), rpmteKey(p),

68
rpm-5.3.8-non-pre-scripts-dont-fail.patch Normal file
View file

@ -0,0 +1,68 @@
--- rpm-5.3.8/lib/psm.c.scriptlet~ 2011-01-09 07:18:14.000000000 +0100
+++ rpm-5.3.8/lib/psm.c 2011-01-19 01:04:33.070131004 +0100
@@ -2178,6 +2178,10 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
rpmRC rc = psm->rc;
int saveerrno;
int xx;
+ int non_pre_scripts_dont_fail = 0;
+#if defined(RPM_VENDOR_MANDRIVA)
+ non_pre_scripts_dont_fail = rpmExpandNumeric("%{?_legacy_compat_non_pre_scripts_dont_fail}");
+#endif
/* XXX hackery to assert(!scareMem) in rpmfiNew. */
/*@-castexpose@*/
@@ -2399,11 +2403,11 @@ assert(he->p.argv != NULL);
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERUN)) {
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
}
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPREUN))
@@ -2743,16 +2747,16 @@ assert(psm->te != NULL);
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOST)) {
rc = rpmpsmNext(psm, PSM_SCRIPT);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
}
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERIN)) {
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
}
/*
@@ -2785,17 +2789,17 @@ assert(psm->te != NULL);
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOPOSTUN)) {
rc = rpmpsmNext(psm, PSM_SCRIPT);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
}
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_NOTRIGGERPOSTUN)) {
/* Run triggers in other package(s) this package sets off. */
rc = rpmpsmNext(psm, PSM_TRIGGERS);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
/* Run triggers in this package other package(s) set off. */
rc = rpmpsmNext(psm, PSM_IMMED_TRIGGERS);
- if (rc) break;
+ if(rc && !non_pre_scripts_dont_fail) break;
}
if (!(rpmtsFlags(ts) & RPMTRANS_FLAG_APPLYONLY))

22
rpm-5.3.8-set-default-bdb-log-dir.patch Normal file
View file

@ -0,0 +1,22 @@
--- rpm-5.3.8/rpmdb/db3.c.set_lg_dir~ 2011-01-25 15:52:56.000000000 +0100
+++ rpm-5.3.8/rpmdb/db3.c 2011-01-25 16:20:29.860333978 +0100
@@ -920,6 +920,19 @@ static int db_init(dbiIndex dbi, const c
}
/* ==== Logging: */
+ const char *logdir;
+
+ logdir = rpmGetPath(dbhome, "/", "log", NULL);
+ /*
+ * Create the /var/lib/rpm/log directory if it doesn't exist (root only).
+ */
+ rpmioMkpath(logdir, 0755, getuid(), getgid());
+
+ xx = dbenv->set_lg_dir(dbenv, logdir);
+ xx = cvtdberr(dbi, "dbenv->set_lg_dir", xx, _debug);
+
+ _free(logdir);
+
/* ==== Memory pool: */
if (eflags & DB_INIT_MPOOL) {

29
rpm-GROUPS Normal file
View file

@ -0,0 +1,29 @@
Amusements/Games
Amusements/Graphics
Applications/Archiving
Applications/Communications
Applications/Databases
Applications/Editors
Applications/Emulators
Applications/Engineering
Applications/File
Applications/Internet
Applications/Multimedia
Applications/Productivity
Applications/Publishing
Applications/System
Applications/Text
Development/Debuggers
Development/Languages
Development/Libraries
Development/System
Development/Tools
Documentation
System Environment/Base
System Environment/Daemons
System Environment/Kernel
System Environment/Libraries
System Environment/Shells
User Interface/Desktops
User Interface/X
User Interface/X Hardware Support

1997
rpm.spec Normal file
View file

File diff suppressed because it is too large Load diff